Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] libopenmpt123: update to 0.5.5
@ 2021-02-02 19:41 ScrelliCopter
  2021-02-02 19:42 ` [PR PATCH] [Updated] " ScrelliCopter
                   ` (9 more replies)
  0 siblings, 10 replies; 11+ messages in thread
From: ScrelliCopter @ 2021-02-02 19:41 UTC (permalink / raw)
  To: ml

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

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

https://github.com/ScrelliCopter/void-packages openmpt
https://github.com/void-linux/void-packages/pull/28414

libopenmpt123: update to 0.5.5
- remove obsolete build options
- optionise PortAudio
- build with SDL2 by default
- add option descriptions

<!-- 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
  - [x] armv6l-musl
-->


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

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

From f076b873092f7f702cdda4510df3d2dcaa26c7aa Mon Sep 17 00:00:00 2001
From: a dinosaur <nick@a-dinosaur.com>
Date: Wed, 3 Feb 2021 06:34:12 +1100
Subject: [PATCH] libopenmpt123: update to 0.5.5 - remove obsolete build
 options - optionise PortAudio - build with SDL2 by default - add option
 descriptions

---
 srcpkgs/libopenmpt/template | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/libopenmpt/template b/srcpkgs/libopenmpt/template
index 9b82c7e90b2..5a4549b2da8 100644
--- a/srcpkgs/libopenmpt/template
+++ b/srcpkgs/libopenmpt/template
@@ -1,33 +1,32 @@
 # Template file for 'libopenmpt'
 pkgname=libopenmpt
-version=0.5.4
+version=0.5.5
 revision=1
 wrksrc="libopenmpt-${version}+release.autotools"
 build_style=gnu-configure
-configure_args="$(vopt_with pulseaudio)
- $(vopt_with sdl) $(vopt_with sdl2)
- $(vopt_enable libopenmpt_modplug) $(vopt_enable libmodplug)"
-hostmakedepends="pkg-config"
-makedepends="zlib-devel mpg123-devel libogg-devel libvorbis-devel
- portaudio-devel portaudio-cpp-devel libsndfile-devel libflac-devel
+configure_args="$(vopt_with pulseaudio) $(vopt_with sdl2) $(vopt_with portaudio)"
+hostmakedepends="pkgconf"
+makedepends="zlib-devel libsndfile-devel
+ libflac-devel mpg123-devel libogg-devel libvorbis-devel
  $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if sdl2 SDL2-devel)
- $(vopt_if sdl SDL-devel)"
+ $(vopt_if portaudio portaudio-devel) $(vopt_if portaudio portaudio-cpp-devel)"
 short_desc="Cross-platform C & C++ library to decode tracked music files (modules)"
 maintainer="a dinosaur <nick@a-dinosaur.com>"
 license="BSD-3-Clause"
 homepage="https://lib.openmpt.org/libopenmpt/"
 distfiles="https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"
-checksum=f34d06b9daa7bca111625369e5bbc2e7c0e0e04737a439b0e6320811babcef40
-conflicts="$(vopt_if libmodplug libmodplug)"
+checksum=f1e01483ebf1a680d9ec030c9af20f5f2a5ac0f1e0642c18bd5593cfaa9ceb6b
 
 post_install() {
 	vlicense LICENSE
 }
 
 # Package build options
-build_options="pulseaudio sdl2 sdl libopenmpt_modplug libmodplug"
-build_options_default="pulseaudio"
-vopt_conflict sdl2 sdl
+build_options="pulseaudio sdl2 portaudio"
+build_options_default="pulseaudio sdl2 portaudio"
+desc_option_pulseaudio="Enable PulseAudio driver in openmpt123"
+desc_option_sdl2="Enable SDL2 driver in openmpt123"
+desc_option_portaudio="Enable PortAudio driver in openmpt123"
 
 libopenmpt-devel_package() {
 	depends="${sourcepkg}-${version}_${revision}"

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

* Re: [PR PATCH] [Updated] libopenmpt123: update to 0.5.5
  2021-02-02 19:41 [PR PATCH] libopenmpt123: update to 0.5.5 ScrelliCopter
@ 2021-02-02 19:42 ` ScrelliCopter
  2021-02-02 23:33 ` [PR REVIEW] libopenmpt: " ericonr
                   ` (8 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: ScrelliCopter @ 2021-02-02 19:42 UTC (permalink / raw)
  To: ml

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

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

https://github.com/ScrelliCopter/void-packages openmpt
https://github.com/void-linux/void-packages/pull/28414

libopenmpt123: update to 0.5.5
- remove obsolete build options
- optionise PortAudio
- build with SDL2 by default
- add option descriptions

<!-- 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
  - [x] armv6l-musl
-->


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

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

From c5a893a8e61b59472aaa7b7aa0748cfaaad47c36 Mon Sep 17 00:00:00 2001
From: a dinosaur <nick@a-dinosaur.com>
Date: Wed, 3 Feb 2021 06:34:12 +1100
Subject: [PATCH] libopenmpt: update to 0.5.5 - remove obsolete build options -
 make PortAudio a build option - build with SDL2 by default - add option
 descriptions

---
 srcpkgs/libopenmpt/template | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/libopenmpt/template b/srcpkgs/libopenmpt/template
index 9b82c7e90b2..5a4549b2da8 100644
--- a/srcpkgs/libopenmpt/template
+++ b/srcpkgs/libopenmpt/template
@@ -1,33 +1,32 @@
 # Template file for 'libopenmpt'
 pkgname=libopenmpt
-version=0.5.4
+version=0.5.5
 revision=1
 wrksrc="libopenmpt-${version}+release.autotools"
 build_style=gnu-configure
-configure_args="$(vopt_with pulseaudio)
- $(vopt_with sdl) $(vopt_with sdl2)
- $(vopt_enable libopenmpt_modplug) $(vopt_enable libmodplug)"
-hostmakedepends="pkg-config"
-makedepends="zlib-devel mpg123-devel libogg-devel libvorbis-devel
- portaudio-devel portaudio-cpp-devel libsndfile-devel libflac-devel
+configure_args="$(vopt_with pulseaudio) $(vopt_with sdl2) $(vopt_with portaudio)"
+hostmakedepends="pkgconf"
+makedepends="zlib-devel libsndfile-devel
+ libflac-devel mpg123-devel libogg-devel libvorbis-devel
  $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if sdl2 SDL2-devel)
- $(vopt_if sdl SDL-devel)"
+ $(vopt_if portaudio portaudio-devel) $(vopt_if portaudio portaudio-cpp-devel)"
 short_desc="Cross-platform C & C++ library to decode tracked music files (modules)"
 maintainer="a dinosaur <nick@a-dinosaur.com>"
 license="BSD-3-Clause"
 homepage="https://lib.openmpt.org/libopenmpt/"
 distfiles="https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"
-checksum=f34d06b9daa7bca111625369e5bbc2e7c0e0e04737a439b0e6320811babcef40
-conflicts="$(vopt_if libmodplug libmodplug)"
+checksum=f1e01483ebf1a680d9ec030c9af20f5f2a5ac0f1e0642c18bd5593cfaa9ceb6b
 
 post_install() {
 	vlicense LICENSE
 }
 
 # Package build options
-build_options="pulseaudio sdl2 sdl libopenmpt_modplug libmodplug"
-build_options_default="pulseaudio"
-vopt_conflict sdl2 sdl
+build_options="pulseaudio sdl2 portaudio"
+build_options_default="pulseaudio sdl2 portaudio"
+desc_option_pulseaudio="Enable PulseAudio driver in openmpt123"
+desc_option_sdl2="Enable SDL2 driver in openmpt123"
+desc_option_portaudio="Enable PortAudio driver in openmpt123"
 
 libopenmpt-devel_package() {
 	depends="${sourcepkg}-${version}_${revision}"

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

* Re: [PR REVIEW] libopenmpt: update to 0.5.5
  2021-02-02 19:41 [PR PATCH] libopenmpt123: update to 0.5.5 ScrelliCopter
  2021-02-02 19:42 ` [PR PATCH] [Updated] " ScrelliCopter
@ 2021-02-02 23:33 ` ericonr
  2021-02-02 23:33 ` ericonr
                   ` (7 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: ericonr @ 2021-02-02 23:33 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28414#discussion_r569004437

Comment:
Use `pkg-config` as other templates already do.

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

* Re: [PR REVIEW] libopenmpt: update to 0.5.5
  2021-02-02 19:41 [PR PATCH] libopenmpt123: update to 0.5.5 ScrelliCopter
  2021-02-02 19:42 ` [PR PATCH] [Updated] " ScrelliCopter
  2021-02-02 23:33 ` [PR REVIEW] libopenmpt: " ericonr
@ 2021-02-02 23:33 ` ericonr
  2021-02-02 23:33 ` ericonr
                   ` (6 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: ericonr @ 2021-02-02 23:33 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28414#discussion_r569004209

Comment:
```suggestion
 $(vopt_if portaudio 'portaudio-devel portaudio-cpp-devel')"
```

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

* Re: [PR REVIEW] libopenmpt: update to 0.5.5
  2021-02-02 19:41 [PR PATCH] libopenmpt123: update to 0.5.5 ScrelliCopter
                   ` (2 preceding siblings ...)
  2021-02-02 23:33 ` ericonr
@ 2021-02-02 23:33 ` ericonr
  2021-02-03  6:01 ` [PR PATCH] [Updated] " ScrelliCopter
                   ` (5 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: ericonr @ 2021-02-02 23:33 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28414#discussion_r569004040

Comment:
These two are described in `common/options.description` already, you can remove them.

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

* Re: [PR PATCH] [Updated] libopenmpt: update to 0.5.5
  2021-02-02 19:41 [PR PATCH] libopenmpt123: update to 0.5.5 ScrelliCopter
                   ` (3 preceding siblings ...)
  2021-02-02 23:33 ` ericonr
@ 2021-02-03  6:01 ` ScrelliCopter
  2021-02-03  6:04 ` [PR REVIEW] " ScrelliCopter
                   ` (4 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: ScrelliCopter @ 2021-02-03  6:01 UTC (permalink / raw)
  To: ml

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

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

https://github.com/ScrelliCopter/void-packages openmpt
https://github.com/void-linux/void-packages/pull/28414

libopenmpt: update to 0.5.5
- remove obsolete build options
- make PortAudio a build option
- build with SDL2 by default
- add option descriptions

<!-- 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
  - [x] armv6l-musl
-->


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

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

From 13693f246ebe5708c04f352ec80671aceb4c91c5 Mon Sep 17 00:00:00 2001
From: a dinosaur <nick@a-dinosaur.com>
Date: Wed, 3 Feb 2021 06:34:12 +1100
Subject: [PATCH] libopenmpt: update to 0.5.5 - remove obsolete build options -
 make PortAudio a build option - build with SDL2 by default - add option
 descriptions

---
 srcpkgs/libopenmpt/template | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/libopenmpt/template b/srcpkgs/libopenmpt/template
index 9b82c7e90b2..842228c27c8 100644
--- a/srcpkgs/libopenmpt/template
+++ b/srcpkgs/libopenmpt/template
@@ -1,33 +1,30 @@
 # Template file for 'libopenmpt'
 pkgname=libopenmpt
-version=0.5.4
+version=0.5.5
 revision=1
 wrksrc="libopenmpt-${version}+release.autotools"
 build_style=gnu-configure
-configure_args="$(vopt_with pulseaudio)
- $(vopt_with sdl) $(vopt_with sdl2)
- $(vopt_enable libopenmpt_modplug) $(vopt_enable libmodplug)"
+configure_args="$(vopt_with pulseaudio) $(vopt_with sdl2) $(vopt_with portaudio)"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel mpg123-devel libogg-devel libvorbis-devel
- portaudio-devel portaudio-cpp-devel libsndfile-devel libflac-devel
+makedepends="zlib-devel libsndfile-devel
+ libflac-devel mpg123-devel libogg-devel libvorbis-devel
  $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if sdl2 SDL2-devel)
- $(vopt_if sdl SDL-devel)"
+ $(vopt_if portaudio portaudio-cpp-devel)"
 short_desc="Cross-platform C & C++ library to decode tracked music files (modules)"
 maintainer="a dinosaur <nick@a-dinosaur.com>"
 license="BSD-3-Clause"
 homepage="https://lib.openmpt.org/libopenmpt/"
 distfiles="https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"
-checksum=f34d06b9daa7bca111625369e5bbc2e7c0e0e04737a439b0e6320811babcef40
-conflicts="$(vopt_if libmodplug libmodplug)"
+checksum=f1e01483ebf1a680d9ec030c9af20f5f2a5ac0f1e0642c18bd5593cfaa9ceb6b
 
 post_install() {
 	vlicense LICENSE
 }
 
 # Package build options
-build_options="pulseaudio sdl2 sdl libopenmpt_modplug libmodplug"
-build_options_default="pulseaudio"
-vopt_conflict sdl2 sdl
+build_options="pulseaudio sdl2 portaudio"
+build_options_default="pulseaudio sdl2 portaudio"
+desc_option_portaudio="Enable support for the PortAudio backend"
 
 libopenmpt-devel_package() {
 	depends="${sourcepkg}-${version}_${revision}"

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

* Re: [PR REVIEW] libopenmpt: update to 0.5.5
  2021-02-02 19:41 [PR PATCH] libopenmpt123: update to 0.5.5 ScrelliCopter
                   ` (4 preceding siblings ...)
  2021-02-03  6:01 ` [PR PATCH] [Updated] " ScrelliCopter
@ 2021-02-03  6:04 ` ScrelliCopter
  2021-02-03  6:05 ` ScrelliCopter
                   ` (3 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: ScrelliCopter @ 2021-02-03  6:04 UTC (permalink / raw)
  To: ml

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

New review comment by ScrelliCopter on void-packages repository

https://github.com/void-linux/void-packages/pull/28414#discussion_r569152411

Comment:
Didn't realise you could quote that, good catch.
Actually `portaudio-cpp-devel` implies  `portaudio-devel` so it was never needed anyway, I've gone ahead and simplified it.

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

* Re: [PR REVIEW] libopenmpt: update to 0.5.5
  2021-02-02 19:41 [PR PATCH] libopenmpt123: update to 0.5.5 ScrelliCopter
                   ` (5 preceding siblings ...)
  2021-02-03  6:04 ` [PR REVIEW] " ScrelliCopter
@ 2021-02-03  6:05 ` ScrelliCopter
  2021-02-03  6:08 ` ScrelliCopter
                   ` (2 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: ScrelliCopter @ 2021-02-03  6:05 UTC (permalink / raw)
  To: ml

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

New review comment by ScrelliCopter on void-packages repository

https://github.com/void-linux/void-packages/pull/28414#discussion_r569152692

Comment:
Removed those and changed the portaudio line to be more consistent.

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

* Re: [PR REVIEW] libopenmpt: update to 0.5.5
  2021-02-02 19:41 [PR PATCH] libopenmpt123: update to 0.5.5 ScrelliCopter
                   ` (6 preceding siblings ...)
  2021-02-03  6:05 ` ScrelliCopter
@ 2021-02-03  6:08 ` ScrelliCopter
  2021-02-03  6:18 ` [PR PATCH] [Updated] " ScrelliCopter
  2021-02-03 20:47 ` [PR PATCH] [Merged]: " ericonr
  9 siblings, 0 replies; 11+ messages in thread
From: ScrelliCopter @ 2021-02-03  6:08 UTC (permalink / raw)
  To: ml

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

New review comment by ScrelliCopter on void-packages repository

https://github.com/void-linux/void-packages/pull/28414#discussion_r569153657

Comment:
This is convention now? Hm, whatever.

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

* Re: [PR PATCH] [Updated] libopenmpt: update to 0.5.5
  2021-02-02 19:41 [PR PATCH] libopenmpt123: update to 0.5.5 ScrelliCopter
                   ` (7 preceding siblings ...)
  2021-02-03  6:08 ` ScrelliCopter
@ 2021-02-03  6:18 ` ScrelliCopter
  2021-02-03 20:47 ` [PR PATCH] [Merged]: " ericonr
  9 siblings, 0 replies; 11+ messages in thread
From: ScrelliCopter @ 2021-02-03  6:18 UTC (permalink / raw)
  To: ml

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

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

https://github.com/ScrelliCopter/void-packages openmpt
https://github.com/void-linux/void-packages/pull/28414

libopenmpt: update to 0.5.5
- remove obsolete build options
- make PortAudio a build option
- build with SDL2 by default
- add option descriptions

<!-- 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
  - [x] armv6l-musl
-->


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

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

From 46e1489aaa98314eda4db9b28f1a6dc0ce89db5a Mon Sep 17 00:00:00 2001
From: a dinosaur <nick@a-dinosaur.com>
Date: Wed, 3 Feb 2021 06:34:12 +1100
Subject: [PATCH] libopenmpt: update to 0.5.5 - remove obsolete build options -
 make PortAudio a build option - build with SDL2 by default - add option
 descriptions

---
 srcpkgs/libopenmpt/template | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/libopenmpt/template b/srcpkgs/libopenmpt/template
index 9b82c7e90b2..55e49689fef 100644
--- a/srcpkgs/libopenmpt/template
+++ b/srcpkgs/libopenmpt/template
@@ -1,33 +1,31 @@
 # Template file for 'libopenmpt'
 pkgname=libopenmpt
-version=0.5.4
+version=0.5.5
 revision=1
 wrksrc="libopenmpt-${version}+release.autotools"
 build_style=gnu-configure
-configure_args="$(vopt_with pulseaudio)
- $(vopt_with sdl) $(vopt_with sdl2)
- $(vopt_enable libopenmpt_modplug) $(vopt_enable libmodplug)"
+configure_args="$(vopt_with pulseaudio) $(vopt_with sdl2)
+ $(vopt_with portaudio) $(vopt_with portaudio portaudiocpp)"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel mpg123-devel libogg-devel libvorbis-devel
- portaudio-devel portaudio-cpp-devel libsndfile-devel libflac-devel
+makedepends="zlib-devel libsndfile-devel
+ libflac-devel mpg123-devel libogg-devel libvorbis-devel
  $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if sdl2 SDL2-devel)
- $(vopt_if sdl SDL-devel)"
+ $(vopt_if portaudio portaudio-cpp-devel)"
 short_desc="Cross-platform C & C++ library to decode tracked music files (modules)"
 maintainer="a dinosaur <nick@a-dinosaur.com>"
 license="BSD-3-Clause"
 homepage="https://lib.openmpt.org/libopenmpt/"
 distfiles="https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"
-checksum=f34d06b9daa7bca111625369e5bbc2e7c0e0e04737a439b0e6320811babcef40
-conflicts="$(vopt_if libmodplug libmodplug)"
+checksum=f1e01483ebf1a680d9ec030c9af20f5f2a5ac0f1e0642c18bd5593cfaa9ceb6b
 
 post_install() {
 	vlicense LICENSE
 }
 
 # Package build options
-build_options="pulseaudio sdl2 sdl libopenmpt_modplug libmodplug"
-build_options_default="pulseaudio"
-vopt_conflict sdl2 sdl
+build_options="pulseaudio sdl2 portaudio"
+build_options_default="pulseaudio sdl2 portaudio"
+desc_option_portaudio="Enable support for the PortAudio backend"
 
 libopenmpt-devel_package() {
 	depends="${sourcepkg}-${version}_${revision}"

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

* Re: [PR PATCH] [Merged]: libopenmpt: update to 0.5.5
  2021-02-02 19:41 [PR PATCH] libopenmpt123: update to 0.5.5 ScrelliCopter
                   ` (8 preceding siblings ...)
  2021-02-03  6:18 ` [PR PATCH] [Updated] " ScrelliCopter
@ 2021-02-03 20:47 ` ericonr
  9 siblings, 0 replies; 11+ messages in thread
From: ericonr @ 2021-02-03 20:47 UTC (permalink / raw)
  To: ml

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

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

libopenmpt: update to 0.5.5
https://github.com/void-linux/void-packages/pull/28414

Description:
- remove obsolete build options
- make PortAudio a build option
- build with SDL2 by default
- add option descriptions

<!-- 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
  - [x] armv6l-musl
-->


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

end of thread, other threads:[~2021-02-03 20:47 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-02 19:41 [PR PATCH] libopenmpt123: update to 0.5.5 ScrelliCopter
2021-02-02 19:42 ` [PR PATCH] [Updated] " ScrelliCopter
2021-02-02 23:33 ` [PR REVIEW] libopenmpt: " ericonr
2021-02-02 23:33 ` ericonr
2021-02-02 23:33 ` ericonr
2021-02-03  6:01 ` [PR PATCH] [Updated] " ScrelliCopter
2021-02-03  6:04 ` [PR REVIEW] " ScrelliCopter
2021-02-03  6:05 ` ScrelliCopter
2021-02-03  6:08 ` ScrelliCopter
2021-02-03  6:18 ` [PR PATCH] [Updated] " ScrelliCopter
2021-02-03 20:47 ` [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).