GNU bug report logs - #72469
[PATCH core-updates] gnu: webrtc-audio-processing: Fix build on i686.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 72469 in the body.
You can then email your comments to 72469 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Kaelyn Takata <kaelyn.alexi <at> protonmail.com>
To: guix-patches <at> gnu.org
Cc: Kaelyn Takata <kaelyn.alexi <at> protonmail.com>
Subject: [PATCH core-updates] gnu: webrtc-audio-processing: Fix build on i686.
Date: Sun, 04 Aug 2024 18:28:36 +0000

* gnu/packages/audio.scm (webrtc-audio-processing): Fix build on i686.
* gnu/packages/patches/webrtc-audio-processing-1.3-Add-generic-byte-order-and-pointer-size-detection.patch
* gnu/packages/patches/webrtc-audio-processing-1.3-x86-no-sse.patch

Change-Id: I3a95e5e2794df0d51e005672b5d3e2d98f27b767
---
 gnu/packages/audio.scm                        | 11 ++++++-
 ...yte-order-and-pointer-size-detection.patch | 32 +++++++++++++++++++
 ...brtc-audio-processing-1.3-x86-no-sse.patch | 13 ++++++++
 3 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/webrtc-audio-processing-1.3-Add-generic-byte-order-and-pointer-size-detection.patch
 create mode 100644 gnu/packages/patches/webrtc-audio-processing-1.3-x86-no-sse.patch

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 382bd77c47..7fd720a435 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -309,8 +309,17 @@ (define-public webrtc-audio-processing
         (string-append "http://freedesktop.org/software/pulseaudio/"
                        name "/" name "-" version ".tar.gz"))
        (sha256
-        (base32 "0xfvq5lxg612vfzk3zk6896zcb4cgrrb7fq76w9h40magz0jymcm"))))
+        (base32 "0xfvq5lxg612vfzk3zk6896zcb4cgrrb7fq76w9h40magz0jymcm"))
+       ;; See https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/5
+       (patches
+        (search-patches
+         "webrtc-audio-processing-1.3-Add-generic-byte-order-and-pointer-size-detection.patch"
+         "webrtc-audio-processing-1.3-x86-no-sse.patch"))))
     (build-system meson-build-system)
+    (arguments
+     (if (target-x86-32?)
+         (list #:configure-flags #~(list "-Dc_args=-DPFFFT_SIMD_DISABLE"))
+         '()))
     (native-inputs (list pkg-config))
     (inputs (list abseil-cpp))
     (synopsis "WebRTC's Audio Processing Library")
diff --git a/gnu/packages/patches/webrtc-audio-processing-1.3-Add-generic-byte-order-and-pointer-size-detection.patch b/gnu/packages/patches/webrtc-audio-processing-1.3-Add-generic-byte-order-and-pointer-size-detection.patch
new file mode 100644
index 0000000000..e2d974afd9
--- /dev/null
+++ b/gnu/packages/patches/webrtc-audio-processing-1.3-Add-generic-byte-order-and-pointer-size-detection.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/917493
+https://sources.debian.org/src/webrtc-audio-processing/1.0-0.2/debian/patches/Add-generic-byte-order-and-pointer-size-detection.patch/
+
+Description: Add generic byte order and pointer size detection
+Author: Than <than <at> redhat.com>
+Origin: https://bugs.freedesktop.org/show_bug.cgi?id=95738#c4
+Last-Update: 2022-02-01
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/webrtc/rtc_base/system/arch.h
++++ b/webrtc/rtc_base/system/arch.h
+@@ -58,7 +58,19 @@
+ #define WEBRTC_ARCH_32_BITS
+ #define WEBRTC_ARCH_LITTLE_ENDIAN
+ #else
+-#error Please add support for your architecture in rtc_base/system/arch.h
++/* instead of failing, use typical unix defines... */
++#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
++#define WEBRTC_ARCH_LITTLE_ENDIAN
++#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
++#define WEBRTC_ARCH_BIG_ENDIAN
++#else
++#error __BYTE_ORDER__ is not defined
++#endif
++#if defined(__LP64__)
++#define WEBRTC_ARCH_64_BITS
++#else
++#define WEBRTC_ARCH_32_BITS
++#endif
+ #endif
+ 
+ #if !(defined(WEBRTC_ARCH_LITTLE_ENDIAN) ^ defined(WEBRTC_ARCH_BIG_ENDIAN))
diff --git a/gnu/packages/patches/webrtc-audio-processing-1.3-x86-no-sse.patch b/gnu/packages/patches/webrtc-audio-processing-1.3-x86-no-sse.patch
new file mode 100644
index 0000000000..c194dd9244
--- /dev/null
+++ b/gnu/packages/patches/webrtc-audio-processing-1.3-x86-no-sse.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/921140
+https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/5
+--- a/webrtc/rtc_base/system/arch.h
++++ b/webrtc/rtc_base/system/arch.h
+@@ -34,7 +34,7 @@
+ #else
+ #define WEBRTC_ARCH_32_BITS
+ #endif
+-#elif defined(_M_IX86) || defined(__i386__)
++#elif defined(__SSE__) && (defined(_M_IX86) || defined(__i386__))
+ #define WEBRTC_ARCH_X86_FAMILY
+ #define WEBRTC_ARCH_X86
+ #define WEBRTC_ARCH_32_BITS

base-commit: baad95b19a24401cad8bee7290e5dbf3b3f38287
-- 
2.45.2

Message #10 received at 72469-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Kaelyn Takata <kaelyn.alexi <at> protonmail.com>
Cc: 72469-done <at> debbugs.gnu.org
Subject: Re: bug#72469: [PATCH core-updates] gnu: webrtc-audio-processing:
 Fix build on i686.
Date: Wed, 21 Aug 2024 17:38:34 +0200

Hi Kaelyn,

Kaelyn Takata <kaelyn.alexi <at> protonmail.com> skribis:

> * gnu/packages/audio.scm (webrtc-audio-processing): Fix build on i686.
> * gnu/packages/patches/webrtc-audio-processing-1.3-Add-generic-byte-order-and-pointer-size-detection.patch
> * gnu/packages/patches/webrtc-audio-processing-1.3-x86-no-sse.patch
>
> Change-Id: I3a95e5e2794df0d51e005672b5d3e2d98f27b767

Applied.  I added the patches to ‘gnu/local.mk’, shortened a bit the
file names, and more importantly I arranged so that the patches are
applied in a phase and only on i686-linux and powerpc64le-linux, to
avoid a rebuild on other architectures (‘webrtc-audio-processing’ has
~3K dependents).

Thank you!

Ludo’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.