diff options
Diffstat (limited to 'audio/chromaprint')
| -rw-r--r-- | audio/chromaprint/Makefile | 4 | ||||
| -rw-r--r-- | audio/chromaprint/files/patch-cmake__modules__FindFFmpeg.cmake | 47 |
2 files changed, 1 insertions, 50 deletions
diff --git a/audio/chromaprint/Makefile b/audio/chromaprint/Makefile index 670b9cc5a38f..f75e1a29a069 100644 --- a/audio/chromaprint/Makefile +++ b/audio/chromaprint/Makefile @@ -10,7 +10,7 @@ COMMENT= AcoustID audio fingerprinting library LICENSE= LGPL21 -LIB_DEPENDS= avcodec${FFMPEG_SUFFIX}:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFFIX} +LIB_DEPENDS= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg USES= cmake:outsource USE_LDCONFIG= yes @@ -18,8 +18,6 @@ USE_LDCONFIG= yes FETCH_ARGS= -Fpr CMAKE_ARGS= -DBUILD_EXAMPLES: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 deleted file mode 100644 index abffc7cb9cf0..000000000000 --- a/audio/chromaprint/files/patch-cmake__modules__FindFFmpeg.cmake +++ /dev/null @@ -1,47 +0,0 @@ ---- ./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 |