From 00de391b66d6e56c7310fa882fc81b82ec20d0a4 Mon Sep 17 00:00:00 2001 From: Ted Hess Date: Wed, 7 Mar 2018 13:32:43 -0500 Subject: [PATCH] libsoxr: Build cleanup. Remove automatic inclusion of avutil if ffmpeg libraries present in build. Signed-off-by: Ted Hess --- libs/libsoxr/Makefile | 3 --- .../010-Remove_automatic_avutil_inclusion.patch | 11 +++++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 libs/libsoxr/patches/010-Remove_automatic_avutil_inclusion.patch diff --git a/libs/libsoxr/Makefile b/libs/libsoxr/Makefile index b0fd350470..69dffc7de6 100644 --- a/libs/libsoxr/Makefile +++ b/libs/libsoxr/Makefile @@ -21,9 +21,6 @@ PKG_MAINTAINER:=Ted Hess , \ 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 index 0000000000..db66a149c7 --- /dev/null +++ b/libs/libsoxr/patches/010-Remove_automatic_avutil_inclusion.patch @@ -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})