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
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).