From 491c035714f1de109fa8664ff5672f35c5e67742 Mon Sep 17 00:00:00 2001 From: a dinosaur 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 " +maintainer="a dinosaur " 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