git: b02e706ba7e9 - main - multimedia/audacious-plugins: Add missing dependencies, enable missing plugins

The branch main has been updated by madpilot:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b02e706ba7e9acf0a1834f4cc64c82dc74793ebc

commit b02e706ba7e9acf0a1834f4cc64c82dc74793ebc
Author:     Guido Falsi <madpilot@FreeBSD.org>
AuthorDate: 2022-06-11 13:33:44 +0000
Commit:     Guido Falsi <madpilot@FreeBSD.org>
CommitDate: 2022-06-11 13:33:44 +0000

    multimedia/audacious-plugins: Add missing dependencies, enable missing plugins
    
    - Add some missing dependencies
    - Adding these dependencies enables building the qthotkey plugin [1]
    - Added dependencies also allow building the qtaudio plugin
    - Add OPENGL option to the qt flavor too, and add requirements to
      allow building the gl-spectrum-qt visualization plugin
    
    PR:             264605 [1]
---
 multimedia/audacious-plugins/Makefile  | 18 ++++++++++++------
 multimedia/audacious-plugins/pkg-plist |  3 +++
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile
index e08b8ff138af..77ec34d7c1a4 100644
--- a/multimedia/audacious-plugins/Makefile
+++ b/multimedia/audacious-plugins/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	audacious-plugins
 PORTVERSION=	4.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://distfiles.audacious-media-player.org/
 
@@ -32,6 +32,7 @@ qt5_BUILD_DEPENDS=	audacious:multimedia/audacious@qt5
 
 gtk2_PKGNAMESUFFIX=	-gtk2
 gtk2_CONFLICTS_INSTALL=	audacious-plugins
+gtk2_LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz
 gtk2_RUN_DEPENDS=	audacious:multimedia/audacious@gtk2
 gtk2_BUILD_DEPENDS=	audacious:multimedia/audacious@gtk2
 
@@ -42,7 +43,7 @@ CONFIGURE_ARGS=	--disable-console --disable-soxr \
 .if ${FLAVOR} == qt5
 CONFIGURE_ARGS+=	--enable-qt --disable-gtk
 USES+=			qt:5
-USE_QT=			core gui widgets
+USE_QT=			core gui multimedia network widgets x11extras
 PLIST_SUB=		QT5="" GTK2="@comment "
 .elif ${FLAVOR} == gtk2
 CONFIGURE_ARGS+=	--disable-qt --enable-gtk --enable-hotkey
@@ -51,7 +52,7 @@ PLIST_SUB=		QT5="@comment " GTK2=""
 .endif
 
 OPTIONS_DEFINE=	AAC ADPLUG AMIDI BS2B CDDA CUE FFMPEG FLAC LAME LIRC \
-		MMS MODPLUG MPRIS NEON NLS NOTIFY OPENMPT SAMPLERATE \
+		MMS MODPLUG MPRIS NEON NLS NOTIFY OPENGL OPENMPT SAMPLERATE \
 		SCROBBLER SID SNDFILE SPEEDPITCH VORBIS WAVPACK
 OPTIONS_MULTI=		OUTPUT
 OPTIONS_MULTI_OUTPUT=	ALSA FILEWRITER JACK OSS PULSEAUDIO SDL SNDIO
@@ -61,7 +62,7 @@ OPTIONS_DEFAULT=	AAC ADPLUG CDDA CUE FILEWRITER FFMPEG FLAC MMS MPRIS \
 OPTIONS_SUB=	yes
 
 .if ${FLAVOR} == gtk2
-OPTIONS_DEFINE+=	AOSD OPENGL
+OPTIONS_DEFINE+=	AOSD
 OPTIONS_DEFAULT+=	AOSD
 .endif
 
@@ -122,9 +123,14 @@ 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_USES=		gl
+OPENGL_USE=		gl=gl
+.if ${FLAVOR} == qt5
+OPENGL_USE+=		qt=opengl
+OPENGL_CONFIGURE_ENABLE=qtglspectrum
+.elif ${FLAVOR} == gtk2
 OPENGL_CONFIGURE_ENABLE=glspectrum
+.endif
 OPENMPT_LIB_DEPENDS=	libopenmpt.so:audio/libopenmpt
 OPENMPT_CONFIGURE_ENABLE=	openmpt
 OSS_CONFIGURE_ENABLE=	oss4
diff --git a/multimedia/audacious-plugins/pkg-plist b/multimedia/audacious-plugins/pkg-plist
index 1d2a5426fd5a..08f1d32ddb8b 100644
--- a/multimedia/audacious-plugins/pkg-plist
+++ b/multimedia/audacious-plugins/pkg-plist
@@ -31,6 +31,7 @@ lib/audacious/General/delete-files.so
 %%NOTIFY%%lib/audacious/General/notify.so
 %%GTK2%%lib/audacious/General/playlist-manager.so
 %%QT5%%lib/audacious/General/playlist-manager-qt.so
+%%QT5%%lib/audacious/General/qthotkey.so
 %%QT5%%lib/audacious/General/qtui.so
 %%SCROBBLER%%lib/audacious/General/scrobbler.so
 %%GTK2%%lib/audacious/General/search-tool.so
@@ -64,6 +65,7 @@ lib/audacious/Input/xsf.so
 %%JACK%%lib/audacious/Output/jack-ng.so
 %%OSS%%lib/audacious/Output/oss4.so
 %%PULSEAUDIO%%lib/audacious/Output/pulse_audio.so
+%%QT5%%lib/audacious/Output/qtaudio.so
 %%SDL%%lib/audacious/Output/sdlout.so
 %%SNDIO%%lib/audacious/Output/sndio-ng.so
 lib/audacious/Transport/gio.so
@@ -74,6 +76,7 @@ lib/audacious/Transport/gio.so
 %%GTK2%%lib/audacious/Visualization/cairo-spectrum.so
 %%QT5%%lib/audacious/Visualization/qt-spectrum.so
 %%GTK2%%%%OPENGL%%lib/audacious/Visualization/gl-spectrum.so
+%%QT5%%%%OPENGL%%lib/audacious/Visualization/gl-spectrum-qt.so
 %%QT5%%lib/audacious/Visualization/vumeter-qt.so
 share/audacious/Skins/Classic/balance.png
 share/audacious/Skins/Classic/cbuttons.png