Github messages for voidlinux
 help / color / mirror / Atom feed
From: hazen2215 <hazen2215@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] timidity: build on musl without broken alsa audio
Date: Sat, 27 May 2023 05:07:05 +0200	[thread overview]
Message-ID: <20230527030705.pl3wZu48spYiOCIqVQGFy3ks3UOqKdFposOe6HC1pBU@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-42440@inbox.vuxu.org>

[-- 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

  parent reply	other threads:[~2023-05-27  3:07 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-25  9:51 [PR PATCH] " hazen2215
2023-05-27  1:52 ` github-actions
2023-05-27  3:07 ` hazen2215 [this message]
2023-06-24 14:54 ` [PR PATCH] [Merged]: " Duncaen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230527030705.pl3wZu48spYiOCIqVQGFy3ks3UOqKdFposOe6HC1pBU@z \
    --to=hazen2215@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).