Re: [PR PATCH] [Updated] dumb: Package dumbplay & split libaldmb, take ownership

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

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

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

https://github.com/ScrelliCopter/void-packages dumbutils2
https://github.com/void-linux/void-packages/pull/28182

dumb: Package dumbplay & split libaldmb, take ownership
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [x] armv7l
  - [ ] armv6l-musl
-->

#### Description
This is a second go at https://github.com/void-linux/void-packages/pull/18472 with (in my opinion) a better approach using subpackages instead of build time options.

libaldmb is a separate library that isn't used by the rest of the package and splitting it avoids a bunch of unnecessary X11 & other desktop dependencies on `dumb`.

For the reference player I created a `dumbplay` subpackage which keeps the SDL2 dependency out of the main library package, ~~the dumbout util technically doesn't need it but I figured it's not important enough to create yet another subpackage for.~~ the tiny dumbout util has minimal dependencies and thus probably belongs in the main package.

I also updated the homepage which still pointed to the old pre-fork page.

Checked and couldn't see any other packages using the Allegro 4 integration (or libdumb at all for that matter) so I'm certain this change shouldn't break any existing package.

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

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

From 61668df227ebe161ca58d6b69f9d4c59801b8bb6 Mon Sep 17 00:00:00 2001
From: a dinosaur <nick@a-dinosaur.com>
Date: Mon, 25 Jan 2021 05:01:20 +1100
Subject: [PATCH] dumb: Package dumbplay & split libaldmb, take ownership

This is a second go at #18472 with (in my opinion) a better approach using
subpackages instead of build time options.

libaldmb is a separate library that isn't used by the rest of the package
and splitting it avoids a bunch of unnecessary X11 & other desktop
dependencies on `dumb`.

For the reference player I created a `dumbplay` subpackage which keeps the SDL2
dependency out of the main library package, the tiny dumbout util has minimal
dependencies and thus probably belongs in the main package.

I also updated the homepage which still pointed to the old pre-fork page.
---
 common/shlibs         |  2 +-
 srcpkgs/aldumb        |  1 +
 srcpkgs/dumb/template | 31 ++++++++++++++++++++++++-------
 srcpkgs/dumbplay      |  1 +
 4 files changed, 27 insertions(+), 8 deletions(-)
 create mode 120000 srcpkgs/aldumb
 create mode 120000 srcpkgs/dumbplay

diff --git a/common/shlibs b/common/shlibs
index d9eb36d27dc..b50f1e8eb54 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1763,7 +1763,7 @@ libsox.so.3 sox-14.4.2_1
 libsoxr.so.0 libsoxr-0.1.2_1
 libsoxr-lsr.so.0 libsoxr-0.1.2_1
 libdumb.so.2 dumb-2.0.3_1
-libaldmb.so.2 dumb-2.0.3_1
+libaldmb.so.2 aldumb-2.0.3_3
 libframe.so.6 frame-2.5.0_1
 libgrail.so.6 grail-3.1.0_1
 libgeis.so.1 geis-2.2.16_1
diff --git a/srcpkgs/aldumb b/srcpkgs/aldumb
new file mode 120000
index 00000000000..6509fa65327
--- /dev/null
+++ b/srcpkgs/aldumb
@@ -0,0 +1 @@
+dumb
\ No newline at end of file
diff --git a/srcpkgs/dumb/template b/srcpkgs/dumb/template
index 21c11c4c2ca..87f5ff89890 100644
--- a/srcpkgs/dumb/template
+++ b/srcpkgs/dumb/template
@@ -1,15 +1,15 @@
 # Template file for 'dumb'
 pkgname=dumb
 version=2.0.3
-revision=2
+revision=3
 build_style=cmake
-configure_args="-DBUILD_SHARED_LIBS=ON -DBUILD_EXAMPLES=OFF"
+configure_args="-DBUILD_SHARED_LIBS=ON -DBUILD_EXAMPLES=ON"
 hostmakedepends="allegro4-devel"
-makedepends="allegro4-devel"
+makedepends="allegro4-devel argtable-devel SDL2-devel"
 short_desc="IT, XM, S3M and MOD player library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="a dinosaur <nick@a-dinosaur.com>"
 license="custom:DUMB"
-homepage="http://dumb.sourceforge.net/"
+homepage="https://github.com/kode54/dumb"
 distfiles="https://github.com/kode54/dumb/archive/${version}.tar.gz"
 checksum=99bfac926aeb8d476562303312d9f47fd05b43803050cd889b44da34a9b2a4f9
 
@@ -31,8 +31,25 @@ dumb-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
-		vmove "usr/lib/*.so"
-		vmove usr/include
+		vmove usr/lib/libdumb.so
+		vmove usr/include/dumb.h
 		vmove usr/lib/pkgconfig
 	}
 }
+
+aldumb_package() {
+	depends="${sourcepkg}>=${version}_${revision} ${sourcepkg}-devel>=${version}_${revision}"
+	short_desc+=", Allegro4 integration"
+	pkg_install() {
+		vmove "usr/lib/libaldmb.so*"
+		vmove usr/include/aldumb.h
+	}
+}
+
+dumbplay_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc="IT, XM, S3M, MOD player & conversion programs using DUMB and SDL2"
+	pkg_install() {
+		vmove usr/bin/dumbplay
+	}
+}
diff --git a/srcpkgs/dumbplay b/srcpkgs/dumbplay
new file mode 120000
index 00000000000..6509fa65327
--- /dev/null
+++ b/srcpkgs/dumbplay
@@ -0,0 +1 @@
+dumb
\ No newline at end of file