From a6023c959cbff0b875a90f0dc6792f35b7d24baa Mon Sep 17 00:00:00 2001 From: nia Date: Sun, 22 Mar 2020 08:39:48 +0000 Subject: [PATCH] audacious: Update to 4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This release switches to Qt 5 by default. The Qt UI has become quite polished by now. It will be quite familiar to users of the GTK2 UI, but it also brings a few nice-to-have improvements, such as a playlist view that is easier to navigate and sort. GTK2 remains available and supported as a build option, but new features will only be added to the Qt UI going forward. Some things that we wanted to get finished didn't make it into this release. In particular, the Qt port of the Winamp-like UI is still missing some key features such the Jump to Song window. Users of the Winamp-like UI may want to continue using GTK2 for now. The Windows builds are also still using GTK2, until some Windows-specific font size issues (on displays greater than 96 DPI) can be worked out in the Qt version. New features and improvements: Clicking on playlist column headers sorts the playlist (#8) Dragging playlist column headers changes the column order (#10) Application-wide settings for volume and time step sizes (#330) New option to hide playlist tabs (#547) Sorting playlist by path now sorts folders after files (#843) Implemented additional MPRIS calls for compatibility with KDE 5.16+ (#900) New OpenMPT-based tracker module plugin (contributed by Chris Spiegel) New VU Meter visualization plugin (contributed by Marc Sánchez) Added option to use a SOCKS network proxy (contributed by Róbert Čerňanský) The Song Change plugin now works on Windows (contributed by Domen Mori) New “Next Album” and “Previous Album” commands The tag editor in Qt UI can now edit multiple files at once Implemented equalizer presets window for Qt UI Lyrics plugin gained the ability to save and load lyrics locally Blur Scope and Spectrum Analyzer visualizations ported to Qt MIDI plugin soundfont selection ported to Qt JACK output plugin gained some new options Added option to endlessly loop PSF files Bug fixes since 3.10.1: Fixed blurry application icon on Windows (#863) Cuesheet entries in an .m3u playlist are now added correctly (#878) Various minor fixes in handling of output stream Other: Experimental support for building with meson --- audio/audacious-plugins/Makefile | 16 +++----------- audio/audacious-plugins/PLIST | 38 ++++++++++++-------------------- audio/audacious-plugins/distinfo | 10 ++++----- audio/audacious/Makefile | 7 +++--- audio/audacious/PLIST | 30 +++++++++++-------------- audio/audacious/buildlink3.mk | 7 ++---- audio/audacious/distinfo | 10 ++++----- audio/audacious/options.mk | 21 +++--------------- 8 files changed, 49 insertions(+), 90 deletions(-) diff --git a/audio/audacious-plugins/Makefile b/audio/audacious-plugins/Makefile index 23e19966dac0..7165aec12a82 100644 --- a/audio/audacious-plugins/Makefile +++ b/audio/audacious-plugins/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.101 2020/03/10 22:09:18 wiz Exp $ +# $NetBSD: Makefile,v 1.102 2020/03/22 08:39:48 nia Exp $ -DISTNAME= audacious-plugins-3.10.1 -PKGREVISION= 8 +DISTNAME= audacious-plugins-4.0 CATEGORIES= audio MASTER_SITES= https://distfiles.audacious-media-player.org/ EXTRACT_SUFX= .tar.bz2 @@ -25,7 +24,7 @@ CONFIGURE_ARGS+= --disable-oss4 CONFIGURE_ARGS+= --disable-qtaudio CONFIGURE_ARGS+= --disable-sndio -PLIST_VARS+= dbus gtk qt +PLIST_VARS+= dbus .include "options.mk" .include "../../audio/audacious/buildlink3.mk" @@ -35,15 +34,6 @@ PLIST.dbus= yes .else CONFIGURE_ARGS+= --disable-mpris2 .endif -.if !empty(PKG_BUILD_OPTIONS.audacious:Mqt5) -PLIST.qt= yes -CONFIGURE_ARGS+= --enable-qt -.endif -.if !empty(PKG_BUILD_OPTIONS.audacious:Mgtk2) -PLIST.gtk= yes -.else -CONFIGURE_ARGS+= --disable-gtk -.endif .include "../../audio/faad2/buildlink3.mk" .include "../../audio/lame/buildlink3.mk" .include "../../audio/libcddb/buildlink3.mk" diff --git a/audio/audacious-plugins/PLIST b/audio/audacious-plugins/PLIST index 3e0c45034e4d..080f3eb1fdd0 100644 --- a/audio/audacious-plugins/PLIST +++ b/audio/audacious-plugins/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.17 2019/07/20 10:39:18 nia Exp $ +@comment $NetBSD: PLIST,v 1.18 2020/03/22 08:39:48 nia Exp $ lib/audacious/Container/asx.so lib/audacious/Container/asx3.so lib/audacious/Container/audpl.so @@ -9,7 +9,6 @@ lib/audacious/Effect/compressor.so lib/audacious/Effect/crossfade.so lib/audacious/Effect/crystalizer.so lib/audacious/Effect/echo.so -${PLIST.gtk}lib/audacious/Effect/ladspa.so lib/audacious/Effect/mixer.so lib/audacious/Effect/resample.so lib/audacious/Effect/silence-removal.so @@ -17,29 +16,20 @@ lib/audacious/Effect/sox-resampler.so lib/audacious/Effect/speed-pitch.so lib/audacious/Effect/stereo.so lib/audacious/Effect/voice_removal.so -${PLIST.gtk}lib/audacious/General/alarm.so -${PLIST.qt}lib/audacious/General/albumart-qt.so -${PLIST.gtk}lib/audacious/General/albumart.so -${PLIST.gtk}lib/audacious/General/aosd.so +lib/audacious/General/albumart-qt.so lib/audacious/General/cd-menu-items.so lib/audacious/General/delete-files.so -${PLIST.gtk}lib/audacious/General/gtkui.so -${PLIST.gtk}lib/audacious/General/hotkey.so -${PLIST.qt}lib/audacious/General/lyricwiki-qt.so -${PLIST.gtk}lib/audacious/General/lyricwiki.so +lib/audacious/General/lyricwiki-qt.so ${PLIST.dbus}lib/audacious/General/mpris2.so -${PLIST.qt}lib/audacious/General/playlist-manager-qt.so -${PLIST.gtk}lib/audacious/General/playlist-manager.so -${PLIST.qt}lib/audacious/General/qtui.so +lib/audacious/General/playlist-manager-qt.so +lib/audacious/General/qtui.so lib/audacious/General/scrobbler.so -${PLIST.qt}lib/audacious/General/search-tool-qt.so -${PLIST.gtk}lib/audacious/General/search-tool.so -${PLIST.qt}lib/audacious/General/skins-qt.so -${PLIST.gtk}lib/audacious/General/skins.so -${PLIST.qt}lib/audacious/General/song-info-qt.so +lib/audacious/General/search-tool-qt.so +lib/audacious/General/skins-qt.so +lib/audacious/General/song-info-qt.so lib/audacious/General/song_change.so -${PLIST.qt}lib/audacious/General/statusicon-qt.so -${PLIST.gtk}lib/audacious/General/statusicon.so +lib/audacious/General/statusicon-qt.so +lib/audacious/General/streamtuner.so lib/audacious/Input/aac-raw.so ${PLIST.adplug}lib/audacious/Input/adplug.so ${PLIST.fluidsynth}lib/audacious/Input/amidi-plug.so @@ -65,10 +55,10 @@ lib/audacious/Output/sdlout.so lib/audacious/Transport/gio.so lib/audacious/Transport/mms.so lib/audacious/Transport/neon.so -${PLIST.gtk}lib/audacious/Visualization/blur_scope.so -${PLIST.gtk}lib/audacious/Visualization/cairo-spectrum.so -${PLIST.qt}lib/audacious/Visualization/gl-spectrum-qt.so -${PLIST.gtk}lib/audacious/Visualization/gl-spectrum.so +lib/audacious/Visualization/blur_scope-qt.so +lib/audacious/Visualization/gl-spectrum-qt.so +lib/audacious/Visualization/qt-spectrum.so +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 diff --git a/audio/audacious-plugins/distinfo b/audio/audacious-plugins/distinfo index 3df439916146..82d84a284d71 100644 --- a/audio/audacious-plugins/distinfo +++ b/audio/audacious-plugins/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.6 2019/07/06 13:17:01 nia Exp $ +$NetBSD: distinfo,v 1.7 2020/03/22 08:39:48 nia Exp $ -SHA1 (audacious-plugins-3.10.1.tar.bz2) = d2e549a402baa59b0181aabad6d7481369e8930e -RMD160 (audacious-plugins-3.10.1.tar.bz2) = 96b7f2b0041508e8cea5f8188d9fb7b69b08f0a3 -SHA512 (audacious-plugins-3.10.1.tar.bz2) = 454e9ce4061e92a0ecda40f562d4cc7453fc0019fd76b25dbe9e319319fa37c22f9785cb29563e8074de8a88e6130106aca1e431790297e1b4636dc974fde565 -Size (audacious-plugins-3.10.1.tar.bz2) = 1715477 bytes +SHA1 (audacious-plugins-4.0.tar.bz2) = 53677851a35582e31069a8302197ef0698b1672e +RMD160 (audacious-plugins-4.0.tar.bz2) = 85510ce0af7daf5d5e44f8c0fc61412fba4be54b +SHA512 (audacious-plugins-4.0.tar.bz2) = f9f7d249ff5b8337729ce59b24ec249b96842ed9986a6a42a4de179bed44a431316537311a5514d652c0f847d7e849afd18e0bb2a2a5628d24cc6d449c52095c +Size (audacious-plugins-4.0.tar.bz2) = 1741569 bytes diff --git a/audio/audacious/Makefile b/audio/audacious/Makefile index d2a43da6e5dc..f916dfc97f4f 100644 --- a/audio/audacious/Makefile +++ b/audio/audacious/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.59 2020/03/10 22:08:37 wiz Exp $ +# $NetBSD: Makefile,v 1.60 2020/03/22 08:39:48 nia Exp $ -DISTNAME= audacious-3.10.1 -PKGREVISION= 4 +DISTNAME= audacious-4.0 CATEGORIES= audio MASTER_SITES= https://distfiles.audacious-media-player.org/ EXTRACT_SUFX= .tar.bz2 @@ -26,4 +25,6 @@ LDFLAGS.Darwin+= -flat_namespace -undefined suppress .include "../../devel/gobject-introspection/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" +.include "../../x11/gtk2/buildlink3.mk" +.include "../../x11/qt5-qtbase/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/audacious/PLIST b/audio/audacious/PLIST index e79eea065f93..c1a80bb13dd0 100644 --- a/audio/audacious/PLIST +++ b/audio/audacious/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2019/07/06 13:17:00 nia Exp $ +@comment $NetBSD: PLIST,v 1.6 2020/03/22 08:39:48 nia Exp $ bin/audacious ${PLIST.dbus}bin/audtool include/audacious/audtag.h @@ -24,29 +24,25 @@ 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 -${PLIST.gtk}include/libaudgui/libaudgui-gtk.h -${PLIST.gtk}include/libaudgui/libaudgui.h -${PLIST.gtk}include/libaudgui/list.h -${PLIST.gtk}include/libaudgui/menu.h -${PLIST.qt}include/libaudqt/export.h -${PLIST.qt}include/libaudqt/iface.h -${PLIST.qt}include/libaudqt/info-widget.h -${PLIST.qt}include/libaudqt/libaudqt.h -${PLIST.qt}include/libaudqt/menu.h +include/libaudqt/colorbutton.h +include/libaudqt/export.h +include/libaudqt/iface.h +include/libaudqt/info-widget.h +include/libaudqt/libaudqt.h +include/libaudqt/menu.h +include/libaudqt/treeview.h lib/libaudcore.so lib/libaudcore.so.5 -lib/libaudcore.so.5.1.0 -${PLIST.gtk}lib/libaudgui.so -${PLIST.gtk}lib/libaudgui.so.5 -${PLIST.gtk}lib/libaudgui.so.5.0.0 -${PLIST.qt}lib/libaudqt.so -${PLIST.qt}lib/libaudqt.so.2 -${PLIST.qt}lib/libaudqt.so.2.1.0 +lib/libaudcore.so.5.2.0 +lib/libaudqt.so +lib/libaudqt.so.2 +lib/libaudqt.so.2.2.0 lib/libaudtag.so lib/libaudtag.so.3 lib/libaudtag.so.3.0.0 diff --git a/audio/audacious/buildlink3.mk b/audio/audacious/buildlink3.mk index d44c318aaed7..ec4b5fa7d88b 100644 --- a/audio/audacious/buildlink3.mk +++ b/audio/audacious/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.44 2020/03/10 22:08:37 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.45 2020/03/22 08:39:48 nia Exp $ BUILDLINK_TREE+= audacious @@ -20,12 +20,9 @@ pkgbase := audacious .if !empty(PKG_BUILD_OPTIONS.audacious:Mdbus) .include "../../sysutils/dbus/buildlink3.mk" .endif -.if !empty(PKG_BUILD_OPTIONS.audacious:Mgtk2) + .include "../../x11/gtk2/buildlink3.mk" -.endif -.if !empty(PKG_BUILD_OPTIONS.audacious:Mqt5) .include "../../x11/qt5-qtbase/buildlink3.mk" -.endif .endif # AUDACIOUS_BUILDLINK3_MK BUILDLINK_TREE+= -audacious diff --git a/audio/audacious/distinfo b/audio/audacious/distinfo index 938b3ec07563..470b4194a869 100644 --- a/audio/audacious/distinfo +++ b/audio/audacious/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.11 2019/07/06 13:17:00 nia Exp $ +$NetBSD: distinfo,v 1.12 2020/03/22 08:39:48 nia Exp $ -SHA1 (audacious-3.10.1.tar.bz2) = 297000119e0d7b94e355bd78d484c85baeab3795 -RMD160 (audacious-3.10.1.tar.bz2) = 6fc2c88fc681a58f42f45d19de36f2f24bc7e1bf -SHA512 (audacious-3.10.1.tar.bz2) = e88891caaa3897f9b4abf39136e20834aedf1287d0d5eefea392fda89050db8db00c6f363976a68fe250ddbae4e27590f7615916a76370a44ca9235f1fa60b43 -Size (audacious-3.10.1.tar.bz2) = 564481 bytes +SHA1 (audacious-4.0.tar.bz2) = 0a21e90ca70d37bdd8c7c7fb97f78fea56184796 +RMD160 (audacious-4.0.tar.bz2) = 123f5c7e0c0235f6f988270912e65f32a0aae544 +SHA512 (audacious-4.0.tar.bz2) = 82a44270a4dad39098f7055d540a44e6e0e9826a3f140d7feb537518e42a8d391357c1adbcc62d118b0a82e79c88729e74748f8b41b9d8e4ff40ffc5d96ec759 +Size (audacious-4.0.tar.bz2) = 579176 bytes SHA1 (patch-configure) = 2f310b55fdfc4147af6132dd821a9f81a1be6864 SHA1 (patch-src_libaudcore_audio.h.in) = 621afba8a610ab0f30d064d5d9ed581e781de7d2 diff --git a/audio/audacious/options.mk b/audio/audacious/options.mk index 145741345eef..c27b5c7ca432 100644 --- a/audio/audacious/options.mk +++ b/audio/audacious/options.mk @@ -1,14 +1,12 @@ -# $NetBSD: options.mk,v 1.1 2019/07/06 13:17:00 nia Exp $ +# $NetBSD: options.mk,v 1.2 2020/03/22 08:39:48 nia Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.audacious -PKG_OPTIONS_OPTIONAL_GROUPS= ui -PKG_OPTIONS_GROUP.ui= qt5 gtk2 PKG_SUPPORTED_OPTIONS+= dbus -PKG_SUGGESTED_OPTIONS+= dbus qt5 gtk2 +PKG_SUGGESTED_OPTIONS+= dbus .include "../../mk/bsd.options.mk" -PLIST_VARS+= dbus gtk qt +PLIST_VARS+= dbus .if !empty(PKG_OPTIONS:Mdbus) PLIST.dbus= yes @@ -17,16 +15,3 @@ TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen .else CONFIGURE_ARGS+= --disable-dbus .endif - -.if !empty(PKG_OPTIONS:Mqt5) -PLIST.qt= yes -CONFIGURE_ARGS+= --enable-qt -.include "../../x11/qt5-qtbase/buildlink3.mk" -.endif - -.if !empty(PKG_OPTIONS:Mgtk2) -PLIST.gtk= yes -.include "../../x11/gtk2/buildlink3.mk" -.else -CONFIGURE_ARGS+= --disable-gtk -.endif