Re: [PR PATCH] [Updated] lsp-plugins: split subpkgs

[dkwo <dkwo@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 409 bytes --]

There is an updated pull request by dkwo against master on the void-packages repository

https://github.com/dkwo/void-packages lsp
https://github.com/void-linux/void-packages/pull/50486

lsp-plugins: split subpkgs
Tested by me and @slimjimsoftware 

This helps unclutter things. @leahneukirchen can you take a look?

A patch file from https://github.com/void-linux/void-packages/pull/50486.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lsp-50486.patch --]
[-- Type: text/x-diff, Size: 7270 bytes --]

From b3d635cd8c1d5600611d2ee6831602b3e8b1b6ad Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Tue, 21 May 2024 12:30:32 -0400
Subject: [PATCH 1/3] lsp-plugins: split subpkgs

---
 srcpkgs/lsp-plugins-clap     |  1 +
 srcpkgs/lsp-plugins-ladspa   |  1 +
 srcpkgs/lsp-plugins-lib      |  1 +
 srcpkgs/lsp-plugins-lv2      |  1 +
 srcpkgs/lsp-plugins-vst2     |  1 +
 srcpkgs/lsp-plugins-xdg      |  1 +
 srcpkgs/lsp-plugins/template | 51 +++++++++++++++++++++++++++++++++++-
 7 files changed, 56 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/lsp-plugins-clap
 create mode 120000 srcpkgs/lsp-plugins-ladspa
 create mode 120000 srcpkgs/lsp-plugins-lib
 create mode 120000 srcpkgs/lsp-plugins-lv2
 create mode 120000 srcpkgs/lsp-plugins-vst2
 create mode 120000 srcpkgs/lsp-plugins-xdg

diff --git a/srcpkgs/lsp-plugins-clap b/srcpkgs/lsp-plugins-clap
new file mode 120000
index 00000000000000..f59057b0c7f794
--- /dev/null
+++ b/srcpkgs/lsp-plugins-clap
@@ -0,0 +1 @@
+lsp-plugins
\ No newline at end of file
diff --git a/srcpkgs/lsp-plugins-ladspa b/srcpkgs/lsp-plugins-ladspa
new file mode 120000
index 00000000000000..f59057b0c7f794
--- /dev/null
+++ b/srcpkgs/lsp-plugins-ladspa
@@ -0,0 +1 @@
+lsp-plugins
\ No newline at end of file
diff --git a/srcpkgs/lsp-plugins-lib b/srcpkgs/lsp-plugins-lib
new file mode 120000
index 00000000000000..f59057b0c7f794
--- /dev/null
+++ b/srcpkgs/lsp-plugins-lib
@@ -0,0 +1 @@
+lsp-plugins
\ No newline at end of file
diff --git a/srcpkgs/lsp-plugins-lv2 b/srcpkgs/lsp-plugins-lv2
new file mode 120000
index 00000000000000..f59057b0c7f794
--- /dev/null
+++ b/srcpkgs/lsp-plugins-lv2
@@ -0,0 +1 @@
+lsp-plugins
\ No newline at end of file
diff --git a/srcpkgs/lsp-plugins-vst2 b/srcpkgs/lsp-plugins-vst2
new file mode 120000
index 00000000000000..f59057b0c7f794
--- /dev/null
+++ b/srcpkgs/lsp-plugins-vst2
@@ -0,0 +1 @@
+lsp-plugins
\ No newline at end of file
diff --git a/srcpkgs/lsp-plugins-xdg b/srcpkgs/lsp-plugins-xdg
new file mode 120000
index 00000000000000..f59057b0c7f794
--- /dev/null
+++ b/srcpkgs/lsp-plugins-xdg
@@ -0,0 +1 @@
+lsp-plugins
\ No newline at end of file
diff --git a/srcpkgs/lsp-plugins/template b/srcpkgs/lsp-plugins/template
index 9473573ff185d1..f32c2c133dad07 100644
--- a/srcpkgs/lsp-plugins/template
+++ b/srcpkgs/lsp-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'lsp-plugins'
 pkgname=lsp-plugins
 version=1.2.14
-revision=1
+revision=2
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="VERBOSE=0"
@@ -21,6 +21,55 @@ do_configure() {
 	make LD="$CXX" PREFIX=/usr config
 }
 
+lsp-plugins-lib_package() {
+	short_desc+=" - main libraries"
+	pkg_install() {
+		vmove usr/lib/liblsp-r3d-glx-lib*
+	}
+}
+
+lsp-plugins-xdg_package() {
+	short_desc+=" - XDG integration"
+	pkg_install() {
+		vmove usr/share/applications
+		vmove usr/share/desktop-directories
+		vmove usr/share/icons
+		vmove etc/xdg/menus/applications-merged
+	}
+}
+
+lsp-plugins-clap_package() {
+	short_desc+=" - clap integrations"
+	depends="${sourcepkg}-lib>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/lib/clap
+	}
+}
+
+lsp-plugins-ladspa_package() {
+	short_desc+=" - ladspa integration"
+	depends="${sourcepkg}-lib>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/lib/ladspa
+	}
+}
+
+lsp-plugins-lv2_package() {
+	short_desc+=" - lv2 plugins"
+	depends="lv2>=0.6.0 ${sourcepkg}-lib>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/lib/lv2
+	}
+}
+
+lsp-plugins-vst2_package() {
+	short_desc+=" - vst2 plugins"
+	depends="${sourcepkg}-lib>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/lib/vst
+	}
+}
+
 lsp-plugins-doc_package() {
 	short_desc+=" - documentation"
 	pkg_install() {

From 239e3bc1ce490294f2d28c1d97ea0edc94adb2af Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Fri, 24 May 2024 12:19:37 -0400
Subject: [PATCH 2/3] lsp-plugins: fix

---
 srcpkgs/{lsp-plugins-lib => lsp-plugins-libs} |  0
 srcpkgs/lsp-plugins/template                  | 12 ++++++------
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename srcpkgs/{lsp-plugins-lib => lsp-plugins-libs} (100%)

diff --git a/srcpkgs/lsp-plugins-lib b/srcpkgs/lsp-plugins-libs
similarity index 100%
rename from srcpkgs/lsp-plugins-lib
rename to srcpkgs/lsp-plugins-libs
diff --git a/srcpkgs/lsp-plugins/template b/srcpkgs/lsp-plugins/template
index f32c2c133dad07..77929268d1ae42 100644
--- a/srcpkgs/lsp-plugins/template
+++ b/srcpkgs/lsp-plugins/template
@@ -21,10 +21,10 @@ do_configure() {
 	make LD="$CXX" PREFIX=/usr config
 }
 
-lsp-plugins-lib_package() {
+lsp-plugins-libs_package() {
 	short_desc+=" - main libraries"
 	pkg_install() {
-		vmove usr/lib/liblsp-r3d-glx-lib*
+		vmove usr/lib/liblsp-r3d-glx-lib*.so
 	}
 }
 
@@ -40,7 +40,7 @@ lsp-plugins-xdg_package() {
 
 lsp-plugins-clap_package() {
 	short_desc+=" - clap integrations"
-	depends="${sourcepkg}-lib>=${version}_${revision}"
+	depends="${sourcepkg}-libs>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/lib/clap
 	}
@@ -48,7 +48,7 @@ lsp-plugins-clap_package() {
 
 lsp-plugins-ladspa_package() {
 	short_desc+=" - ladspa integration"
-	depends="${sourcepkg}-lib>=${version}_${revision}"
+	depends="${sourcepkg}-libs>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/lib/ladspa
 	}
@@ -56,7 +56,7 @@ lsp-plugins-ladspa_package() {
 
 lsp-plugins-lv2_package() {
 	short_desc+=" - lv2 plugins"
-	depends="lv2>=0.6.0 ${sourcepkg}-lib>=${version}_${revision}"
+	depends="lv2>=0.6.0 ${sourcepkg}-libs>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/lib/lv2
 	}
@@ -64,7 +64,7 @@ lsp-plugins-lv2_package() {
 
 lsp-plugins-vst2_package() {
 	short_desc+=" - vst2 plugins"
-	depends="${sourcepkg}-lib>=${version}_${revision}"
+	depends="${sourcepkg}-libs>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/lib/vst
 	}

From ae7ab395e24a35ee9dad2cffea5de6aa4b826f06 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Sun, 26 May 2024 12:42:08 -0400
Subject: [PATCH 3/3] lsp-plugins: make it effectively a metapkg

---
 srcpkgs/lsp-plugins/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/lsp-plugins/template b/srcpkgs/lsp-plugins/template
index 77929268d1ae42..40dce0617d9dfb 100644
--- a/srcpkgs/lsp-plugins/template
+++ b/srcpkgs/lsp-plugins/template
@@ -8,6 +8,8 @@ make_build_args="VERBOSE=0"
 hostmakedepends="pkg-config php lv2"
 makedepends="lv2 libglvnd-devel jack-devel libsndfile-devel
  libXrandr-devel cairo-devel freetype-devel"
+depends="lsp-plugins-libs lsp-plugins-xdg
+ lsp-plugins-clap lsp-plugins-ladspa lsp-plugins-lv2 lsp-plugins-vst2"
 short_desc="Collection of open-source audio plugins for studios"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -25,6 +27,7 @@ lsp-plugins-libs_package() {
 	short_desc+=" - main libraries"
 	pkg_install() {
 		vmove usr/lib/liblsp-r3d-glx-lib*.so
+		vmove usr/lib/lsp-plugins/liblsp-plugins-jack*.so
 	}
 }
 
@@ -82,10 +85,6 @@ lsp-plugins-devel_package() {
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/lib/pkgconfig
-		for f in $DESTDIR/usr/lib/*; do
-			if echo ${f##*/} | grep -Eq '^[^.]*\.(a|so)$'; then
-				vmove ${f#$DESTDIR/}
-			fi
-		done
+		vmove usr/lib/liblsp-r3d-glx-lib*.a
 	}
 }