diff options
| author | Max Brazhnikov <makc@FreeBSD.org> | 2013-07-10 15:25:37 +0000 |
|---|---|---|
| committer | Max Brazhnikov <makc@FreeBSD.org> | 2013-07-10 15:25:37 +0000 |
| commit | b3f29cd18f34d6b2f95f055c77e780df4943bbd4 (patch) | |
| tree | 3d48048943100effa0fba21f952ed855c84e1e0e /audio/chromaprint/files | |
| parent | c15d240d9b35fb5a7cd19c8659a97dd14d106aa8 (diff) | |
| download | ports-b3f29cd18f34d6b2f95f055c77e780df4943bbd4.tar.gz ports-b3f29cd18f34d6b2f95f055c77e780df4943bbd4.zip | |
- Add patch which allows to build audio/acoustid-fingerprinter and
audio/chromaprint with different ffmpeg ports (based on patch from
multimedia/kdemultimedia4-ffmpegthumbs)
- Switch dependency to multimedia/ffmpeg1
- Bump PORTREVISION due to dependency change in audio/chromaprint
Approved by: no reply from jhale@
Notes
Notes:
svn path=/head/; revision=322705
Diffstat (limited to 'audio/chromaprint/files')
| -rw-r--r-- | audio/chromaprint/files/patch-cmake__modules__FindFFmpeg.cmake | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/audio/chromaprint/files/patch-cmake__modules__FindFFmpeg.cmake b/audio/chromaprint/files/patch-cmake__modules__FindFFmpeg.cmake new file mode 100644 index 000000000000..abffc7cb9cf0 --- /dev/null +++ b/audio/chromaprint/files/patch-cmake__modules__FindFFmpeg.cmake @@ -0,0 +1,47 @@ +--- ./cmake/modules/FindFFmpeg.cmake.orig 2012-09-05 18:05:36.000000000 +0000 ++++ ./cmake/modules/FindFFmpeg.cmake 2013-03-24 22:35:28.751290553 +0000 +@@ -39,16 +39,16 @@ + /opt/include + /usr/freeware/include + NO_DEFAULT_PATH +- PATH_SUFFIXES ffmpeg ++ PATH_SUFFIXES ffmpeg${FFMPEG_SUFFIX} + DOC "Location of FFMPEG Headers" + ) + FIND_PATH(FFMPEG_${varname}_INCLUDE_DIRS lib${shortname}/${headername} +- PATH_SUFFIXES ffmpeg ++ PATH_SUFFIXES ffmpeg${FFMPEG_SUFFIX} + DOC "Location of FFMPEG Headers" + ) + + FIND_LIBRARY(FFMPEG_${varname}_LIBRARIES +- NAMES ${shortname} ++ NAMES ${shortname}${FFMPEG_SUFFIX} + PATHS + ${FFMPEG_ROOT}/lib + $ENV{FFMPEG_DIR}/lib +@@ -63,11 +63,12 @@ + /opt/csw/lib + /opt/lib + /usr/freeware/lib64 ++ PATH_SUFFIXES ffmpeg${FFMPEG_SUFFIX} + NO_DEFAULT_PATH + DOC "Location of FFMPEG Libraries" + ) + FIND_LIBRARY(FFMPEG_${varname}_LIBRARIES +- NAMES ${shortname} ++ NAMES ${shortname}${FFMPEG_SUFFIX} + DOC "Location of FFMPEG Libraries" + ) + +@@ -77,6 +78,10 @@ + + ENDMACRO(FFMPEG_FIND) + ++if (NOT DEFINED FFMPEG_SUFFIX) ++ set(FFMPEG_SUFFIX 1) ++endif () ++ + SET(FFMPEG_ROOT "$ENV{FFMPEG_DIR}" CACHE PATH "Location of FFMPEG") + + # find stdint.h |