From f3f14ab9650f68f64a370b0b83b0532694405efd Mon Sep 17 00:00:00 2001
From: Dmitry Ilyin <dima@doty.ru>
Date: Thu, 18 Aug 2022 23:25:38 +0300
Subject: [PATCH] Tinify libfdk encoder (#376)

* Tinify libfdk encoder

* Test skip of download artifact
---
 .github/workflows/hi3516ev200_matrix.yml      |  6 ++--
 .../fdk-aac-openipc/fdk-aac-openipc.mk        | 28 ++++++++++---------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/hi3516ev200_matrix.yml b/.github/workflows/hi3516ev200_matrix.yml
index 75128c4a..7b83ceae 100644
--- a/.github/workflows/hi3516ev200_matrix.yml
+++ b/.github/workflows/hi3516ev200_matrix.yml
@@ -97,7 +97,9 @@ jobs:
           echo "SDK_PATH=$SDK_PATH" >> $GITHUB_ENV
 
       - uses: actions/upload-artifact@v3
-        if: ${{ (env.ACT || github.event_name == 'pull_request') && env.NEED == 'true' }}
+        # uncomment one of the options:
+        # 1. Build only there is no such toolchain
+        if: env.NEED == 'true'
         with:
           name: '${{ env.TOOLNAME }}.tgz'
           path: ${{ env.SDK_PATH }}
@@ -213,7 +215,7 @@ jobs:
           echo "TOOLNAME=$TOOLNAME" >> $GITHUB_ENV
 
       - uses: actions/download-artifact@v3
-        if: ${{ (env.ACT || github.event_name == 'pull_request') }}
+        continue-on-error: true
         with:
           name: '${{ env.TOOLNAME }}.tgz'
 
diff --git a/general/package/fdk-aac-openipc/fdk-aac-openipc.mk b/general/package/fdk-aac-openipc/fdk-aac-openipc.mk
index 199dbdda..8263c98a 100644
--- a/general/package/fdk-aac-openipc/fdk-aac-openipc.mk
+++ b/general/package/fdk-aac-openipc/fdk-aac-openipc.mk
@@ -4,20 +4,22 @@
 #
 ################################################################################
 
-FDK_AAC_OPENIPC_VERSION = 2.0.2
-FDK_AAC_OPENIPC_SITE = $(call github,mstorsjo,fdk-aac,v$(FDK_AAC_OPENIPC_VERSION))
+FDK_AAC_OPENIPC_VERSION = tinification
+FDK_AAC_OPENIPC_SITE = $(call github,widgetii,fdk-aac,$(FDK_AAC_OPENIPC_VERSION))
 FDK_AAC_OPENIPC_LICENSE = fdk-aac license
 FDK_AAC_OPENIPC_LICENSE_FILES = NOTICE
 FDK_AAC_OPENIPC_INSTALL_STAGING = YES
-FDK_AAC_OPENIPC_CONF_OPTS = --disable-static
+FDK_AAC_OPENIPC_CONF_OPTS = \
+	-DBUILD_SHARED_LIBS=OFF \
+	-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=TRUE \
+	-DCMAKE_POLICY_DEFAULT_CMP0069=NEW \
+	-DDISABLE_SBR_ENCODER=ON \
+	-DDISABLE_SAC_ENCODER=ON \
+	-DDISABLE_META_ENCODER=ON \
+	-DDISABLE_NOISE_SHAPING=ON \
+	-DDISABLE_TRANSPORT_ENCODER=ON \
+	-DDISABLE_STEREO=ON \
+	-DDISABLE_DECODERS=ON \
+	-DCMAKE_BUILD_TYPE=Release
 
-# This package uses autoconf, but not automake, so we need to call
-# their special autogen.sh script, and have custom target and staging
-# installation commands.
-
-define FDK_AAC_OPENIPC_RUN_AUTOGEN
-	cd $(@D) && PATH=$(BR_PATH) ./autogen.sh
-endef
-FDK_AAC_OPENIPC_PRE_CONFIGURE_HOOKS += FDK_AAC_OPENIPC_RUN_AUTOGEN
-
-$(eval $(autotools-package))
+$(eval $(cmake-package))