Recently a qt5-flavor has been added to audacious, which ran in a
dpb-related issue:
audacious/plugins, depends on audacious/player,
audacious/plugins,qt5 depends on audacious/player,qt5
audacious/player, and audacious/player,qt5 conflict, which means that
whichever flavor is built first prevents the other flavor from building,
unless this happens on different machines or dpb "junks" no longer
needed installed packages in between.
A similar situation used to exist with kde3/kde4 for which a fix has
been introduced (DPB_PROPERTIES=tag:{kde3,kde4}). Unfortunately only one
set of tags can exist meaning that using this mechanism for audacious is
kind of a hack.
I would like to fix this issue as it is likely that a release is coming
up soon. There are two solutions:
1. Temporarily disable the qt5 flavor and work on a solution after
release
2. Move away from gtk in favor of qt5
It seems that upstream of audacious is slowly moving towards qt5, which
means that option 2 makes the most sense. As such, i would like to
propose to move audacious to Qt5. FWIW the winamp classic interface
still works.
Diff below has been run tested and 'pkg_add -u' seems to update a
previously installed qt5-flavor without any issue.
Opinions/comments/OKs?
diff --git audio/audacious/Makefile audio/audacious/Makefile
index 683fa32c7b8..e2415936d9c 100644
--- audio/audacious/Makefile
+++ audio/audacious/Makefile
@@ -2,8 +2,6 @@
SUBDIR =
SUBDIR += player
- SUBDIR += player,qt5
SUBDIR += plugins
- SUBDIR += plugins,qt5
.include <bsd.port.subdir.mk>
diff --git audio/audacious/Makefile.inc audio/audacious/Makefile.inc
index a1116baf1e1..ecb3d0f0505 100644
--- audio/audacious/Makefile.inc
+++ audio/audacious/Makefile.inc
@@ -18,20 +18,9 @@ FIX_EXTRACT_PERMISSIONS = Yes
BUILD_DEPENDS += devel/gettext,-tools
-# Although at fist glance it may appear that we could MULTI_PACKAGE audacious,
-# actually we can't. Some core libraries will link qt5 if we build with both
-# toolkits. So we use FLAVORS instead.
-# https://redmine.audacious-media-player.org/issues/1071
-
-.if ${FLAVOR:Mqt5}
MODULES += x11/qt5
CONFIGURE_ARGS += --disable-gtk \
--enable-qt
-.else
-LIB_DEPENDS += x11/gtk+2
-CONFIGURE_ARGS += --disable-qt \
- --enable-gtk
-.endif
USE_GMAKE = Yes
diff --git audio/audacious/player/Makefile audio/audacious/player/Makefile
index afcc54a3887..5beed0b42a7 100644
--- audio/audacious/player/Makefile
+++ audio/audacious/player/Makefile
@@ -4,39 +4,21 @@ COMMENT = graphical audio player which supports
lots of formats
DISTNAME = audacious-${VERSION}
PKGNAME = audacious-player-${VERSION}
-REVISION = 0
-
-FLAVORS = qt5
-FLAVOR ?=
+REVISION = 1
SHARED_LIBS += audcore 5.2 # 5.3
-SHARED_LIBS += audgui 4.1 # 5.1
SHARED_LIBS += audtag 3.0 # 3.0
SHARED_LIBS += audqt 0.0 # 2.3
# BSD
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} c gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
-WANTLIB += iconv intl m
-
-.if ${FLAVOR:Mqt5}
-WANTLIB += Qt5Core Qt5Gui Qt5Widgets
-.else
-WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
-WANTLIB += Xrandr Xrender atk-1.0 cairo fontconfig freetype gdk-x11-2.0
-WANTLIB += gdk_pixbuf-2.0 gtk-x11-2.0 harfbuzz pango-1.0 pangocairo-1.0
-WANTLIB += pangoft2-1.0 z
-.endif
+WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Widgets c gio-2.0
+WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 iconv intl m
RUN_DEPENDS = devel/desktop-file-utils
-.if !${FLAVOR:Mqt5}
-RUN_DEPENDS += x11/gtk+3,-guic
-.endif
-
MAKE_ENV = LIBaudcore_VERSION=${LIBaudcore_VERSION} \
- LIBaudgui_VERSION=${LIBaudgui_VERSION} \
LIBaudtag_VERSION=${LIBaudtag_VERSION} \
LIBaudqt_VERSION=${LIBaudqt_VERSION}
diff --git audio/audacious/player/pkg/PFRAG.no-qt5
audio/audacious/player/pkg/PFRAG.no-qt5
deleted file mode 100644
index 6d6232c77e9..00000000000
--- audio/audacious/player/pkg/PFRAG.no-qt5
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $OpenBSD: PFRAG.no-qt5,v 1.1 2021/02/19 20:44:45 edd Exp $
-include/libaudgui/
-include/libaudgui/libaudgui-gtk.h
-include/libaudgui/libaudgui.h
-include/libaudgui/list.h
-include/libaudgui/menu.h
-@lib lib/libaudgui.so.${LIBaudgui_VERSION}
diff --git audio/audacious/player/pkg/PFRAG.qt5
audio/audacious/player/pkg/PFRAG.qt5
deleted file mode 100644
index 8e360e559ed..00000000000
--- audio/audacious/player/pkg/PFRAG.qt5
+++ /dev/null
@@ -1,11 +0,0 @@
-@comment $OpenBSD: PFRAG.qt5,v 1.1 2021/02/19 20:44:45 edd Exp $
-include/libaudqt/
-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
-@lib lib/libaudqt.so.${LIBaudqt_VERSION}
diff --git audio/audacious/player/pkg/PLIST audio/audacious/player/pkg/PLIST
index 4f871538793..c02e22369ac 100644
--- audio/audacious/player/pkg/PLIST
+++ audio/audacious/player/pkg/PLIST
@@ -1,7 +1,6 @@
@comment $OpenBSD: PLIST,v 1.3 2021/02/19 20:44:45 edd Exp $
@conflict audacious-<4.0
-%%qt5%%
-!%%qt5%%
+@pkgpath audio/audacious/player,qt5
@bin bin/audacious
@bin bin/audtool
include/audacious/
@@ -36,7 +35,17 @@ include/libaudcore/tuple.h
include/libaudcore/vfs.h
include/libaudcore/vfs_async.h
include/libaudcore/visualizer.h
+include/libaudqt/
+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
@lib lib/libaudcore.so.${LIBaudcore_VERSION}
+@lib lib/libaudqt.so.${LIBaudqt_VERSION}
@lib lib/libaudtag.so.${LIBaudtag_VERSION}
lib/pkgconfig/audacious.pc
@man man/man1/audacious.1
diff --git audio/audacious/plugins/Makefile audio/audacious/plugins/Makefile
index 0cf3487e0ae..24352da8e09 100644
--- audio/audacious/plugins/Makefile
+++ audio/audacious/plugins/Makefile
@@ -3,32 +3,22 @@
COMMENT = input and output plugins for Audacious
DISTNAME = audacious-plugins-${VERSION}
-REVISION = 1
-
-FLAVORS = qt5
-FLAVOR ?=
+REVISION = 2
# BSD / GPL
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} FLAC GL X11 audcore audtag avcodec
+WANTLIB += ${COMPILER_LIBCXX} FLAC GL Qt5Core Qt5Gui Qt5OpenGL
+WANTLIB += Qt5Widgets Qt5X11Extras X11 audcore audqt audtag avcodec
WANTLIB += avformat avutil cddb cdio cdio_cdda cue curl faad gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gobject-2.0 iconv intl m mms modplug
WANTLIB += mp3lame mpg123 neon notify ogg samplerate sndfile sndio
WANTLIB += soxr vorbis vorbisenc vorbisfile wavpack xml2 z
-.if ${FLAVOR:Mqt5}
-WANTLIB += Qt5Core Qt5Gui Qt5OpenGL Qt5Widgets Qt5X11Extras audqt
-.else
-WANTLIB += Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
-WANTLIB += Xrandr Xrender atk-1.0 audgui cairo fontconfig freetype
-WANTLIB += gdk-x11-2.0 gmodule-2.0 gtk-x11-2.0 harfbuzz pango-1.0
-WANTLIB += pangocairo-1.0 pangoft2-1.0
-.endif
-
# needed for the gio plugin
RUN_DEPENDS = x11/gnome/gvfs
-LIB_DEPENDS = audio/faad>=2.7 \
+LIB_DEPENDS = audio/audacious/player>=${VERSION} \
+ audio/faad>=2.7 \
audio/flac \
audio/lame \
audio/libcdio \
@@ -46,14 +36,8 @@ LIB_DEPENDS = audio/faad>=2.7 \
multimedia/libmms \
net/curl \
net/neon \
- textproc/libxml
-
-.if ${FLAVOR:Mqt5}
-LIB_DEPENDS +=
audacious-player->=${VERSION}-qt5:audio/audacious/player,qt5 \
+ textproc/libxml \
x11/qt5/qtx11extras
-.else
-LIB_DEPENDS +=
audacious-player->=${VERSION}-!qt5:audio/audacious/player
-.endif
CONFIGURE_ARGS = --disable-alsa \
--disable-amidiplug \
diff --git audio/audacious/plugins/pkg/PFRAG.no-qt5
audio/audacious/plugins/pkg/PFRAG.no-qt5
deleted file mode 100644
index b005824fb9a..00000000000
--- audio/audacious/plugins/pkg/PFRAG.no-qt5
+++ /dev/null
@@ -1,14 +0,0 @@
-@comment $OpenBSD: PFRAG.no-qt5,v 1.1 2021/02/19 20:44:45 edd Exp $
-@so lib/audacious/Effect/ladspa.so
-@so lib/audacious/General/alarm.so
-@so lib/audacious/General/albumart.so
-@so lib/audacious/General/aosd.so
-@so lib/audacious/General/gtkui.so
-@so lib/audacious/General/hotkey.so
-@so lib/audacious/General/playlist-manager.so
-@so lib/audacious/General/search-tool.so
-@so lib/audacious/General/skins.so
-@so lib/audacious/General/statusicon.so
-@so lib/audacious/Visualization/blur_scope.so
-@so lib/audacious/Visualization/cairo-spectrum.so
-@so lib/audacious/Visualization/gl-spectrum.so
diff --git audio/audacious/plugins/pkg/PFRAG.qt5
audio/audacious/plugins/pkg/PFRAG.qt5
deleted file mode 100644
index b506139090e..00000000000
--- audio/audacious/plugins/pkg/PFRAG.qt5
+++ /dev/null
@@ -1,14 +0,0 @@
-@comment $OpenBSD: PFRAG.qt5,v 1.2 2021/02/23 06:30:57 bket Exp $
-@so lib/audacious/General/albumart-qt.so
-@so lib/audacious/General/lyricwiki-qt.so
-@so lib/audacious/General/playlist-manager-qt.so
-@so lib/audacious/General/qthotkey.so
-@so lib/audacious/General/qtui.so
-@so lib/audacious/General/search-tool-qt.so
-@so lib/audacious/General/skins-qt.so
-@so lib/audacious/General/song-info-qt.so
-@so lib/audacious/General/statusicon-qt.so
-@so lib/audacious/Visualization/blur_scope-qt.so
-@so lib/audacious/Visualization/gl-spectrum-qt.so
-@so lib/audacious/Visualization/qt-spectrum.so
-@so lib/audacious/Visualization/vumeter-qt.so
diff --git audio/audacious/plugins/pkg/PLIST audio/audacious/plugins/pkg/PLIST
index 2348aa6c52c..3908e2ba8e6 100644
--- audio/audacious/plugins/pkg/PLIST
+++ audio/audacious/plugins/pkg/PLIST
@@ -1,8 +1,7 @@
@comment $OpenBSD: PLIST,v 1.3 2021/02/19 20:44:45 edd Exp $
@pkgpath audio/audacious-plugins,-main
@pkgpath audio/audacious-plugins
-%%qt5%%
-!%%qt5%%
+@pkgpath audio/audacious/plugins,qt5
lib/audacious/
lib/audacious/Container/
@so lib/audacious/Container/asx.so
@@ -25,12 +24,21 @@ lib/audacious/Effect/
@so lib/audacious/Effect/stereo.so
@so lib/audacious/Effect/voice_removal.so
lib/audacious/General/
+@so lib/audacious/General/albumart-qt.so
@so lib/audacious/General/cd-menu-items.so
@so lib/audacious/General/delete-files.so
+@so lib/audacious/General/lyricwiki-qt.so
@so lib/audacious/General/mpris2.so
@so lib/audacious/General/notify.so
+@so lib/audacious/General/playlist-manager-qt.so
+@so lib/audacious/General/qthotkey.so
+@so lib/audacious/General/qtui.so
@so lib/audacious/General/scrobbler.so
+@so lib/audacious/General/search-tool-qt.so
+@so lib/audacious/General/skins-qt.so
+@so lib/audacious/General/song-info-qt.so
@so lib/audacious/General/song_change.so
+@so lib/audacious/General/statusicon-qt.so
lib/audacious/Input/
@so lib/audacious/Input/aac-raw.so
@so lib/audacious/Input/cdaudio-ng.so
@@ -55,6 +63,10 @@ lib/audacious/Transport/
@so lib/audacious/Transport/mms.so
@so lib/audacious/Transport/neon.so
lib/audacious/Visualization/
+@so lib/audacious/Visualization/blur_scope-qt.so
+@so lib/audacious/Visualization/gl-spectrum-qt.so
+@so lib/audacious/Visualization/qt-spectrum.so
+@so lib/audacious/Visualization/vumeter-qt.so
share/audacious/Skins/
share/audacious/Skins/Classic/
share/audacious/Skins/Classic/balance.png
diff --git meta/Makefile meta/Makefile
index 0e7a07ac7c3..fac3dfa5bd4 100644
--- meta/Makefile
+++ meta/Makefile
@@ -2,7 +2,6 @@
SUBDIR =
SUBDIR += audacious
- SUBDIR += audacious,qt5
SUBDIR += avr
SUBDIR += geda
SUBDIR += gnome
diff --git meta/audacious/Makefile meta/audacious/Makefile
index 08428c455c6..37bf75628f5 100644
--- meta/audacious/Makefile
+++ meta/audacious/Makefile
@@ -3,19 +3,12 @@
COMMENT = audacious meta-package
VERSION = 4.1
+REVISION = 0
PKGNAME = audacious-${VERSION}
MAINTAINER = Bjorn Ketelaars <b...@openbsd.org>
-FLAVORS = qt5
-FLAVOR ?=
-
-.if ${FLAVOR:Mqt5}
-RUN_DEPENDS = audio/audacious/player,qt5>=${VERSION} \
- audio/audacious/plugins,qt5>=${VERSION}
-.else
-RUN_DEPENDS = audacious-player->=${VERSION}-!qt5:audio/audacious/player \
- audacious-plugins->=${VERSION}-!qt5:audio/audacious/plugins
-.endif
+RUN_DEPENDS = audio/audacious/player>=${VERSION} \
+ audio/audacious/plugins>=${VERSION}
.include <bsd.port.mk>
diff --git meta/audacious/pkg/PLIST meta/audacious/pkg/PLIST
index bfe9be1f17b..4875fc5087a 100644
--- meta/audacious/pkg/PLIST
+++ meta/audacious/pkg/PLIST
@@ -1,2 +1,3 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2020/04/15 15:56:24 bket Exp $
@pkgpath audio/audacious
+@pkgpath meta/audacious,qt5
