Index: multimedia/audacious-gtk3/Makefile =================================================================== --- multimedia/audacious-gtk3/Makefile +++ multimedia/audacious-gtk3/Makefile @@ -2,68 +2,55 @@ # $FreeBSD$ PORTNAME= audacious -PORTVERSION= 3.9 -PORTREVISION= 1 +PORTVERSION= 3.10 +DISTVERSIONPREFIX= ${PORTNAME}- DISTVERSIONSUFFIX= -gtk3 CATEGORIES= multimedia audio -#MASTER_SITES= http://distfiles.audacious-media-player.org/ PKGNAMESUFFIX= ${DISTVERSIONSUFFIX} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jhale@FreeBSD.org COMMENT= Gtk+3 port of lightweight and versatile audio player -LICENSE= GPLv3 +LICENSE= BSD2CLAUSE BSD3CLAUSE +LICENSE_COMB= multi +LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libfreetype.so:print/freetype2 \ - libfontconfig.so:x11-fonts/fontconfig + libfontconfig.so:x11-fonts/fontconfig -CONFLICTS_INSTALL= audacious-3.* - -MASTERDIR= ${.CURDIR}/../audacious -DISTINFO_FILE= ${.CURDIR}/distinfo -FILESDIR= ${MASTERDIR}/files -SUB_FILES= pkg-message - USES= autoreconf compiler:c++11-lib desktop-file-utils \ - gettext-tools gmake localbase pkgconfig - + gettext-runtime gmake gnome iconv localbase pkgconfig +USE_GNOME= gtk30 glib20 cairo +USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= audacious-media-player -GH_TAGNAME= 7a490de -GNU_CONFIGURE= yes -USE_XORG= x11 sm -USE_GNOME= gtk30 glib20 cairo -USE_LDCONFIG= yes +CONFLICTS_INSTALL= audacious-gtk2 audacious-qt5 + INSTALLS_ICONS= yes +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-libiconv-prefix=${ICONV_PREFIX} \ + --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \ + --without-buildstamp \ + --enable-gtk -CONFIGURE_ARGS= --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \ - --enable-gtk \ - --without-buildstamp +SUB_FILES= pkg-message +SUB_LIST= PORTSDIR=${PORTSDIR} -OPTIONS_DEFINE= ICONV NLS EXECINFO -OPTIONS_DEFAULT=ICONV EXECINFO -ICONV_USES= iconv -NLS_USES= gettext-runtime -NLS_CONFIGURE_OFF= --disable-nls -NLS_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-Makefile -OPTIONS_SUB= yes -EXECINFO_DESC= Build with libexecinfo support +OPTIONS_DEFINE= NLS +OPTIONS_SUB= yes -.include +NLS_USES= gettext-tools +NLS_CONFIGURE_ENABLE= nls +NLS_BINARY_ALIAS_OFF= msgfmt=${TRUE} -post-patch: -.if ${PORT_OPTIONS:MEXECINFO} - @${REINPLACE_CMD} 's|-lm |-lm -lexecinfo |' \ - ${WRKSRC}/src/audacious/Makefile - @${REINPLACE_CMD} 's|-laudcore|-laudcore -lexecinfo|' \ - ${WRKSRC}/audacious.pc.in -.endif - ${REINPLACE_CMD} -e 's| $${MFLAGS}||g' \ - ${WRKSRC}/buildsys.mk.in +post-patch-NLS-off: + ${REINPLACE_CMD} -e '/^SUBDIRS/s| po||' ${WRKSRC}/Makefile post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/aud* - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib* + ${MKDIR} ${STAGEDIR}${PREFIX}/share/appdata + ${INSTALL_DATA} ${WRKSRC}/contrib/audacious.appdata.xml ${STAGEDIR}${PREFIX}/share/appdata + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/aud* + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib* .include Index: multimedia/audacious-gtk3/distinfo =================================================================== --- multimedia/audacious-gtk3/distinfo +++ multimedia/audacious-gtk3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1506368343 -SHA256 (audacious-media-player-audacious-3.9-gtk3-7a490de_GH0.tar.gz) = 3a105932ad8d3489fdd9ea4fa845211388638a3da92182d6445c5d3b31678115 -SIZE (audacious-media-player-audacious-3.9-gtk3-7a490de_GH0.tar.gz) = 860819 +TIMESTAMP = 1536427754 +SHA256 (audacious-media-player-audacious-audacious-3.10-gtk3_GH0.tar.gz) = 149ac37e045feeb59df4e1848b3894716d021b85680df4817c77b2aca0f45732 +SIZE (audacious-media-player-audacious-audacious-3.10-gtk3_GH0.tar.gz) = 801874 Index: multimedia/audacious-gtk3/files/pkg-message.in =================================================================== --- /dev/null +++ multimedia/audacious-gtk3/files/pkg-message.in @@ -0,0 +1,15 @@ +======================================================================= + +Audacious is now installed! + +You must also install the corresponding Audacious plugins +package. Audacious will not run without it. + +By pkg: + # pkg install audacious-plugins-gtk3 + +By ports: + # cd %%PORTSDIR%%/multimedia/audacious-plugins-gtk3 + # make install clean + +======================================================================= Index: multimedia/audacious-gtk3/pkg-plist =================================================================== --- multimedia/audacious-gtk3/pkg-plist +++ multimedia/audacious-gtk3/pkg-plist @@ -34,7 +34,7 @@ include/libaudgui/menu.h lib/libaudcore.so lib/libaudcore.so.5 -lib/libaudcore.so.5.0.0 +lib/libaudcore.so.5.1.0 lib/libaudgui.so lib/libaudgui.so.5 lib/libaudgui.so.5.0.0 @@ -48,19 +48,9 @@ share/applications/audacious.desktop %%DATADIR%%/AUTHORS %%DATADIR%%/COPYING -%%DATADIR%%/images/about-logo.png -%%DATADIR%%/images/about-logo.svg -%%DATADIR%%/images/album.png -%%DATADIR%%/images/appearance.png -%%DATADIR%%/images/audio.png -%%DATADIR%%/images/connectivity.png -%%DATADIR%%/images/info.png -%%DATADIR%%/images/playlist.png -%%DATADIR%%/images/plugins.png share/icons/hicolor/48x48/apps/audacious.png share/icons/hicolor/scalable/apps/audacious.svg %%NLS%%share/locale/ar/LC_MESSAGES/audacious.mo -%%NLS%%share/locale/ast/LC_MESSAGES/audacious.mo %%NLS%%share/locale/be/LC_MESSAGES/audacious.mo %%NLS%%share/locale/bg/LC_MESSAGES/audacious.mo %%NLS%%share/locale/ca/LC_MESSAGES/audacious.mo @@ -70,7 +60,6 @@ %%NLS%%share/locale/de/LC_MESSAGES/audacious.mo %%NLS%%share/locale/el/LC_MESSAGES/audacious.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/audacious.mo -%%NLS%%share/locale/eo/LC_MESSAGES/audacious.mo %%NLS%%share/locale/es/LC_MESSAGES/audacious.mo %%NLS%%share/locale/es_AR/LC_MESSAGES/audacious.mo %%NLS%%share/locale/es_MX/LC_MESSAGES/audacious.mo @@ -80,7 +69,6 @@ %%NLS%%share/locale/fi/LC_MESSAGES/audacious.mo %%NLS%%share/locale/fr/LC_MESSAGES/audacious.mo %%NLS%%share/locale/gl/LC_MESSAGES/audacious.mo -%%NLS%%share/locale/he/LC_MESSAGES/audacious.mo %%NLS%%share/locale/hu/LC_MESSAGES/audacious.mo %%NLS%%share/locale/id_ID/LC_MESSAGES/audacious.mo %%NLS%%share/locale/it/LC_MESSAGES/audacious.mo @@ -99,14 +87,11 @@ %%NLS%%share/locale/ru/LC_MESSAGES/audacious.mo %%NLS%%share/locale/si/LC_MESSAGES/audacious.mo %%NLS%%share/locale/sk/LC_MESSAGES/audacious.mo -%%NLS%%share/locale/sq/LC_MESSAGES/audacious.mo %%NLS%%share/locale/sr/LC_MESSAGES/audacious.mo -%%NLS%%share/locale/sr@latin/LC_MESSAGES/audacious.mo %%NLS%%share/locale/sr_RS/LC_MESSAGES/audacious.mo %%NLS%%share/locale/sv/LC_MESSAGES/audacious.mo %%NLS%%share/locale/ta/LC_MESSAGES/audacious.mo %%NLS%%share/locale/tr/LC_MESSAGES/audacious.mo %%NLS%%share/locale/uk/LC_MESSAGES/audacious.mo -%%NLS%%share/locale/vi/LC_MESSAGES/audacious.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/audacious.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/audacious.mo Index: multimedia/audacious-plugins-gtk3/Makefile =================================================================== --- multimedia/audacious-plugins-gtk3/Makefile +++ multimedia/audacious-plugins-gtk3/Makefile @@ -2,137 +2,170 @@ # $FreeBSD$ PORTNAME= audacious-plugins -PORTVERSION= 3.9 +PORTVERSION= 3.10 +DISTVERSIONPREFIX= ${PORTNAME}- DISTVERSIONSUFFIX= -gtk3 -PORTREVISION= 5 CATEGORIES= multimedia audio -#MASTER_SITES= http://distfiles.audacious-media-player.org/ PKGNAMESUFFIX= ${DISTVERSIONSUFFIX} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jhale@FreeBSD.org COMMENT= Plugins needed for audacious-gtk3 -LICENSE= GPLv3 +LICENSE= BSD2CLAUSE +LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= audacious:multimedia/audacious-gtk3 -LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \ - libdbus-1.so:devel/dbus \ - libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 -RUN_DEPENDS= audacious:multimedia/audacious-gtk3 +BUILD_DEPENDS= audacious-gtk3>=${PORTVERSION}:multimedia/audacious-gtk3 +RUN_DEPENDS= audacious-gtk3>=${PORTVERSION}:multimedia/audacious-gtk3 -CONFLICTS_INSTALL= audacious-plugins-3.* - -MASTERDIR= ${.CURDIR}/../audacious-plugins -DISTINFO_FILE= ${.CURDIR}/distinfo -FILESDIR= ${MASTERDIR}/files - -USES= autoreconf compiler:c++11-lib gettext-tools gmake iconv \ - localbase pkgconfig - +USES= autoreconf compiler:c++11-lib gettext gmake gnome \ + iconv localbase pkgconfig +USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 libxml2 +USE_XORG= x11 USE_GITHUB= yes GH_ACCOUNT= audacious-media-player -GH_TAGNAME= 9c44e5e +CONFLICTS_INSTALL= audacious-plugins-gtk2 audacious-plugins-qt5 + GNU_CONFIGURE= yes -USE_LDCONFIG= yes -USE_GNOME= gtk30 glib20 libxml2 cairo gdkpixbuf2 -USE_XORG= x11 +CONFIGURE_ARGS= --with-libiconv-prefix=${ICONV_PREFIX} \ + --enable-gtk --enable-filewriter --enable-hotkey -CONFIGURE_ARGS+=--disable-console --disable-sndio --disable-soxr \ - --enable-gnomeshortcuts \ - --enable-gtk --enable-filewriter --enable-hotkey +OPTIONS_DEFINE= NLS +OPTIONS_GROUP= COMMS CODECS EFFECTS VISUAL +COMMS_DESC= Transport and communication +OPTIONS_GROUP_COMMS= HTTPS LASTFM LIRC MMS MPRIS +CODECS_DESC= Encoders, decoders, file writers +OPTIONS_GROUP_CODECS= AAC ADPLUG CDDA CUE FFMPEG FLAC FLUIDSYNTH GME \ + LAME MODPLUG MPG123 SID SNDFILE VORBIS WAVPACK +EFFECTS_DESC= Audio manipulation effects +OPTIONS_GROUP_EFFECTS= BS2B SAMPLERATE SOXR SPEEDPITCH +VISUAL_DESC= Visualizations and notifications +OPTIONS_GROUP_VISUAL= NOTIFY OPENGL OSD +OPTIONS_MULTI= OUTPUT +OUTPUT_DESC= Output plugins +OPTIONS_MULTI_OUTPUT= ALSA JACK OSS PULSEAUDIO SDL SNDIO +OPTIONS_DEFAULT= AAC CDDA CUE FFMPEG FLAC HTTPS LASTFM MMS MPG123 \ + MPRIS NLS NOTIFY OSD OSS VORBIS WAVPACK +OPTIONS_SUB= yes -OPTIONS_DEFINE= AAC ALSA AMIDI AOSD BS2B CDDA CUE FFMPEG \ - FLAC JACK LAME LIRC MP3 MMS MODPLUG MPRIS NEON NLS NOTIFY \ - OPENGL OSS PULSEAUDIO SAMPLERATE SCROBBLER SDL SID SNDFILE \ - SPEEDPITCH VORBIS WAVPACK -OPTIONS_DEFAULT= AAC AOSD CDDA CUE FFMPEG FLAC MP3 \ - MMS MPRIS NEON NLS NOTIFY OSS SCROBBLER VORBIS WAVPACK - AAC_LIB_DEPENDS= libfaad.so:audio/faad -AAC_CONFIGURE_OFF= --disable-aac +AAC_CONFIGURE_ENABLE= aac + +ADPLUG_DESC= AdLib sound emulation +ADPLUG_LIB_DEPENDS= libadplug.so:audio/libadplug \ + libbinio.so:devel/libbinio +ADPLUG_CONFIGURE_ENABLE= adplug + ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib -ALSA_CONFIGURE_OFF= --disable-alsa -AMIDI_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth -AMIDI_CONFIGURE_OFF= --disable-amidiplug -AOSD_USE= gnome=pango -AOSD_USE= xorg=xrender -AOSD_LIB_DEPENDS= libXcomposite.so:x11/libXcomposite -AOSD_CONFIGURE_ENABLE= aosd +ALSA_CONFIGURE_ENABLE= alsa + +BS2B_DESC= Bauer stereophonic-to-binaural effect BS2B_LIB_DEPENDS= libbs2b.so:audio/libbs2b -BS2B_CONFIGURE_OFF= --disable-bs2b -CDDA_LIB_DEPENDS= libcdio_cdda.so:sysutils/libcdio-paranoia \ - libcddb.so:audio/libcddb \ - libcdio.so:sysutils/libcdio -CDDA_CONFIGURE_OFF= --disable-cdaudio +BS2B_CONFIGURE_ENABLE= bs2b + +CDDA_LIB_DEPENDS= libcddb.so:audio/libcddb \ + libcdio.so:sysutils/libcdio \ + libcdio_cdda.so:sysutils/libcdio-paranoia +CDDA_CONFIGURE_ENABLE= cdaudio + CUE_LIB_DEPENDS= libcue.so:textproc/libcue -CUE_CONFIGURE_OFF= --disable-cue +CUE_CONFIGURE_ENABLE= cue + +GME_DESC= Game Music Emu demuxer +GME_LIB_DEPENDS= libgme.so:audio/libgme +GME_CONFIGURE_ENABLE= console + FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg FFMPEG_CONFIGURE_WITH= ffmpeg=ffmpeg + FLAC_LIB_DEPENDS= libFLAC.so:audio/flac -FLAC_CONFIGURE_ON= --enable-flac --enable-filewriter -FLAC_CONFIGURE_OFF= --disable-flac --disable-filewriter -JACK_LIB_DEPENDS= libjack.so:audio/jack \ - libsamplerate.so:audio/libsamplerate -JACK_CONFIGURE_OFF= --disable-jack +FLAC_CONFIGURE_ENABLE= flac + +FLUIDSYNTH_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth +FLUIDSYNTH_CONFIGURE_ENABLE= amidiplug + +HTTPS_DESC= HTTP(S) support via Neon +HTTPS_LIB_DEPENDS= libneon.so:www/neon +HTTPS_CONFIGURE_ENABLE= neon + +JACK_LIB_DEPENDS= libjack.so:audio/jack +JACK_CONFIGURE_ENABLE= jack + LAME_LIB_DEPENDS= libmp3lame.so:audio/lame -LAME_CONFIGURE_OFF= --disable-filewriter_mp3 +LAME_CONFIGURE_ENABLE= filewriter_mp3 + +LASTFM_LIB_DEPENDS= libcurl.so:ftp/curl +LASTFM_CONFIGURE_ENABLE= scrobbler2 + LIRC_LIB_DEPENDS= liblirc_client.so:comms/lirc -LIRC_CONFIGURE_OFF= --disable-lirc -MP3_LIB_DEPENDS= libmpg123.so:audio/mpg123 -MP3_CONFIGURE_OFF= --disable-mp3 +LIRC_CONFIGURE_ENABLE= lirc + MMS_LIB_DEPENDS= libmms.so:net/libmms -MMS_CONFIGURE_OFF= --disable-mms -MODPLUG_LIB_DEPENDS= libmodplug.so:audio/libmodplug -MODPLUG_CONFIGURE_OFF= --disable-modplug +MMS_CONFIGURE_ENABLE= mms + +MODPLUG_LIB_DEPENDS= libmodplug.so:audio/libmodplug +MODPLUG_CONFIGURE_ENABLE= modplug + +MPG123_LIB_DEPENDS= libmpg123.so:audio/mpg123 +MPG123_CONFIGURE_ENABLE= mpg123 + +MPRIS_DESC= MPRIS D-Bus support MPRIS_CONFIGURE_ENABLE= mpris2 -NEON_LIB_DEPENDS= libneon.so:www/neon -NEON_CONFIGURE_OFF= --disable-neon -NLS_USES= gettext-runtime -NLS_CONFIGURE_OFF= --disable-nls -NLS_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-Makefile -NOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify + +NLS_CONFIGURE_ENABLE= nls +NLS_BINARY_ALIAS_OFF= msgfmt=${TRUE} + +NOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify NOTIFY_CONFIGURE_ENABLE= notify -OPENGL_USE= xorg=x11 gl=gl + +OPENGL_USE= gl=gl OPENGL_CONFIGURE_ENABLE= glspectrum + +OSD_USE= xorg=xcomposite,xrender +OSD_CONFIGURE_ENABLE= aosd + OSS_CONFIGURE_ENABLE= oss4 -PULSEAUDIO_LIB_DEPENDS= libpulse-mainloop-glib.so:audio/pulseaudio -PULSEAUDIO_CONFIGURE_OFF= --disable-pulse -SAMPLERATE_LIB_DEPENDS= libsamplerate.so:audio/libsamplerate -SAMPLERATE_CONFIGURE_OFF= --disable-resample -SCROBBLER_LIB_DEPENDS= libcurl.so:ftp/curl -SCROBBLER_CONFIGURE_OFF= --disable-scrobbler2 -SDL_LIB_DEPENDS= libSDL2.so:devel/sdl20 -SDL_CONFIGURE_ON= --enable-sdlout --with-libsdl=2 -SDL_CONFIGURE_OFF= --disable-sdlout + +PULSEAUDIO_LIB_DEPENDS= libpulse-mainloop-glib.so:audio/pulseaudio +PULSEAUDIO_CONFIGURE_ENABLE= pulse + +QTMULTIMEDIA_DESC= QtMultimedia audio support +QTMULTIMEDIA_USE= qt=multimedia,network +QTMULTIMEDIA_CONFIGURE_ENABLE= qaudio + +SAMPLERATE_LIB_DEPENDS= libsamplerate.so:audio/libsamplerate +SAMPLERATE_CONFIGURE_ENABLE= resample + +SDL_USE= sdl=sdl2 +SDL_CONFIGURE_ENABLE= sdlout +SDL_CONFIGURE_ON= --with-libsdl=2 + +SID_DESC= Commodore 64 sound emulation SID_LIB_DEPENDS= libsidplayfp.so:audio/libsidplayfp -SID_CONFIGURE_OFF= --disable-sid -SNDFILE_LIB_DEPENDS= libsndfile.so:audio/libsndfile -SNDFILE_CONFIGURE_OFF= --disable-sndfile -SPEEDPITCH_CONFIGURE_OFF= --disable-speedpitch -SPEEDPITCH_IMPLIES= SAMPLERATE -VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis \ - libogg.so:audio/libogg +SID_CONFIGURE_ENABLE= sid + +SNDFILE_LIB_DEPENDS= libsndfile.so:audio/libsndfile +SNDFILE_CONFIGURE_ENABLE= sndfile + +SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio +SNDIO_CONFIGURE_ENABLE= sndio + +SOXR_LIB_DEPENDS= libsoxr.so:audio/libsoxr +SOXR_CONFIGURE_ENABLE= soxr + +SPEEDPITCH_DESC= Speed and pitch plugin +SPEEDPITCH_CONFIGURE_ENABLE= speedpitch +SPEEDPITCH_IMPLIES= SAMPLERATE + +VORBIS_LIB_DEPENDS= libogg.so:audio/libogg \ + libvorbis.so:audio/libvorbis VORBIS_CONFIGURE_ENABLE= vorbis -WAVPACK_LIB_DEPENDS= libwavpack.so:audio/wavpack -WAVPACK_CONFIGURE_OFF= --disable-wavpack -OPTIONS_SUB= yes -AMIDI_DESC= Amidi decoder -AOSD_DESC= Audacious OSD -BS2B_DESC= BS2B effect -SCROBBLER_DESC= Scrobbler decoder -SID_DESC= Sound chip emulator of Commodore -NEON_DESC= Neon plugin -SPEEDPITCH_DESC=Speed and Pitch plugin -MPRIS_DESC= NPRIS plugin +WAVPACK_LIB_DEPENDS= libwavpack.so:audio/wavpack +WAVPACK_CONFIGURE_ENABLE= wavpack -post-patch: - ${REINPLACE_CMD} -e 's| $${MFLAGS}||g' \ - ${WRKSRC}/buildsys.mk.in - ${FIND} ${WRKSRC} -type f -name 'Makefile' \ - | ${XARGS} ${REINPLACE_CMD} -e 's| -Wno-bool-operation||' +post-patch-NLS-off: + ${REINPLACE_CMD} -e '/^SUBDIRS/s| po||' ${WRKSRC}/Makefile post-install: @${FIND} ${STAGEDIR}${PREFIX}/lib/audacious/ -name "*.so" \ Index: multimedia/audacious-plugins-gtk3/distinfo =================================================================== --- multimedia/audacious-plugins-gtk3/distinfo +++ multimedia/audacious-plugins-gtk3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1506369854 -SHA256 (audacious-media-player-audacious-plugins-3.9-gtk3-9c44e5e_GH0.tar.gz) = bfcae7c2312aeee360ac30be494ac0e97629af21b8823afa501abdbf19d5fcde -SIZE (audacious-media-player-audacious-plugins-3.9-gtk3-9c44e5e_GH0.tar.gz) = 2749596 +TIMESTAMP = 1536429555 +SHA256 (audacious-media-player-audacious-plugins-audacious-plugins-3.10-gtk3_GH0.tar.gz) = c1687550dd3bbeaeec4f7c2a9bae270b2041c4a54c741bc7ed5be67090d1ac50 +SIZE (audacious-media-player-audacious-plugins-audacious-plugins-3.10-gtk3_GH0.tar.gz) = 2579849 Index: multimedia/audacious-plugins-gtk3/pkg-plist =================================================================== --- multimedia/audacious-plugins-gtk3/pkg-plist +++ multimedia/audacious-plugins-gtk3/pkg-plist @@ -14,15 +14,15 @@ lib/audacious/Effect/mixer.so %%SAMPLERATE%%lib/audacious/Effect/resample.so lib/audacious/Effect/silence-removal.so +%%SOXR%%lib/audacious/Effect/sox-resampler.so %%SPEEDPITCH%%lib/audacious/Effect/speed-pitch.so lib/audacious/Effect/stereo.so lib/audacious/Effect/voice_removal.so lib/audacious/General/alarm.so lib/audacious/General/albumart.so -%%AOSD%%lib/audacious/General/aosd.so +%%OSD%%lib/audacious/General/aosd.so %%CDDA%%lib/audacious/General/cd-menu-items.so lib/audacious/General/delete-files.so -lib/audacious/General/gnomeshortcuts.so lib/audacious/General/gtkui.so lib/audacious/General/hotkey.so %%LIRC%%lib/audacious/General/lirc.so @@ -30,18 +30,19 @@ %%MPRIS%%lib/audacious/General/mpris2.so %%NOTIFY%%lib/audacious/General/notify.so lib/audacious/General/playlist-manager.so -%%SCROBBLER%%lib/audacious/General/scrobbler.so +%%LASTFM%%lib/audacious/General/scrobbler.so lib/audacious/General/search-tool.so lib/audacious/General/skins.so lib/audacious/General/song_change.so lib/audacious/General/statusicon.so %%AAC%%lib/audacious/Input/aac-raw.so -lib/audacious/Input/adplug.so -%%AMIDI%%lib/audacious/Input/amidi-plug.so +%%ADPLUG%%lib/audacious/Input/adplug.so +%%FLUIDSYNTH%%lib/audacious/Input/amidi-plug.so %%CDDA%%lib/audacious/Input/cdaudio-ng.so +%%GME%%lib/audacious/Input/console.so %%FFMPEG%%lib/audacious/Input/ffaudio.so %%FLAC%%lib/audacious/Input/flacng.so -%%MP3%%lib/audacious/Input/madplug.so +%%MPG123%%lib/audacious/Input/madplug.so lib/audacious/Input/metronom.so %%MODPLUG%%lib/audacious/Input/modplug.so lib/audacious/Input/psf2.so @@ -58,9 +59,10 @@ %%OSS%%lib/audacious/Output/oss4.so %%PULSEAUDIO%%lib/audacious/Output/pulse_audio.so %%SDL%%lib/audacious/Output/sdlout.so +%%SNDIO%%lib/audacious/Output/sndio-ng.so lib/audacious/Transport/gio.so %%MMS%%lib/audacious/Transport/mms.so -%%NEON%%lib/audacious/Transport/neon.so +%%HTTPS%%lib/audacious/Transport/neon.so lib/audacious/Visualization/blur_scope.so lib/audacious/Visualization/cairo-spectrum.so %%OPENGL%%lib/audacious/Visualization/gl-spectrum.so Index: multimedia/audacious-plugins/Makefile =================================================================== --- multimedia/audacious-plugins/Makefile +++ multimedia/audacious-plugins/Makefile @@ -2,127 +2,198 @@ # $FreeBSD$ PORTNAME= audacious-plugins -PORTVERSION= 3.9 -PORTREVISION= 5 +PORTVERSION= 3.10 CATEGORIES= multimedia audio MASTER_SITES= http://distfiles.audacious-media-player.org/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jhale@FreeBSD.org COMMENT= Plugins needed for audacious LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= audacious:multimedia/audacious -LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \ - libdbus-1.so:devel/dbus \ - libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 -RUN_DEPENDS= audacious:multimedia/audacious +BUILD_DEPENDS= audacious-${FLAVOR}>=${PORTVERSION}:multimedia/audacious@${FLAVOR} +RUN_DEPENDS= audacious-${FLAVOR}>=${PORTVERSION}:multimedia/audacious@${FLAVOR} -CONFLICTS_INSTALL= audacious-plugins-gtk3-3.* +FLAVORS= gtk2 qt5 +FLAVOR?= ${FLAVORS:[1]} +gtk2_PKGNAMESUFFIX= -gtk2 +gtk2_CONFLICTS_INSTALL= audacious-plugins-qt5 +gtk2_LIB_DEPENDS= libfreetype.so:print/freetype2 \ + libfontconfig.so:x11-fonts/fontconfig +qt5_PKGNAMESUFFIX= -qt5 +qt5_CONFLICTS_INSTALL= audacious-plugins-gtk2 -USES= compiler:c++11-lib gettext-tools gmake iconv \ - localbase pkgconfig tar:bzip2 +USES= compiler:c++11-lib gettext-runtime gmake gnome \ + iconv localbase pkgconfig tar:bzip2 +USE_GNOME= glib20 libxml2 + +CONFLICTS_INSTALL= audacious-plugins-gtk3 + GNU_CONFIGURE= yes -USE_LDCONFIG= yes -USE_GNOME= gtk20 glib20 libxml2 cairo gdkpixbuf2 -USE_XORG= x11 +CONFIGURE_ARGS= --with-libiconv-prefix=${ICONV_PREFIX} -CONFIGURE_ARGS= --disable-console --disable-sndio --disable-soxr \ - --enable-gnomeshortcuts \ - --enable-gtk --enable-filewriter --enable-hotkey +.if ${FLAVOR} == qt5 +USES+= qt:5 +USE_QT= core gui widgets buildtools_build qmake_build +CONFIGURE_ARGS+= --disable-gtk --enable-qt --disable-ampache +PLIST_SUB+= GTK2="@comment " QT5="" +.else +USE_GNOME+= cairo gtk20 +USE_XORG+= x11 +CONFIGURE_ARGS+= --disable-qt --enable-gtk --enable-hotkey +INSTALLS_ICONS= yes +PLIST_SUB+= GTK2="" QT5="@comment " +.endif -OPTIONS_DEFINE= AAC ALSA AMIDI AOSD BS2B CDDA CUE FFMPEG \ - FLAC JACK LAME LIRC MP3 MMS MODPLUG MPRIS NEON NLS NOTIFY \ - OPENGL OSS PULSEAUDIO SAMPLERATE SCROBBLER SDL SID SNDFILE \ - SPEEDPITCH VORBIS WAVPACK -OPTIONS_DEFAULT= AAC AOSD CDDA CUE FFMPEG FLAC MP3 \ - MMS MPRIS NEON NLS NOTIFY OSS SCROBBLER VORBIS WAVPACK +OPTIONS_DEFINE= NLS +OPTIONS_GROUP= COMMS CODECS EFFECTS VISUAL +COMMS_DESC= Transport and communication +OPTIONS_GROUP_COMMS= HTTPS LASTFM LIRC MMS MPRIS +CODECS_DESC= Encoders, decoders, file writers +OPTIONS_GROUP_CODECS= AAC ADPLUG CDDA CUE FFMPEG FLAC FLUIDSYNTH GME \ + LAME MODPLUG MPG123 SID SNDFILE VORBIS WAVPACK +EFFECTS_DESC= Audio manipulation effects +OPTIONS_GROUP_EFFECTS= BS2B SAMPLERATE SOXR SPEEDPITCH +VISUAL_DESC= Visualizations and notifications +OPTIONS_GROUP_VISUAL= NOTIFY OPENGL OSD +OPTIONS_MULTI= OUTPUT +OUTPUT_DESC= Output plugins +OPTIONS_MULTI_OUTPUT= ALSA JACK OSS PULSEAUDIO QTMULTIMEDIA SDL SNDIO +OPTIONS_DEFAULT= AAC CDDA CUE FFMPEG FLAC HTTPS LASTFM MMS MPG123 \ + MPRIS NLS NOTIFY OSD OSS VORBIS WAVPACK +OPTIONS_SUB= yes +.if ${FLAVOR} == qt5 +OPTIONS_EXCLUDE= OSD +.else +OPTIONS_EXCLUDE= QTMULTIMEDIA +.endif AAC_LIB_DEPENDS= libfaad.so:audio/faad -AAC_CONFIGURE_OFF= --disable-aac +AAC_CONFIGURE_ENABLE= aac + +ADPLUG_DESC= AdLib sound emulation +ADPLUG_LIB_DEPENDS= libadplug.so:audio/libadplug \ + libbinio.so:devel/libbinio +ADPLUG_CONFIGURE_ENABLE= adplug + ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib -ALSA_CONFIGURE_OFF= --disable-alsa -AMIDI_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth -AMIDI_CONFIGURE_OFF= --disable-amidiplug -AOSD_USE= gnome=pango -AOSD_USE= xorg=xrender -AOSD_LIB_DEPENDS= libXcomposite.so:x11/libXcomposite -AOSD_CONFIGURE_ENABLE= aosd +ALSA_CONFIGURE_ENABLE= alsa + +BS2B_DESC= Bauer stereophonic-to-binaural effect BS2B_LIB_DEPENDS= libbs2b.so:audio/libbs2b -BS2B_CONFIGURE_OFF= --disable-bs2b -CDDA_LIB_DEPENDS= libcdio_cdda.so:sysutils/libcdio-paranoia \ - libcddb.so:audio/libcddb \ - libcdio.so:sysutils/libcdio -CDDA_CONFIGURE_OFF= --disable-cdaudio +BS2B_CONFIGURE_ENABLE= bs2b + +CDDA_LIB_DEPENDS= libcddb.so:audio/libcddb \ + libcdio.so:sysutils/libcdio \ + libcdio_cdda.so:sysutils/libcdio-paranoia +CDDA_CONFIGURE_ENABLE= cdaudio + CUE_LIB_DEPENDS= libcue.so:textproc/libcue -CUE_CONFIGURE_OFF= --disable-cue +CUE_CONFIGURE_ENABLE= cue + +GME_DESC= Game Music Emu demuxer +GME_LIB_DEPENDS= libgme.so:audio/libgme +GME_CONFIGURE_ENABLE= console + FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg FFMPEG_CONFIGURE_WITH= ffmpeg=ffmpeg + FLAC_LIB_DEPENDS= libFLAC.so:audio/flac -FLAC_CONFIGURE_ON= --enable-flac --enable-filewriter -FLAC_CONFIGURE_OFF= --disable-flac --disable-filewriter -JACK_LIB_DEPENDS= libjack.so:audio/jack \ - libsamplerate.so:audio/libsamplerate -JACK_CONFIGURE_OFF= --disable-jack +FLAC_CONFIGURE_ENABLE= flac + +FLUIDSYNTH_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth +FLUIDSYNTH_CONFIGURE_ENABLE= amidiplug + +HTTPS_DESC= HTTP(S) support via Neon +HTTPS_LIB_DEPENDS= libneon.so:www/neon +HTTPS_CONFIGURE_ENABLE= neon + +JACK_LIB_DEPENDS= libjack.so:audio/jack +JACK_CONFIGURE_ENABLE= jack + LAME_LIB_DEPENDS= libmp3lame.so:audio/lame -LAME_CONFIGURE_OFF= --disable-filewriter_mp3 +LAME_CONFIGURE_ENABLE= filewriter_mp3 + +LASTFM_LIB_DEPENDS= libcurl.so:ftp/curl +LASTFM_CONFIGURE_ENABLE= scrobbler2 + LIRC_LIB_DEPENDS= liblirc_client.so:comms/lirc -LIRC_CONFIGURE_OFF= --disable-lirc -MP3_LIB_DEPENDS= libmpg123.so:audio/mpg123 -MP3_CONFIGURE_OFF= --disable-mp3 +LIRC_CONFIGURE_ENABLE= lirc + MMS_LIB_DEPENDS= libmms.so:net/libmms -MMS_CONFIGURE_OFF= --disable-mms -MODPLUG_LIB_DEPENDS= libmodplug.so:audio/libmodplug -MODPLUG_CONFIGURE_OFF= --disable-modplug +MMS_CONFIGURE_ENABLE= mms + +MODPLUG_LIB_DEPENDS= libmodplug.so:audio/libmodplug +MODPLUG_CONFIGURE_ENABLE= modplug + +MPG123_LIB_DEPENDS= libmpg123.so:audio/mpg123 +MPG123_CONFIGURE_ENABLE= mpg123 + +MPRIS_DESC= MPRIS D-Bus support MPRIS_CONFIGURE_ENABLE= mpris2 -NEON_LIB_DEPENDS= libneon.so:www/neon -NEON_CONFIGURE_OFF= --disable-neon -NLS_USES= gettext-runtime -NLS_CONFIGURE_OFF= --disable-nls -NLS_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-Makefile -NOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify + +NLS_USES= gettext-tools +NLS_CONFIGURE_ENABLE= nls +NLS_BINARY_ALIAS_OFF= msgfmt=${TRUE} + +NOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify +NOTIFY_USE= gnome=gdkpixbuf2 NOTIFY_CONFIGURE_ENABLE= notify -OPENGL_USE= xorg=x11 gl=gl + +.if ${FLAVOR} == qt5 +OPENGL_USE= gl=gl qt=opengl +OPENGL_CONFIGURE_ENABLE= qtglspectrum +.else +OPENGL_USE= gl=gl OPENGL_CONFIGURE_ENABLE= glspectrum +.endif + +OSD_USE= xorg=xcomposite,xrender +OSD_CONFIGURE_ENABLE= aosd + OSS_CONFIGURE_ENABLE= oss4 -PULSEAUDIO_LIB_DEPENDS= libpulse-mainloop-glib.so:audio/pulseaudio -PULSEAUDIO_CONFIGURE_OFF= --disable-pulse -SAMPLERATE_LIB_DEPENDS= libsamplerate.so:audio/libsamplerate -SAMPLERATE_CONFIGURE_OFF= --disable-resample -SCROBBLER_LIB_DEPENDS= libcurl.so:ftp/curl -SCROBBLER_CONFIGURE_OFF= --disable-scrobbler2 -SDL_LIB_DEPENDS= libSDL2.so:devel/sdl20 -SDL_CONFIGURE_ON= --enable-sdlout --with-libsdl=2 -SDL_CONFIGURE_OFF= --disable-sdlout + +PULSEAUDIO_LIB_DEPENDS= libpulse-mainloop-glib.so:audio/pulseaudio +PULSEAUDIO_CONFIGURE_ENABLE= pulse + +QTMULTIMEDIA_DESC= QtMultimedia audio support +QTMULTIMEDIA_USE= qt=multimedia,network +QTMULTIMEDIA_CONFIGURE_ENABLE= qaudio + +SAMPLERATE_LIB_DEPENDS= libsamplerate.so:audio/libsamplerate +SAMPLERATE_CONFIGURE_ENABLE= resample + +SDL_USE= sdl=sdl2 +SDL_CONFIGURE_ENABLE= sdlout +SDL_CONFIGURE_ON= --with-libsdl=2 + +SID_DESC= Commodore 64 sound emulation SID_LIB_DEPENDS= libsidplayfp.so:audio/libsidplayfp -SID_CONFIGURE_OFF= --disable-sid -SNDFILE_LIB_DEPENDS= libsndfile.so:audio/libsndfile -SNDFILE_CONFIGURE_OFF= --disable-sndfile -SPEEDPITCH_CONFIGURE_OFF= --disable-speedpitch -SPEEDPITCH_IMPLIES= SAMPLERATE -VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis \ - libogg.so:audio/libogg +SID_CONFIGURE_ENABLE= sid + +SNDFILE_LIB_DEPENDS= libsndfile.so:audio/libsndfile +SNDFILE_CONFIGURE_ENABLE= sndfile + +SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio +SNDIO_CONFIGURE_ENABLE= sndio + +SOXR_LIB_DEPENDS= libsoxr.so:audio/libsoxr +SOXR_CONFIGURE_ENABLE= soxr + +SPEEDPITCH_DESC= Speed and pitch plugin +SPEEDPITCH_CONFIGURE_ENABLE= speedpitch +SPEEDPITCH_IMPLIES= SAMPLERATE + +VORBIS_LIB_DEPENDS= libogg.so:audio/libogg \ + libvorbis.so:audio/libvorbis VORBIS_CONFIGURE_ENABLE= vorbis -WAVPACK_LIB_DEPENDS= libwavpack.so:audio/wavpack -WAVPACK_CONFIGURE_OFF= --disable-wavpack -OPTIONS_SUB= yes -AMIDI_DESC= Amidi decoder -AOSD_DESC= Audacious OSD -BS2B_DESC= BS2B effect -SCROBBLER_DESC= Scrobbler decoder -SID_DESC= Sound chip emulator of Commodore -NEON_DESC= Neon plugin -SPEEDPITCH_DESC=Speed and Pitch plugin -MPRIS_DESC= NPRIS plugin +WAVPACK_LIB_DEPENDS= libwavpack.so:audio/wavpack +WAVPACK_CONFIGURE_ENABLE= wavpack -post-patch: - @${REINPLACE_CMD} -e 's| $${MFLAGS}||g' \ - ${WRKSRC}/buildsys.mk.in - @${FIND} ${WRKSRC} -type f -name 'Makefile' \ - | ${XARGS} ${REINPLACE_CMD} -e 's| -Wno-bool-operation||' +post-patch-NLS-off: + ${REINPLACE_CMD} -e '/^SUBDIRS/s| po||' ${WRKSRC}/Makefile post-install: @${FIND} ${STAGEDIR}${PREFIX}/lib/audacious/ -name "*.so" \ Index: multimedia/audacious-plugins/distinfo =================================================================== --- multimedia/audacious-plugins/distinfo +++ multimedia/audacious-plugins/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1506363579 -SHA256 (audacious-plugins-3.9.tar.bz2) = 8bf7f21089cb3406968cc9c71307774aee7100ec4607f28f63cf5690d5c927b8 -SIZE (audacious-plugins-3.9.tar.bz2) = 1843084 +TIMESTAMP = 1536281971 +SHA256 (audacious-plugins-3.10.tar.bz2) = 5061ebb20169eb4d3f15aafbe83b43363762dc8d19ca0cd83f5556dc577e618f +SIZE (audacious-plugins-3.10.tar.bz2) = 1701877 Index: multimedia/audacious-plugins/files/extra-patch-Makefile =================================================================== --- multimedia/audacious-plugins/files/extra-patch-Makefile +++ multimedia/audacious-plugins/files/extra-patch-Makefile @@ -1,8 +0,0 @@ ---- Makefile.orig 2015-11-07 23:04:08 UTC -+++ Makefile -@@ -1,4 +1,4 @@ --SUBDIRS = src po -+SUBDIRS = src - - DISTCLEAN = buildsys.mk config.h config.log config.status extra.mk - Index: multimedia/audacious-plugins/files/patch-buildsys.mk.in =================================================================== --- multimedia/audacious-plugins/files/patch-buildsys.mk.in +++ multimedia/audacious-plugins/files/patch-buildsys.mk.in @@ -1,11 +0,0 @@ ---- buildsys.mk.in.orig 2016-09-22 01:16:40 UTC -+++ buildsys.mk.in -@@ -205,7 +205,7 @@ pre-depend: - - ${PROG} ${PROG_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA} - ${LINK_STATUS} -- if ${LD} -o $@ ${OBJS} ${OBJS_EXTRA} ${LDFLAGS} ${LIBS}; then \ -+ if ${LD} -o $@ ${OBJS} ${OBJS_EXTRA} ${LIBS} ${LDFLAGS}; then \ - ${LINK_OK}; \ - else \ - ${LINK_FAILED}; \ Index: multimedia/audacious-plugins/pkg-plist =================================================================== --- multimedia/audacious-plugins/pkg-plist +++ multimedia/audacious-plugins/pkg-plist @@ -10,38 +10,47 @@ lib/audacious/Effect/crossfade.so lib/audacious/Effect/crystalizer.so lib/audacious/Effect/echo.so -lib/audacious/Effect/ladspa.so +%%GTK2%%lib/audacious/Effect/ladspa.so lib/audacious/Effect/mixer.so %%SAMPLERATE%%lib/audacious/Effect/resample.so lib/audacious/Effect/silence-removal.so +%%SOXR%%lib/audacious/Effect/sox-resampler.so %%SPEEDPITCH%%lib/audacious/Effect/speed-pitch.so lib/audacious/Effect/stereo.so lib/audacious/Effect/voice_removal.so -lib/audacious/General/alarm.so -lib/audacious/General/albumart.so -%%AOSD%%lib/audacious/General/aosd.so +%%GTK2%%lib/audacious/General/alarm.so +%%GTK2%%lib/audacious/General/albumart.so +%%QT5%%lib/audacious/General/albumart-qt.so +%%OSD%%lib/audacious/General/aosd.so %%CDDA%%lib/audacious/General/cd-menu-items.so lib/audacious/General/delete-files.so -lib/audacious/General/gnomeshortcuts.so -lib/audacious/General/gtkui.so -lib/audacious/General/hotkey.so +%%GTK2%%lib/audacious/General/gtkui.so +%%GTK2%%lib/audacious/General/hotkey.so %%LIRC%%lib/audacious/General/lirc.so -lib/audacious/General/lyricwiki.so +%%GTK2%%lib/audacious/General/lyricwiki.so +%%QT5%%lib/audacious/General/lyricwiki-qt.so %%MPRIS%%lib/audacious/General/mpris2.so %%NOTIFY%%lib/audacious/General/notify.so -lib/audacious/General/playlist-manager.so -%%SCROBBLER%%lib/audacious/General/scrobbler.so -lib/audacious/General/search-tool.so -lib/audacious/General/skins.so +%%GTK2%%lib/audacious/General/playlist-manager.so +%%QT5%%lib/audacious/General/playlist-manager-qt.so +%%QT5%%lib/audacious/General/qtui.so +%%LASTFM%%lib/audacious/General/scrobbler.so +%%GTK2%%lib/audacious/General/search-tool.so +%%QT5%%lib/audacious/General/search-tool-qt.so +%%GTK2%%lib/audacious/General/skins.so +%%QT5%%lib/audacious/General/skins-qt.so lib/audacious/General/song_change.so -lib/audacious/General/statusicon.so +%%QT5%%lib/audacious/General/song-info-qt.so +%%GTK2%%lib/audacious/General/statusicon.so +%%QT5%%lib/audacious/General/statusicon-qt.so %%AAC%%lib/audacious/Input/aac-raw.so -lib/audacious/Input/adplug.so -%%AMIDI%%lib/audacious/Input/amidi-plug.so +%%ADPLUG%%lib/audacious/Input/adplug.so +%%FLUIDSYNTH%%lib/audacious/Input/amidi-plug.so %%CDDA%%lib/audacious/Input/cdaudio-ng.so +%%GME%%lib/audacious/Input/console.so %%FFMPEG%%lib/audacious/Input/ffaudio.so %%FLAC%%lib/audacious/Input/flacng.so -%%MP3%%lib/audacious/Input/madplug.so +%%MPG123%%lib/audacious/Input/madplug.so lib/audacious/Input/metronom.so %%MODPLUG%%lib/audacious/Input/modplug.so lib/audacious/Input/psf2.so @@ -57,13 +66,16 @@ %%JACK%%lib/audacious/Output/jack-ng.so %%OSS%%lib/audacious/Output/oss4.so %%PULSEAUDIO%%lib/audacious/Output/pulse_audio.so +%%QTMULTIMEDIA%%lib/audacious/Output/qtaudio.so %%SDL%%lib/audacious/Output/sdlout.so +%%SNDIO%%lib/audacious/Output/sndio-ng.so lib/audacious/Transport/gio.so %%MMS%%lib/audacious/Transport/mms.so -%%NEON%%lib/audacious/Transport/neon.so -lib/audacious/Visualization/blur_scope.so -lib/audacious/Visualization/cairo-spectrum.so -%%OPENGL%%lib/audacious/Visualization/gl-spectrum.so +%%HTTPS%%lib/audacious/Transport/neon.so +%%GTK2%%lib/audacious/Visualization/blur_scope.so +%%GTK2%%lib/audacious/Visualization/cairo-spectrum.so +%%GTK2%%%%OPENGL%%lib/audacious/Visualization/gl-spectrum.so +%%QT5%%%%OPENGL%%lib/audacious/Visualization/gl-spectrum-qt.so share/audacious/Skins/Classic/balance.png share/audacious/Skins/Classic/cbuttons.png share/audacious/Skins/Classic/eq_ex.png Index: multimedia/audacious/Makefile =================================================================== --- multimedia/audacious/Makefile +++ multimedia/audacious/Makefile @@ -2,57 +2,67 @@ # $FreeBSD$ PORTNAME= audacious -PORTVERSION= 3.9 -PORTREVISION= 1 +PORTVERSION= 3.10 CATEGORIES= multimedia audio MASTER_SITES= http://distfiles.audacious-media-player.org/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jhale@FreeBSD.org COMMENT= Lightweight and versatile audio player LICENSE= BSD2CLAUSE BSD3CLAUSE LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libfreetype.so:print/freetype2 \ - libfontconfig.so:x11-fonts/fontconfig +FLAVORS= gtk2 qt5 +FLAVOR?= ${FLAVORS:[1]} +gtk2_PKGNAMESUFFIX= -gtk2 +gtk2_CONFLICTS_INSTALL= audacious-qt5 +gtk2_LIB_DEPENDS= libfreetype.so:print/freetype2 \ + libfontconfig.so:x11-fonts/fontconfig +qt5_PKGNAMESUFFIX= -qt5 +qt5_CONFLICTS_INSTALL= audacious-gtk2 -CONFLICTS_INSTALL= audacious-gtk3-3.* +USES= compiler:c++11-lib desktop-file-utils gettext-runtime \ + gmake gnome iconv localbase pkgconfig tar:bzip2 +USE_GNOME= glib20 +USE_LDCONFIG= yes -SUB_FILES= pkg-message +CONFLICTS_INSTALL= audacious-gtk3 -USES= compiler:c++11-lib desktop-file-utils gettext-tools gmake \ - localbase pkgconfig tar:bzip2 GNU_CONFIGURE= yes -USE_XORG= x11 sm -USE_GNOME= gtk20 glib20 cairo -USE_LDCONFIG= yes -INSTALLS_ICONS= yes - -CONFIGURE_ARGS= --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \ - --enable-gtk \ +CONFIGURE_ARGS= --with-libiconv-prefix=${ICONV_PREFIX} \ + --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \ --without-buildstamp -OPTIONS_DEFINE= ICONV NLS EXECINFO -OPTIONS_DEFAULT=ICONV EXECINFO -ICONV_USES= iconv -NLS_USES= gettext-runtime -NLS_CONFIGURE_OFF= --disable-nls -NLS_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-Makefile -OPTIONS_SUB= yes -EXECINFO_DESC= Build with libexecinfo support +SUB_FILES= pkg-message +SUB_LIST= FLAVOR=${FLAVOR} \ + PORTSDIR=${PORTSDIR} -post-patch: - @${REINPLACE_CMD} -e 's| $${MFLAGS}||g' \ - ${WRKSRC}/buildsys.mk.in +.if ${FLAVOR} == qt5 +USES+= qt:5 +USE_QT= core gui widgets buildtools_build qmake_build +CONFIGURE_ARGS+= --disable-gtk --enable-qt +PLIST_SUB+= GTK2="@comment " QT5="" +.else +USE_GNOME+= cairo gtk20 +CONFIGURE_ARGS+= --disable-qt --enable-gtk +INSTALLS_ICONS= yes +PLIST_SUB+= GTK2="" QT5="@comment " +.endif -post-patch-EXECINFO-on: - @${REINPLACE_CMD} 's|-lm |-lm -lexecinfo |' \ - ${WRKSRC}/src/audacious/Makefile - @${REINPLACE_CMD} 's|-laudcore|-laudcore -lexecinfo|' \ - ${WRKSRC}/audacious.pc.in +OPTIONS_DEFINE= NLS +OPTIONS_SUB= yes +NLS_USES= gettext-tools +NLS_CONFIGURE_ENABLE= nls +NLS_BINARY_ALIAS_OFF= msgfmt=${TRUE} + +post-patch-NLS-off: + ${REINPLACE_CMD} -e '/^SUBDIRS/s| po||' ${WRKSRC}/Makefile + post-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/share/appdata + ${INSTALL_DATA} ${WRKSRC}/contrib/audacious.appdata.xml ${STAGEDIR}${PREFIX}/share/appdata @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/aud* @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib* Index: multimedia/audacious/distinfo =================================================================== --- multimedia/audacious/distinfo +++ multimedia/audacious/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1506360445 -SHA256 (audacious-3.9.tar.bz2) = 2d8044673ac786d71b08004f190bbca368258bf60e6602ffc0d9622835ccb05e -SIZE (audacious-3.9.tar.bz2) = 599488 +TIMESTAMP = 1536241997 +SHA256 (audacious-3.10.tar.bz2) = 6e4d49ac48a373c4c47d605fe18fbd5854bc30af6fece11331069af40eaa3fb5 +SIZE (audacious-3.10.tar.bz2) = 563531 Index: multimedia/audacious/files/extra-patch-Makefile =================================================================== --- multimedia/audacious/files/extra-patch-Makefile +++ /dev/null @@ -1,8 +0,0 @@ ---- Makefile.orig 2015-11-08 04:44:35 UTC -+++ Makefile -@@ -1,4 +1,4 @@ --SUBDIRS = src man images po -+SUBDIRS = src man images - - DISTCLEAN = audacious.pc buildsys.mk config.h config.log config.status extra.mk - Index: multimedia/audacious/files/patch-Makefile =================================================================== --- multimedia/audacious/files/patch-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.orig 2016-08-24 14:50:57 UTC -+++ Makefile -@@ -14,6 +14,8 @@ DATA = AUTHORS \ - images/playlist.png \ - images/plugins.png - -+CONTRIB = contrib/audacious.appdata.xml -+ - include buildsys.mk - - install-extra: Index: multimedia/audacious/files/patch-buildsys.mk.in =================================================================== --- multimedia/audacious/files/patch-buildsys.mk.in +++ /dev/null @@ -1,36 +0,0 @@ ---- buildsys.mk.in.orig 2016-08-24 14:50:57 UTC -+++ buildsys.mk.in -@@ -166,7 +166,7 @@ depend: pre-depend ${SRCS} - done; \ - if test x"$$regen" = x"1" -a x"$$deps" != x""; then \ - ${DEPEND_STATUS}; \ -- if ${MAKE} ${MFLAGS} $$deps && cat $$deps >.deps; then \ -+ if ${MAKE} ${MFLAGS} $$deps && sed 's|/[^ ]*/include/audacious/dbus.h||g' $$deps >.deps; then \ - rm -f $$deps; \ - ${DEPEND_OK}; \ - else \ -@@ -205,7 +205,7 @@ pre-depend: - - ${PROG} ${PROG_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA} - ${LINK_STATUS} -- if ${LD} -o $@ ${OBJS} ${OBJS_EXTRA} ${LDFLAGS} ${LIBS}; then \ -+ if ${LD} -o $@ ${OBJS} ${OBJS_EXTRA} ${LIBS} ${LDFLAGS}; then \ - ${LINK_OK}; \ - else \ - ${LINK_FAILED}; \ -@@ -604,6 +604,15 @@ install: install-extra - fi \ - done - -+ for i in ${CONTRIB}; do \ -+ ${INSTALL_STATUS}; \ -+ if ${MKDIR_P} ${DESTDIR}${datarootdir}/appdata && ${INSTALL} -m 644 $$i ${DESTDIR}${datarootdir}/appdata/$$(basename $$i); then \ -+ ${INSTALL_OK}; \ -+ else \ -+ ${INSTALL_FAILED}; \ -+ fi \ -+ done -+ - for i in ${PROG}; do \ - ${INSTALL_STATUS}; \ - if ${MKDIR_P} ${DESTDIR}${bindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i; then \ Index: multimedia/audacious/files/patch-extra.mk.in =================================================================== --- multimedia/audacious/files/patch-extra.mk.in +++ /dev/null @@ -1,10 +0,0 @@ ---- extra.mk.in.orig 2016-08-24 14:50:57 UTC -+++ extra.mk.in -@@ -12,6 +12,7 @@ GMODULE_LIBS ?= @GMODULE_LIBS@ - GTK_CFLAGS ?= @GTK_CFLAGS@ - GTK_LIBS ?= @GTK_LIBS@ - QTCORE_CFLAGS ?= @QTCORE_CFLAGS@ -+LIBINTL ?= @LIBINTL@ - QTCORE_LIBS ?= @QTCORE_LIBS@ - QT_CFLAGS ?= @QT_CFLAGS@ - QT_LIBS ?= @QT_LIBS@ Index: multimedia/audacious/files/patch-src_audtool_Makefile =================================================================== --- multimedia/audacious/files/patch-src_audtool_Makefile +++ /dev/null @@ -1,8 +0,0 @@ ---- src/audtool/Makefile.orig 2016-08-24 14:50:57 UTC -+++ src/audtool/Makefile -@@ -15,4 +15,4 @@ include ../../buildsys.mk - include ../../extra.mk - - CPPFLAGS := -I../.. -I../dbus ${CPPFLAGS} ${GLIB_CFLAGS} ${GIO_CFLAGS} --LIBS := ../dbus/aud-dbus.a ${LIBS} ${GLIB_LIBS} ${GIO_LIBS} -+LIBS := ../dbus/aud-dbus.a ${LIBS} ${GLIB_LIBS} ${GIO_LIBS} ${LIBINTL} Index: multimedia/audacious/files/pkg-message.in =================================================================== --- multimedia/audacious/files/pkg-message.in +++ multimedia/audacious/files/pkg-message.in @@ -1,4 +1,15 @@ -Audacious supports Gzipped and uncompressed skins. If you would like to use -Zip format skins you will need to ensure archivers/unzip is installed. +======================================================================= -You should install plugins port, without it, Audacious is useless! +Audacious is now installed! + +You must also install the corresponding Audacious plugins +package. Audacious will not run without it. + +By pkg: + # pkg install audacious-plugins-%%FLAVOR%% + +By ports: + # cd %%PORTSDIR%%/multimedia/audacious-plugins + # make FLAVOR=%%FLAVOR%% install clean + +======================================================================= Index: multimedia/audacious/pkg-plist =================================================================== --- multimedia/audacious/pkg-plist +++ multimedia/audacious/pkg-plist @@ -28,16 +28,24 @@ include/libaudcore/vfs.h include/libaudcore/vfs_async.h include/libaudcore/visualizer.h -include/libaudgui/libaudgui-gtk.h -include/libaudgui/libaudgui.h -include/libaudgui/list.h -include/libaudgui/menu.h +%%GTK2%%include/libaudgui/libaudgui-gtk.h +%%GTK2%%include/libaudgui/libaudgui.h +%%GTK2%%include/libaudgui/list.h +%%GTK2%%include/libaudgui/menu.h +%%QT5%%include/libaudqt/export.h +%%QT5%%include/libaudqt/iface.h +%%QT5%%include/libaudqt/info-widget.h +%%QT5%%include/libaudqt/libaudqt.h +%%QT5%%include/libaudqt/menu.h lib/libaudcore.so lib/libaudcore.so.5 -lib/libaudcore.so.5.0.0 -lib/libaudgui.so -lib/libaudgui.so.5 -lib/libaudgui.so.5.0.0 +lib/libaudcore.so.5.1.0 +%%GTK2%%lib/libaudgui.so +%%GTK2%%lib/libaudgui.so.5 +%%GTK2%%lib/libaudgui.so.5.0.0 +%%QT5%%lib/libaudqt.so +%%QT5%%lib/libaudqt.so.2 +%%QT5%%lib/libaudqt.so.2.1.0 lib/libaudtag.so lib/libaudtag.so.3 lib/libaudtag.so.3.0.0 @@ -48,19 +56,9 @@ share/applications/audacious.desktop %%DATADIR%%/AUTHORS %%DATADIR%%/COPYING -%%DATADIR%%/images/about-logo.png -%%DATADIR%%/images/about-logo.svg -%%DATADIR%%/images/album.png -%%DATADIR%%/images/appearance.png -%%DATADIR%%/images/audio.png -%%DATADIR%%/images/connectivity.png -%%DATADIR%%/images/info.png -%%DATADIR%%/images/playlist.png -%%DATADIR%%/images/plugins.png share/icons/hicolor/48x48/apps/audacious.png share/icons/hicolor/scalable/apps/audacious.svg %%NLS%%share/locale/ar/LC_MESSAGES/audacious.mo -%%NLS%%share/locale/ast/LC_MESSAGES/audacious.mo %%NLS%%share/locale/be/LC_MESSAGES/audacious.mo %%NLS%%share/locale/bg/LC_MESSAGES/audacious.mo %%NLS%%share/locale/ca/LC_MESSAGES/audacious.mo @@ -70,7 +68,6 @@ %%NLS%%share/locale/de/LC_MESSAGES/audacious.mo %%NLS%%share/locale/el/LC_MESSAGES/audacious.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/audacious.mo -%%NLS%%share/locale/eo/LC_MESSAGES/audacious.mo %%NLS%%share/locale/es/LC_MESSAGES/audacious.mo %%NLS%%share/locale/es_AR/LC_MESSAGES/audacious.mo %%NLS%%share/locale/es_MX/LC_MESSAGES/audacious.mo @@ -80,7 +77,6 @@ %%NLS%%share/locale/fi/LC_MESSAGES/audacious.mo %%NLS%%share/locale/fr/LC_MESSAGES/audacious.mo %%NLS%%share/locale/gl/LC_MESSAGES/audacious.mo -%%NLS%%share/locale/he/LC_MESSAGES/audacious.mo %%NLS%%share/locale/hu/LC_MESSAGES/audacious.mo %%NLS%%share/locale/id_ID/LC_MESSAGES/audacious.mo %%NLS%%share/locale/it/LC_MESSAGES/audacious.mo @@ -99,14 +95,11 @@ %%NLS%%share/locale/ru/LC_MESSAGES/audacious.mo %%NLS%%share/locale/si/LC_MESSAGES/audacious.mo %%NLS%%share/locale/sk/LC_MESSAGES/audacious.mo -%%NLS%%share/locale/sq/LC_MESSAGES/audacious.mo %%NLS%%share/locale/sr/LC_MESSAGES/audacious.mo -%%NLS%%share/locale/sr@latin/LC_MESSAGES/audacious.mo %%NLS%%share/locale/sr_RS/LC_MESSAGES/audacious.mo %%NLS%%share/locale/sv/LC_MESSAGES/audacious.mo %%NLS%%share/locale/ta/LC_MESSAGES/audacious.mo %%NLS%%share/locale/tr/LC_MESSAGES/audacious.mo %%NLS%%share/locale/uk/LC_MESSAGES/audacious.mo -%%NLS%%share/locale/vi/LC_MESSAGES/audacious.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/audacious.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/audacious.mo