[PR PATCH] webrtc-audio-processing: fix for i686-musl build

[PR PATCH] webrtc-audio-processing: fix for i686-musl build

[xeroxslayer]

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

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

https://github.com/xeroxslayer/void-packages webrtc-audio-processing
https://github.com/void-linux/void-packages/pull/51443

webrtc-audio-processing: fix for i686-musl build
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture: x86_64-musl, i686-musl (with `-A i686-musl`)
- I built this PR locally for these architectures:
  - x86_64 (`-A x86_64` on x86_64-musl)
  - i686 (`-A i686` on x86_64-musl)
  - aarch64 (`-A x86_64 -a aarch64` on x86_64-musl)
  - aarch64-musl (`-A x86_64-musl -a aarch64-musl` on x86_64-musl)
  - armv7l (`-A i686 -a armv7l` on x86_64-musl)
  - armv7l-musl (`-A i686-musl -a armv7l-musl` on x86_64-musl)

PS: Sorry for the new PR, I messed something up when squashing.

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-webrtc-audio-processing-51443.patch --]
[-- Type: text/x-diff, Size: 988 bytes --]

From aceb082cb80127a9a669453e3dbc50f1442aa40f Mon Sep 17 00:00:00 2001
From: xeroxslayer <xeroxslayer@proton.me>
Date: Thu, 25 Jul 2024 13:22:45 +0200
Subject: [PATCH] webrtc-audio-processing: fix for i686-musl build

---
 srcpkgs/webrtc-audio-processing/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/webrtc-audio-processing/template b/srcpkgs/webrtc-audio-processing/template
index e5277d17e0b9e3..e8d6f805c35840 100644
--- a/srcpkgs/webrtc-audio-processing/template
+++ b/srcpkgs/webrtc-audio-processing/template
@@ -13,7 +13,7 @@ distfiles="${FREEDESKTOP_SITE}/pulseaudio/webrtc-audio-processing/webrtc-audio-p
 checksum=95552fc17faa0202133707bbb3727e8c2cf64d4266fe31bfdb2298d769c1db75
 
 # Upstream issue: https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/5
-if [ "$XBPS_MACHINE" = "i686" ]; then
+if [[ "$XBPS_TARGET_MACHINE" = "i686"* ]]; then
 	CXXFLAGS="-DPFFFT_SIMD_DISABLE=1"
 	CFLAGS="-DPFFFT_SIMD_DISABLE=1"
 fi

Re: [PR REVIEW] webrtc-audio-processing: fix for i686-musl build

[sgn]

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/51443#discussion_r1691520271

Comment:
I am not sure, but I think it's prefered to use `case ... esac` for this, no?

Re: [PR REVIEW] webrtc-audio-processing: fix for i686-musl build

[xeroxslayer]

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

New review comment by xeroxslayer on void-packages repository

https://github.com/void-linux/void-packages/pull/51443#discussion_r1691683596

Comment:
Yes, I do believe so as well, but it doesn't make a whole lot of a difference. I just went allong with what was already in the template.

Re: [PR REVIEW] webrtc-audio-processing: fix for i686-musl build

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/51443#discussion_r1691937282

Comment:
using bash test should be fine

Re: [PR PATCH] [Merged]: webrtc-audio-processing: fix for i686-musl build

[classabbyamp]

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

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

webrtc-audio-processing: fix for i686-musl build
https://github.com/void-linux/void-packages/pull/51443

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

#### Local build testing
- I built this PR locally for my native architecture: x86_64-musl, i686-musl (with `-A i686-musl`)
- I built this PR locally for these architectures:
  - x86_64 (`-A x86_64` on x86_64-musl)
  - i686 (`-A i686` on x86_64-musl)
  - aarch64 (`-A x86_64 -a aarch64` on x86_64-musl)
  - aarch64-musl (`-A x86_64-musl -a aarch64-musl` on x86_64-musl)
  - armv7l (`-A i686 -a armv7l` on x86_64-musl)
  - armv7l-musl (`-A i686-musl -a armv7l-musl` on x86_64-musl)

PS: Sorry for the new PR, I messed something up when squashing.

[PR PATCH] webrtc-audio-processing: fix for i686-musl build

[xeroxslayer]

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

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

https://github.com/xeroxslayer/void-packages webrtc-audio-processing
https://github.com/void-linux/void-packages/pull/51424

webrtc-audio-processing: fix for i686-musl build
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture: x86_64-musl, i686-musl (with `-A i686-musl`)
- I built this PR locally for these architectures:
  - x86_64 (`-A x86_64` on x86_64-musl)
  - i686 (`-A i686` on x86_64-musl)
  - aarch64 (`-A x86_64 -a aarch64` on x86_64-musl)
  - aarch64-musl (`-A x86_64-musl -a aarch64-musl` on x86_64-musl)
  - armv7l (`-A i686 -a armv7l` on x86_64-musl)
  - armv7l-musl (`-A i686-musl -a armv7l-musl` on x86_64-musl)


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-webrtc-audio-processing-51424.patch --]
[-- Type: text/x-diff, Size: 986 bytes --]

From 35d5d5260bc01998eb31957d4450e94788aa7927 Mon Sep 17 00:00:00 2001
From: xeroxslayer <xeroxslayer@proton.me>
Date: Wed, 24 Jul 2024 16:06:08 +0200
Subject: [PATCH] Fix i686-musl build

---
 srcpkgs/webrtc-audio-processing/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/webrtc-audio-processing/template b/srcpkgs/webrtc-audio-processing/template
index e5277d17e0b9e3..5ee8c56f0ac173 100644
--- a/srcpkgs/webrtc-audio-processing/template
+++ b/srcpkgs/webrtc-audio-processing/template
@@ -13,7 +13,7 @@ distfiles="${FREEDESKTOP_SITE}/pulseaudio/webrtc-audio-processing/webrtc-audio-p
 checksum=95552fc17faa0202133707bbb3727e8c2cf64d4266fe31bfdb2298d769c1db75
 
 # Upstream issue: https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/5
-if [ "$XBPS_MACHINE" = "i686" ]; then
+if [ "$XBPS_MACHINE" = "i686" ] || [ "$XBPS_MACHINE" = "i686-musl" ]; then
 	CXXFLAGS="-DPFFFT_SIMD_DISABLE=1"
 	CFLAGS="-DPFFFT_SIMD_DISABLE=1"
 fi

Re: [PR REVIEW] webrtc-audio-processing: fix for i686-musl build

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/51424#discussion_r1689927798

Comment:
```suggestion
if [[ "$XBPS_TARGET_MACHINE" = "i686"* ]]; then
```

Re: [PR REVIEW] webrtc-audio-processing: fix for i686-musl build

[abenson]

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

New review comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/51424#discussion_r1689938024

Comment:
In addition to classabbyamp's suggestion, please fix the commit message to follow the convention. The message used at the PR's title will suffice, though you could amend it to just say "for i686" since it seems to apply to both i686/i686-musl.

Re: [PR REVIEW] webrtc-audio-processing: fix for i686-musl build

[abenson]

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

New review comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/51424#discussion_r1689938024

Comment:
In addition to classabbyamp's suggestion, please squash and fix the commit message to follow the convention. The message used at the PR's title will suffice.

Re: [PR REVIEW] webrtc-audio-processing: fix for i686-musl build

[xeroxslayer]

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

New review comment by xeroxslayer on void-packages repository

https://github.com/void-linux/void-packages/pull/51424#discussion_r1690397383

Comment:
Will do.