libsoxr: Build cleanup.
authorTed Hess <thess@kitschensync.net>
Wed, 7 Mar 2018 18:32:43 +0000 (13:32 -0500)
committerTed Hess <thess@kitschensync.net>
Wed, 7 Mar 2018 18:33:59 +0000 (13:33 -0500)
Remove automatic inclusion of avutil if ffmpeg libraries present in build.

Signed-off-by: Ted Hess <thess@kitschensync.net>
libs/libsoxr/Makefile
libs/libsoxr/patches/010-Remove_automatic_avutil_inclusion.patch [new file with mode: 0644]

index b0fd3504707c7aafc0f6d8af7c50537b5c2f7524..69dffc7de687b17435028c4b75b299755a4fa7d5 100644 (file)
@@ -21,9 +21,6 @@ PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>, \
 PKG_LICENSE:=LGPL-2.1
 PKG_LICENSE_FILES:=LICENCE
 
-PKG_FIXUP:=libtool
-PKG_REMOVE_FILES:=autogen.sh
-
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
diff --git a/libs/libsoxr/patches/010-Remove_automatic_avutil_inclusion.patch b/libs/libsoxr/patches/010-Remove_automatic_avutil_inclusion.patch
new file mode 100644 (file)
index 0000000..db66a14
--- /dev/null
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -134,7 +134,7 @@ if (WITH_AVFFT)
+   endif ()
+ endif ()
+-if (WITH_AVFFT OR (CMAKE_SYSTEM_PROCESSOR MATCHES "^arm" AND SIMD32_FOUND AND WITH_CR32))
++if (WITH_AVFFT)
+   find_package (LibAVUtil)
+   if (AVUTIL_FOUND)
+     include_directories (${AVUTIL_INCLUDE_DIRS})