Date: Sun, 25 Dec 2016 13:13:23 +0000 (UTC) From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r429418 - in head/audio/gogglesmm: . files Message-ID: <201612251313.uBPDDNSM019958@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhale Date: Sun Dec 25 13:13:23 2016 New Revision: 429418 URL: https://svnweb.freebsd.org/changeset/ports/429418 Log: - Update to 1.1.4 - Convert to CMAKE_BOOL - Simplify DOCS installation Modified: head/audio/gogglesmm/Makefile head/audio/gogglesmm/distinfo head/audio/gogglesmm/files/patch-gap_CMakeLists.txt head/audio/gogglesmm/pkg-plist Modified: head/audio/gogglesmm/Makefile ============================================================================== --- head/audio/gogglesmm/Makefile Sun Dec 25 13:12:36 2016 (r429417) +++ head/audio/gogglesmm/Makefile Sun Dec 25 13:13:23 2016 (r429418) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gogglesmm -PORTVERSION= 1.1.3 +PORTVERSION= 1.1.4 CATEGORIES= audio MAINTAINER= jhale@FreeBSD.org @@ -22,6 +22,8 @@ USES= cmake compiler:c++11-lib desktop- USE_XORG= ice sm x11 INSTALLS_ICONS= yes +PORTDOCS= AUTHORS ChangeLog README + OPTIONS_DEFINE= ALSA DBUS DOCS FAAD FLAC GCRYPT MAD NLS \ OGG OPENGL OPUS PULSEAUDIO OPTIONS_RADIO= VORBISDEC @@ -31,62 +33,49 @@ OPTIONS_DEFAULT= DBUS FAAD FLAC MAD OGG OPTIONS_SUB= yes ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib -ALSA_CMAKE_ON= -DWITH_ALSA:BOOL=ON -ALSA_CMAKE_OFF= -DWITH_ALSA:BOOL=OFF +ALSA_CMAKE_BOOL= WITH_ALSA DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus -DBUS_CMAKE_ON= -DWITH_DBUS:BOOL=ON -DBUS_CMAKE_OFF= -DWITH_DBUS:BOOL=OFF +DBUS_CMAKE_BOOL= WITH_DBUS FAAD_LIB_DEPENDS= libfaad.so:audio/faad -FAAD_CMAKE_ON= -DWITH_FAAD:BOOL=ON -FAAD_CMAKE_OFF= -DWITH_FAAD:BOOL=OFF +FAAD_CMAKE_BOOL= WITH_FAAD FLAC_LIB_DEPENDS= libFLAC.so:audio/flac -FLAC_CMAKE_ON= -DWITH_FLAC:BOOL=ON -FLAC_CMAKE_OFF= -DWITH_FLAC:BOOL=OFF +FLAC_CMAKE_BOOL= WITH_FLAC FLAC_IMPLIES= OGG GCRYPT_DESC= Use libgcrypt for md5 calculation GCRYPT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt -GCRYPT_CMAKE_ON= -DWITH_GCRYPT:BOOL=ON -GCRYPT_CMAKE_OFF= -DWITH_GCRYPT:BOOL=OFF +GCRYPT_CMAKE_BOOL= WITH_GCRYPT MAD_LIB_DEPENDS= libmad.so:audio/libmad -MAD_CMAKE_ON= -DWITH_MAD:BOOL=ON -MAD_CMAKE_OFF= -DWITH_MAD:BOOL=OFF +MAD_CMAKE_BOOL= WITH_MAD NLS_USES= gettext NLS_LDFLAGS= -lintl -NLS_CMAKE_ON= -DWITH_NLS:BOOL=ON -NLS_CMAKE_OFF= -DWITH_NLS:BOOL=OFF +NLS_CMAKE_BOOL= WITH_NLS OGG_LIB_DEPENDS= libogg.so:audio/libogg -OGG_CMAKE_ON= -DWITH_OGG:BOOL=ON -OGG_CMAKE_OFF= -DWITH_OGG:BOOL=OFF +OGG_CMAKE_BOOL= WITH_OGG OPENGL_LIB_DEPENDS= libepoxy.so:graphics/libepoxy OPENGL_USE= GL=gl,glu -OPENGL_CMAKE_ON= -DWITH_OPENGL:BOOL=ON -OPENGL_CMAKE_OFF= -DWITH_OPENGL:BOOL=OFF +OPENGL_CMAKE_BOOL= WITH_OPENGL OPUS_LIB_DEPENDS= libopus.so:audio/opus -OPUS_CMAKE_ON= -DWITH_OPUS:BOOL=ON -OPUS_CMAKE_OFF= -DWITH_OPUS:BOOL=OFF +OPUS_CMAKE_BOOL= WITH_OPUS OPUS_IMPLIES= OGG PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio -PULSEAUDIO_CMAKE_ON= -DWITH_PULSE:BOOL=ON -PULSEAUDIO_CMAKE_OFF= -DWITH_PULSE:BOOL=OFF +PULSEAUDIO_CMAKE_BOOL= WITH_PULSE TREMOR_LIB_DEPENDS= libvorbisidec.so:audio/libtremor -TREMOR_CMAKE_ON= -DWITH_TREMOR:BOOL=ON -TREMOR_CMAKE_OFF= -DWITH_TREMOR:BOOL=OFF +TREMOR_CMAKE_BOOL= WITH_TREMOR TREMOR_IMPLIES= OGG VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis -VORBIS_CMAKE_ON= -DWITH_VORBIS:BOOL=ON -VORBIS_CMAKE_OFF= -DWITH_VORBIS:BOOL=OFF +VORBIS_CMAKE_BOOL= WITH_VORBIS VORBIS_IMPLIES= OGG .include <bsd.port.options.mk> @@ -97,7 +86,6 @@ IGNORE= you have selected an option that post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKSRC} && ${INSTALL_DATA} AUTHORS ChangeLog README \ - ${STAGEDIR}${DOCSDIR}) + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> Modified: head/audio/gogglesmm/distinfo ============================================================================== --- head/audio/gogglesmm/distinfo Sun Dec 25 13:12:36 2016 (r429417) +++ head/audio/gogglesmm/distinfo Sun Dec 25 13:13:23 2016 (r429418) @@ -1,3 +1,3 @@ -TIMESTAMP = 1479598736 -SHA256 (gogglesmm-gogglesmm-1.1.3_GH0.tar.gz) = 99907fe988429e88c051eef557143e3e07fedd64fe67c2d7a26e4de556055d37 -SIZE (gogglesmm-gogglesmm-1.1.3_GH0.tar.gz) = 1394950 +TIMESTAMP = 1482584810 +SHA256 (gogglesmm-gogglesmm-1.1.4_GH0.tar.gz) = 92df634580ecf5734a5a1fe21cc0296498aa8dd264ec1164e9a2b60d4c659a90 +SIZE (gogglesmm-gogglesmm-1.1.4_GH0.tar.gz) = 1411691 Modified: head/audio/gogglesmm/files/patch-gap_CMakeLists.txt ============================================================================== --- head/audio/gogglesmm/files/patch-gap_CMakeLists.txt Sun Dec 25 13:12:36 2016 (r429417) +++ head/audio/gogglesmm/files/patch-gap_CMakeLists.txt Sun Dec 25 13:13:23 2016 (r429418) @@ -1,10 +1,11 @@ ---- gap/CMakeLists.txt.orig 2016-10-22 17:13:46 UTC +--- gap/CMakeLists.txt.orig 2016-12-23 18:20:04 UTC +++ gap/CMakeLists.txt -@@ -103,7 +103,17 @@ if(UNIX) +@@ -103,7 +103,18 @@ if(UNIX) option(WITH_OSS "OSS Output Support" ON) option(WITH_ALSA "ALSA Output Support" OFF) endif() -+ option(WITH_CDDA "CDDA Support" OFF) ++ option(WITH_A52 "ATSC A/52 Stream Decoder Support" OFF) ++ option(WITH_DCA "DTS Coherent Acoustics Decoder Support" OFF) + option(WITH_JACK "JACK Sound Server Support" OFF) + option(WITH_FAAD "FAAD Support" OFF) + option(WITH_FLAC "FLAC Support" OFF) @@ -18,7 +19,7 @@ endif() # Endiannes -@@ -256,7 +266,7 @@ if(BUILD_GAP_SHARED_LIB) +@@ -278,7 +289,7 @@ if(BUILD_GAP_SHARED_LIB) endif() @@ -27,29 +28,32 @@ LIST(APPEND PLUGIN_SOURCES plugins/ap_flac.cpp) LIST(APPEND LIBRARIES ${FLAC_LIBRARIES}) set(HAVE_FLAC 1) -@@ -268,52 +278,52 @@ if(TREMOR_FOUND AND OGG_FOUND AND WITH_T +@@ -291,7 +302,7 @@ if(TREMOR_FOUND AND OGG_FOUND AND WITH_T set(HAVE_TREMOR 1) endif() -if(VORBIS_FOUND AND OGG_FOUND AND NOT WITH_TREMOR) +if(VORBIS_FOUND AND WITH_VORBIS AND OGG_FOUND AND NOT WITH_TREMOR) LIST(APPEND PLUGIN_SOURCES plugins/ap_vorbis.cpp) + LIST(APPEND PLUGIN_HEADERS plugins/ap_vorbis.h) LIST(APPEND LIBRARIES ${VORBIS_LIBRARIES}) - set(HAVE_VORBIS 1) +@@ -299,7 +310,7 @@ if(VORBIS_FOUND AND OGG_FOUND AND NOT WI endif() -if(OGG_FOUND AND (FLAC_FOUND OR OPUS_FOUND OR VORBIS_FOUND OR TREMOR_FOUND)) +if(OGG_FOUND AND WITH_OGG AND (FLAC_FOUND OR OPUS_FOUND OR VORBIS_FOUND OR TREMOR_FOUND)) LIST(APPEND PLUGIN_SOURCES plugins/ap_ogg.cpp plugins/ap_ogg_decoder.cpp) + LIST(APPEND PLUGIN_HEADERS plugins/ap_ogg_decoder.h) LIST(APPEND LIBRARIES ${OGG_LIBRARIES}) - set(HAVE_OGG 1) +@@ -307,39 +318,39 @@ if(OGG_FOUND AND (FLAC_FOUND OR OPUS_FOU endif() -if(OPUS_FOUND AND OGG_FOUND) +if(OPUS_FOUND AND OGG_FOUND AND WITH_OPUS) LIST(APPEND PLUGIN_SOURCES plugins/ap_opus.cpp) + LIST(APPEND PLUGIN_HEADERS plugins/ap_opus.h) LIST(APPEND LIBRARIES ${OPUS_LIBRARIES}) set(HAVE_OPUS 1) endif() @@ -69,18 +73,18 @@ set(HAVE_FAAD 1) endif() --if(CDDA_FOUND) -+if(CDDA_FOUND AND WITH_CDDA) - LIST(APPEND PLUGIN_SOURCES plugins/ap_cdda.cpp) - LIST(APPEND LIBRARIES ${CDDA_LIBRARIES}) - set(HAVE_CDDA 1) +-if(DCA_FOUND) ++if(DCA_FOUND AND WITH_DCA) + LIST(APPEND PLUGIN_SOURCES plugins/ap_dca.cpp) + LIST(APPEND LIBRARIES ${DCA_LIBRARIES}) + set(HAVE_DCA 1) endif() --if(SMB_FOUND) -+if(SMB_FOUND AND WITH_SMB) - LIST(APPEND PLUGIN_SOURCES plugins/ap_smb.cpp) - LIST(APPEND LIBRARIES ${SMB_LIBRARIES}) - set(HAVE_SMB 1) +-if(A52_FOUND) ++if(A52_FOUND AND WITH_A52) + LIST(APPEND PLUGIN_SOURCES plugins/ap_a52.cpp) + LIST(APPEND LIBRARIES ${A52_LIBRARIES}) + set(HAVE_A52 1) endif() -if(SAMPLERATE_FOUND) @@ -88,7 +92,7 @@ LIST(APPEND LIBRARIES ${SAMPLERATE_LIBRARIES}) set(HAVE_SAMPLERATE 1) endif() -@@ -360,7 +370,7 @@ if(NOT CMAKE_SYSTEM_NAME STREQUAL "Windo +@@ -380,7 +391,7 @@ if(NOT WIN32) endif() # Pulse Output @@ -97,7 +101,7 @@ add_library(gap_pulse MODULE plugins/ap_pulse.cpp) target_link_libraries(gap_pulse ${PULSE_LIBRARIES}) target_include_directories(gap_pulse PRIVATE ${PROJECT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${FOX_INCLUDE_DIRS}) -@@ -369,7 +379,7 @@ if(NOT CMAKE_SYSTEM_NAME STREQUAL "Windo +@@ -389,7 +400,7 @@ if(NOT WIN32) endif() # Jack Output Modified: head/audio/gogglesmm/pkg-plist ============================================================================== --- head/audio/gogglesmm/pkg-plist Sun Dec 25 13:12:36 2016 (r429417) +++ head/audio/gogglesmm/pkg-plist Sun Dec 25 13:13:23 2016 (r429418) @@ -6,9 +6,6 @@ lib/gogglesmm/libgap_wav.so man/man1/gogglesmm.1.gz share/appdata/gogglesmm.appdata.xml share/applications/gogglesmm.desktop -%%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/README %%DATADIR%%/import_banshee_stats.py %%DATADIR%%/import_gogglesmm12.py %%DATADIR%%/import_gogglesmm12_stats.py
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612251313.uBPDDNSM019958>