Browse Source

libsoxr: Build cleanup.

Remove automatic inclusion of avutil if ffmpeg libraries present in build.

Signed-off-by: Ted Hess <thess@kitschensync.net>
lilik-openwrt-22.03
Ted Hess 7 years ago
parent
commit
00de391b66
2 changed files with 11 additions and 3 deletions
  1. +0
    -3
      libs/libsoxr/Makefile
  2. +11
    -0
      libs/libsoxr/patches/010-Remove_automatic_avutil_inclusion.patch

+ 0
- 3
libs/libsoxr/Makefile View 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


+ 11
- 0
libs/libsoxr/patches/010-Remove_automatic_avutil_inclusion.patch View File

@ -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})

Loading…
Cancel
Save