faad2: update to 2.11.1

CMake is used now.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

diff --git a/libs/faad2/Makefile b/libs/faad2/Makefile
index 5bff32174fb0ed6da73cf00777a81c468d1b7870..4b8ce1e0697833b986c7b937d33971dd838cef85 100644 (file)
--- a/libs/faad2/Makefile
+++ b/libs/faad2/Makefile
@@ -9,20 +9,17 @@ PKG_NAME:=faad2
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=2.10.1
+PKG_SOURCE_VERSION:=2.11.1
 PKG_SOURCE_URL:=https://github.com/knik0/faad2
-PKG_MIRROR_HASH:=8a42cbc5833bd3c076f92363f0cbbcf6f848231c59b2f17dbe5d151cb8684fe1
+PKG_MIRROR_HASH:=d57b209ba5d88e4838987d84ba50cd5a9313c217a4144b9ea55f6bd5d44684f9
 
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
 PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=COPYING
 PKG_CPE_ID:=cpe:/a:audiocoding:freeware_advanced_audio_decoder_2
 
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
 
 define Package/faad2/Default
   URL:=http://www.audiocoding.com/faad2.html
@@ -62,7 +59,7 @@ $(call Package/faad2/Default/description)
 endef
 
 TARGET_CFLAGS += \
-       $(if $(CONFIG_BUILD_PATENTED),,-DLC_ONLY_DECODER) \
+       $(if $(CONFIG_BUILD_PATENTED),,-DLC_ONLY_DECODER -DDISABLE_SBR) \
        $(if $(CONFIG_SOFT_FLOAT),-DFIXED_POINT)
 
 CONFIGURE_ARGS += \
@@ -74,7 +71,7 @@ define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/include
        $(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfaad.{a,so*} $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfaad.so* $(1)/usr/lib/
 endef
 
 define Package/faad2/install

diff --git a/libs/faad2/patches/030-sbr-ps-dec.patch b/libs/faad2/patches/030-sbr-ps-dec.patch
deleted file mode 100644 (file)
index 19710c3..0000000
--- a/libs/faad2/patches/030-sbr-ps-dec.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/libfaad/common.h
-+++ b/libfaad/common.h
-@@ -120,8 +120,7 @@ extern "C" {
-   #undef DRM_PS
-   #undef ALLOW_SMALL_FRAMELENGTH
-   #undef ERROR_RESILIENCE
--#endif
--
-+#else
- #define SBR_DEC
- //#define SBR_LOW_POWER
- #define PS_DEC
-@@ -129,6 +128,7 @@ extern "C" {
- #ifdef SBR_LOW_POWER
- #undef PS_DEC
- #endif
-+#endif
- 
- /* FIXED POINT: No MAIN decoding */
- #ifdef FIXED_POINT