Page MenuHomeFreeBSD

D25591.diff
No OneTemporary

D25591.diff

Index: MOVED
===================================================================
--- MOVED
+++ MOVED
@@ -15149,3 +15149,5 @@
databases/mariadb102-server|databases/mariadb103-server|2020-07-01|Has expired: Port will be removed when 10.5 is added, please switch to a newer version
databases/mariadb102-client|databases/mariadb103-client|2020-07-01|Has expired: Port will be removed when 10.5 is added, please switch to a newer version
databases/py-django-transaction-hooks||2020-07-02|Has expired: Unmaintained upstream and merged into Django since 1.9
+multimedia/audacious-gtk3|multimedia/audacious|2020-08-15|GTK3 interface abandoned upstream
+multimedia/audacious-plugins-gtk3|multimedia/audacious-plugins|2020-08-15|GTK3 interface abandoned upstream
Index: multimedia/Makefile
===================================================================
--- multimedia/Makefile
+++ multimedia/Makefile
@@ -13,9 +13,7 @@
SUBDIR += assimp
SUBDIR += atomicparsley
SUBDIR += audacious
- SUBDIR += audacious-gtk3
SUBDIR += audacious-plugins
- SUBDIR += audacious-plugins-gtk3
SUBDIR += avidemux
SUBDIR += avidemux-cli
SUBDIR += avidemux-plugins
Index: multimedia/audacious-gtk3/Makefile
===================================================================
--- multimedia/audacious-gtk3/Makefile
+++ multimedia/audacious-gtk3/Makefile
@@ -1,72 +0,0 @@
-# Created by: Zastupov Stepan [RedChrom] <redchrom@mail.ru>
-# $FreeBSD$
-
-PORTNAME= audacious
-PORTVERSION= 3.10.1
-PORTREVISION= 1
-DISTVERSIONSUFFIX= -gtk3
-CATEGORIES= multimedia audio
-#MASTER_SITES= http://distfiles.audacious-media-player.org/
-PKGNAMESUFFIX= ${DISTVERSIONSUFFIX}
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= Gtk+3 port of lightweight and versatile audio player
-
-LICENSE= GPLv3
-LICENSE_FILE= ${WRKSRC}/COPYING
-
-LIB_DEPENDS= libfreetype.so:print/freetype2 \
- 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 gnome localbase pkgconfig xorg
-
-USE_GITHUB= yes
-GH_ACCOUNT= audacious-media-player
-GH_TAGNAME= 89521a6
-
-GNU_CONFIGURE= yes
-USE_XORG= x11 sm
-USE_GNOME= gtk30 glib20 cairo
-USE_LDCONFIG= yes
-INSTALLS_ICONS= yes
-
-CONFIGURE_ARGS= --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \
- --enable-gtk \
- --without-buildstamp
-
-OPTIONS_DEFINE= EXECINFO ICONV NLS
-OPTIONS_DEFAULT=EXECINFO ICONV
-OPTIONS_SUB= yes
-
-EXECINFO_DESC= Build with libexecinfo support
-
-ICONV_USES= iconv
-NLS_USES= gettext-runtime
-NLS_CONFIGURE_ENABLE= nls
-
-post-patch:
- ${REINPLACE_CMD} -e 's| $${MFLAGS}||g' \
- ${WRKSRC}/buildsys.mk.in
-
-post-patch-NLS-off:
- ${REINPLACE_CMD} -e 's,po,,' ${WRKSRC}/Makefile
-
-post-patch-EXECINFO-on:
- @${REINPLACE_CMD} 's|-lm |-lm -lexecinfo |' \
- ${WRKSRC}/src/audacious/Makefile
- @${REINPLACE_CMD} 's|-laudcore|-laudcore -lexecinfo|' \
- ${WRKSRC}/audacious.pc.in
-
-post-install:
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/aud* \
- ${STAGEDIR}${PREFIX}/lib/lib*
-
-.include <bsd.port.mk>
Index: multimedia/audacious-gtk3/distinfo
===================================================================
--- multimedia/audacious-gtk3/distinfo
+++ multimedia/audacious-gtk3/distinfo
@@ -1,3 +0,0 @@
-TIMESTAMP = 1545847656
-SHA256 (audacious-media-player-audacious-3.10.1-gtk3-89521a6_GH0.tar.gz) = 82991fd5061d3b6df9935b07d112fab8e83e90c90d733a12c7d68e92fb884f99
-SIZE (audacious-media-player-audacious-3.10.1-gtk3-89521a6_GH0.tar.gz) = 801667
Index: multimedia/audacious-plugins-gtk3/Makefile
===================================================================
--- multimedia/audacious-plugins-gtk3/Makefile
+++ multimedia/audacious-plugins-gtk3/Makefile
@@ -1,148 +0,0 @@
-# Created by: Zastupov Stepan [RedChrom] <redchrom@mail.ru>
-# $FreeBSD$
-
-PORTNAME= audacious-plugins
-PORTVERSION= 3.10.1
-DISTVERSIONSUFFIX= -gtk3
-PORTREVISION= 5
-CATEGORIES= multimedia audio
-#MASTER_SITES= http://distfiles.audacious-media-player.org/
-PKGNAMESUFFIX= ${DISTVERSIONSUFFIX}
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= Plugins needed for audacious-gtk3
-
-LICENSE= GPLv3
-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 \
- libmpg123.so:audio/mpg123
-RUN_DEPENDS= audacious: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 gnome \
- iconv localbase pkgconfig xorg
-
-USE_GITHUB= yes
-GH_ACCOUNT= audacious-media-player
-GH_TAGNAME= 4cf5e07
-
-GNU_CONFIGURE= yes
-USE_GNOME= gtk30 glib20 libxml2 cairo gdkpixbuf2
-USE_XORG= x11
-
-CONFIGURE_ARGS+=--disable-console --disable-soxr \
- --enable-gnomeshortcuts \
- --enable-gtk --enable-hotkey
-
-OPTIONS_DEFINE= AAC AMIDI AOSD BS2B CDDA CUE FFMPEG FLAC LAME LIRC \
- MMS MODPLUG MPRIS NEON NLS NOTIFY OPENGL SAMPLERATE \
- SCROBBLER SID SNDFILE SPEEDPITCH VORBIS WAVPACK
-OPTIONS_MULTI= OUTPUT
-OPTIONS_MULTI_OUTPUT= ALSA FILEWRITER JACK OSS PULSEAUDIO SDL SNDIO
-OPTIONS_DEFAULT=AAC AOSD CDDA CUE FILEWRITER FFMPEG FLAC \
- MMS MPRIS NEON NLS NOTIFY OSS SCROBBLER VORBIS WAVPACK
-OPTIONS_SUB= yes
-
-AMIDI_DESC= Amidi decoder
-AOSD_DESC= Audacious OSD
-BS2B_DESC= BS2B effect
-FILEWRITER_DESC=File writer
-MPRIS_DESC= NPRIS plugin
-NEON_DESC= Neon plugin
-SCROBBLER_DESC= Scrobbler decoder
-SID_DESC= Sound chip emulator of Commodore
-SPEEDPITCH_DESC=Speed and Pitch plugin
-
-AAC_LIB_DEPENDS= libfaad.so:audio/faad
-AAC_CONFIGURE_ENABLE= aac
-ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
-ALSA_CONFIGURE_ENABLE= alsa
-AMIDI_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth
-AMIDI_CONFIGURE_ENABLE= amidiplug
-AOSD_USES= gnome xorg
-AOSD_USE= gnome=pango xorg=xrender
-AOSD_LIB_DEPENDS= libXcomposite.so:x11/libXcomposite
-AOSD_CONFIGURE_ENABLE= aosd
-BS2B_LIB_DEPENDS= libbs2b.so:audio/libbs2b
-BS2B_CONFIGURE_ENABLE= bs2b
-CDDA_LIB_DEPENDS= libcdio_cdda.so:sysutils/libcdio-paranoia \
- libcddb.so:audio/libcddb \
- libcdio.so:sysutils/libcdio
-CDDA_CONFIGURE_ENABLE= cdaudio
-CUE_LIB_DEPENDS= libcue.so:textproc/libcue
-CUE_CONFIGURE_ENABLE= cue
-FILEWRITER_CONFIGURE_ENABLE= filewriter
-FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg
-FFMPEG_CONFIGURE_WITH= ffmpeg=ffmpeg
-FLAC_LIB_DEPENDS= libFLAC.so:audio/flac
-FLAC_CONFIGURE_ENABLE= flac
-JACK_LIB_DEPENDS= libjack.so:audio/jack \
- libsamplerate.so:audio/libsamplerate
-JACK_CONFIGURE_ENABLE= jack
-LAME_LIB_DEPENDS= libmp3lame.so:audio/lame
-LAME_CONFIGURE_ENABLE= filewriter_mp3
-LIRC_LIB_DEPENDS= liblirc_client.so:comms/lirc
-LIRC_CONFIGURE_ENABLE= lirc
-MMS_LIB_DEPENDS= libmms.so:net/libmms
-MMS_CONFIGURE_ENABLE= mms
-MODPLUG_LIB_DEPENDS= libmodplug.so:audio/libmodplug
-MODPLUG_CONFIGURE_ENABLE= modplug
-MPRIS_CONFIGURE_ENABLE= mpris2
-NEON_LIB_DEPENDS= libneon.so:www/neon
-NEON_CONFIGURE_ENABLE= neon
-NLS_USES= gettext-runtime
-NLS_CONFIGURE_ENABLE= nls
-NOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify
-NOTIFY_CONFIGURE_ENABLE=notify
-OPENGL_USES= gl xorg
-OPENGL_USE= xorg=x11 gl=gl
-OPENGL_CONFIGURE_ENABLE=glspectrum
-OSS_CONFIGURE_ENABLE= oss4
-PULSEAUDIO_LIB_DEPENDS= libpulse-mainloop-glib.so:audio/pulseaudio
-PULSEAUDIO_CONFIGURE_ENABLE= pulse
-SAMPLERATE_LIB_DEPENDS= libsamplerate.so:audio/libsamplerate
-SAMPLERATE_CONFIGURE_ENABLE= resample
-SCROBBLER_LIB_DEPENDS= libcurl.so:ftp/curl
-SCROBBLER_CONFIGURE_ENABLE= scrobbler2
-SDL_CONFIGURE_ON= --enable-sdlout --with-libsdl=2
-SDL_CONFIGURE_OFF= --disable-sdlout
-SDL_USES= sdl
-SDL_USE= SDL=sdl2
-SID_LIB_DEPENDS= libsidplayfp.so:audio/libsidplayfp
-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
-SPEEDPITCH_CONFIGURE_ENABLE= speedpitch
-SPEEDPITCH_IMPLIES= SAMPLERATE
-VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis \
- libogg.so:audio/libogg
-VORBIS_CONFIGURE_ENABLE=vorbis
-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 's,po,,' ${WRKSRC}/Makefile
-
-post-install:
- @${FIND} ${STAGEDIR}${PREFIX}/lib/audacious/ -name "*.so" \
- -exec ${STRIP_CMD} {} \;
-
-.include <bsd.port.mk>
Index: multimedia/audacious-plugins-gtk3/distinfo
===================================================================
--- multimedia/audacious-plugins-gtk3/distinfo
+++ multimedia/audacious-plugins-gtk3/distinfo
@@ -1,3 +0,0 @@
-TIMESTAMP = 1545847704
-SHA256 (audacious-media-player-audacious-plugins-3.10.1-gtk3-4cf5e07_GH0.tar.gz) = 513e4e4151955e149b51e8604d5fb94845afe51bd03a47ee63dbe4e53ef8bdd0
-SIZE (audacious-media-player-audacious-plugins-3.10.1-gtk3-4cf5e07_GH0.tar.gz) = 2579889
Index: multimedia/audacious-plugins/Makefile
===================================================================
--- multimedia/audacious-plugins/Makefile
+++ multimedia/audacious-plugins/Makefile
@@ -2,45 +2,67 @@
# $FreeBSD$
PORTNAME= audacious-plugins
-PORTVERSION= 3.10.1
-PORTREVISION= 6
+PORTVERSION= 4.0.4
CATEGORIES= multimedia audio
MASTER_SITES= http://distfiles.audacious-media-player.org/
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= madpilot@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 \
libmpg123.so:audio/mpg123
-RUN_DEPENDS= audacious:multimedia/audacious
+FLAVORS= qt5 gtk2
+FLAVOR?= ${FLAVORS:[1]}
+
USES= compiler:c++11-lib gettext-tools gmake gnome iconv \
localbase pkgconfig tar:bzip2 xorg
-USE_GNOME= gtk20 glib20 libxml2 cairo gdkpixbuf2
+USE_GNOME= glib20 libxml2 gdkpixbuf2
USE_XORG= x11
-CONFLICTS_INSTALL= audacious-plugins-gtk3-3.*
+qt5_CONFLICTS_INSTALL= audacious-plugins-gtk2
+qt5_RUN_DEPENDS= audacious:multimedia/audacious@qt5
+qt5_BUILD_DEPENDS= audacious:multimedia/audacious@qt5
+gtk2_PKGNAMESUFFIX= -gtk2
+gtk2_CONFLICTS_INSTALL= audacious-plugins
+gtk2_RUN_DEPENDS= audacious:multimedia/audacious@gtk2
+gtk2_BUILD_DEPENDS= audacious:multimedia/audacious@gtk2
+
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-console --disable-soxr \
- --enable-gnomeshortcuts \
- --enable-gtk --enable-hotkey
+ --enable-gnomeshortcuts
-OPTIONS_DEFINE= AAC AMIDI AOSD BS2B CDDA CUE FFMPEG FLAC LAME LIRC \
- MMS MODPLUG MPRIS NEON NLS NOTIFY OPENGL SAMPLERATE \
+.if ${FLAVOR} == qt5
+CONFIGURE_ARGS+= --enable-qt --disable-gtk
+USES+= qt:5
+USE_QT= core gui widgets
+PLIST_SUB= QT5="" GTK2="@comment "
+.elif ${FLAVOR} == gtk2
+CONFIGURE_ARGS+= --disable-qt --enable-gtk --enable-hotkey
+USE_GNOME+= gtk20 cairo
+PLIST_SUB= QT5="@comment " GTK2=""
+.endif
+
+OPTIONS_DEFINE= AAC AMIDI BS2B CDDA CUE FFMPEG FLAC LAME LIRC \
+ MMS MODPLUG MPRIS NEON NLS NOTIFY SAMPLERATE \
SCROBBLER SID SNDFILE SPEEDPITCH VORBIS WAVPACK
OPTIONS_MULTI= OUTPUT
OPTIONS_MULTI_OUTPUT= ALSA FILEWRITER JACK OSS PULSEAUDIO SDL SNDIO
-OPTIONS_DEFAULT=AAC AOSD CDDA CUE FILEWRITER FFMPEG FLAC \
+OPTIONS_DEFAULT=AAC CDDA CUE FILEWRITER FFMPEG FLAC \
MMS MPRIS NEON NLS NOTIFY OSS SCROBBLER VORBIS WAVPACK
OPTIONS_SUB= yes
+
+.if ${FLAVOR} == gtk2
+OPTIONS_DEFINE+= AOSD OPENGL
+OPTIONS_DEFAULT+= AOSD
+.endif
AMIDI_DESC= Amidi decoder
AOSD_DESC= Audacious OSD
Index: multimedia/audacious-plugins/distinfo
===================================================================
--- multimedia/audacious-plugins/distinfo
+++ multimedia/audacious-plugins/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1545847672
-SHA256 (audacious-plugins-3.10.1.tar.bz2) = eec3177631f99729bf0e94223b627406cc648c70e6646e35613c7b55040a2642
-SIZE (audacious-plugins-3.10.1.tar.bz2) = 1715477
+TIMESTAMP = 1594154149
+SHA256 (audacious-plugins-4.0.4.tar.bz2) = 36f240ab61bf19cbca2ab6da6fc44667ae582f062627e33e656224f2fab85c48
+SIZE (audacious-plugins-4.0.4.tar.bz2) = 1761281
Index: multimedia/audacious-plugins/pkg-plist
===================================================================
--- multimedia/audacious-plugins/pkg-plist
+++ multimedia/audacious-plugins/pkg-plist
@@ -10,30 +10,38 @@
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
%%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
+%%GTK2%%%%AOSD%%lib/audacious/General/aosd.so
%%CDDA%%lib/audacious/General/cd-menu-items.so
lib/audacious/General/delete-files.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
+%%GTK2%%lib/audacious/General/playlist-manager.so
+%%QT5%%lib/audacious/General/playlist-manager-qt.so
+%%QT5%%lib/audacious/General/qtui.so
%%SCROBBLER%%lib/audacious/General/scrobbler.so
-lib/audacious/General/search-tool.so
-lib/audacious/General/skins.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
+%%QT5%%lib/audacious/General/song-info-qt.so
lib/audacious/General/song_change.so
-lib/audacious/General/statusicon.so
+%%GTK2%%lib/audacious/General/statusicon.so
+%%QT5%%lib/audacious/General/statusicon-qt.so
%%AAC%%lib/audacious/Input/aac-raw.so
%%AMIDI%%lib/audacious/Input/amidi-plug.so
%%CDDA%%lib/audacious/Input/cdaudio-ng.so
@@ -60,9 +68,12 @@
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
+%%GTK2%%lib/audacious/Visualization/blur_scope.so
+%%QT5%%lib/audacious/Visualization/blur_scope-qt.so
+%%GTK2%%lib/audacious/Visualization/cairo-spectrum.so
+%%QT5%%lib/audacious/Visualization/qt-spectrum.so
+%%GTK2%%%%OPENGL%%lib/audacious/Visualization/gl-spectrum.so
+%%QT5%%lib/audacious/Visualization/vumeter-qt.so
share/audacious/Skins/Classic/balance.png
share/audacious/Skins/Classic/cbuttons.png
share/audacious/Skins/Classic/eq_ex.png
@@ -196,8 +207,6 @@
%%NLS%%share/locale/es_AR/LC_MESSAGES/audacious-plugins.mo
%%NLS%%share/locale/es_MX/LC_MESSAGES/audacious-plugins.mo
%%NLS%%share/locale/et/LC_MESSAGES/audacious-plugins.mo
-%%NLS%%share/locale/eu/LC_MESSAGES/audacious-plugins.mo
-%%NLS%%share/locale/fa_IR/LC_MESSAGES/audacious-plugins.mo
%%NLS%%share/locale/fi/LC_MESSAGES/audacious-plugins.mo
%%NLS%%share/locale/fr/LC_MESSAGES/audacious-plugins.mo
%%NLS%%share/locale/gl/LC_MESSAGES/audacious-plugins.mo
@@ -206,7 +215,6 @@
%%NLS%%share/locale/it/LC_MESSAGES/audacious-plugins.mo
%%NLS%%share/locale/ja/LC_MESSAGES/audacious-plugins.mo
%%NLS%%share/locale/ko/LC_MESSAGES/audacious-plugins.mo
-%%NLS%%share/locale/ky/LC_MESSAGES/audacious-plugins.mo
%%NLS%%share/locale/lt/LC_MESSAGES/audacious-plugins.mo
%%NLS%%share/locale/lv/LC_MESSAGES/audacious-plugins.mo
%%NLS%%share/locale/ml_IN/LC_MESSAGES/audacious-plugins.mo
Index: multimedia/audacious/Makefile
===================================================================
--- multimedia/audacious/Makefile
+++ multimedia/audacious/Makefile
@@ -2,12 +2,11 @@
# $FreeBSD$
PORTNAME= audacious
-PORTVERSION= 3.10.1
-PORTREVISION= 1
+PORTVERSION= 4.0.4
CATEGORIES= multimedia audio
MASTER_SITES= https://distfiles.audacious-media-player.org/
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= madpilot@FreeBSD.org
COMMENT= Lightweight and versatile audio player
LICENSE= BSD2CLAUSE BSD3CLAUSE
@@ -17,35 +16,45 @@
LIB_DEPENDS= libfreetype.so:print/freetype2 \
libfontconfig.so:x11-fonts/fontconfig
+FLAVORS= qt5 gtk2
+FLAVOR?= ${FLAVORS:[1]}
+
USES= compiler:c++11-lib desktop-file-utils gettext-tools gmake \
- gnome localbase pkgconfig tar:bzip2 xorg
+ iconv localbase pkgconfig tar:bzip2 xorg
USE_XORG= x11 sm
-USE_GNOME= gtk20 glib20 cairo
USE_LDCONFIG= yes
+qt5_CONFLICTS_INSTALL= audacious-gtk2
+
+gtk2_PKGNAMESUFFIX= -gtk2
+gtk2_CONFLICTS_INSTALL= audacious
+
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
SUB_FILES= pkg-message
-CONFLICTS_INSTALL= audacious-gtk3-3.*
-
CONFIGURE_ARGS= --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \
- --enable-gtk \
--without-buildstamp
-OPTIONS_DEFINE= ICONV NLS EXECINFO
-OPTIONS_DEFAULT=ICONV EXECINFO
+.if ${FLAVOR} == qt5
+CONFIGURE_ARGS+= --enable-qt --disable-gtk
+USES+= qt:5
+USE_QT= buildtools_build core gui widgets
+PLIST_SUB= QT5="" GTK2="@comment "
+.elif ${FLAVOR} == gtk2
+CONFIGURE_ARGS+= --disable-qt --enable-gtk
+USES+= gnome
+USE_GNOME= gtk20 glib20 cairo
+PLIST_SUB= QT5="@comment " GTK2=""
+.endif
+
+OPTIONS_DEFINE= NLS EXECINFO
+OPTIONS_DEFAULT=EXECINFO
OPTIONS_SUB= yes
EXECINFO_DESC= Build with libexecinfo support
-ICONV_USES= iconv
-
NLS_USES= gettext-runtime
NLS_CONFIGURE_ENABLE= nls
-
-post-patch:
- @${REINPLACE_CMD} -e 's| $${MFLAGS}||g' \
- ${WRKSRC}/buildsys.mk.in
post-patch-NLS-off:
${REINPLACE_CMD} -e 's,po,,' ${WRKSRC}/Makefile
Index: multimedia/audacious/distinfo
===================================================================
--- multimedia/audacious/distinfo
+++ multimedia/audacious/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1545847636
-SHA256 (audacious-3.10.1.tar.bz2) = 8366e840bb3c9448c2cf0cf9a0800155b0bd7cc212a28ba44990c3d2289c6b93
-SIZE (audacious-3.10.1.tar.bz2) = 564481
+TIMESTAMP = 1594150908
+SHA256 (audacious-4.0.4.tar.bz2) = 27fae151760cc65193f31224d5ba08fe9f52d2c31b9a688e8a5468b97f7c95bf
+SIZE (audacious-4.0.4.tar.bz2) = 577440
Index: multimedia/audacious/pkg-plist
===================================================================
--- multimedia/audacious/pkg-plist
+++ multimedia/audacious/pkg-plist
@@ -23,21 +23,32 @@
include/libaudcore/ringbuf.h
include/libaudcore/runtime.h
include/libaudcore/templates.h
+include/libaudcore/threads.h
include/libaudcore/tinylock.h
include/libaudcore/tuple.h
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
+%%QT5%%include/libaudqt/colorbutton.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
+%%QT5%%include/libaudqt/treeview.h
+%%GTK2%%include/libaudgui/libaudgui-gtk.h
+%%GTK2%%include/libaudgui/libaudgui.h
+%%GTK2%%include/libaudgui/list.h
+%%GTK2%%include/libaudgui/menu.h
lib/libaudcore.so
lib/libaudcore.so.5
-lib/libaudcore.so.5.1.0
-lib/libaudgui.so
-lib/libaudgui.so.5
-lib/libaudgui.so.5.0.0
+lib/libaudcore.so.5.2.0
+%%GTK2%%lib/libaudgui.so
+%%GTK2%%lib/libaudgui.so.5
+%%GTK2%%lib/libaudgui.so.5.1.0
+%%QT5%%lib/libaudqt.so
+%%QT5%%lib/libaudqt.so.2
+%%QT5%%lib/libaudqt.so.2.2.0
lib/libaudtag.so
lib/libaudtag.so.3
lib/libaudtag.so.3.0.0
@@ -64,8 +75,6 @@
%%NLS%%share/locale/es_AR/LC_MESSAGES/audacious.mo
%%NLS%%share/locale/es_MX/LC_MESSAGES/audacious.mo
%%NLS%%share/locale/et/LC_MESSAGES/audacious.mo
-%%NLS%%share/locale/eu/LC_MESSAGES/audacious.mo
-%%NLS%%share/locale/fa_IR/LC_MESSAGES/audacious.mo
%%NLS%%share/locale/fi/LC_MESSAGES/audacious.mo
%%NLS%%share/locale/fr/LC_MESSAGES/audacious.mo
%%NLS%%share/locale/gl/LC_MESSAGES/audacious.mo
@@ -74,7 +83,6 @@
%%NLS%%share/locale/it/LC_MESSAGES/audacious.mo
%%NLS%%share/locale/ja/LC_MESSAGES/audacious.mo
%%NLS%%share/locale/ko/LC_MESSAGES/audacious.mo
-%%NLS%%share/locale/ky/LC_MESSAGES/audacious.mo
%%NLS%%share/locale/lt/LC_MESSAGES/audacious.mo
%%NLS%%share/locale/lv/LC_MESSAGES/audacious.mo
%%NLS%%share/locale/ml_IN/LC_MESSAGES/audacious.mo
@@ -83,7 +91,6 @@
%%NLS%%share/locale/pl/LC_MESSAGES/audacious.mo
%%NLS%%share/locale/pt_BR/LC_MESSAGES/audacious.mo
%%NLS%%share/locale/pt_PT/LC_MESSAGES/audacious.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/audacious.mo
%%NLS%%share/locale/ru/LC_MESSAGES/audacious.mo
%%NLS%%share/locale/si/LC_MESSAGES/audacious.mo
%%NLS%%share/locale/sk/LC_MESSAGES/audacious.mo

File Metadata

Mime Type
text/plain
Expires
Sun, Apr 19, 1:27 PM (15 h, 47 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31708945
Default Alt Text
D25591.diff (20 KB)

Event Timeline