Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] dumb: Package dumbplay & split libaldmb, take ownership
@ 2021-01-24 19:32 ScrelliCopter
  2021-01-24 20:03 ` ScrelliCopter
                   ` (9 more replies)
  0 siblings, 10 replies; 11+ messages in thread
From: ScrelliCopter @ 2021-01-24 19:32 UTC (permalink / raw)
  To: ml

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

There is a new 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
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.

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: 3359 bytes --]

From 35356eeffa15f6f5ce69b6d12867fa0acc4dfe1f 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

---
 common/shlibs         |  2 +-
 srcpkgs/aldumb        |  1 +
 srcpkgs/aldumb-devel  |  1 +
 srcpkgs/dumb/template | 39 ++++++++++++++++++++++++++++++++-------
 srcpkgs/dumbplay      |  1 +
 5 files changed, 36 insertions(+), 8 deletions(-)
 create mode 120000 srcpkgs/aldumb
 create mode 120000 srcpkgs/aldumb-devel
 create mode 120000 srcpkgs/dumbplay

diff --git a/common/shlibs b/common/shlibs
index 8c6b5d9d014..11179dfd4fc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1799,7 +1799,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/aldumb-devel b/srcpkgs/aldumb-devel
new file mode 120000
index 00000000000..6509fa65327
--- /dev/null
+++ b/srcpkgs/aldumb-devel
@@ -0,0 +1 @@
+dumb
\ No newline at end of file
diff --git a/srcpkgs/dumb/template b/srcpkgs/dumb/template
index 21c11c4c2ca..8cd2588a151 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,33 @@ 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}"
+	short_desc+=", Allegro4 integration"
+	pkg_install() {
+		vmove "usr/lib/libaldmb.so.*"
+	}
+}
+
+aldumb-devel_package() {
+	depends="aldumb>=${version}_${revision} ${sourcepkg}-devel>=${version}_${revision}"
+	short_desc+=", Allegro4 integration - development files"
+	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
+	}
+}
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

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: dumb: Package dumbplay & split libaldmb, take ownership
  2021-01-24 19:32 [PR PATCH] dumb: Package dumbplay & split libaldmb, take ownership ScrelliCopter
@ 2021-01-24 20:03 ` ScrelliCopter
  2021-02-18  5:03 ` [PR REVIEW] " ericonr
                   ` (8 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: ScrelliCopter @ 2021-01-24 20:03 UTC (permalink / raw)
  To: ml

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

New comment by ScrelliCopter on void-packages repository

https://github.com/void-linux/void-packages/pull/28182#issuecomment-766422814

Comment:
Edited comment, didn't realise there was a new PR format.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR REVIEW] dumb: Package dumbplay & split libaldmb, take ownership
  2021-01-24 19:32 [PR PATCH] dumb: Package dumbplay & split libaldmb, take ownership ScrelliCopter
  2021-01-24 20:03 ` ScrelliCopter
@ 2021-02-18  5:03 ` ericonr
  2021-02-18  5:03 ` ericonr
                   ` (7 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: ericonr @ 2021-02-18  5:03 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28182#discussion_r578133834

Comment:
There is of course the issue that this removes `libaldmb` from users who rely on it being provided by `dumb`.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR REVIEW] dumb: Package dumbplay & split libaldmb, take ownership
  2021-01-24 19:32 [PR PATCH] dumb: Package dumbplay & split libaldmb, take ownership ScrelliCopter
  2021-01-24 20:03 ` ScrelliCopter
  2021-02-18  5:03 ` [PR REVIEW] " ericonr
@ 2021-02-18  5:03 ` ericonr
  2021-02-19  2:04 ` ScrelliCopter
                   ` (6 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: ericonr @ 2021-02-18  5:03 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28182#discussion_r578132925

Comment:
IMO this doesn't need to be split. devel packages can be a little bit bloated, it isn't a big issue.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR REVIEW] dumb: Package dumbplay & split libaldmb, take ownership
  2021-01-24 19:32 [PR PATCH] dumb: Package dumbplay & split libaldmb, take ownership ScrelliCopter
                   ` (2 preceding siblings ...)
  2021-02-18  5:03 ` ericonr
@ 2021-02-19  2:04 ` ScrelliCopter
  2021-02-19  2:21 ` ScrelliCopter
                   ` (5 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: ScrelliCopter @ 2021-02-19  2:04 UTC (permalink / raw)
  To: ml

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

New review comment by ScrelliCopter on void-packages repository

https://github.com/void-linux/void-packages/pull/28182#discussion_r578874196

Comment:
Makes sense, especially if the only people who are going to be using the Allegro stuff would be building against it.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR REVIEW] dumb: Package dumbplay & split libaldmb, take ownership
  2021-01-24 19:32 [PR PATCH] dumb: Package dumbplay & split libaldmb, take ownership ScrelliCopter
                   ` (3 preceding siblings ...)
  2021-02-19  2:04 ` ScrelliCopter
@ 2021-02-19  2:21 ` ScrelliCopter
  2021-02-19  3:06 ` ScrelliCopter
                   ` (4 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: ScrelliCopter @ 2021-02-19  2:21 UTC (permalink / raw)
  To: ml

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

New review comment by ScrelliCopter on void-packages repository

https://github.com/void-linux/void-packages/pull/28182#discussion_r578879546

Comment:
I figured giving aldmb a devel package would help make it more orthogonal w/ dumb-devel but figures aldmb is already such a specific use case that eliminating the superfluous subpackage is a better idea, I'll do that.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: dumb: Package dumbplay & split libaldmb, take ownership
  2021-01-24 19:32 [PR PATCH] dumb: Package dumbplay & split libaldmb, take ownership ScrelliCopter
                   ` (4 preceding siblings ...)
  2021-02-19  2:21 ` ScrelliCopter
@ 2021-02-19  3:06 ` ScrelliCopter
  2021-02-19  3:58 ` [PR REVIEW] " ScrelliCopter
                   ` (3 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: ScrelliCopter @ 2021-02-19  3:06 UTC (permalink / raw)
  To: ml

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

New comment by ScrelliCopter on void-packages repository

https://github.com/void-linux/void-packages/pull/28182#issuecomment-781782351

Comment:
> Is this package really something you'd use in an environment where allegro4's dependencies aren't already installed? Maybe push all the extras (aldumb and dumbplay) into a single subpackage with all extra deps?
> 
> I'm not sure this will receive any updates any more, so it's not going to make maintenance much harder, I'd just prefer to be sure it's not adding to many unnecessary subpackages.

Allegro 4 is ancient and none of the packages in Void's repos that depend on `allegro4` use `dumb` nor its optional Allegro 4 integration. Newer versions of Allegro use DUMB directly and don't rely on this old support library.
I only know of one well-known piece of software; Adventure Game Studio; that uses both Allegro 4 & DUMB, but its DUMB appears to be an ancient 0.9.2 version that is built in-tree rather than being pulled from the distro.

I'll concede that the proposed split is more than a little philosophical rather than purely technical, but I can see an (admittedly extremely rare) case for running dumb and dumbout on a headless server where the chains of X11 & desktop sound server dependencies allegro4 would pull in only serve to add unnecessary bloat. IMO that justifies splitting a seldom used glue library.

> 
> Also, please include the rationale you exposed in the PR message in the commit message itself.

Will do on next push.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR REVIEW] dumb: Package dumbplay & split libaldmb, take ownership
  2021-01-24 19:32 [PR PATCH] dumb: Package dumbplay & split libaldmb, take ownership ScrelliCopter
                   ` (5 preceding siblings ...)
  2021-02-19  3:06 ` ScrelliCopter
@ 2021-02-19  3:58 ` ScrelliCopter
  2021-02-19  5:01 ` [PR PATCH] [Updated] " ScrelliCopter
                   ` (2 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: ScrelliCopter @ 2021-02-19  3:58 UTC (permalink / raw)
  To: ml

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

New review comment by ScrelliCopter on void-packages repository

https://github.com/void-linux/void-packages/pull/28182#discussion_r578909266

Comment:
Fair point, may affect users who build forks of old games like https://github.com/carstene1ns/alex4
I'm guessing there's no way to deal with a split on existing installations other than hoping there are no users who actively use aldmb.so from `dumb`? (I severely doubt there are, but still)

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR PATCH] [Updated] dumb: Package dumbplay & split libaldmb, take ownership
  2021-01-24 19:32 [PR PATCH] dumb: Package dumbplay & split libaldmb, take ownership ScrelliCopter
                   ` (6 preceding siblings ...)
  2021-02-19  3:58 ` [PR REVIEW] " ScrelliCopter
@ 2021-02-19  5:01 ` ScrelliCopter
  2021-02-19  5:02 ` ScrelliCopter
  2021-02-24  4:57 ` [PR PATCH] [Merged]: " ericonr
  9 siblings, 0 replies; 11+ messages in thread
From: ScrelliCopter @ 2021-02-19  5:01 UTC (permalink / raw)
  To: ml

[-- 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: 3753 bytes --]

From 491c035714f1de109fa8664ff5672f35c5e67742 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/aldumb-devel  |  1 +
 srcpkgs/dumb/template | 31 ++++++++++++++++++++++++-------
 srcpkgs/dumbplay      |  1 +
 5 files changed, 28 insertions(+), 8 deletions(-)
 create mode 120000 srcpkgs/aldumb
 create mode 120000 srcpkgs/aldumb-devel
 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/aldumb-devel b/srcpkgs/aldumb-devel
new file mode 120000
index 00000000000..6509fa65327
--- /dev/null
+++ b/srcpkgs/aldumb-devel
@@ -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

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR PATCH] [Updated] dumb: Package dumbplay & split libaldmb, take ownership
  2021-01-24 19:32 [PR PATCH] dumb: Package dumbplay & split libaldmb, take ownership ScrelliCopter
                   ` (7 preceding siblings ...)
  2021-02-19  5:01 ` [PR PATCH] [Updated] " ScrelliCopter
@ 2021-02-19  5:02 ` ScrelliCopter
  2021-02-24  4:57 ` [PR PATCH] [Merged]: " ericonr
  9 siblings, 0 replies; 11+ messages in thread
From: ScrelliCopter @ 2021-02-19  5:02 UTC (permalink / raw)
  To: ml

[-- 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

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR PATCH] [Merged]: dumb: Package dumbplay & split libaldmb, take ownership
  2021-01-24 19:32 [PR PATCH] dumb: Package dumbplay & split libaldmb, take ownership ScrelliCopter
                   ` (8 preceding siblings ...)
  2021-02-19  5:02 ` ScrelliCopter
@ 2021-02-24  4:57 ` ericonr
  9 siblings, 0 replies; 11+ messages in thread
From: ericonr @ 2021-02-24  4:57 UTC (permalink / raw)
  To: ml

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

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

dumb: Package dumbplay & split libaldmb, take ownership
https://github.com/void-linux/void-packages/pull/28182

Description:
<!-- 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.

^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2021-02-24  4:57 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-24 19:32 [PR PATCH] dumb: Package dumbplay & split libaldmb, take ownership ScrelliCopter
2021-01-24 20:03 ` ScrelliCopter
2021-02-18  5:03 ` [PR REVIEW] " ericonr
2021-02-18  5:03 ` ericonr
2021-02-19  2:04 ` ScrelliCopter
2021-02-19  2:21 ` ScrelliCopter
2021-02-19  3:06 ` ScrelliCopter
2021-02-19  3:58 ` [PR REVIEW] " ScrelliCopter
2021-02-19  5:01 ` [PR PATCH] [Updated] " ScrelliCopter
2021-02-19  5:02 ` ScrelliCopter
2021-02-24  4:57 ` [PR PATCH] [Merged]: " ericonr

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).