From 3b07e06908d3de0065424808a784967f377b2afb Mon Sep 17 00:00:00 2001 From: bra1nwave Date: Tue, 3 Sep 2019 09:16:37 +0200 Subject: [PATCH 1/2] audacious: enable Qt interface --- common/shlibs | 1 + srcpkgs/audacious/template | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/common/shlibs b/common/shlibs index 09df4f3ceca..30b3b4653d5 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1151,6 +1151,7 @@ libguess.so.1 libguess-1.1_1 libaudcore.so.5 audacious-3.9_1 libaudgui.so.5 audacious-3.9_1 libaudtag.so.3 audacious-3.8_1 +libaudqt.so.2 audacious-3.10.1_2 libgstreamer-1.0.so.0 gstreamer1-1.0.0_1 libgstbase-1.0.so.0 gstreamer1-1.0.0_1 libgstcontroller-1.0.so.0 gstreamer1-1.0.0_1 diff --git a/srcpkgs/audacious/template b/srcpkgs/audacious/template index 69528553607..5add753405e 100644 --- a/srcpkgs/audacious/template +++ b/srcpkgs/audacious/template @@ -1,11 +1,12 @@ # Template file for 'audacious' pkgname=audacious version=3.10.1 -revision=1 +revision=2 build_style=gnu-configure -configure_args="--enable-thunar" +configure_args="$(vopt_enable gtk) $(vopt_enable qt)" hostmakedepends="pkg-config glib-devel" -makedepends="libSM-devel gtk+-devel dbus-glib-devel libguess-devel" +makedepends="libSM-devel dbus-glib-devel libguess-devel $(vopt_if gtk gtk+-devel) +$(vopt_if qt qt5-devel)" depends="desktop-file-utils hicolor-icon-theme" short_desc="Lightweight, advanced audio player focused on audio quality" maintainer="Orphaned " @@ -14,6 +15,15 @@ homepage="https://audacious-media-player.org/" distfiles="https://distfiles.${pkgname}-media-player.org/${pkgname}-${version}.tar.bz2" checksum=8366e840bb3c9448c2cf0cf9a0800155b0bd7cc212a28ba44990c3d2289c6b93 +build_options="gtk qt" +build_options_default="gtk" +desc_option_gtk="Enable support for the GTK+2 GUI toolkit" +vopt_conflict gtk qt + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-host-tools" +fi + post_install() { vlicense COPYING } @@ -24,6 +34,6 @@ audacious-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove usr/lib/*.so + vmove "usr/lib/*.so" } } From 04ed9d59ad99bb0c702c331efbb07a6b0a3d585b Mon Sep 17 00:00:00 2001 From: bra1nwave Date: Tue, 3 Sep 2019 09:16:53 +0200 Subject: [PATCH 2/2] audacious-plugins: enable Qt interface - add cue support --- srcpkgs/audacious-plugins/template | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/srcpkgs/audacious-plugins/template b/srcpkgs/audacious-plugins/template index d97bf72f30e..a50d65e7819 100644 --- a/srcpkgs/audacious-plugins/template +++ b/srcpkgs/audacious-plugins/template @@ -1,14 +1,16 @@ # Template file for 'audacious-plugins' pkgname=audacious-plugins version=3.10.1 -revision=3 +revision=4 build_style=gnu-configure +configure_args="$(vopt_enable gtk) $(vopt_enable qt)" hostmakedepends="pkg-config" makedepends="audacious-devel alsa-lib-devel pulseaudio-devel jack-devel lame-devel libvorbis-devel libflac-devel mpg123-devel faad2-devel ffmpeg-devel libmodplug-devel fluidsynth-devel libcdio-paranoia-devel wavpack-devel libnotify-devel - libcurl-devel libmtp-devel neon-devel libmms-devel gtk+-devel libxml2-devel - libbs2b-devel libsoxr-devel libsidplayfp-devel" + libcurl-devel libmtp-devel neon-devel libmms-devel libxml2-devel + libbs2b-devel libsoxr-devel libsidplayfp-devel libcue-devel + $(vopt_if gtk gtk+-devel) $(vopt_if qt 'qt5-devel qt5-multimedia-devel')" short_desc="Plugins for the Audacious media player" maintainer="Orphaned " license="BSD-2-Clause" @@ -16,6 +18,11 @@ homepage="https://audacious-media-player.org/" distfiles="https://distfiles.audacious-media-player.org/${pkgname}-${version}.tar.bz2" checksum=eec3177631f99729bf0e94223b627406cc648c70e6646e35613c7b55040a2642 +build_options="gtk qt" +build_options_default="gtk" +desc_option_gtk="Enable support for the GTK+2 GUI toolkit" +vopt_conflict gtk qt + post_install() { vlicense COPYING }