[vlc-commits] contrib/soxr: use pkgconfig to find FFmpeg/Libav

[Sean McGovern]

vlc/vlc-3.0 | branch: master | Sean McGovern <gseanmcg at gmail.com> | Tue Mar 20 16:12:23 2018 -0400| [dda8fbfa03631fbcd2152d11a6bea8169ecd4c1d] | committer: Thomas Guillem

contrib/soxr: use pkgconfig to find FFmpeg/Libav

Signed-off-by: Thomas Guillem <thomas at gllm.fr>
(cherry picked from commit f1c1a800c579c99e903e06efa0f1b657d72ca2cc)
Signed-off-by: Thomas Guillem <thomas at gllm.fr>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=dda8fbfa03631fbcd2152d11a6bea8169ecd4c1d
---

 contrib/src/soxr/find_ff_pkgconfig.patch | 27 +++++++++++++++++++++++++++
 contrib/src/soxr/rules.mak               |  1 +
 2 files changed, 28 insertions(+)

diff --git a/contrib/src/soxr/find_ff_pkgconfig.patch b/contrib/src/soxr/find_ff_pkgconfig.patch
new file mode 100644
index 0000000000..3231f63963
--- /dev/null
+++ b/contrib/src/soxr/find_ff_pkgconfig.patch
@@ -0,0 +1,27 @@
+--- soxr/CMakeLists.txt.orig	2018-03-20 15:53:33.455252098 -0400
++++ soxr/CMakeLists.txt	2018-03-20 15:54:37.683356636 -0400
+@@ -127,18 +127,20 @@
+ endif ()
+ 
+ if (WITH_AVFFT)
+-  find_package (LibAVCodec REQUIRED)
++  find_package(PkgConfig)
++  pkg_check_modules(AVCODEC REQUIRED libavcodec)
+   if (AVCODEC_FOUND)
+     include_directories (${AVCODEC_INCLUDE_DIRS})
+-    set (LIBS ${LIBS} ${AVCODEC_LIBRARIES})
++    set (LIBS ${LIBS} ${AVCODEC_LDFLAGS})
+   endif ()
+ endif ()
+ 
+ if (WITH_AVFFT OR (CMAKE_SYSTEM_PROCESSOR MATCHES "^arm" AND SIMD32_FOUND AND WITH_CR32))
+-  find_package (LibAVUtil)
++  find_package(PkgConfig)
++  pkg_check_modules(AVUTIL REQUIRED libavutil)
+   if (AVUTIL_FOUND)
+     include_directories (${AVUTIL_INCLUDE_DIRS})
+-    set (LIBS ${LIBS} ${AVUTIL_LIBRARIES})
++    set (LIBS ${LIBS} ${AVUTIL_LDFLAGS})
+   endif ()
+ endif ()
+ 
diff --git a/contrib/src/soxr/rules.mak b/contrib/src/soxr/rules.mak
index ed2893f138..3fffc690c8 100644
--- a/contrib/src/soxr/rules.mak
+++ b/contrib/src/soxr/rules.mak
@@ -17,6 +17,7 @@ soxr: soxr-$(SOXR_VERSION)-Source.tar.xz .sum-soxr
 	$(UNPACK)
 	$(APPLY) $(SRC)/soxr/0001-always-generate-.pc.patch
 	$(APPLY) $(SRC)/soxr/0002-expose-Libs.private-in-.pc.patch
+	$(APPLY) $(SRC)/soxr/find_ff_pkgconfig.patch
 	$(MOVE)
 
 .soxr: soxr toolchain.cmake