diff --git a/br-ext-chip-fullhan/Config.in b/br-ext-chip-fullhan/Config.in index 4f6d3177..1428fc5a 100644 --- a/br-ext-chip-fullhan/Config.in +++ b/br-ext-chip-fullhan/Config.in @@ -1,6 +1,7 @@ source "$BR2_EXTERNAL_FULLHAN_PATH/linux/Config.ext.in" source "$BR2_EXTERNAL_FULLHAN_PATH/package/fullhan_patcher/Config.in" source "$BR2_EXTERNAL_FULLHAN_PATH/package/aura-httpd/Config.in" +source "$BR2_EXTERNAL_FULLHAN_PATH/package/fdk-aac-openipc/Config.in" source "$BR2_EXTERNAL_FULLHAN_PATH/package/fwprintenv-openipc/Config.in" source "$BR2_EXTERNAL_FULLHAN_PATH/package/ipctool/Config.in" source "$BR2_EXTERNAL_FULLHAN_PATH/package/lame-openipc/Config.in" diff --git a/br-ext-chip-fullhan/external.mk b/br-ext-chip-fullhan/external.mk index 919ac29d..17fc1119 100644 --- a/br-ext-chip-fullhan/external.mk +++ b/br-ext-chip-fullhan/external.mk @@ -1,6 +1,7 @@ include $(BR2_EXTERNAL_FULLHAN_PATH)/linux/linux-ext-fullhan_patcher.mk include $(BR2_EXTERNAL_FULLHAN_PATH)/package/fullhan_patcher/fullhan_patcher.mk include $(BR2_EXTERNAL_FULLHAN_PATH)/package/aura-httpd/aura-httpd.mk +include $(BR2_EXTERNAL_FULLHAN_PATH)/package/fdk-aac-openipc/fdk-aac-openipc.mk include $(BR2_EXTERNAL_FULLHAN_PATH)/package/fwprintenv-openipc/fwprintenv-openipc.mk include $(BR2_EXTERNAL_FULLHAN_PATH)/package/ipctool/ipctool.mk include $(BR2_EXTERNAL_FULLHAN_PATH)/package/lame-openipc/lame-openipc.mk diff --git a/br-ext-chip-fullhan/package/fdk-aac-openipc b/br-ext-chip-fullhan/package/fdk-aac-openipc new file mode 120000 index 00000000..c2027828 --- /dev/null +++ b/br-ext-chip-fullhan/package/fdk-aac-openipc @@ -0,0 +1 @@ +../../general/package/fdk-aac-openipc \ No newline at end of file diff --git a/br-ext-chip-goke/Config.in b/br-ext-chip-goke/Config.in index 84b076d0..15889a10 100644 --- a/br-ext-chip-goke/Config.in +++ b/br-ext-chip-goke/Config.in @@ -1,6 +1,7 @@ source "$BR2_EXTERNAL_GOKE_PATH/linux/Config.ext.in" source "$BR2_EXTERNAL_GOKE_PATH/package/goke_patcher/Config.in" source "$BR2_EXTERNAL_GOKE_PATH/package/aura-httpd/Config.in" +source "$BR2_EXTERNAL_GOKE_PATH/package/fdk-aac-openipc/Config.in" source "$BR2_EXTERNAL_GOKE_PATH/package/fwprintenv-openipc/Config.in" source "$BR2_EXTERNAL_GOKE_PATH/package/ipctool/Config.in" source "$BR2_EXTERNAL_GOKE_PATH/package/lame-openipc/Config.in" diff --git a/br-ext-chip-goke/external.mk b/br-ext-chip-goke/external.mk index 71f7d7b4..52570ac0 100644 --- a/br-ext-chip-goke/external.mk +++ b/br-ext-chip-goke/external.mk @@ -1,6 +1,7 @@ include $(BR2_EXTERNAL_GOKE_PATH)/linux/linux-ext-goke_patcher.mk include $(BR2_EXTERNAL_GOKE_PATH)/package/goke_patcher/goke_patcher.mk include $(BR2_EXTERNAL_GOKE_PATH)/package/aura-httpd/aura-httpd.mk +include $(BR2_EXTERNAL_GOKE_PATH)/package/fdk-aac-openipc/fdk-aac-openipc.mk include $(BR2_EXTERNAL_GOKE_PATH)/package/fwprintenv-openipc/fwprintenv-openipc.mk include $(BR2_EXTERNAL_GOKE_PATH)/package/ipctool/ipctool.mk include $(BR2_EXTERNAL_GOKE_PATH)/package/lame-openipc/lame-openipc.mk diff --git a/br-ext-chip-goke/package/fdk-aac-openipc b/br-ext-chip-goke/package/fdk-aac-openipc new file mode 120000 index 00000000..c2027828 --- /dev/null +++ b/br-ext-chip-goke/package/fdk-aac-openipc @@ -0,0 +1 @@ +../../general/package/fdk-aac-openipc \ No newline at end of file diff --git a/br-ext-chip-hisilicon/Config.in b/br-ext-chip-hisilicon/Config.in index e1e37bc7..4c24981a 100644 --- a/br-ext-chip-hisilicon/Config.in +++ b/br-ext-chip-hisilicon/Config.in @@ -1,6 +1,7 @@ source "$BR2_EXTERNAL_HISILICON_PATH/linux/Config.ext.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/hisi_patcher/Config.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/aura-httpd/Config.in" +source "$BR2_EXTERNAL_HISILICON_PATH/package/fdk-aac-openipc/Config.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/fwprintenv-openipc/Config.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/gdbserver-lite/Config.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/hisi_gpio/Config.in" diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_openipc_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_openipc_defconfig index a031cc3a..9a6c4252 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_openipc_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_openipc_defconfig @@ -47,6 +47,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=y BR2_PACKAGE_FWPRINTENV_OPENIPC=y # BR2_PACKAGE_HASERL is not set BR2_PACKAGE_HISI_GPIO=y diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_glibc_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_glibc_defconfig index 91f67411..f765feea 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_glibc_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_glibc_defconfig @@ -51,6 +51,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=y BR2_PACKAGE_FWPRINTENV_OPENIPC=y # BR2_PACKAGE_HASERL is not set 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 ad971324..f1699072 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_openipc_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_openipc_defconfig @@ -48,6 +48,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=y BR2_PACKAGE_FWPRINTENV_OPENIPC=y # BR2_PACKAGE_HASERL is not set BR2_PACKAGE_HISI_GPIO=y @@ -88,5 +89,3 @@ BR2_PACKAGE_YAML_CLI=y # BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U is not set # BR2_PACKAGE_RTL8188EU is not set -# Beta -BR2_PACKAGE_VO_AACENC=y diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3518ev300_openipc_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3518ev300_openipc_defconfig index 9ccec883..6d2cf589 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3518ev300_openipc_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3518ev300_openipc_defconfig @@ -69,11 +69,3 @@ BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y - -# Unused -# BR2_SHARED_STATIC_LIBS is not set -# BR2_PACKAGE_JPEG_TURBO is not set -# BR2_PACKAGE_MINIHTTP is not set -# BR2_PACKAGE_MXML is not set -# BR2_PACKAGE_SSHPASS is not set -# BR2_PACKAGE_RTL8188EU is not set diff --git a/br-ext-chip-hisilicon/external.mk b/br-ext-chip-hisilicon/external.mk index d785829a..58d7a4fe 100644 --- a/br-ext-chip-hisilicon/external.mk +++ b/br-ext-chip-hisilicon/external.mk @@ -2,6 +2,7 @@ include $(BR2_EXTERNAL_HISILICON_PATH)/linux/linux-ext-hisi_patcher.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/hisi_patcher/hisi_patcher.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/aura-httpd/aura-httpd.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/gdbserver-lite/gdbserver-lite.mk +include $(BR2_EXTERNAL_HISILICON_PATH)/package/fdk-aac-openipc/fdk-aac-openipc.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/fwprintenv-openipc/fwprintenv-openipc.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/hisi_gpio/hisi_gpio.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516ev300/hisilicon-osdrv-hi3516ev300.mk diff --git a/br-ext-chip-hisilicon/package/fdk-aac-openipc b/br-ext-chip-hisilicon/package/fdk-aac-openipc new file mode 120000 index 00000000..c2027828 --- /dev/null +++ b/br-ext-chip-hisilicon/package/fdk-aac-openipc @@ -0,0 +1 @@ +../../general/package/fdk-aac-openipc \ No newline at end of file diff --git a/br-ext-chip-ingenic/Config.in b/br-ext-chip-ingenic/Config.in index cc1f836b..2360d35d 100644 --- a/br-ext-chip-ingenic/Config.in +++ b/br-ext-chip-ingenic/Config.in @@ -1,6 +1,7 @@ source "$BR2_EXTERNAL_INGENIC_PATH/linux/Config.ext.in" source "$BR2_EXTERNAL_INGENIC_PATH/package/ingenic_patcher/Config.in" source "$BR2_EXTERNAL_INGENIC_PATH/package/aura-httpd/Config.in" +source "$BR2_EXTERNAL_INGENIC_PATH/package/fdk-aac-openipc/Config.in" source "$BR2_EXTERNAL_INGENIC_PATH/package/fwprintenv-openipc/Config.in" source "$BR2_EXTERNAL_INGENIC_PATH/package/ipctool/Config.in" source "$BR2_EXTERNAL_INGENIC_PATH/package/lame-openipc/Config.in" diff --git a/br-ext-chip-ingenic/external.mk b/br-ext-chip-ingenic/external.mk index 2af40953..4268e999 100644 --- a/br-ext-chip-ingenic/external.mk +++ b/br-ext-chip-ingenic/external.mk @@ -1,6 +1,7 @@ include $(BR2_EXTERNAL_INGENIC_PATH)/linux/linux-ext-ingenic_patcher.mk include $(BR2_EXTERNAL_INGENIC_PATH)/package/ingenic_patcher/ingenic_patcher.mk include $(BR2_EXTERNAL_INGENIC_PATH)/package/aura-httpd/aura-httpd.mk +include $(BR2_EXTERNAL_INGENIC_PATH)/package/fdk-aac-openipc/fdk-aac-openipc.mk include $(BR2_EXTERNAL_INGENIC_PATH)/package/fwprintenv-openipc/fwprintenv-openipc.mk include $(BR2_EXTERNAL_INGENIC_PATH)/package/ipctool/ipctool.mk include $(BR2_EXTERNAL_INGENIC_PATH)/package/lame-openipc/lame-openipc.mk diff --git a/br-ext-chip-ingenic/package/fdk-aac-openipc b/br-ext-chip-ingenic/package/fdk-aac-openipc new file mode 120000 index 00000000..c2027828 --- /dev/null +++ b/br-ext-chip-ingenic/package/fdk-aac-openipc @@ -0,0 +1 @@ +../../general/package/fdk-aac-openipc \ No newline at end of file diff --git a/br-ext-chip-novatek/Config.in b/br-ext-chip-novatek/Config.in index 0ae5a560..7b9d7a37 100644 --- a/br-ext-chip-novatek/Config.in +++ b/br-ext-chip-novatek/Config.in @@ -1,6 +1,7 @@ source "$BR2_EXTERNAL_NOVATEK_PATH/linux/Config.ext.in" source "$BR2_EXTERNAL_NOVATEK_PATH/package/novatek_patcher/Config.in" source "$BR2_EXTERNAL_NOVATEK_PATH/package/aura-httpd/Config.in" +source "$BR2_EXTERNAL_NOVATEK_PATH/package/fdk-aac-openipc/Config.in" source "$BR2_EXTERNAL_NOVATEK_PATH/package/fwprintenv-openipc/Config.in" source "$BR2_EXTERNAL_NOVATEK_PATH/package/ipctool/Config.in" source "$BR2_EXTERNAL_NOVATEK_PATH/package/lame-openipc/Config.in" diff --git a/br-ext-chip-novatek/external.mk b/br-ext-chip-novatek/external.mk index ca927d6a..130bef13 100644 --- a/br-ext-chip-novatek/external.mk +++ b/br-ext-chip-novatek/external.mk @@ -1,6 +1,7 @@ include $(BR2_EXTERNAL_NOVATEK_PATH)/linux/linux-ext-novatek_patcher.mk include $(BR2_EXTERNAL_NOVATEK_PATH)/package/novatek_patcher/novatek_patcher.mk include $(BR2_EXTERNAL_NOVATEK_PATH)/package/aura-httpd/aura-httpd.mk +include $(BR2_EXTERNAL_NOVATEK_PATH)/package/fdk-aac-openipc/fdk-aac-openipc.mk include $(BR2_EXTERNAL_NOVATEK_PATH)/package/fwprintenv-openipc/fwprintenv-openipc.mk include $(BR2_EXTERNAL_NOVATEK_PATH)/package/ipctool/ipctool.mk include $(BR2_EXTERNAL_NOVATEK_PATH)/package/lame-openipc/lame-openipc.mk diff --git a/br-ext-chip-novatek/package/fdk-aac-openipc b/br-ext-chip-novatek/package/fdk-aac-openipc new file mode 120000 index 00000000..c2027828 --- /dev/null +++ b/br-ext-chip-novatek/package/fdk-aac-openipc @@ -0,0 +1 @@ +../../general/package/fdk-aac-openipc \ No newline at end of file diff --git a/br-ext-chip-sigmastar/Config.in b/br-ext-chip-sigmastar/Config.in index dff3b786..5de498ca 100644 --- a/br-ext-chip-sigmastar/Config.in +++ b/br-ext-chip-sigmastar/Config.in @@ -1,6 +1,7 @@ source "$BR2_EXTERNAL_SIGMASTAR_PATH/linux/Config.ext.in" source "$BR2_EXTERNAL_SIGMASTAR_PATH/package/sigmastar_patcher/Config.in" source "$BR2_EXTERNAL_SIGMASTAR_PATH/package/aura-httpd/Config.in" +source "$BR2_EXTERNAL_SIGMASTAR_PATH/package/fdk-aac-openipc/Config.in" source "$BR2_EXTERNAL_SIGMASTAR_PATH/package/fwprintenv-openipc/Config.in" source "$BR2_EXTERNAL_SIGMASTAR_PATH/package/gdbserver-lite/Config.in" source "$BR2_EXTERNAL_SIGMASTAR_PATH/package/ipctool/Config.in" diff --git a/br-ext-chip-sigmastar/external.mk b/br-ext-chip-sigmastar/external.mk index ae64a0fb..a836b85a 100644 --- a/br-ext-chip-sigmastar/external.mk +++ b/br-ext-chip-sigmastar/external.mk @@ -1,6 +1,7 @@ include $(BR2_EXTERNAL_SIGMASTAR_PATH)/linux/linux-ext-sigmastar_patcher.mk include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/sigmastar_patcher/sigmastar_patcher.mk include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/aura-httpd/aura-httpd.mk +include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/fdk-aac-openipc/fdk-aac-openipc.mk include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/fwprintenv-openipc/fwprintenv-openipc.mk include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/gdbserver-lite/gdbserver-lite.mk include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/ipctool/ipctool.mk diff --git a/br-ext-chip-sigmastar/package/fdk-aac-openipc b/br-ext-chip-sigmastar/package/fdk-aac-openipc new file mode 120000 index 00000000..c2027828 --- /dev/null +++ b/br-ext-chip-sigmastar/package/fdk-aac-openipc @@ -0,0 +1 @@ +../../general/package/fdk-aac-openipc \ No newline at end of file diff --git a/br-ext-chip-xiongmai/Config.in b/br-ext-chip-xiongmai/Config.in index 249ca30b..76617e5b 100644 --- a/br-ext-chip-xiongmai/Config.in +++ b/br-ext-chip-xiongmai/Config.in @@ -1,6 +1,7 @@ source "$BR2_EXTERNAL_XIONGMAI_PATH/linux/Config.ext.in" source "$BR2_EXTERNAL_XIONGMAI_PATH/package/xiongmai_patcher/Config.in" source "$BR2_EXTERNAL_XIONGMAI_PATH/package/aura-httpd/Config.in" +source "$BR2_EXTERNAL_XIONGMAI_PATH/package/fdk-aac-openipc/Config.in" source "$BR2_EXTERNAL_XIONGMAI_PATH/package/fwprintenv-openipc/Config.in" source "$BR2_EXTERNAL_XIONGMAI_PATH/package/ipctool/Config.in" source "$BR2_EXTERNAL_XIONGMAI_PATH/package/lame-openipc/Config.in" diff --git a/br-ext-chip-xiongmai/external.mk b/br-ext-chip-xiongmai/external.mk index 50cc0ac1..cae78b7d 100644 --- a/br-ext-chip-xiongmai/external.mk +++ b/br-ext-chip-xiongmai/external.mk @@ -1,6 +1,7 @@ include $(BR2_EXTERNAL_XIONGMAI_PATH)/linux/linux-ext-xiongmai_patcher.mk include $(BR2_EXTERNAL_XIONGMAI_PATH)/package/xiongmai_patcher/xiongmai_patcher.mk include $(BR2_EXTERNAL_XIONGMAI_PATH)/package/aura-httpd/aura-httpd.mk +include $(BR2_EXTERNAL_XIONGMAI_PATH)/package/fdk-aac-openipc/fdk-aac-openipc.mk include $(BR2_EXTERNAL_XIONGMAI_PATH)/package/fwprintenv-openipc/fwprintenv-openipc.mk include $(BR2_EXTERNAL_XIONGMAI_PATH)/package/ipctool/ipctool.mk include $(BR2_EXTERNAL_XIONGMAI_PATH)/package/lame-openipc/lame-openipc.mk diff --git a/br-ext-chip-xiongmai/package/fdk-aac-openipc b/br-ext-chip-xiongmai/package/fdk-aac-openipc new file mode 120000 index 00000000..c2027828 --- /dev/null +++ b/br-ext-chip-xiongmai/package/fdk-aac-openipc @@ -0,0 +1 @@ +../../general/package/fdk-aac-openipc \ No newline at end of file diff --git a/general/package/fdk-aac-openipc/Config.in b/general/package/fdk-aac-openipc/Config.in new file mode 100644 index 00000000..92826c27 --- /dev/null +++ b/general/package/fdk-aac-openipc/Config.in @@ -0,0 +1,24 @@ +# These are the architectures supported by FDK AAC +config BR2_PACKAGE_FDK_AAC_OPENIPC_ARCH_SUPPORTS + bool + default y if BR2_aarch64 + default y if BR2_arm || BR2_armeb + default y if BR2_i386 || BR2_x86_64 + default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el + default y if BR2_powerpc + default y if BR2_sh + +config BR2_PACKAGE_FDK_AAC_OPENIPC + bool "fdk-aac-openipc" + depends on BR2_PACKAGE_FDK_AAC_OPENIPC_ARCH_SUPPORTS + depends on BR2_INSTALL_LIBSTDCPP + help + The Fraunhofer FDK AAC Codec Library for Android ("FDK AAC + Codec") is software that implements the MPEG Advanced Audio + Coding ("AAC") encoding and decoding scheme for digital audio + + https://github.com/mstorsjo/fdk-aac + +comment "fdk-aac needs a toolchain w/ C++" + depends on BR2_PACKAGE_FDK_AAC_OPENIPC_ARCH_SUPPORTS + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/general/package/fdk-aac-openipc/fdk-aac-openipc.mk b/general/package/fdk-aac-openipc/fdk-aac-openipc.mk new file mode 100644 index 00000000..edd32740 --- /dev/null +++ b/general/package/fdk-aac-openipc/fdk-aac-openipc.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# fdk-aac-openipc +# +################################################################################ + +FDK_AAC_OPENIPC_VERSION = 2.0.2 +FDK_AAC_OPENIPC_SITE = $(call github,mstorsjo,fdk-aac,v$(FDK_AAC_OPENIPC_VERSION)) +FDK_AAC_OPENIPC_LICENSE = fdk-aac license +FDK_AAC_OPENIPC_LICENSE_FILES = NOTICE +FDK_AAC_OPENIPC_INSTALL_STAGING = YES + +# 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))