From ad1203ebb9da640ada304a03450226acf4505748 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 12 May 2020 15:08:50 -0700 Subject: [PATCH] faad2: update to 2.9.2 Removed upstreamed patches. Signed-off-by: Rosen Penev --- libs/faad2/Makefile | 8 ++--- libs/faad2/patches/010-lc-decoder.patch | 48 ------------------------- libs/faad2/patches/020-bits.patch | 35 ------------------ 3 files changed, 4 insertions(+), 87 deletions(-) delete mode 100644 libs/faad2/patches/010-lc-decoder.patch delete mode 100644 libs/faad2/patches/020-bits.patch diff --git a/libs/faad2/Makefile b/libs/faad2/Makefile index 51ea563e7c..a4b573d58f 100644 --- a/libs/faad2/Makefile +++ b/libs/faad2/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=faad2 -PKG_VERSION:=2.9.1 +PKG_VERSION:=2.9.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/knik0/faad2/tar.gz/2_9_1? -PKG_HASH:=7fa33cff76abdda5a220ca5de0b2e05a77354f3b97f735193c2940224898aa9a -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-2_9_1 +PKG_SOURCE_URL:=https://codeload.github.com/knik0/faad2/tar.gz/2_9_2? +PKG_HASH:=9728b2b94f94ab49363cd229e7377fbe6ef3c311c5cd80da662d53ddb0ee091d +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-2_9_2 PKG_MAINTAINER:=Ted Hess PKG_LICENSE:=GPL-2.0-or-later diff --git a/libs/faad2/patches/010-lc-decoder.patch b/libs/faad2/patches/010-lc-decoder.patch deleted file mode 100644 index fa1ffb3b5b..0000000000 --- a/libs/faad2/patches/010-lc-decoder.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 8552fd53aaf5059ed769a0564330816beacaca98 Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Tue, 10 Mar 2020 17:38:29 -0700 -Subject: [PATCH] fix compilation with LC_ONLY_DECODER - -881b5e263f25a8a8b714e83407fc2c9dab407e40 broke compilation by always -defining DRN and DRM_PS. Fix this and place the define where it belongs. ---- - libfaad/Makefile.am | 2 +- - libfaad/common.h | 7 +++++-- - 2 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/libfaad/Makefile.am b/libfaad/Makefile.am -index 8ed57ae..7d9c71f 100644 ---- a/libfaad/Makefile.am -+++ b/libfaad/Makefile.am -@@ -32,5 +32,5 @@ libfaad_la_SOURCES = bits.c cfft.c decoder.c drc.c \ - - libfaad_drm_la_LDFLAGS = ${libfaad_la_LDFLAGS} - libfaad_drm_la_LIBADD = ${libfaad_la_LIBADD} --libfaad_drm_la_CFLAGS = ${libfaad_la_CFLAGS} -DDRM -DDRM_PS -+libfaad_drm_la_CFLAGS = ${libfaad_la_CFLAGS} -DDRM_SUPPORT - libfaad_drm_la_SOURCES = ${libfaad_la_SOURCES} -diff --git a/libfaad/common.h b/libfaad/common.h -index 8b78807..76722e4 100644 ---- a/libfaad/common.h -+++ b/libfaad/common.h -@@ -91,8 +91,10 @@ extern "C" { - /* Allow decoding of LD profile AAC */ - #define LD_DEC - /* Allow decoding of Digital Radio Mondiale (DRM) */ --//#define DRM --//#define DRM_PS -+#ifdef DRM_SUPPORT -+#define DRM -+#define DRM_PS -+#endif - - /* LD can't do without LTP */ - #ifdef LD_DEC -@@ -115,6 +117,7 @@ extern "C" { - #undef MAIN_DEC - #undef SSR_DEC - #undef DRM -+ #undef DRM_PS - #undef ALLOW_SMALL_FRAMELENGTH - #undef ERROR_RESILIENCE - #endif diff --git a/libs/faad2/patches/020-bits.patch b/libs/faad2/patches/020-bits.patch deleted file mode 100644 index ca53cd55b7..0000000000 --- a/libs/faad2/patches/020-bits.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 4ae9873a80ea47858d20f1d590aaf816c3aebb20 Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Tue, 10 Mar 2020 20:13:57 -0700 -Subject: [PATCH] fix compilation without SBR/PS_DEC - -The bits.h include needs to be in mp4.h as it uses the bitfield struct. ---- - libfaad/mp4.c | 1 - - libfaad/mp4.h | 1 + - 2 files changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libfaad/mp4.c b/libfaad/mp4.c -index 9f0198a..dbcff83 100644 ---- a/libfaad/mp4.c -+++ b/libfaad/mp4.c -@@ -33,7 +33,6 @@ - - #include - --#include "bits.h" - #include "mp4.h" - #include "syntax.h" - -diff --git a/libfaad/mp4.h b/libfaad/mp4.h -index 5a94be4..d99a3e3 100644 ---- a/libfaad/mp4.h -+++ b/libfaad/mp4.h -@@ -35,6 +35,7 @@ - extern "C" { - #endif - -+#include "bits.h" - #include "neaacdec.h" - - int8_t AudioSpecificConfig2(uint8_t *pBuffer,