From patchwork Sun Aug 4 18:28:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaelyn Takata X-Patchwork-Id: 66698 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9CC5C27BBE2; Sun, 4 Aug 2024 19:30:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8698F27BBE9 for ; Sun, 4 Aug 2024 19:30:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1safzF-000557-HV; Sun, 04 Aug 2024 14:29:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1safzC-00054b-W8 for guix-patches@gnu.org; Sun, 04 Aug 2024 14:29:43 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1safzC-0003r3-Mg for guix-patches@gnu.org; Sun, 04 Aug 2024 14:29:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:From:Date:To:Subject; bh=RVBPAUn9+MJOjTlr4PGocs3xSU/QfHqoalCrGW2Cxuk=; b=UKJqpHFZwlXsAA/E/7/UDVBRhjQNcHm65rqrzgqVJKZGX0turKhk3ONthpI07wFS5A0jLD9qJVaUlZmEI0gEk4vUhKfngcc5W87xIQdDN0rBnQwaWmGok1BsQtzel2XYUYRgX3nT4l9YmHuRzrAK9VY59wbX/o8hEuPHhNwdlnWUtT2p2JUsV3yacUTzsLcyYIeRdoaxR28N8U20QDNCrO8iQlNGGbwts/i53Eb2+lkfn5UwBrH5yLfZiRXtauqMcn24Sa7WoNJTT/e4PJdJK4TNN5TvQrdpSUMLX+6OUjzlKsf2HfGC9ChOZ7IjHfAaR0eYlu9i/LdfQ30jrCjLDA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1safzW-00076g-Ov for guix-patches@gnu.org; Sun, 04 Aug 2024 14:30:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72469] [PATCH core-updates] gnu: webrtc-audio-processing: Fix build on i686. Resent-From: Kaelyn Takata Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Aug 2024 18:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 72469 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72469@debbugs.gnu.org Cc: Kaelyn Takata X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.172279615127112 (code B ref -1); Sun, 04 Aug 2024 18:30:02 +0000 Received: (at submit) by debbugs.gnu.org; 4 Aug 2024 18:29:11 +0000 Received: from localhost ([127.0.0.1]:57270 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1safyg-00073C-Ni for submit@debbugs.gnu.org; Sun, 04 Aug 2024 14:29:11 -0400 Received: from lists.gnu.org ([209.51.188.17]:41194) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1safye-000733-Qf for submit@debbugs.gnu.org; Sun, 04 Aug 2024 14:29:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1safyJ-0004zi-2A for guix-patches@gnu.org; Sun, 04 Aug 2024 14:28:47 -0400 Received: from mail-4316.protonmail.ch ([185.70.43.16]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1safyG-0003VU-II for guix-patches@gnu.org; Sun, 04 Aug 2024 14:28:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1722796121; x=1723055321; bh=RVBPAUn9+MJOjTlr4PGocs3xSU/QfHqoalCrGW2Cxuk=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=p4hhdxuib28tGkZKyANhy7rCCNlGUPnxPrdq2QR9JX5rIsJksPwURgJ7U418qll5i ATG47g/d6LsLvs3opagtkGfS1cQ4OxL4iXBHJwEJtvsWinJReIGXoQKIqO93X8oShT sI25QibNFVk081eLDhdK2hCkhp0C9Iz8G3ETqq45GJYa3zGNwqQsO3giJOJ6xNJYVN yAK9K+uLID/1NoKfdyHyvd4c3xCwhDq1E2xi3QCrdEj/PujrxCZNBu8dkFkLq2RC8E Ycjy4fvqyNABwTmnXCgri3ph0cgeOhF1tq4rLjAmA/O5GNJ/CsOvUnQOWmgh8a0oDC xPN0+/AWDJjRg== Date: Sun, 04 Aug 2024 18:28:36 +0000 Message-ID: Feedback-ID: 34709329:user:proton X-Pm-Message-ID: 59126c2bbd161b1ddeafc210e26f6dda199c20bf MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.43.16; envelope-from=kaelyn.alexi@protonmail.com; helo=mail-4316.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Kaelyn Takata X-ACL-Warn: , Kaelyn Takata via Guix-patches X-Patchwork-Original-From: Kaelyn Takata via Guix-patches via From: Kaelyn Takata Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 base-commit: baad95b19a24401cad8bee7290e5dbf3b3f38287 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 +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