- 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)
Responsible Changed From-To: freebsd-ports-bugs->nemysis Over to maintainer (via the GNATS Auto Assign Tool)
> - 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 > - Remove useless REINPLACE When pkgconfig/alure-static.pc is installed it does not work for my upcomming Port games/opensurge PR 182515. I need time to investigate other and come to a conclusion.
* Rusmir Dusko (nemysis@FreeBSD.org) wrote: > > - 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 > > - Remove useless REINPLACE > > When pkgconfig/alure-static.pc is installed it does not work > for my upcomming Port games/opensurge PR 182515. > > I need time to investigate other and come to a conclusion. On the second though, static lib may be removed completely. As static libs don't automatically link dependencies and alure-static.pc does not list them, it will never link if used by somebody. Updated patch: --- alure.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,10 +12,9 @@ LICENSE= MIT -LIB_DEPENDS= libsndfile.so:${PORTSDIR}/audio/libsndfile - USES= cmake openal:soft pkgconfig USE_LDCONFIG= yes +CMAKE_ARGS= -DBUILD_STATIC:BOOL=FALSE CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib @@ -22,40 +21,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 +62,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,8 @@ bin/alureplay bin/alurestream include/AL/alure.h -%%STATIC%%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.pc @dirrmtry include/AL --- alure.patch ends here --- -- Dmitry Marakasov . 55B5 0596 FF1E 8D84 5F56 9510 D35A 80DD F9D2 F77D amdmi3@amdmi3.ru ..: jabber: amdmi3@jabber.ru http://www.amdmi3.ru
State Changed From-To: open->closed Committed, with minor changes. Thanks!
Author: nemysis Date: Wed Jan 22 01:45:44 2014 New Revision: 340678 URL: http://svnweb.freebsd.org/changeset/ports/340678 QAT: https://qat.redports.org/buildarchive/r340678/ Log: - Bump PORTREVISION [1] - Make sndfile dependency optional like all others [1] - Remove STATIC lib and Option [1] - Disable all warnings with -w - Remove OPTIONS_SUB=yes [1] - Fix options. They were affecting non-existing cmake variables; USE_VORBIS was always set to true [1] - Use the new format for LIB_DEPENDS [1] - Add REINPLACE to fix CMakeLists.txt type which prevented linking with libFLAC [1] - Add patch to fix build of FLUIDSYNTH Option [1] - Remove useless REINPLACE_CMD [1] - Change pkg-plist, remove STATIC libs [1] PR: ports/185949 [1] Submitted by: amdmi3 Added: head/audio/alure/files/ head/audio/alure/files/patch-src__codec_fluidsynth.cpp (contents, props changed) Modified: head/audio/alure/Makefile head/audio/alure/pkg-plist (contents, props changed) Modified: head/audio/alure/Makefile ============================================================================== --- head/audio/alure/Makefile Wed Jan 22 01:24:09 2014 (r340677) +++ head/audio/alure/Makefile Wed Jan 22 01:45:44 2014 (r340678) @@ -3,7 +3,7 @@ PORTNAME= alure PORTVERSION= 1.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio MASTER_SITES= http://kcat.strangesoft.net/alure-releases/ @@ -12,68 +12,61 @@ COMMENT= Utility library to help manage LICENSE= MIT -LIB_DEPENDS= libsndfile.so:${PORTSDIR}/audio/libsndfile - USES= cmake openal:soft pkgconfig USE_LDCONFIG= yes +CMAKE_ARGS= -DBUILD_STATIC:BOOL=FALSE -CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib +CFLAGS+= -w 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} @${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}) Added: head/audio/alure/files/patch-src__codec_fluidsynth.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/alure/files/patch-src__codec_fluidsynth.cpp Wed Jan 22 01:45:44 2014 (r340678) @@ -0,0 +1,10 @@ +--- ./src/codec_fluidsynth.cpp.orig 2011-07-29 10:37:48.000000000 +0200 ++++ ./src/codec_fluidsynth.cpp 2014-01-22 01:32:03.000000000 +0100 +@@ -27,6 +27,7 @@ + + #include <string.h> + #include <assert.h> ++#include <unistd.h> + #ifdef _WIN32 + #include <io.h> + #endif Modified: head/audio/alure/pkg-plist ============================================================================== --- head/audio/alure/pkg-plist Wed Jan 22 01:24:09 2014 (r340677) +++ head/audio/alure/pkg-plist Wed Jan 22 01:45:44 2014 (r340678) @@ -2,10 +2,8 @@ bin/alurecdplay bin/alureplay bin/alurestream include/AL/alure.h -%%STATIC%%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.pc @dirrmtry include/AL _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"