[vlc-commits] contribs: soxr: Fix build when providing PKG_CONFIG_EXECUTABLE

[Hugo Beauzée-Luyssen]

vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Mon Oct 15 12:18:13 2018 +0200| [fd7356d7f7d5677e7fd70211ae1cc3ff2e9ad2bf] | committer: Hugo Beauzée-Luyssen

contribs: soxr: Fix build when providing PKG_CONFIG_EXECUTABLE

Otherwise the 2nd find_package(PkgConfig) gets confused:

-- Found PkgConfig: /path/to/pkg-config (found version "0.29")
-- Checking for module 'libavcodec'
--   Found libavcodec, version 58.19.104
-- Could NOT find PkgConfig (missing: PKG_CONFIG_EXECUTABLE) (found version "0.29")
CMake Error at /usr/share/cmake-3.12/Modules/FindPkgConfig.cmake:489 (message):
  pkg-config tool not found
Call Stack (most recent call first):
  /usr/share/cmake-3.12/Modules/FindPkgConfig.cmake:602 (_pkg_check_modules_internal)
  CMakeLists.txt:140 (pkg_check_modules)

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

 contrib/src/soxr/find_ff_pkgconfig.patch | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/contrib/src/soxr/find_ff_pkgconfig.patch b/contrib/src/soxr/find_ff_pkgconfig.patch
index 3231f63963..0627c97a10 100644
--- a/contrib/src/soxr/find_ff_pkgconfig.patch
+++ b/contrib/src/soxr/find_ff_pkgconfig.patch
@@ -1,11 +1,13 @@
---- 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 @@
+--- soxr/CMakeLists.txt.orig	2018-10-15 12:15:01.620074074 +0200
++++ soxr/CMakeLists.txt	2018-10-15 12:16:27.269662032 +0200
+@@ -126,19 +126,21 @@
+   set (WITH_CR64S ${SIMD64_FOUND})
  endif ()
  
++find_package(PkgConfig)
++
  if (WITH_AVFFT)
 -  find_package (LibAVCodec REQUIRED)
-+  find_package(PkgConfig)
 +  pkg_check_modules(AVCODEC REQUIRED libavcodec)
    if (AVCODEC_FOUND)
      include_directories (${AVCODEC_INCLUDE_DIRS})
@@ -16,7 +18,6 @@
  
  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})