[PR PATCH] dumb: make allegro4, examples optional & build the latter as dumb-examples

[PR PATCH] dumb: make allegro4, examples optional & build the latter as dumb-examples

[voidlinux-github]

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

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

https://github.com/ScrelliCopter/void-packages dumbutils
https://github.com/void-linux/void-packages/pull/18472

dumb: make allegro4, examples optional & build the latter as dumb-examples
The reference players are actually quite useful so I think it's worth packaging them.

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

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

From 548461b752f6c0751d8a0e6797906660a296fb42 Mon Sep 17 00:00:00 2001
From: a dinosaur <nick@a-dinosaur.com>
Date: Thu, 23 Jan 2020 01:08:23 +1100
Subject: [PATCH] dumb: make allegro4, examples optional & build the latter as
 dumb-examples

---
 common/shlibs         |  4 ++--
 srcpkgs/dumb-examples |  1 +
 srcpkgs/dumb/template | 28 +++++++++++++++++++++++++---
 3 files changed, 28 insertions(+), 5 deletions(-)
 create mode 120000 srcpkgs/dumb-examples

diff --git a/common/shlibs b/common/shlibs
index 35fcd4de243..bdccd749a70 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1739,8 +1739,8 @@ libportmidi.so portmidi-217_1
 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
+libdumb.so.2 dumb-2.0.3_2
+libaldmb.so.2 dumb-2.0.3_2
 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/dumb-examples b/srcpkgs/dumb-examples
new file mode 120000
index 00000000000..6509fa65327
--- /dev/null
+++ b/srcpkgs/dumb-examples
@@ -0,0 +1 @@
+dumb
\ No newline at end of file
diff --git a/srcpkgs/dumb/template b/srcpkgs/dumb/template
index 41dac7e92b1..1f3261fa6bd 100644
--- a/srcpkgs/dumb/template
+++ b/srcpkgs/dumb/template
@@ -1,12 +1,18 @@
 # Template file for 'dumb'
 pkgname=dumb
 version=2.0.3
-revision=1
+revision=2
 build_style=cmake
-configure_args="-DBUILD_SHARED_LIBS=ON -DBUILD_EXAMPLES=OFF -GNinja"
+configure_args="-GNinja
+	-DBUILD_SHARED_LIBS=ON
+	$(vopt_bool allegro4 BUILD_ALLEGRO4)
+	$(vopt_bool examples BUILD_EXAMPLES)"
 make_cmd=ninja
 hostmakedepends="ninja"
-makedepends="allegro4-devel"
+makedepends="
+	$(vopt_if allegro4 allegro4-devel)
+	$(vopt_if examples argtable-devel)
+	$(vopt_if examples SDL2-devel)"
 short_desc="IT, XM, S3M and MOD player library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:DUMB"
@@ -14,6 +20,12 @@ homepage="http://dumb.sourceforge.net/"
 distfiles="https://github.com/kode54/dumb/archive/${version}.tar.gz"
 checksum=99bfac926aeb8d476562303312d9f47fd05b43803050cd889b44da34a9b2a4f9
 
+# Package build options
+build_options="allegro4 examples"
+desc_option_allegro4="Enable optional Allegro 4 support"
+desc_option_examples="Enable building example programs (dumbplay & dumbout)"
+build_options_default="allegro4 examples"
+
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*)
 		configure_args+=" -DUSE_SSE=ON"
@@ -42,3 +54,13 @@ dumb-devel_package() {
 		vmove usr/lib/pkgconfig
 	}
 }
+
+if [ ! -z "$build_option_examples" ]; then
+	dumb-examples_package() {
+		depends="argtable SDL2"
+		short_desc+="Reference IT, XM, S3M, MOD player programs using DUMB and SDL2"
+		pkg_install() {
+			vmove usr/bin
+		}
+	}
+fi

Re: [PR PATCH] [Updated] dumb: make allegro4, examples optional & build the latter as dumb-examples

[voidlinux-github]

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

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

https://github.com/ScrelliCopter/void-packages dumbutils
https://github.com/void-linux/void-packages/pull/18472

dumb: make allegro4, examples optional & build the latter as dumb-examples
The reference players are actually quite useful so I think it's worth packaging them.

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

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

From 8949d5970466569ca9cd4fa594a6a0ec2bedcfbf Mon Sep 17 00:00:00 2001
From: a dinosaur <nick@a-dinosaur.com>
Date: Thu, 23 Jan 2020 01:08:23 +1100
Subject: [PATCH] dumb: make allegro4, examples optional & build the latter as
 dumb-examples

---
 common/shlibs         |  4 ++--
 srcpkgs/dumb-examples |  1 +
 srcpkgs/dumb/template | 28 +++++++++++++++++++++++++---
 3 files changed, 28 insertions(+), 5 deletions(-)
 create mode 120000 srcpkgs/dumb-examples

diff --git a/common/shlibs b/common/shlibs
index 35fcd4de243..bdccd749a70 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1739,8 +1739,8 @@ libportmidi.so portmidi-217_1
 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
+libdumb.so.2 dumb-2.0.3_2
+libaldmb.so.2 dumb-2.0.3_2
 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/dumb-examples b/srcpkgs/dumb-examples
new file mode 120000
index 00000000000..6509fa65327
--- /dev/null
+++ b/srcpkgs/dumb-examples
@@ -0,0 +1 @@
+dumb
\ No newline at end of file
diff --git a/srcpkgs/dumb/template b/srcpkgs/dumb/template
index 41dac7e92b1..bbead1b8279 100644
--- a/srcpkgs/dumb/template
+++ b/srcpkgs/dumb/template
@@ -1,12 +1,18 @@
 # Template file for 'dumb'
 pkgname=dumb
 version=2.0.3
-revision=1
+revision=2
 build_style=cmake
-configure_args="-DBUILD_SHARED_LIBS=ON -DBUILD_EXAMPLES=OFF -GNinja"
+configure_args="-GNinja
+	-DBUILD_SHARED_LIBS=ON
+	$(vopt_bool allegro4 BUILD_ALLEGRO4)
+	$(vopt_bool examples BUILD_EXAMPLES)"
 make_cmd=ninja
 hostmakedepends="ninja"
-makedepends="allegro4-devel"
+makedepends="
+	$(vopt_if allegro4 allegro4-devel)
+	$(vopt_if examples argtable-devel)
+	$(vopt_if examples SDL2-devel)"
 short_desc="IT, XM, S3M and MOD player library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:DUMB"
@@ -14,6 +20,12 @@ homepage="http://dumb.sourceforge.net/"
 distfiles="https://github.com/kode54/dumb/archive/${version}.tar.gz"
 checksum=99bfac926aeb8d476562303312d9f47fd05b43803050cd889b44da34a9b2a4f9
 
+# Package build options
+build_options="allegro4 examples"
+desc_option_allegro4="Enable optional Allegro 4 support"
+desc_option_examples="Enable building example programs (dumbplay & dumbout)"
+build_options_default="allegro4 examples"
+
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*)
 		configure_args+=" -DUSE_SSE=ON"
@@ -42,3 +54,13 @@ dumb-devel_package() {
 		vmove usr/lib/pkgconfig
 	}
 }
+
+if [ "$build_option_examples" ]; then
+	dumb-examples_package() {
+		depends="argtable SDL2"
+		short_desc+="Reference IT, XM, S3M, MOD player programs using DUMB and SDL2"
+		pkg_install() {
+			vmove usr/bin
+		}
+	}
+fi

Re: [PR PATCH] [Updated] dumb: make allegro4, examples optional & build the latter as dumb-examples

[voidlinux-github]

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

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

https://github.com/ScrelliCopter/void-packages dumbutils
https://github.com/void-linux/void-packages/pull/18472

dumb: make allegro4, examples optional & build the latter as dumb-examples
The reference players are actually quite useful so I think it's worth packaging them.

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

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

From 88abc234214e4b21a4b483d6d2d3610869dd714e Mon Sep 17 00:00:00 2001
From: a dinosaur <nick@a-dinosaur.com>
Date: Thu, 23 Jan 2020 01:08:23 +1100
Subject: [PATCH] dumb: make allegro4, examples optional & build the latter as
 dumb-examples

---
 common/shlibs         |  4 ++--
 srcpkgs/dumb-examples |  1 +
 srcpkgs/dumb/template | 24 +++++++++++++++++++++---
 3 files changed, 24 insertions(+), 5 deletions(-)
 create mode 120000 srcpkgs/dumb-examples

diff --git a/common/shlibs b/common/shlibs
index 35fcd4de243..bdccd749a70 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1739,8 +1739,8 @@ libportmidi.so portmidi-217_1
 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
+libdumb.so.2 dumb-2.0.3_2
+libaldmb.so.2 dumb-2.0.3_2
 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/dumb-examples b/srcpkgs/dumb-examples
new file mode 120000
index 00000000000..6509fa65327
--- /dev/null
+++ b/srcpkgs/dumb-examples
@@ -0,0 +1 @@
+dumb
\ No newline at end of file
diff --git a/srcpkgs/dumb/template b/srcpkgs/dumb/template
index 41dac7e92b1..18e4ded23cc 100644
--- a/srcpkgs/dumb/template
+++ b/srcpkgs/dumb/template
@@ -1,12 +1,15 @@
 # Template file for 'dumb'
 pkgname=dumb
 version=2.0.3
-revision=1
+revision=2
 build_style=cmake
-configure_args="-DBUILD_SHARED_LIBS=ON -DBUILD_EXAMPLES=OFF -GNinja"
+configure_args="-GNinja -DBUILD_SHARED_LIBS=ON
+ $(vopt_bool allegro4 BUILD_ALLEGRO4)
+ $(vopt_bool examples BUILD_EXAMPLES)"
 make_cmd=ninja
 hostmakedepends="ninja"
-makedepends="allegro4-devel"
+makedepends="$(vopt_if allegro4 allegro4-devel)
+ $(vopt_if examples argtable-devel) $(vopt_if examples SDL2-devel)"
 short_desc="IT, XM, S3M and MOD player library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:DUMB"
@@ -14,6 +17,12 @@ homepage="http://dumb.sourceforge.net/"
 distfiles="https://github.com/kode54/dumb/archive/${version}.tar.gz"
 checksum=99bfac926aeb8d476562303312d9f47fd05b43803050cd889b44da34a9b2a4f9
 
+# Package build options
+build_options="allegro4 examples"
+desc_option_allegro4="Enable optional Allegro 4 support"
+desc_option_examples="Enable building example programs (dumbplay & dumbout)"
+build_options_default="allegro4 examples"
+
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*)
 		configure_args+=" -DUSE_SSE=ON"
@@ -42,3 +51,12 @@ dumb-devel_package() {
 		vmove usr/lib/pkgconfig
 	}
 }
+
+if [ "$build_option_examples" ]; then
+	dumb-examples_package() {
+		short_desc+="Reference IT, XM, S3M, MOD player programs using DUMB and SDL2"
+		pkg_install() {
+			vmove usr/bin
+		}
+	}
+fi

Re: [PR PATCH] [Updated] dumb: make allegro4, examples optional & build the latter as dumb-examples

[voidlinux-github]

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

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

https://github.com/ScrelliCopter/void-packages dumbutils
https://github.com/void-linux/void-packages/pull/18472

dumb: make allegro4, examples optional & build the latter as dumb-examples
The reference players are actually quite useful so I think it's worth packaging them.

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

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

From b8950d1e7a82e19531f1866f6ce92643d0f942f2 Mon Sep 17 00:00:00 2001
From: a dinosaur <nick@a-dinosaur.com>
Date: Thu, 23 Jan 2020 01:08:23 +1100
Subject: [PATCH] dumb: make allegro4, examples optional & build the latter as
 dumb-examples

---
 common/shlibs         |  4 ++--
 srcpkgs/dumb-examples |  1 +
 srcpkgs/dumb/template | 24 +++++++++++++++++++++---
 3 files changed, 24 insertions(+), 5 deletions(-)
 create mode 120000 srcpkgs/dumb-examples

diff --git a/common/shlibs b/common/shlibs
index 35fcd4de243..bdccd749a70 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1739,8 +1739,8 @@ libportmidi.so portmidi-217_1
 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
+libdumb.so.2 dumb-2.0.3_2
+libaldmb.so.2 dumb-2.0.3_2
 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/dumb-examples b/srcpkgs/dumb-examples
new file mode 120000
index 00000000000..6509fa65327
--- /dev/null
+++ b/srcpkgs/dumb-examples
@@ -0,0 +1 @@
+dumb
\ No newline at end of file
diff --git a/srcpkgs/dumb/template b/srcpkgs/dumb/template
index 41dac7e92b1..a20ceccc7ab 100644
--- a/srcpkgs/dumb/template
+++ b/srcpkgs/dumb/template
@@ -1,12 +1,15 @@
 # Template file for 'dumb'
 pkgname=dumb
 version=2.0.3
-revision=1
+revision=2
 build_style=cmake
-configure_args="-DBUILD_SHARED_LIBS=ON -DBUILD_EXAMPLES=OFF -GNinja"
+configure_args="-GNinja -DBUILD_SHARED_LIBS=ON
+ $(vopt_bool allegro4 BUILD_ALLEGRO4)
+ $(vopt_bool examples BUILD_EXAMPLES)"
 make_cmd=ninja
 hostmakedepends="ninja"
-makedepends="allegro4-devel"
+makedepends="$(vopt_if allegro4 allegro4-devel)
+ $(vopt_if examples argtable-devel) $(vopt_if examples SDL2-devel)"
 short_desc="IT, XM, S3M and MOD player library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:DUMB"
@@ -14,6 +17,12 @@ homepage="http://dumb.sourceforge.net/"
 distfiles="https://github.com/kode54/dumb/archive/${version}.tar.gz"
 checksum=99bfac926aeb8d476562303312d9f47fd05b43803050cd889b44da34a9b2a4f9
 
+# Package build options
+build_options="allegro4 examples"
+desc_option_allegro4="Enable optional Allegro 4 support"
+desc_option_examples="Enable building example programs (dumbplay & dumbout)"
+build_options_default="allegro4 examples"
+
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*)
 		configure_args+=" -DUSE_SSE=ON"
@@ -42,3 +51,12 @@ dumb-devel_package() {
 		vmove usr/lib/pkgconfig
 	}
 }
+
+if [ "$build_option_examples" ]; then
+	dumb-examples_package() {
+		short_desc="Reference IT, XM, S3M, MOD player programs using DUMB and SDL2"
+		pkg_install() {
+			vmove usr/bin
+		}
+	}
+fi

Re: dumb: make allegro4, examples optional & build the latter as dumb-examples

[voidlinux-github]

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

New comment by ScrelliCopter on void-packages repository

https://github.com/void-linux/void-packages/pull/18472#issuecomment-578489916

Comment:
Normalised formatting & fixed short description for `dumb-examples` which was being incorrectly appended.

Re: [PR REVIEW] dumb: make allegro4, examples optional & build the latter as dumb-examples

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/18472#discussion_r496323861

Comment:
Did this shared library change? If not, this entry shouldn't be changed, since it tells the system the minimum version of `dumb` that contains the library.

Re: dumb: make allegro4, examples optional & build the latter as dumb-examples

[ScrelliCopter]

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

New comment by ScrelliCopter on void-packages repository

https://github.com/void-linux/void-packages/pull/18472#issuecomment-721006825

Comment:
Closing cus this is old and probably not the best way to do this.

Re: [PR PATCH] [Closed]: dumb: make allegro4, examples optional & build the latter as dumb-examples

[ScrelliCopter]

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

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

dumb: make allegro4, examples optional & build the latter as dumb-examples
https://github.com/void-linux/void-packages/pull/18472

Description:
The reference players are actually quite useful so I think it's worth packaging them.