Date: Tue, 21 Jan 2014 04:55:47 +0400 (MSK) From: Dmitry Marakasov <amdmi3@amdmi3.ru> To: FreeBSD-gnats-submit@freebsd.org Cc: nemysis@FreeBSD.org Subject: ports/185949: [PATCH] audio/alure: numerous fixes and improvements Message-ID: <20140121005548.BC6EE42799@hades.panopticon> Resent-Message-ID: <201401210100.s0L10090006788@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 185949 >Category: ports >Synopsis: [PATCH] audio/alure: numerous fixes and improvements >Confidential: no >Severity: serious >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Jan 21 01:00:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Dmitry Marakasov >Release: FreeBSD 10.0-RELEASE amd64 >Organization: >Environment: System: FreeBSD hades.panopticon 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260807: Fri Jan 17 13:14:28 MSK >Description: - Fix options. They were affecting non-existing cmake variables; USE_VORBIS was always set to true - Make sndfile dependency optional like all others - Use new LIB_DEPENDS syntax - Remove STATIC option - it has separate library and pkgconfig file so it can't cause any conflicts, and it doesn't have any overhead to be worth disabling - Add patch to fix build of FLUIDSYNTH options - Add REINPLACE to fix CMakeLists.txt type which prevented linking with libFLAC - Remove useless REINPLACE - Bump PORTREVISION Port maintainer (nemysis@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99_11 (mode: change, diff: SVN) >How-To-Repeat: >Fix: --- alure-1.2_2.patch begins here --- Index: Makefile =================================================================== --- Makefile (revision 340514) +++ Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= alure PORTVERSION= 1.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio MASTER_SITES= http://kcat.strangesoft.net/alure-releases/ @@ -12,8 +12,6 @@ LICENSE= MIT -LIB_DEPENDS= libsndfile.so:${PORTSDIR}/audio/libsndfile - USES= cmake openal:soft pkgconfig USE_LDCONFIG= yes @@ -22,40 +20,41 @@ PORTDOCS= * PORTEXAMPLES= * -OPTIONS_DEFINE= DOCS DUMB EXAMPLES FLAC FLUIDSYNTH MPG123 MODPLUG STATIC VORBIS -OPTIONS_DEFAULT= DUMB FLAC VORBIS +OPTIONS_DEFINE= DOCS DUMB EXAMPLES FLAC FLUIDSYNTH MPG123 MODPLUG VORBIS SNDFILE +OPTIONS_DEFAULT= DUMB FLAC VORBIS SNDFILE DUMB_DESC= DUMB audio library decoding support FLUIDSYNTH_DESC= MIDI support via FluidSynth MODPLUG_DESC= MOD decoding via ModPlug -OPTIONS_SUB= yes - DOCS_BUILD_DEPENDS= NaturalDocs:${PORTSDIR}/devel/naturaldocs -DUMB_BUILD_DEPENDS= ${LOCALBASE}/include/dumb.h:${PORTSDIR}/audio/dumb-allegro -DUMB_CMAKE_ON= -DUSE_DUMB:BOOL=TRUE -DUMB_CMAKE_OFF= -DUSE_DUMB:BOOL=FALSE -FLAC_LIB_DEPENDS= FLAC:${PORTSDIR}/audio/flac -FLAC_CMAKE_ON= -DUSE_FLAC:BOOL=TRUE -FLAC_CMAKE_OFF= -DUSE_FLAC:BOOL=FALSE -FLUIDSYNTH_LIB_DEPENDS= fluidsynth:${PORTSDIR}/audio/fluidsynth -FLUIDSYNTH_CMAKE_ON= -DUSE_FLUIDSYNTH:BOOL=TRUE -FLUIDSYNTH_CMAKE_OFF= -DUSE_FLUIDSYNTH:BOOL=FALSE -MPG123_LIB_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 -MPG123_CMAKE_ON= -DUSE_MPG123:BOOL=TRUE -MPG123_CMAKE_OFF= -DUSE_MPG123:BOOL=FALSE -MODPLUG_BUILD_DEPENDS= ${LOCALBASE}/include/libmodplug/modplug.h:${PORTSDIR}/audio/libmodplug -MODPLUG_CMAKE_ON= -DUSE_MODPLUG:BOOL=TRUE -MODPLUG_CMAKE_OFF= -DUSE_MODPLUG:BOOL=FALSE -VORBIS_LIB_DEPENDS= vorbis:${PORTSDIR}/audio/libvorbis -VORBIS_CMAKE_ON= -DUSE_VORBIS:BOOL=TRUE -VORBIS_CMAKE_OFF= -DUSE_VORBIS:BOOL=TRUE +DUMB_BUILD_DEPENDS= ${LOCALBASE}/include/dumb.h:${PORTSDIR}/audio/dumb +DUMB_CMAKE_ON= -DDUMB:BOOL=TRUE +DUMB_CMAKE_OFF= -DDUMB:BOOL=FALSE +FLAC_LIB_DEPENDS= libFLAC.so:${PORTSDIR}/audio/flac +FLAC_CMAKE_ON= -DFLAC:BOOL=TRUE +FLAC_CMAKE_OFF= -DFLAC:BOOL=FALSE +FLUIDSYNTH_LIB_DEPENDS= libfluidsynth.so:${PORTSDIR}/audio/fluidsynth +FLUIDSYNTH_CMAKE_ON= -DFLUIDSYNTH:BOOL=TRUE +FLUIDSYNTH_CMAKE_OFF= -DFLUIDSYNTH:BOOL=FALSE +MPG123_LIB_DEPENDS= libmpg123.so:${PORTSDIR}/audio/mpg123 +MPG123_CMAKE_ON= -DMPG123:BOOL=TRUE +MPG123_CMAKE_OFF= -DMPG123:BOOL=FALSE +MODPLUG_LIB_DEPENDS= libmodplug.so:${PORTSDIR}/audio/libmodplug +MODPLUG_CMAKE_ON= -DMODPLUG:BOOL=TRUE +MODPLUG_CMAKE_OFF= -DMODPLUG:BOOL=FALSE +VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis +VORBIS_CMAKE_ON= -DVORBIS:BOOL=TRUE +VORBIS_CMAKE_OFF= -DVORBIS:BOOL=FALSE +SNDFILE_LIB_DEPENDS= libsndfile.so:${PORTSDIR}/audio/libsndfile +SNDFILE_CMAKE_ON= -DSNDFILE:BOOL=TRUE +SNDFILE_CMAKE_OFF= -DSNDFILE:BOOL=FALSE .include <bsd.port.options.mk> post-patch: - @${REINPLACE_CMD} -e 's|lib$${LIB_SUFFIX}/pkgconfig|$${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|' \ - -e 's|"ModPlug support (for IT/XM/S3M/MOD)" OFF)|"ModPlug support (for IT/XM/S3M/MOD)" ON)|' \ + @${REINPLACE_CMD} -e 's|lib$${LIB_SUFFIX}/pkgconfig|libdata/pkgconfig|' \ + -e 's|LIBFLAC_LIBRARIES|FLAC_LIBRARIES|' \ ${WRKSRC}/CMakeLists.txt .if ${PORT_OPTIONS:MDOCS} @@ -62,18 +61,11 @@ @${REINPLACE_CMD} \ -e 's|INSTALL(DIRECTORY "$${ALURE_SOURCE_DIR}/docs/html"|INSTALL(DIRECTORY "$${ALURE_SOURCE_DIR}/docs/html" "$${ALURE_SOURCE_DIR}/docs/naturaldocs"|' \ ${WRKSRC}/CMakeLists.txt -.endif - -.if ! ${PORT_OPTIONS:MDOCS} +.else @${REINPLACE_CMD} -i '' '/FIND_PROGRAM(NATDOCS_BIN NaturalDocs)/,/ENDIF(NATDOCS_BIN)/s/^/#/' ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} -i '' -e '/INSTALL(DIRECTORY "$${ALURE_SOURCE_DIR}/,+2d' ${WRKSRC}/CMakeLists.txt .endif -.if ! ${PORT_OPTIONS:MSTATIC} - @${REINPLACE_CMD} -e 's|"Build the static version of the library" ON)|"Build the static version of the library" OFF)|' \ - ${WRKSRC}/CMakeLists.txt -.endif - post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} @(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) Index: files/patch-src-codec__fluidsynth.cpp =================================================================== --- files/patch-src-codec__fluidsynth.cpp (revision 0) +++ files/patch-src-codec__fluidsynth.cpp (working copy) @@ -0,0 +1,10 @@ +--- src/codec_fluidsynth.cpp.orig 2011-07-29 12:37:48.000000000 +0400 ++++ src/codec_fluidsynth.cpp 2014-01-21 03:54:27.990735707 +0400 +@@ -27,6 +27,7 @@ + + #include <string.h> + #include <assert.h> ++#include <unistd.h> + #ifdef _WIN32 + #include <io.h> + #endif Property changes on: files/patch-src-codec__fluidsynth.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: pkg-plist =================================================================== --- pkg-plist (revision 340514) +++ pkg-plist (working copy) @@ -2,10 +2,10 @@ bin/alureplay bin/alurestream include/AL/alure.h -%%STATIC%%lib/libalure-static.a +lib/libalure-static.a lib/libalure.so lib/libalure.so.1 lib/libalure.so.1.2.0 -%%STATIC%%libdata/pkgconfig/alure-static.pc +libdata/pkgconfig/alure-static.pc libdata/pkgconfig/alure.pc @dirrmtry include/AL --- alure-1.2_2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140121005548.BC6EE42799>