From d98767eb4ec4f592d161f38aee91b5cc3bc4dd4c Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 20 May 2024 16:28:13 -0400 Subject: [PATCH] audacious-base: new package to break cycle audacious should depend on audacious-plugins: ERROR ../src/libaudcore/plugin-init.cc:155 [start_required]: No output plugin found. (Did you forget to install audacious-plugins?) but if audacious depends on audacious-plugins, a cycle is created: audacious -> audacious-plugins -> audacious --- common/shlibs | 8 ++++---- srcpkgs/audacious-base-devel | 1 + srcpkgs/{audacious => audacious-base}/template | 12 ++++++------ srcpkgs/audacious-devel | 1 - 4 files changed, 11 insertions(+), 11 deletions(-) create mode 120000 srcpkgs/audacious-base-devel rename srcpkgs/{audacious => audacious-base}/template (78%) delete mode 120000 srcpkgs/audacious-devel diff --git a/common/shlibs b/common/shlibs index 2c4de718054..75b6728b9ff 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1116,10 +1116,10 @@ liblab_gamut.so.1 graphviz-libs-2.40.1_1 libmowgli-2.so.0 libmowgli-2.1.3_8 libgts-0.7.so.5 gts-0.7.6_1 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 +libaudcore.so.5 audacious-base-4.3.1_1 +libaudgui.so.5 audacious-base-4.3.1_1 +libaudtag.so.3 audacious-base-4.3.1_1 +libaudqt.so.2 audacious-base-4.3.1_1 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-base-devel b/srcpkgs/audacious-base-devel new file mode 120000 index 00000000000..aec082697c0 --- /dev/null +++ b/srcpkgs/audacious-base-devel @@ -0,0 +1 @@ +audacious-base \ No newline at end of file diff --git a/srcpkgs/audacious/template b/srcpkgs/audacious-base/template similarity index 78% rename from srcpkgs/audacious/template rename to srcpkgs/audacious-base/template index ddd89b22eaf..e3553fdd0cc 100644 --- a/srcpkgs/audacious/template +++ b/srcpkgs/audacious-base/template @@ -1,6 +1,6 @@ -# Template file for 'audacious' -#Keep in sync with audacious-plugins! -pkgname=audacious +# Template file for 'audacious-base' +# Keep in sync with audacious and audacious-plugins +pkgname=audacious-base version=4.3.1 revision=1 build_style=meson @@ -9,7 +9,7 @@ configure_args="-Dlibarchive=true $(vopt_bool gtk3 gtk) $(vopt_bool gtk3) hostmakedepends="pkg-config gettext glib-devel $(vopt_if qt 'qt6-base qt6-tools')" makedepends="libSM-devel dbus-glib-devel libguess-devel libarchive-devel $(vopt_if gtk3 gtk+3-devel) $(vopt_if qt qt6-base-devel)" -depends="desktop-file-utils hicolor-icon-theme" +depends="desktop-file-utils hicolor-icon-theme $(vopt_if qt qt6-svg)" short_desc="Lightweight, advanced audio player focused on audio quality" maintainer="classabbyamp " license="BSD-2-Clause" @@ -25,8 +25,8 @@ post_install() { vlicense COPYING } -audacious-devel_package() { - depends="audacious>=${version}_${revision}" +audacious-base-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include diff --git a/srcpkgs/audacious-devel b/srcpkgs/audacious-devel deleted file mode 120000 index 80416fa9394..00000000000 --- a/srcpkgs/audacious-devel +++ /dev/null @@ -1 +0,0 @@ -audacious \ No newline at end of file