CVS commit: pkgsrc/audio

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed May 18 15:09:55 UTC 2022

Modified Files:
        pkgsrc/audio/audacious: Makefile PLIST options.mk
        pkgsrc/audio/audacious-plugins: Makefile PLIST

Log Message:
audacious: Allow building without either gtk or qt.


To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 pkgsrc/audio/audacious/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/audio/audacious/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/audacious/options.mk
cvs rdiff -u -r1.130 -r1.131 pkgsrc/audio/audacious-plugins/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/audio/audacious-plugins/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/audacious/Makefile
diff -u pkgsrc/audio/audacious/Makefile:1.73 pkgsrc/audio/audacious/Makefile:1.74
--- pkgsrc/audio/audacious/Makefile:1.73        Mon Apr 18 19:09:40 2022
+++ pkgsrc/audio/audacious/Makefile     Wed May 18 15:09:55 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2022/04/18 19:09:40 adam Exp $
+# $NetBSD: Makefile,v 1.74 2022/05/18 15:09:55 nia Exp $
 
 DISTNAME=      audacious-4.1
 PKGREVISION=   3
@@ -25,6 +25,4 @@ LDFLAGS.Darwin+=      -flat_namespace -undefi
 .include "../../devel/glib2/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"

Index: pkgsrc/audio/audacious/PLIST
diff -u pkgsrc/audio/audacious/PLIST:1.8 pkgsrc/audio/audacious/PLIST:1.9
--- pkgsrc/audio/audacious/PLIST:1.8    Thu Mar  4 10:40:58 2021
+++ pkgsrc/audio/audacious/PLIST        Wed May 18 15:09:55 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2021/03/04 10:40:58 nia Exp $
+@comment $NetBSD: PLIST,v 1.9 2022/05/18 15:09:55 nia Exp $
 bin/audacious
 ${PLIST.dbus}bin/audtool
 include/audacious/audtag.h
@@ -31,27 +31,27 @@ 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
-include/libaudqt/colorbutton.h
-include/libaudqt/dock.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
+${PLIST.gtk2}include/libaudgui/libaudgui-gtk.h
+${PLIST.gtk2}include/libaudgui/libaudgui.h
+${PLIST.gtk2}include/libaudgui/list.h
+${PLIST.gtk2}include/libaudgui/menu.h
+${PLIST.qt5}include/libaudqt/colorbutton.h
+${PLIST.qt5}include/libaudqt/dock.h
+${PLIST.qt5}include/libaudqt/export.h
+${PLIST.qt5}include/libaudqt/iface.h
+${PLIST.qt5}include/libaudqt/info-widget.h
+${PLIST.qt5}include/libaudqt/libaudqt.h
+${PLIST.qt5}include/libaudqt/menu.h
+${PLIST.qt5}include/libaudqt/treeview.h
 lib/libaudcore.so
 lib/libaudcore.so.5
 lib/libaudcore.so.5.3.0
-lib/libaudgui.so
-lib/libaudgui.so.5
-lib/libaudgui.so.5.1.0
-lib/libaudqt.so
-lib/libaudqt.so.2
-lib/libaudqt.so.2.3.0
+${PLIST.gtk2}lib/libaudgui.so
+${PLIST.gtk2}lib/libaudgui.so.5
+${PLIST.gtk2}lib/libaudgui.so.5.1.0
+${PLIST.qt5}lib/libaudqt.so
+${PLIST.qt5}lib/libaudqt.so.2
+${PLIST.qt5}lib/libaudqt.so.2.3.0
 lib/libaudtag.so
 lib/libaudtag.so.3
 lib/libaudtag.so.3.0.0

Index: pkgsrc/audio/audacious/options.mk
diff -u pkgsrc/audio/audacious/options.mk:1.3 pkgsrc/audio/audacious/options.mk:1.4
--- pkgsrc/audio/audacious/options.mk:1.3       Sun May  2 11:06:12 2021
+++ pkgsrc/audio/audacious/options.mk   Wed May 18 15:09:55 2022
@@ -1,13 +1,12 @@
-# $NetBSD: options.mk,v 1.3 2021/05/02 11:06:12 nia Exp $
+# $NetBSD: options.mk,v 1.4 2022/05/18 15:09:55 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.audacious
-PKG_SUPPORTED_OPTIONS+=                dbus
-PKG_SUGGESTED_OPTIONS+=                dbus
+PKG_SUPPORTED_OPTIONS+=                gtk2 qt5 dbus
+PKG_SUGGESTED_OPTIONS+=                gtk2 qt5 dbus
 
 .include "../../mk/bsd.options.mk"
 
 PLIST_VARS+=   dbus
-
 .if !empty(PKG_OPTIONS:Mdbus)
 PLIST.dbus=    yes
 USE_TOOLS+=    gdbus-codegen
@@ -15,3 +14,23 @@ USE_TOOLS+=  gdbus-codegen
 .else
 CONFIGURE_ARGS+=       --disable-dbus
 .endif
+
+PLIST_VARS+=   gtk2
+.if !empty(PKG_OPTIONS:Mgtk2)
+PLIST.gtk2+=   yes
+.include "../../x11/gtk2/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-gtk
+.endif
+
+PLIST_VARS+=   qt5
+.if !empty(PKG_OPTIONS:Mqt5)
+PLIST.qt5+=    yes
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-qt
+.endif
+
+.if empty(PKG_OPTIONS:Mgtk2) && empty(PKG_OPTIONS:Mqt5)
+PKG_FAIL_REASON+=      "Must select at least one GUI option!"
+.endif

Index: pkgsrc/audio/audacious-plugins/Makefile
diff -u pkgsrc/audio/audacious-plugins/Makefile:1.130 pkgsrc/audio/audacious-plugins/Makefile:1.131
--- pkgsrc/audio/audacious-plugins/Makefile:1.130       Mon Apr 18 19:10:18 2022
+++ pkgsrc/audio/audacious-plugins/Makefile     Wed May 18 15:09:55 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.130 2022/04/18 19:10:18 adam Exp $
+# $NetBSD: Makefile,v 1.131 2022/05/18 15:09:55 nia Exp $
 
 DISTNAME=      audacious-plugins-4.1
 PKGREVISION=   11
@@ -43,16 +43,31 @@ SUBST_SED.oss+=             -e "s,/dev/dsp,${DEVOSS
 CONFIGURE_ARGS+=       --disable-oss4
 .endif
 
-PLIST_VARS+=   dbus
-
-.include "options.mk"
 .include "../../audio/audacious/buildlink3.mk"
+
+PLIST_VARS+=           gtk2
+.if ${PKG_BUILD_OPTIONS.audacious:Mgtk2}
+PLIST.gtk2+=           yes
+.else
+CONFIGURE_ARGS+=       --disable-gtk
+.endif
+
+PLIST_VARS+=           qt5
+.if ${PKG_BUILD_OPTIONS.audacious:Mqt5}
+PLIST.qt5=             yes
+.else
+CONFIGURE_ARGS+=       --disable-qt
+.endif
+
+PLIST_VARS+=   dbus
 .if ${PKG_BUILD_OPTIONS.audacious:Mdbus}
 USE_TOOLS+=            gdbus-codegen
 PLIST.dbus=            yes
 .else
 CONFIGURE_ARGS+=       --disable-mpris2
 .endif
+
+.include "options.mk"
 .include "../../audio/faad2/buildlink3.mk"
 .include "../../audio/lame/buildlink3.mk"
 .include "../../audio/libcddb/buildlink3.mk"

Index: pkgsrc/audio/audacious-plugins/PLIST
diff -u pkgsrc/audio/audacious-plugins/PLIST:1.24 pkgsrc/audio/audacious-plugins/PLIST:1.25
--- pkgsrc/audio/audacious-plugins/PLIST:1.24   Fri May 14 06:42:48 2021
+++ pkgsrc/audio/audacious-plugins/PLIST        Wed May 18 15:09:55 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2021/05/14 06:42:48 nia Exp $
+@comment $NetBSD: PLIST,v 1.25 2022/05/18 15:09:55 nia Exp $
 lib/audacious/Container/asx.so
 lib/audacious/Container/asx3.so
 lib/audacious/Container/audpl.so
@@ -9,36 +9,36 @@ 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
+${PLIST.gtk2}lib/audacious/Effect/ladspa.so
 lib/audacious/Effect/mixer.so
 lib/audacious/Effect/resample.so
 lib/audacious/Effect/silence-removal.so
 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-qt.so
-lib/audacious/General/albumart.so
-lib/audacious/General/aosd.so
+${PLIST.gtk2}lib/audacious/General/alarm.so
+${PLIST.qt5}lib/audacious/General/albumart-qt.so
+${PLIST.gtk2}lib/audacious/General/albumart.so
+${PLIST.gtk2}lib/audacious/General/aosd.so
 lib/audacious/General/cd-menu-items.so
 lib/audacious/General/delete-files.so
-lib/audacious/General/gtkui.so
-lib/audacious/General/hotkey.so
+${PLIST.gtk2}lib/audacious/General/gtkui.so
+${PLIST.gtk2}lib/audacious/General/hotkey.so
 ${PLIST.lirc}lib/audacious/General/lirc.so
-lib/audacious/General/lyricwiki-qt.so
+${PLIST.qt5}lib/audacious/General/lyricwiki-qt.so
 ${PLIST.dbus}lib/audacious/General/mpris2.so
-lib/audacious/General/playlist-manager-qt.so
-lib/audacious/General/playlist-manager.so
-lib/audacious/General/qtui.so
+${PLIST.qt5}lib/audacious/General/playlist-manager-qt.so
+${PLIST.gtk2}lib/audacious/General/playlist-manager.so
+${PLIST.qt5}lib/audacious/General/qtui.so
 lib/audacious/General/scrobbler.so
-lib/audacious/General/search-tool-qt.so
-lib/audacious/General/search-tool.so
-lib/audacious/General/skins-qt.so
-lib/audacious/General/skins.so
-lib/audacious/General/song-info-qt.so
+${PLIST.qt5}lib/audacious/General/search-tool-qt.so
+${PLIST.gtk2}lib/audacious/General/search-tool.so
+${PLIST.qt5}lib/audacious/General/skins-qt.so
+${PLIST.gtk2}lib/audacious/General/skins.so
+${PLIST.qt5}lib/audacious/General/song-info-qt.so
 lib/audacious/General/song_change.so
-lib/audacious/General/statusicon-qt.so
-lib/audacious/General/statusicon.so
+${PLIST.qt5}lib/audacious/General/statusicon-qt.so
+${PLIST.gtk2}lib/audacious/General/statusicon.so
 lib/audacious/Input/aac-raw.so
 ${PLIST.adplug}lib/audacious/Input/adplug.so
 ${PLIST.fluidsynth}lib/audacious/Input/amidi-plug.so
@@ -65,13 +65,13 @@ lib/audacious/Output/sdlout.so
 lib/audacious/Transport/gio.so
 lib/audacious/Transport/mms.so
 lib/audacious/Transport/neon.so
-lib/audacious/Visualization/blur_scope-qt.so
-lib/audacious/Visualization/blur_scope.so
-lib/audacious/Visualization/cairo-spectrum.so
-lib/audacious/Visualization/gl-spectrum-qt.so
-lib/audacious/Visualization/gl-spectrum.so
-lib/audacious/Visualization/qt-spectrum.so
-lib/audacious/Visualization/vumeter-qt.so
+${PLIST.qt5}lib/audacious/Visualization/blur_scope-qt.so
+${PLIST.gtk2}lib/audacious/Visualization/blur_scope.so
+${PLIST.gtk2}lib/audacious/Visualization/cairo-spectrum.so
+${PLIST.qt5}lib/audacious/Visualization/gl-spectrum-qt.so
+${PLIST.gtk2}lib/audacious/Visualization/gl-spectrum.so
+${PLIST.qt5}lib/audacious/Visualization/qt-spectrum.so
+${PLIST.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