From b3f29cd18f34d6b2f95f055c77e780df4943bbd4 Mon Sep 17 00:00:00 2001 From: Max Brazhnikov Date: Wed, 10 Jul 2013 15:25:37 +0000 Subject: - 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@ --- audio/acoustid-fingerprinter/Makefile | 6 ++- .../files/patch-cmake__modules__FindFFmpeg.cmake | 47 ++++++++++++++++++++++ 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 audio/acoustid-fingerprinter/files/patch-cmake__modules__FindFFmpeg.cmake (limited to 'audio/acoustid-fingerprinter') diff --git a/audio/acoustid-fingerprinter/Makefile b/audio/acoustid-fingerprinter/Makefile index 2c15c2c7ffc8..b07e564fe6ec 100644 --- a/audio/acoustid-fingerprinter/Makefile +++ b/audio/acoustid-fingerprinter/Makefile @@ -2,6 +2,7 @@ PORTNAME= acoustid-fingerprinter PORTVERSION= 0.6 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://cloud.github.com/downloads/lalinsky/${PORTNAME}/ @@ -12,7 +13,7 @@ LICENSE= GPLv2 LIB_DEPENDS= chromaprint:${PORTSDIR}/audio/chromaprint \ tag:${PORTSDIR}/audio/taglib \ - avcodec:${PORTSDIR}/multimedia/ffmpeg + avcodec${FFMPEG_SUFFIX}:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFFIX} USES= cmake USE_QT4= gui network \ @@ -20,6 +21,9 @@ USE_QT4= gui network \ INSTALLS_ICONS= yes MAKE_JOBS_SAFE= yes +CMAKE_ARGS= -DFFMPEG_SUFFIX:STRING=${FFMPEG_SUFFIX} +FFMPEG_SUFFIX?= 1 + post-patch: ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/cmake/modules/*.cmake diff --git a/audio/acoustid-fingerprinter/files/patch-cmake__modules__FindFFmpeg.cmake b/audio/acoustid-fingerprinter/files/patch-cmake__modules__FindFFmpeg.cmake new file mode 100644 index 000000000000..abffc7cb9cf0 --- /dev/null +++ b/audio/acoustid-fingerprinter/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 -- cgit v1.2.3