Date: Wed, 10 Jul 2013 15:25:37 +0000 (UTC) From: Max Brazhnikov <makc@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r322705 - in head/audio: acoustid-fingerprinter acoustid-fingerprinter/files chromaprint chromaprint/files clementine-player kid3-kde4 puddletag py-pyacoustid Message-ID: <201307101525.r6AFPboM082347@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: makc Date: Wed Jul 10 15:25:37 2013 New Revision: 322705 URL: http://svnweb.freebsd.org/changeset/ports/322705 Log: - 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@ Added: head/audio/acoustid-fingerprinter/files/ head/audio/acoustid-fingerprinter/files/patch-cmake__modules__FindFFmpeg.cmake (contents, props changed) head/audio/chromaprint/files/ head/audio/chromaprint/files/patch-cmake__modules__FindFFmpeg.cmake (contents, props changed) Modified: head/audio/acoustid-fingerprinter/Makefile head/audio/chromaprint/Makefile head/audio/clementine-player/Makefile head/audio/kid3-kde4/Makefile head/audio/puddletag/Makefile head/audio/py-pyacoustid/Makefile Modified: head/audio/acoustid-fingerprinter/Makefile ============================================================================== --- head/audio/acoustid-fingerprinter/Makefile Wed Jul 10 15:23:02 2013 (r322704) +++ head/audio/acoustid-fingerprinter/Makefile Wed Jul 10 15:25:37 2013 (r322705) @@ -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 Added: head/audio/acoustid-fingerprinter/files/patch-cmake__modules__FindFFmpeg.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/acoustid-fingerprinter/files/patch-cmake__modules__FindFFmpeg.cmake Wed Jul 10 15:25:37 2013 (r322705) @@ -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 Modified: head/audio/chromaprint/Makefile ============================================================================== --- head/audio/chromaprint/Makefile Wed Jul 10 15:23:02 2013 (r322704) +++ head/audio/chromaprint/Makefile Wed Jul 10 15:25:37 2013 (r322705) @@ -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 l 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|' \ Added: head/audio/chromaprint/files/patch-cmake__modules__FindFFmpeg.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/chromaprint/files/patch-cmake__modules__FindFFmpeg.cmake Wed Jul 10 15:25:37 2013 (r322705) @@ -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 Modified: head/audio/clementine-player/Makefile ============================================================================== --- head/audio/clementine-player/Makefile Wed Jul 10 15:23:02 2013 (r322704) +++ head/audio/clementine-player/Makefile Wed Jul 10 15:25:37 2013 (r322705) @@ -3,6 +3,7 @@ PORTNAME= clementine PORTVERSION= 1.1.1 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= GOOGLE_CODE PKGNAMESUFFIX= -player Modified: head/audio/kid3-kde4/Makefile ============================================================================== --- head/audio/kid3-kde4/Makefile Wed Jul 10 15:23:02 2013 (r322704) +++ head/audio/kid3-kde4/Makefile Wed Jul 10 15:25:37 2013 (r322705) @@ -2,7 +2,7 @@ PORTNAME= kid3 PORTVERSION= 2.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio kde MASTER_SITES= SF Modified: head/audio/puddletag/Makefile ============================================================================== --- head/audio/puddletag/Makefile Wed Jul 10 15:23:02 2013 (r322704) +++ head/audio/puddletag/Makefile Wed Jul 10 15:25:37 2013 (r322705) @@ -2,7 +2,7 @@ PORTNAME= puddletag PORTVERSION= 1.0.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio python MASTER_SITES= SF MASTER_SITE_SUBDIR=${PORTNAME} Modified: head/audio/py-pyacoustid/Makefile ============================================================================== --- head/audio/py-pyacoustid/Makefile Wed Jul 10 15:23:02 2013 (r322704) +++ head/audio/py-pyacoustid/Makefile Wed Jul 10 15:25:37 2013 (r322705) @@ -3,6 +3,7 @@ PORTNAME= pyacoustid PORTVERSION= 1.0.0 +PORTREVISION= 1 CATEGORIES= audio python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307101525.r6AFPboM082347>