From 1092d8a03f4c8e7e69ea2d6cc7e2e90c89d54031 Mon Sep 17 00:00:00 2001
From: "Igor Zalatov (from Citadel PC)" <flyrouter@gmail.com>
Date: Wed, 15 Dec 2021 22:57:36 +0300
Subject: [PATCH] Rollback json-c package to hi3516ev300, enable
 fdk-aac-openipc package for hi3516cv500

---
 .../configs/unknown_unknown_hi3516cv500_openipc_defconfig      | 2 +-
 .../configs/unknown_unknown_hi3516ev300_openipc_defconfig      | 2 +-
 general/package/ipctool/ipctool.mk                             | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516cv500_openipc_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516cv500_openipc_defconfig
index 95f17938..25c08e7c 100644
--- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516cv500_openipc_defconfig
+++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516cv500_openipc_defconfig
@@ -46,7 +46,7 @@ BR2_GLOBAL_PATCH_DIR="$(TOPDIR)/../general/package/all-patches"
 # OpenIPC packages
 BR2_PACKAGE_BUSYBOX_CONFIG="$(TOPDIR)/../general/package/busybox/busybox.config"
 BR2_PACKAGE_DROPBEAR=y
-# BR2_PACKAGE_FDK_AAC_OPENIPC is not set
+BR2_PACKAGE_FDK_AAC_OPENIPC=y
 BR2_PACKAGE_FWPRINTENV_OPENIPC=y
 BR2_PACKAGE_HASERL=y
 BR2_PACKAGE_HISI_GPIO=y
diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_openipc_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_openipc_defconfig
index fc8fb228..982dc1d4 100644
--- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_openipc_defconfig
+++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_openipc_defconfig
@@ -55,7 +55,7 @@ BR2_PACKAGE_HASERL=y
 BR2_PACKAGE_HISI_GPIO=y
 BR2_PACKAGE_HISILICON_OSDRV_HI3516EV300=y
 BR2_PACKAGE_IPCTOOL=y
-BR2_PACKAGE_JSON_C_OPENIPC=y
+BR2_PACKAGE_JSON_C=y
 BR2_PACKAGE_LAME_OPENIPC=y
 BR2_PACKAGE_LIBCURL_OPENIPC=y
 BR2_PACKAGE_LIBCURL_OPENIPC_CURL=y
diff --git a/general/package/ipctool/ipctool.mk b/general/package/ipctool/ipctool.mk
index c7e2b991..a5b152a4 100644
--- a/general/package/ipctool/ipctool.mk
+++ b/general/package/ipctool/ipctool.mk
@@ -9,8 +9,7 @@ IPCTOOL_SITE = $(call github,openipc,ipctool,$(IPCTOOL_VERSION))
 IPCTOOL_LICENSE = MIT
 IPCTOOL_LICENSE_FILES = LICENSE
 
-IPCTOOL_CONF_OPTS += -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release 
-# -DSKIP_VERSION=ON
+IPCTOOL_CONF_OPTS += -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release -DSKIP_VERSION=ON
 
 IPCTOOL_MAKE_OPTS += VERBOSE=1