svn commit: r541716 - in head: . multimedia multimedia/audacious multimedia/audacious-gtk3 multimedia/audacious-plugins multimedia/audacious-plugins-gtk3
Guido Falsi
madpilot at FreeBSD.org
Wed Jul 8 20:05:09 UTC 2020
Author: madpilot
Date: Wed Jul 8 20:05:07 2020
New Revision: 541716
URL: https://svnweb.freebsd.org/changeset/ports/541716
Log:
- Update audacious to 4.0.4
- Remove gtk3 versions, upstream discountinued support for that UI [1]
- Flavorize port and make qt (upstream main UI) version the
default flavor
- Add gtk2 as a flavor, although the gtk2 UI is deprecated upstream
- Take maintainership
[1] https://redmine.audacious-media-player.org/boards/1/topics/2489?r=2500#message-2500
Approved by: portmgr (flavors addition)
Differential Revision: https://reviews.freebsd.org/D25591
Deleted:
head/multimedia/audacious-gtk3/
head/multimedia/audacious-plugins-gtk3/
Modified:
head/MOVED
head/multimedia/Makefile
head/multimedia/audacious-plugins/Makefile
head/multimedia/audacious-plugins/distinfo
head/multimedia/audacious-plugins/pkg-plist
head/multimedia/audacious/Makefile
head/multimedia/audacious/distinfo
head/multimedia/audacious/pkg-plist
Modified: head/MOVED
==============================================================================
--- head/MOVED Wed Jul 8 19:51:01 2020 (r541715)
+++ head/MOVED Wed Jul 8 20:05:07 2020 (r541716)
@@ -15149,3 +15149,5 @@ databases/mariadb101-server|databases/mariadb103-serve
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-07-08|GTK3 interface abandoned upstream
+multimedia/audacious-plugins-gtk3|multimedia/audacious-plugins|2020-07-08|GTK3 interface abandoned upstream
Modified: head/multimedia/Makefile
==============================================================================
--- head/multimedia/Makefile Wed Jul 8 19:51:01 2020 (r541715)
+++ head/multimedia/Makefile Wed Jul 8 20:05:07 2020 (r541716)
@@ -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
Modified: head/multimedia/audacious-plugins/Makefile
==============================================================================
--- head/multimedia/audacious-plugins/Makefile Wed Jul 8 19:51:01 2020 (r541715)
+++ head/multimedia/audacious-plugins/Makefile Wed Jul 8 20:05:07 2020 (r541716)
@@ -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 at FreeBSD.org
+MAINTAINER= madpilot at 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 at qt5
+qt5_BUILD_DEPENDS= audacious:multimedia/audacious at qt5
+gtk2_PKGNAMESUFFIX= -gtk2
+gtk2_CONFLICTS_INSTALL= audacious-plugins
+gtk2_RUN_DEPENDS= audacious:multimedia/audacious at gtk2
+gtk2_BUILD_DEPENDS= audacious:multimedia/audacious at 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
Modified: head/multimedia/audacious-plugins/distinfo
==============================================================================
--- head/multimedia/audacious-plugins/distinfo Wed Jul 8 19:51:01 2020 (r541715)
+++ head/multimedia/audacious-plugins/distinfo Wed Jul 8 20:05:07 2020 (r541716)
@@ -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
Modified: head/multimedia/audacious-plugins/pkg-plist
==============================================================================
--- head/multimedia/audacious-plugins/pkg-plist Wed Jul 8 19:51:01 2020 (r541715)
+++ head/multimedia/audacious-plugins/pkg-plist Wed Jul 8 20:05:07 2020 (r541716)
@@ -10,30 +10,38 @@ lib/audacious/Effect/compressor.so
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/Input/xsf.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
+%%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 @@ share/audacious/Skins/TinyPlayer/volume.png
%%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 @@ share/audacious/Skins/TinyPlayer/volume.png
%%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
Modified: head/multimedia/audacious/Makefile
==============================================================================
--- head/multimedia/audacious/Makefile Wed Jul 8 19:51:01 2020 (r541715)
+++ head/multimedia/audacious/Makefile Wed Jul 8 20:05:07 2020 (r541716)
@@ -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 at FreeBSD.org
+MAINTAINER= madpilot at FreeBSD.org
COMMENT= Lightweight and versatile audio player
LICENSE= BSD2CLAUSE BSD3CLAUSE
@@ -17,35 +16,45 @@ LICENSE_FILE= ${WRKSRC}/COPYING
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
Modified: head/multimedia/audacious/distinfo
==============================================================================
--- head/multimedia/audacious/distinfo Wed Jul 8 19:51:01 2020 (r541715)
+++ head/multimedia/audacious/distinfo Wed Jul 8 20:05:07 2020 (r541716)
@@ -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
Modified: head/multimedia/audacious/pkg-plist
==============================================================================
--- head/multimedia/audacious/pkg-plist Wed Jul 8 19:51:01 2020 (r541715)
+++ head/multimedia/audacious/pkg-plist Wed Jul 8 20:05:07 2020 (r541716)
@@ -23,21 +23,32 @@ include/libaudcore/probe.h
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 @@ share/icons/hicolor/scalable/apps/audacious.svg
%%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 @@ share/icons/hicolor/scalable/apps/audacious.svg
%%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 @@ share/icons/hicolor/scalable/apps/audacious.svg
%%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
More information about the svn-ports-head
mailing list