audacious: drop flavor and move to Qt5
Recent addition of a qt5-flavor resulted in a dpb-related issue causing only one of the flavors being build unless building happens on different machines or dpb junks no longer needed installed packages in between. Fix this by dropping flavors and moving audacious to Qt5. "ports parts are good" sthen@
This commit is contained in:
bket
parent
3496900bba
commit
df7550d71a
@ -1,9 +1,7 @@
|
||||
# $OpenBSD: Makefile,v 1.65 2021/02/19 20:44:44 edd Exp $
|
||||
# $OpenBSD: Makefile,v 1.66 2021/03/28 05:40:31 bket Exp $
|
||||
|
||||
SUBDIR =
|
||||
SUBDIR += player
|
||||
SUBDIR += player,qt5
|
||||
SUBDIR += plugins
|
||||
SUBDIR += plugins,qt5
|
||||
|
||||
.include <bsd.port.subdir.mk>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile.inc,v 1.9 2021/02/23 06:30:57 bket Exp $
|
||||
# $OpenBSD: Makefile.inc,v 1.10 2021/03/28 05:40:31 bket Exp $
|
||||
|
||||
# Do not forget to sync meta/audacious
|
||||
VERSION = 4.1
|
||||
@ -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
|
||||
|
||||
|
||||
@ -1,42 +1,24 @@
|
||||
# $OpenBSD: Makefile,v 1.6 2021/02/23 06:30:57 bket Exp $
|
||||
# $OpenBSD: Makefile,v 1.7 2021/03/28 05:40:32 bket Exp $
|
||||
|
||||
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}
|
||||
|
||||
|
||||
@ -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}
|
||||
@ -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}
|
||||
@ -1,7 +1,6 @@
|
||||
@comment $OpenBSD: PLIST,v 1.3 2021/02/19 20:44:45 edd Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.4 2021/03/28 05:40:32 bket 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
|
||||
|
||||
@ -1,34 +1,24 @@
|
||||
# $OpenBSD: Makefile,v 1.8 2021/02/23 06:30:57 bket Exp $
|
||||
# $OpenBSD: Makefile,v 1.9 2021/03/28 05:40:32 bket Exp $
|
||||
|
||||
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 \
|
||||
|
||||
@ -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
|
||||
@ -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
|
||||
@ -1,8 +1,7 @@
|
||||
@comment $OpenBSD: PLIST,v 1.3 2021/02/19 20:44:45 edd Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.4 2021/03/28 05:40:32 bket 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
|
||||
|
||||
@ -1,8 +1,7 @@
|
||||
# $OpenBSD: Makefile,v 1.21 2021/03/20 12:46:38 bentley Exp $
|
||||
# $OpenBSD: Makefile,v 1.22 2021/03/28 05:40:32 bket Exp $
|
||||
|
||||
SUBDIR =
|
||||
SUBDIR += audacious
|
||||
SUBDIR += audacious,qt5
|
||||
SUBDIR += avr
|
||||
SUBDIR += geda
|
||||
SUBDIR += gnome
|
||||
|
||||
@ -1,21 +1,14 @@
|
||||
# $OpenBSD: Makefile,v 1.7 2021/02/19 20:44:45 edd Exp $
|
||||
# $OpenBSD: Makefile,v 1.8 2021/03/28 05:40:32 bket Exp $
|
||||
|
||||
COMMENT = audacious meta-package
|
||||
|
||||
VERSION = 4.1
|
||||
REVISION = 0
|
||||
PKGNAME = audacious-${VERSION}
|
||||
|
||||
MAINTAINER = Bjorn Ketelaars <bket@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>
|
||||
|
||||
@ -1,2 +1,3 @@
|
||||
@comment $OpenBSD: PLIST,v 1.1.1.1 2020/04/15 15:56:24 bket Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.2 2021/03/28 05:40:32 bket Exp $
|
||||
@pkgpath audio/audacious
|
||||
@pkgpath meta/audacious,qt5
|
||||
|
||||
Loading…
Reference in New Issue
Block a user