diff options
| author | makc <makc@FreeBSD.org> | 2013-07-10 23:25:37 +0800 |
|---|---|---|
| committer | makc <makc@FreeBSD.org> | 2013-07-10 23:25:37 +0800 |
| commit | 1a510ec9e3c55c633ce0ab2b3b8cc9c8c5733343 (patch) | |
| tree | 3d48048943100effa0fba21f952ed855c84e1e0e /audio/chromaprint | |
| parent | 4011ba167cd528d14686379e20c4688e0d6e5bc7 (diff) | |
| download | freebsd-ports-gnome-1a510ec9e3c55c633ce0ab2b3b8cc9c8c5733343.tar.gz freebsd-ports-gnome-1a510ec9e3c55c633ce0ab2b3b8cc9c8c5733343.tar.zst freebsd-ports-gnome-1a510ec9e3c55c633ce0ab2b3b8cc9c8c5733343.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@
Diffstat (limited to 'audio/chromaprint')
| -rw-r--r-- | audio/chromaprint/Makefile | 9 | ||||
| -rw-r--r-- | audio/chromaprint/files/patch-cmake__modules__FindFFmpeg.cmake | 47 |
2 files changed, 53 insertions, 3 deletions
diff --git a/audio/chromaprint/Makefile b/audio/chromaprint/Makefile index e2c0ee339f4a..c82c3f37831c 100644 --- a/audio/chromaprint/Makefile +++ b/audio/chromaprint/Makefile @@ -2,6 +2,7 @@ PORTNAME= chromaprint PORTVERSION= 0.7 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://cloud.github.com/downloads/lalinsky/${PORTNAME}/ @@ -10,14 +11,16 @@ COMMENT= AcoustID audio fingerprinting library LICENSE= LGPL21 -LIB_DEPENDS= avcodec:${PORTSDIR}/multimedia/ffmpeg +LIB_DEPENDS= avcodec${FFMPEG_SUFFIX}:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFFIX} -USES= cmake +USES= cmake:outsource USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes CMAKE_ARGS= -DBUILD_EXAMPLES:BOOL=ON \ - -DWITH_AVFFT:BOOL=ON + -DWITH_AVFFT:BOOL=ON \ + -DFFMPEG_SUFFIX:STRING=${FFMPEG_SUFFIX} +FFMPEG_SUFFIX?= 1 post-patch: ${REINPLACE_CMD} -e '/pkgconfig/s|$${LIB_INSTALL_DIR}|libdata|' \ 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 |