[PR PATCH] mpg123: move all "extra" plugings to mpg123-sdl, rename to mpg123-extras

[PR PATCH] mpg123: move all "extra" plugings to mpg123-sdl, rename to mpg123-extras

[ahesford]

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

There is a new pull request by ahesford against master on the void-packages repository

https://github.com/ahesford/void-packages mpg123-extras
https://github.com/void-linux/void-packages/pull/41323

mpg123: move all "extra" plugings to mpg123-sdl, rename to mpg123-extras
`mpg123-jack` introduces a build cycle, so let's minimize the dependencies of the base `mpg123` package by moving all "extras" to an `mpg123-extras` package that manages the individual subpackages. The `mpg123-extras` package can act as a meta that pulls in all the others.

**NOTE:** Because `mpg123-extras` isn't a real metapackage, `xbps-src` will refuse to create the package when it is empty, so fool the process by installing the `README`. I'm open to other ways to handle this problem, but it seems better that the template should be something generic instead of one of the arbitrary subpackages.

cc: @sgn 

Closes #41301.

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

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

From 42f462b3e115aa93543f6839d0b9feb239946ab4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 27 Dec 2022 19:08:06 -0500
Subject: [PATCH] mpg123: move all "extra" plugings to mpg123-sdl, rename to
 mpg123-extras

mpg123-jack introduces a build cycle, so let's minimize the dependencies
of the base mpg123 package by moving all "extras" to an mpg123-extras
package that manages the individual subpackages. The mpg123-extras
package can act as a meta that pulls in all the others.

Closes #41301.
---
 srcpkgs/mpg123-extras/template | 69 ++++++++++++++++++++++++++++++++++
 srcpkgs/mpg123-jack            |  2 +-
 srcpkgs/mpg123-pulseaudio      |  2 +-
 srcpkgs/mpg123-sdl             |  1 +
 srcpkgs/mpg123-sdl/template    | 28 --------------
 srcpkgs/mpg123-sndio           |  2 +-
 srcpkgs/mpg123/template        | 28 ++------------
 7 files changed, 76 insertions(+), 56 deletions(-)
 create mode 100644 srcpkgs/mpg123-extras/template
 create mode 120000 srcpkgs/mpg123-sdl
 delete mode 100644 srcpkgs/mpg123-sdl/template

diff --git a/srcpkgs/mpg123-extras/template b/srcpkgs/mpg123-extras/template
new file mode 100644
index 000000000000..b713670b5292
--- /dev/null
+++ b/srcpkgs/mpg123-extras/template
@@ -0,0 +1,69 @@
+# Template file for 'mpg123-extras'
+# Sync with mpg123
+pkgname=mpg123-extras
+version=1.31.1
+revision=3
+build_style=gnu-configure
+# --with-cpu not necessary, upstream detects features correctly
+configure_args="--with-optimization=0 --with-default-audio=alsa"
+hostmakedepends="pkg-config"
+makedepends="alsa-lib-devel SDL2-devel jack-devel pulseaudio-devel sndio-devel"
+depends="mpg123-sdl mpg123-jack mpg123-pulseaudio mpg123-sndio"
+short_desc="Fast console MPEG audio decoder/player - extra plugins"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-2.1-only"
+homepage="https://www.mpg123.org/"
+changelog="https://www.mpg123.org/cgi-bin/scm/mpg123/trunk/NEWS"
+distfiles="${SOURCEFORGE_SITE}/mpg123/mpg123-${version}.tar.bz2
+ https://www.mpg123.org/download/mpg123-${version}.tar.bz2"
+checksum="5dcb0936efd44cb583498b6585845206f002a7b19d5066a2683be361954d955a
+ 5dcb0936efd44cb583498b6585845206f002a7b19d5066a2683be361954d955a"
+
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	configure_args+=" --disable-lfs-alias"
+fi
+
+post_install() {
+	# Prune everything except the plugins that will be installed
+	find ${DESTDIR} \
+		'(' -name output_sdl.so \
+			-o -name output_jack.so \
+			-o -name output_pulse.so \
+			-o -name output_sndio.so \
+		')' -o '(' -not -type d -delete ')'
+
+	# Main package cannot be empty
+	vdoc README
+}
+
+mpg123-sdl_package() {
+	depends="libmpg123>=${version}_${revision}"
+	short_desc="${short_desc%% - *} - SDL output plugin"
+	pkg_install() {
+		vmove usr/lib/mpg123/output_sdl.so
+	}
+}
+
+mpg123-jack_package() {
+	depends="libmpg123>=${version}_${revision}"
+	short_desc="${short_desc%% - *} - JACK output plugin"
+	pkg_install() {
+		vmove usr/lib/mpg123/output_jack.so
+	}
+}
+
+mpg123-pulseaudio_package() {
+	depends="libmpg123>=${version}_${revision}"
+	short_desc="${short_desc%% - *} - Pulseaudio output plugin"
+	pkg_install() {
+		vmove usr/lib/mpg123/output_pulse.so
+	}
+}
+
+mpg123-sndio_package() {
+	depends="libmpg123>=${version}_${revision}"
+	short_desc="${short_desc%% - *} - sndio output plugin"
+	pkg_install() {
+		vmove usr/lib/mpg123/output_sndio.so
+	}
+}
diff --git a/srcpkgs/mpg123-jack b/srcpkgs/mpg123-jack
index 9e68ce8491a2..2c8801ea1400 120000
--- a/srcpkgs/mpg123-jack
+++ b/srcpkgs/mpg123-jack
@@ -1 +1 @@
-mpg123
\ No newline at end of file
+mpg123-extras
\ No newline at end of file
diff --git a/srcpkgs/mpg123-pulseaudio b/srcpkgs/mpg123-pulseaudio
index 9e68ce8491a2..2c8801ea1400 120000
--- a/srcpkgs/mpg123-pulseaudio
+++ b/srcpkgs/mpg123-pulseaudio
@@ -1 +1 @@
-mpg123
\ No newline at end of file
+mpg123-extras
\ No newline at end of file
diff --git a/srcpkgs/mpg123-sdl b/srcpkgs/mpg123-sdl
new file mode 120000
index 000000000000..2c8801ea1400
--- /dev/null
+++ b/srcpkgs/mpg123-sdl
@@ -0,0 +1 @@
+mpg123-extras
\ No newline at end of file
diff --git a/srcpkgs/mpg123-sdl/template b/srcpkgs/mpg123-sdl/template
deleted file mode 100644
index 02803f59109b..000000000000
--- a/srcpkgs/mpg123-sdl/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'mpg123-sdl'
-# Sync with mpg123
-pkgname=mpg123-sdl
-version=1.31.1
-revision=2
-build_style=gnu-configure
-# --with-cpu not necessary, upstream detects features correctly
-configure_args="--with-optimization=0 --with-default-audio=alsa"
-hostmakedepends="pkg-config"
-makedepends="alsa-lib-devel SDL2-devel"
-depends="libmpg123>=${version}<=${version}_9999"
-short_desc="Fast console MPEG audio decoder/player - SDL output plugin"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-only"
-homepage="https://www.mpg123.org/"
-changelog="https://www.mpg123.org/cgi-bin/scm/mpg123/trunk/NEWS"
-distfiles="${SOURCEFORGE_SITE}/mpg123/mpg123-${version}.tar.bz2
- https://www.mpg123.org/download/mpg123-${version}.tar.bz2"
-checksum="5dcb0936efd44cb583498b6585845206f002a7b19d5066a2683be361954d955a
- 5dcb0936efd44cb583498b6585845206f002a7b19d5066a2683be361954d955a"
-
-if [ "$XBPS_TARGET_LIBC" = musl ]; then
-	configure_args+=" --disable-lfs-alias"
-fi
-
-post_install() {
-	find ${DESTDIR} -name output_sdl.so -o '(' -not -type d -delete ')'
-}
diff --git a/srcpkgs/mpg123-sndio b/srcpkgs/mpg123-sndio
index 9e68ce8491a2..2c8801ea1400 120000
--- a/srcpkgs/mpg123-sndio
+++ b/srcpkgs/mpg123-sndio
@@ -1 +1 @@
-mpg123
\ No newline at end of file
+mpg123-extras
\ No newline at end of file
diff --git a/srcpkgs/mpg123/template b/srcpkgs/mpg123/template
index d17147a85d5b..43aadc500ff5 100644
--- a/srcpkgs/mpg123/template
+++ b/srcpkgs/mpg123/template
@@ -1,13 +1,13 @@
 # Template file for 'mpg123'
-# Sync with mpg123-sdl
+# Sync with mpg123-extras
 pkgname=mpg123
 version=1.31.1
-revision=2
+revision=3
 build_style=gnu-configure
 # --with-cpu not necessary, upstream detects features correctly
 configure_args="--with-optimization=0 --with-default-audio=alsa"
 hostmakedepends="pkg-config"
-makedepends="alsa-lib-devel jack-devel pulseaudio-devel sndio-devel"
+makedepends="alsa-lib-devel"
 short_desc="Fast console MPEG audio decoder/player"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
@@ -23,28 +23,6 @@ if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	configure_args+=" --disable-lfs-alias"
 fi
 
-mpg123-jack_package() {
-	depends="libmpg123-${version}_${revision}"
-	short_desc+=" - JACK output plugin"
-	pkg_install() {
-		vmove usr/lib/mpg123/output_jack.so
-	}
-}
-mpg123-pulseaudio_package() {
-	depends="libmpg123-${version}_${revision}"
-	short_desc+=" - Pulseaudio output plugin"
-	pkg_install() {
-		vmove usr/lib/mpg123/output_pulse.so
-	}
-}
-
-mpg123-sndio_package() {
-	depends="libmpg123-${version}_${revision}"
-	short_desc+=" - sndio output plugin"
-	pkg_install() {
-		vmove usr/lib/mpg123/output_sndio.so
-	}
-}
 libmpg123_package() {
 	short_desc+=" - Runtime library"
 	pkg_install() {

Re: [PR REVIEW] mpg123: move all "extra" plugings to mpg123-sdl, rename to mpg123-extras

[sgn]

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/41323#discussion_r1058008641

Comment:
Please don't `>=_${revision}` because the `-extra` needs to be rebuilt whenever `mpg123` is rebuilt for no good reason. We probably want to limit to same version, too. 
```suggestion
	depends="libmpg123>=${version}_1<=${version}_999"
```

Re: [PR PATCH] [Updated] mpg123: move all "extra" plugings to mpg123-sdl, rename to mpg123-extras

[ahesford]

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

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

https://github.com/ahesford/void-packages mpg123-extras
https://github.com/void-linux/void-packages/pull/41323

mpg123: move all "extra" plugings to mpg123-sdl, rename to mpg123-extras
`mpg123-jack` introduces a build cycle, so let's minimize the dependencies of the base `mpg123` package by moving all "extras" to an `mpg123-extras` package that manages the individual subpackages. The `mpg123-extras` package can act as a meta that pulls in all the others.

**NOTE:** Because `mpg123-extras` isn't a real metapackage, `xbps-src` will refuse to create the package when it is empty, so fool the process by installing the `README`. I'm open to other ways to handle this problem, but it seems better that the template should be something generic instead of one of the arbitrary subpackages.

cc: @sgn 

Closes #41301.

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

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

From 5b98af1c1069596c8bf3f68acc50e8406dfe5e55 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 27 Dec 2022 19:08:06 -0500
Subject: [PATCH] mpg123: move all "extra" plugings to mpg123-sdl, rename to
 mpg123-extras

mpg123-jack introduces a build cycle, so let's minimize the dependencies
of the base mpg123 package by moving all "extras" to an mpg123-extras
package that manages the individual subpackages. The mpg123-extras
package can act as a meta that pulls in all the others.

Closes #41301.
---
 srcpkgs/mpg123-extras/template | 72 ++++++++++++++++++++++++++++++++++
 srcpkgs/mpg123-jack            |  2 +-
 srcpkgs/mpg123-pulseaudio      |  2 +-
 srcpkgs/mpg123-sdl             |  1 +
 srcpkgs/mpg123-sdl/template    | 28 -------------
 srcpkgs/mpg123-sndio           |  2 +-
 srcpkgs/mpg123/template        | 28 ++-----------
 7 files changed, 79 insertions(+), 56 deletions(-)
 create mode 100644 srcpkgs/mpg123-extras/template
 create mode 120000 srcpkgs/mpg123-sdl
 delete mode 100644 srcpkgs/mpg123-sdl/template

diff --git a/srcpkgs/mpg123-extras/template b/srcpkgs/mpg123-extras/template
new file mode 100644
index 000000000000..68931b41d423
--- /dev/null
+++ b/srcpkgs/mpg123-extras/template
@@ -0,0 +1,72 @@
+# Template file for 'mpg123-extras'
+# Sync with mpg123
+pkgname=mpg123-extras
+version=1.31.1
+revision=3
+build_style=gnu-configure
+# --with-cpu not necessary, upstream detects features correctly
+configure_args="--with-optimization=0 --with-default-audio=alsa"
+hostmakedepends="pkg-config"
+makedepends="alsa-lib-devel SDL2-devel jack-devel pulseaudio-devel sndio-devel"
+depends="mpg123-sdl mpg123-jack mpg123-pulseaudio mpg123-sndio"
+short_desc="Fast console MPEG audio decoder/player - extra plugins"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-2.1-only"
+homepage="https://www.mpg123.org/"
+changelog="https://www.mpg123.org/cgi-bin/scm/mpg123/trunk/NEWS"
+distfiles="${SOURCEFORGE_SITE}/mpg123/mpg123-${version}.tar.bz2
+ https://www.mpg123.org/download/mpg123-${version}.tar.bz2"
+checksum="5dcb0936efd44cb583498b6585845206f002a7b19d5066a2683be361954d955a
+ 5dcb0936efd44cb583498b6585845206f002a7b19d5066a2683be361954d955a"
+
+# Restrict extras to the same matching version, ignore revision
+_depends="libmpg123>=${version}_1<=${version}_9999"
+
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	configure_args+=" --disable-lfs-alias"
+fi
+
+post_install() {
+	# Prune everything except the plugins that will be installed
+	find ${DESTDIR} \
+		'(' -name output_sdl.so \
+			-o -name output_jack.so \
+			-o -name output_pulse.so \
+			-o -name output_sndio.so \
+		')' -o '(' -not -type d -delete ')'
+
+	# Main package cannot be empty
+	vdoc README
+}
+
+mpg123-sdl_package() {
+	depends="${_depends}"
+	short_desc="${short_desc%% - *} - SDL output plugin"
+	pkg_install() {
+		vmove usr/lib/mpg123/output_sdl.so
+	}
+}
+
+mpg123-jack_package() {
+	depends="${_depends}"
+	short_desc="${short_desc%% - *} - JACK output plugin"
+	pkg_install() {
+		vmove usr/lib/mpg123/output_jack.so
+	}
+}
+
+mpg123-pulseaudio_package() {
+	depends="${_depends}"
+	short_desc="${short_desc%% - *} - Pulseaudio output plugin"
+	pkg_install() {
+		vmove usr/lib/mpg123/output_pulse.so
+	}
+}
+
+mpg123-sndio_package() {
+	depends="${_depends}"
+	short_desc="${short_desc%% - *} - sndio output plugin"
+	pkg_install() {
+		vmove usr/lib/mpg123/output_sndio.so
+	}
+}
diff --git a/srcpkgs/mpg123-jack b/srcpkgs/mpg123-jack
index 9e68ce8491a2..2c8801ea1400 120000
--- a/srcpkgs/mpg123-jack
+++ b/srcpkgs/mpg123-jack
@@ -1 +1 @@
-mpg123
\ No newline at end of file
+mpg123-extras
\ No newline at end of file
diff --git a/srcpkgs/mpg123-pulseaudio b/srcpkgs/mpg123-pulseaudio
index 9e68ce8491a2..2c8801ea1400 120000
--- a/srcpkgs/mpg123-pulseaudio
+++ b/srcpkgs/mpg123-pulseaudio
@@ -1 +1 @@
-mpg123
\ No newline at end of file
+mpg123-extras
\ No newline at end of file
diff --git a/srcpkgs/mpg123-sdl b/srcpkgs/mpg123-sdl
new file mode 120000
index 000000000000..2c8801ea1400
--- /dev/null
+++ b/srcpkgs/mpg123-sdl
@@ -0,0 +1 @@
+mpg123-extras
\ No newline at end of file
diff --git a/srcpkgs/mpg123-sdl/template b/srcpkgs/mpg123-sdl/template
deleted file mode 100644
index 02803f59109b..000000000000
--- a/srcpkgs/mpg123-sdl/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'mpg123-sdl'
-# Sync with mpg123
-pkgname=mpg123-sdl
-version=1.31.1
-revision=2
-build_style=gnu-configure
-# --with-cpu not necessary, upstream detects features correctly
-configure_args="--with-optimization=0 --with-default-audio=alsa"
-hostmakedepends="pkg-config"
-makedepends="alsa-lib-devel SDL2-devel"
-depends="libmpg123>=${version}<=${version}_9999"
-short_desc="Fast console MPEG audio decoder/player - SDL output plugin"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-only"
-homepage="https://www.mpg123.org/"
-changelog="https://www.mpg123.org/cgi-bin/scm/mpg123/trunk/NEWS"
-distfiles="${SOURCEFORGE_SITE}/mpg123/mpg123-${version}.tar.bz2
- https://www.mpg123.org/download/mpg123-${version}.tar.bz2"
-checksum="5dcb0936efd44cb583498b6585845206f002a7b19d5066a2683be361954d955a
- 5dcb0936efd44cb583498b6585845206f002a7b19d5066a2683be361954d955a"
-
-if [ "$XBPS_TARGET_LIBC" = musl ]; then
-	configure_args+=" --disable-lfs-alias"
-fi
-
-post_install() {
-	find ${DESTDIR} -name output_sdl.so -o '(' -not -type d -delete ')'
-}
diff --git a/srcpkgs/mpg123-sndio b/srcpkgs/mpg123-sndio
index 9e68ce8491a2..2c8801ea1400 120000
--- a/srcpkgs/mpg123-sndio
+++ b/srcpkgs/mpg123-sndio
@@ -1 +1 @@
-mpg123
\ No newline at end of file
+mpg123-extras
\ No newline at end of file
diff --git a/srcpkgs/mpg123/template b/srcpkgs/mpg123/template
index d17147a85d5b..43aadc500ff5 100644
--- a/srcpkgs/mpg123/template
+++ b/srcpkgs/mpg123/template
@@ -1,13 +1,13 @@
 # Template file for 'mpg123'
-# Sync with mpg123-sdl
+# Sync with mpg123-extras
 pkgname=mpg123
 version=1.31.1
-revision=2
+revision=3
 build_style=gnu-configure
 # --with-cpu not necessary, upstream detects features correctly
 configure_args="--with-optimization=0 --with-default-audio=alsa"
 hostmakedepends="pkg-config"
-makedepends="alsa-lib-devel jack-devel pulseaudio-devel sndio-devel"
+makedepends="alsa-lib-devel"
 short_desc="Fast console MPEG audio decoder/player"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
@@ -23,28 +23,6 @@ if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	configure_args+=" --disable-lfs-alias"
 fi
 
-mpg123-jack_package() {
-	depends="libmpg123-${version}_${revision}"
-	short_desc+=" - JACK output plugin"
-	pkg_install() {
-		vmove usr/lib/mpg123/output_jack.so
-	}
-}
-mpg123-pulseaudio_package() {
-	depends="libmpg123-${version}_${revision}"
-	short_desc+=" - Pulseaudio output plugin"
-	pkg_install() {
-		vmove usr/lib/mpg123/output_pulse.so
-	}
-}
-
-mpg123-sndio_package() {
-	depends="libmpg123-${version}_${revision}"
-	short_desc+=" - sndio output plugin"
-	pkg_install() {
-		vmove usr/lib/mpg123/output_sndio.so
-	}
-}
 libmpg123_package() {
 	short_desc+=" - Runtime library"
 	pkg_install() {

Re: [PR REVIEW] mpg123: move all "extra" plugings to mpg123-sdl, rename to mpg123-extras

[ahesford]

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/41323#discussion_r1058034007

Comment:
Setting `<=` a high revision number is a bit hacky, but probably less horrible than the alternatives, which would be either hacking out a `next_version` variable so we could do `libmpg123>=${version}<${next_version}` (which would be fragile) or just dropping the `<=` (which might break some people's systems on upgrade). Done.

Re: [PR PATCH] [Merged]: mpg123: move all "extra" plugings to mpg123-sdl, rename to mpg123-extras

[sgn]

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

There's a merged pull request on the void-packages repository

mpg123: move all "extra" plugings to mpg123-sdl, rename to mpg123-extras
https://github.com/void-linux/void-packages/pull/41323

Description:
`mpg123-jack` introduces a build cycle, so let's minimize the dependencies of the base `mpg123` package by moving all "extras" to an `mpg123-extras` package that manages the individual subpackages. The `mpg123-extras` package can act as a meta that pulls in all the others.

**NOTE:** Because `mpg123-extras` isn't a real metapackage, `xbps-src` will refuse to create the package when it is empty, so fool the process by installing the `README`. I'm open to other ways to handle this problem, but it seems better that the template should be something generic instead of one of the arbitrary subpackages.

cc: @sgn 

Closes #41301.