[PR PATCH] timidity: build on musl without broken alsa audio

[PR PATCH] timidity: build on musl without broken alsa audio

[hazen2215]

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

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

https://github.com/hazen2215/void-packages timidity-musl
https://github.com/void-linux/void-packages/pull/42440

timidity: build on musl without broken alsa audio
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)


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

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

From d76daef67c65dae9c5650e6ef75da793dad40bae Mon Sep 17 00:00:00 2001
From: hazen2215 <haz@disroot.org>
Date: Wed, 22 Feb 2023 04:42:14 +0900
Subject: [PATCH] timidity: build on musl without broken alsa audio

---
 srcpkgs/timidity/template | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/timidity/template b/srcpkgs/timidity/template
index 4488d67ad953..9efb53716ee8 100644
--- a/srcpkgs/timidity/template
+++ b/srcpkgs/timidity/template
@@ -1,12 +1,10 @@
 # Template file for 'timidity'
 pkgname=timidity
 version=2.15.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--with-default-path=/etc/timidity
- --enable-audio=alsa,oss,ao,vorbis,flac --enable-server
- --enable-alsaseq=yes --enable-network
- --enable-gtk --enable-ncurses"
+configure_args="--with-default-path=/etc/timidity --enable-server
+ --enable-alsaseq=yes --enable-network --enable-gtk --enable-ncurses"
 hostmakedepends="pkg-config"
 makedepends="alsa-lib-devel libvorbis-devel libao-devel libflac-devel
  libX11-devel gtk+-devel ncurses-devel"
@@ -17,9 +15,12 @@ homepage="http://timidity.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/timidity/TiMidity++-${version}.tar.xz"
 checksum=9eaf4fadb0e19eb8e35cd4ac16142d604c589e43d0e8798237333697e6381d39
 
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) broken="uses alsa's pcm_old.h, which depends on symbol versioning to work";;
-esac
+# disable alsa audio on musl since it uses pcm_old.h, which depends on symbol versioning to work
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	configure_args+=" --enable-audio=oss,ao,vorbis,flac"
+else
+	configure_args+=" --enable-audio=alsa,oss,ao,vorbis,flac"
+fi
 
 if [ "$CROSS_BUILD" ]; then
 	# check for va_copy runs test program; assume no for target

Re: timidity: build on musl without broken alsa audio

[github-actions]

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

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/42440#issuecomment-1565146799

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

Re: [PR PATCH] [Updated] timidity: build on musl without broken alsa audio

[hazen2215]

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

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

https://github.com/hazen2215/void-packages timidity-musl
https://github.com/void-linux/void-packages/pull/42440

timidity: build on musl without broken alsa audio
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)


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

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

From 16c5f5fd5c4c4ee6b362dfc7951b8b0ff8d01752 Mon Sep 17 00:00:00 2001
From: hazen2215 <haz@disroot.org>
Date: Wed, 22 Feb 2023 04:42:14 +0900
Subject: [PATCH] timidity: build on musl without broken alsa audio

---
 srcpkgs/timidity/template | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/timidity/template b/srcpkgs/timidity/template
index 4488d67ad953..9efb53716ee8 100644
--- a/srcpkgs/timidity/template
+++ b/srcpkgs/timidity/template
@@ -1,12 +1,10 @@
 # Template file for 'timidity'
 pkgname=timidity
 version=2.15.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--with-default-path=/etc/timidity
- --enable-audio=alsa,oss,ao,vorbis,flac --enable-server
- --enable-alsaseq=yes --enable-network
- --enable-gtk --enable-ncurses"
+configure_args="--with-default-path=/etc/timidity --enable-server
+ --enable-alsaseq=yes --enable-network --enable-gtk --enable-ncurses"
 hostmakedepends="pkg-config"
 makedepends="alsa-lib-devel libvorbis-devel libao-devel libflac-devel
  libX11-devel gtk+-devel ncurses-devel"
@@ -17,9 +15,12 @@ homepage="http://timidity.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/timidity/TiMidity++-${version}.tar.xz"
 checksum=9eaf4fadb0e19eb8e35cd4ac16142d604c589e43d0e8798237333697e6381d39
 
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) broken="uses alsa's pcm_old.h, which depends on symbol versioning to work";;
-esac
+# disable alsa audio on musl since it uses pcm_old.h, which depends on symbol versioning to work
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	configure_args+=" --enable-audio=oss,ao,vorbis,flac"
+else
+	configure_args+=" --enable-audio=alsa,oss,ao,vorbis,flac"
+fi
 
 if [ "$CROSS_BUILD" ]; then
 	# check for va_copy runs test program; assume no for target

Re: [PR PATCH] [Merged]: timidity: build on musl without broken alsa audio

[Duncaen]

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

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

timidity: build on musl without broken alsa audio
https://github.com/void-linux/void-packages/pull/42440

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)