summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2014-08-11 23:21:11 +0000
committerwiz <wiz@pkgsrc.org>2014-08-11 23:21:11 +0000
commit22020e66c43bb38685e1d633ee2fa6db5e481668 (patch)
tree9b405e27045a1a56db60d674e3b6c91cc1517954 /audio
parente3075855919a63c2b943c23d553ecaceede8cba7 (diff)
downloadpkgsrc-22020e66c43bb38685e1d633ee2fa6db5e481668.tar.gz
Fix ffmpeg1 detection.
Diffstat (limited to 'audio')
-rw-r--r--audio/chromaprint/patches/patch-cmake_modules_FindFFmpeg.cmake31
1 files changed, 31 insertions, 0 deletions
diff --git a/audio/chromaprint/patches/patch-cmake_modules_FindFFmpeg.cmake b/audio/chromaprint/patches/patch-cmake_modules_FindFFmpeg.cmake
new file mode 100644
index 00000000000..e09d9c7d1b8
--- /dev/null
+++ b/audio/chromaprint/patches/patch-cmake_modules_FindFFmpeg.cmake
@@ -0,0 +1,31 @@
+$NetBSD: patch-cmake_modules_FindFFmpeg.cmake,v 1.1 2014/08/11 23:21:11 wiz Exp $
+
+Include ffmpeg1 pkgsrc paths in search path.
+
+--- cmake/modules/FindFFmpeg.cmake.orig 2013-11-23 15:43:42.000000000 +0000
++++ cmake/modules/FindFFmpeg.cmake
+@@ -28,6 +28,7 @@ MACRO(FFMPEG_FIND varname shortname head
+ FIND_PATH(FFMPEG_${varname}_INCLUDE_DIRS lib${shortname}/${headername}
+ PATHS
+ ${FFMPEG_ROOT}/include
++ ${FFMPEG_ROOT}/include/ffmpeg1
+ $ENV{FFMPEG_DIR}/include
+ ~/Library/Frameworks
+ /Library/Frameworks
+@@ -43,7 +44,7 @@ MACRO(FFMPEG_FIND varname shortname head
+ DOC "Location of FFMPEG Headers"
+ )
+ FIND_PATH(FFMPEG_${varname}_INCLUDE_DIRS lib${shortname}/${headername}
+- PATH_SUFFIXES ffmpeg
++ PATH_SUFFIXES ffmpeg ffmpeg1
+ DOC "Location of FFMPEG Headers"
+ )
+
+@@ -51,6 +52,7 @@ MACRO(FFMPEG_FIND varname shortname head
+ NAMES ${shortname}
+ PATHS
+ ${FFMPEG_ROOT}/lib
++ ${FFMPEG_ROOT}/lib/ffmpeg1
+ $ENV{FFMPEG_DIR}/lib
+ ~/Library/Frameworks
+ /Library/Frameworks