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 | |
parent | Hopefully finish fixing the l10n ports after r322586 and r322618. (diff) |
- 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')
-rw-r--r-- | audio/acoustid-fingerprinter/Makefile | 6 | ||||
-rw-r--r-- | audio/acoustid-fingerprinter/files/patch-cmake__modules__FindFFmpeg.cmake | 47 | ||||
-rw-r--r-- | audio/chromaprint/Makefile | 9 | ||||
-rw-r--r-- | audio/chromaprint/files/patch-cmake__modules__FindFFmpeg.cmake | 47 | ||||
-rw-r--r-- | audio/clementine-player/Makefile | 1 | ||||
-rw-r--r-- | audio/kid3-kde4/Makefile | 2 | ||||
-rw-r--r-- | audio/puddletag/Makefile | 2 | ||||
-rw-r--r-- | audio/py-pyacoustid/Makefile | 1 |
8 files changed, 109 insertions, 6 deletions
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 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 diff --git a/audio/clementine-player/Makefile b/audio/clementine-player/Makefile index a695bb1b3466..d7d039a51acc 100644 --- a/audio/clementine-player/Makefile +++ b/audio/clementine-player/Makefile @@ -3,6 +3,7 @@ PORTNAME= clementine PORTVERSION= 1.1.1 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= GOOGLE_CODE PKGNAMESUFFIX= -player diff --git a/audio/kid3-kde4/Makefile b/audio/kid3-kde4/Makefile index ba5fc7338fce..1c25beca4fc1 100644 --- a/audio/kid3-kde4/Makefile +++ b/audio/kid3-kde4/Makefile @@ -2,7 +2,7 @@ PORTNAME= kid3 PORTVERSION= 2.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio kde MASTER_SITES= SF diff --git a/audio/puddletag/Makefile b/audio/puddletag/Makefile index 54898b8baf44..fa45efa46270 100644 --- a/audio/puddletag/Makefile +++ b/audio/puddletag/Makefile @@ -2,7 +2,7 @@ PORTNAME= puddletag PORTVERSION= 1.0.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio python MASTER_SITES= SF MASTER_SITE_SUBDIR=${PORTNAME} diff --git a/audio/py-pyacoustid/Makefile b/audio/py-pyacoustid/Makefile index 81b31e16fc27..eff1f92451b0 100644 --- a/audio/py-pyacoustid/Makefile +++ b/audio/py-pyacoustid/Makefile @@ -3,6 +3,7 @@ PORTNAME= pyacoustid PORTVERSION= 1.0.0 +PORTREVISION= 1 CATEGORIES= audio python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} |