From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 05 01:43:47 2021 Received: (at submit) by debbugs.gnu.org; 5 Sep 2021 05:43:47 +0000 Received: from localhost ([127.0.0.1]:48979 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mMkwO-0007j5-OX for submit@debbugs.gnu.org; Sun, 05 Sep 2021 01:43:47 -0400 Received: from lists.gnu.org ([209.51.188.17]:34696) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mMkwN-0007iy-Ar for submit@debbugs.gnu.org; Sun, 05 Sep 2021 01:43:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47392) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mMkwN-0005Uz-3A for guix-patches@gnu.org; Sun, 05 Sep 2021 01:43:39 -0400 Received: from out0.migadu.com ([94.23.1.103]:28686) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mMkwJ-0005CS-9x for guix-patches@gnu.org; Sun, 05 Sep 2021 01:43:38 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1630820612; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V6bK89F6uJ5M7l+//AwZ/T97UYOWz1tR5lggbpwIADI=; b=PDCGirLzAkV6HpHcM8ducngrtZm66+SiPkaAPEOn4fNFB21YOg2kJvOTwJQV7VWjSnHtHO quDEe1Gz6W0W6viRkta/NF/qjwvT8JXUiTMt0xVrsjAr6Lm0nf9Go1MlKg+btyG0fX+HId Uw8Xqi0wmpNWsZRsnxVnm048urlpeCg= From: Sarah Morgensen To: guix-patches@gnu.org Subject: [PATCH core-updates-frozen] gnu: pipewire: Fix build with GCC 10. Date: Sat, 4 Sep 2021 22:43:29 -0700 Message-Id: <34b45d8ddb1f73d27008c7e94eb5bc24b0238b59.1630820433.git.iskarian@mgsn.dev> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev Received-SPF: pass client-ip=94.23.1.103; envelope-from=iskarian@mgsn.dev; helo=out0.migadu.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) * gnu/packages/patches/pipewire-0.2.7-fno-common.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/linux.scm (pipewire)[source]: Use it. --- Builds for me on x86_64, but I didn't test dependents. It's the patch Gentoo used before they dropped 0.2, though, so we should be good. -- Sarah gnu/local.mk | 1 + gnu/packages/linux.scm | 4 +- .../patches/pipewire-0.2.7-fno-common.patch | 51 +++++++++++++++++++ 3 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/pipewire-0.2.7-fno-common.patch diff --git a/gnu/local.mk b/gnu/local.mk index bb22e29caa..23dcdccc6c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1567,6 +1567,7 @@ dist_patch_DATA = \ %D%/packages/patches/pinball-system-ltdl.patch \ %D%/packages/patches/pingus-boost-headers.patch \ %D%/packages/patches/pingus-sdl-libs-config.patch \ + %D%/packages/patches/pipewire-0.2.7-fno-common.patch \ %D%/packages/patches/pixman-CVE-2016-5296.patch \ %D%/packages/patches/pjproject-correct-the-cflags-field.patch \ %D%/packages/patches/pjproject-fix-pkg-config-ldflags.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 63f0e4108c..a8830850d2 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -55,6 +55,7 @@ ;;; Copyright © 2021 Ivan Gankevich ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2021 Guillaume Le Vaillant +;;; Copyright © 2021 Sarah Morgensen ;;; ;;; This file is part of GNU Guix. ;;; @@ -7845,7 +7846,8 @@ types and interfaces and translates so that the X server can use them.") (file-name (git-file-name name version)) (sha256 (base32 - "1q5wrqnhhs6r49p8yvkw1pl0cnsd4rndxy4h5lvdydwgf1civcwc")))) + "1q5wrqnhhs6r49p8yvkw1pl0cnsd4rndxy4h5lvdydwgf1civcwc")) + (patches (search-patches "pipewire-0.2.7-fno-common.patch")))) (build-system meson-build-system) (arguments '(#:configure-flags '("-Dsystemd=false"))) diff --git a/gnu/packages/patches/pipewire-0.2.7-fno-common.patch b/gnu/packages/patches/pipewire-0.2.7-fno-common.patch new file mode 100644 index 0000000000..f7d9b25932 --- /dev/null +++ b/gnu/packages/patches/pipewire-0.2.7-fno-common.patch @@ -0,0 +1,51 @@ +Fixes 'multiple definition errors' when building with GCC 10+ + +From: https://bugs.gentoo.org/710796 +Originally from: https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/a62e41e +and https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/7a976c7 + +--- a/spa/plugins/bluez5/a2dp-codecs.h ++++ b/spa/plugins/bluez5/a2dp-codecs.h +@@ -284,15 +284,15 @@ + } + } + +-const a2dp_sbc_t bluez_a2dp_sbc; ++extern const a2dp_sbc_t bluez_a2dp_sbc; + #if ENABLE_MP3 +-const a2dp_mpeg_t bluez_a2dp_mpeg; ++extern const a2dp_mpeg_t bluez_a2dp_mpeg; + #endif + #if ENABLE_AAC +-const a2dp_aac_t bluez_a2dp_aac; ++extern const a2dp_aac_t bluez_a2dp_aac; + #endif + #if ENABLE_APTX +-const a2dp_aptx_t bluez_a2dp_aptx; ++extern const a2dp_aptx_t bluez_a2dp_aptx; + #endif + + #endif +--- a/spa/plugins/bluez5/bluez5-monitor.c ++++ b/spa/plugins/bluez5/bluez5-monitor.c +@@ -75,7 +75,7 @@ + struct spa_list transport_list; + }; + +-struct spa_handle_factory spa_a2dp_sink_factory; ++extern struct spa_handle_factory spa_a2dp_sink_factory; + + static void fill_item(struct spa_bt_monitor *this, struct spa_bt_transport *transport, + struct spa_pod **result, struct spa_pod_builder *builder) +--- a/spa/plugins/bluez5/meson.build ++++ b/spa/plugins/bluez5/meson.build +@@ -1,7 +1,8 @@ + + bluez5_sources = ['plugin.c', + 'a2dp-sink.c', +- 'bluez5-monitor.c'] ++ 'a2dp-codecs.c', ++ 'bluez5-monitor.c'] + + bluez5lib = shared_library('spa-bluez5', + bluez5_sources, base-commit: 68dd6d809398297dc2ebef522186c9b9f2566739 -- 2.32.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 05 05:15:08 2021 Received: (at 50396-done) by debbugs.gnu.org; 5 Sep 2021 09:15:08 +0000 Received: from localhost ([127.0.0.1]:49198 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mMoF2-0002w2-CQ for submit@debbugs.gnu.org; Sun, 05 Sep 2021 05:15:08 -0400 Received: from mout01.posteo.de ([185.67.36.65]:37913) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mMoF1-0002vL-El for 50396-done@debbugs.gnu.org; Sun, 05 Sep 2021 05:15:07 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id EA4F9240026 for <50396-done@debbugs.gnu.org>; Sun, 5 Sep 2021 11:15:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1630833301; bh=HG1jI9QJJjlU6zfwyonTXCN5ULQynVERRn8AAfpP8FY=; h=From:To:Cc:Subject:Date:From; b=bv6q9iLYS0Fjp1soXVQ8Mu/ktBx70iCi2eYmjrcXuRwB6T0Akv7+Gl7qiKPcaXczk 56/C/nl9b4Nzu6t8J8Kx/rVxN4uo+Vauwb3Tjiv8l1UBKgh8jr8Vl9GL8BrwdgzS3W fjGp/h+PTPAkIcyR4arBGLs6Wz0WZGka7bZ3IgFcxobQac5auAA76jVznaD8bnyFwn E1eQ30zyeB0G/Wn8hQpkJ8gNI++ZBXDvsvgzU73PIrJhpYL/RwPLB1j69aZRbMJyZB f9zRHItyzvJAPSKYtM8qEnFyawdhemTaN23X/bw5wUoPqnOfeyRCLvg/aU3joCbxZV 0wMNck6JSkmSg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4H2Qps2Kk0z6tmG; Sun, 5 Sep 2021 11:15:01 +0200 (CEST) References: <34b45d8ddb1f73d27008c7e94eb5bc24b0238b59.1630820433.git.iskarian@mgsn.dev> From: Guillaume Le Vaillant To: Sarah Morgensen Subject: Re: [bug#50396] [PATCH core-updates-frozen] gnu: pipewire: Fix build with GCC 10. Date: Sun, 05 Sep 2021 09:14:18 +0000 In-reply-to: <34b45d8ddb1f73d27008c7e94eb5bc24b0238b59.1630820433.git.iskarian@mgsn.dev> Message-ID: <87bl572xke.fsf@kitej> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 50396-done Cc: 50396-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-=-= Content-Type: text/plain Patch pushed as 48bd27863ff5d6445dd393294fc6aec1f93a0d6a. Thanks. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIUEAREKAC0WIQTLxZxm7Ce5cXlAaz5r6CCK3yH+PwUCYTSKkQ8cZ2x2QHBvc3Rl by5uZXQACgkQa+ggit8h/j9lCQD9FZXtnZsW5cTuIvBaZff4YOlmapoJsMA3e1Ux M/W+ShoA/0AgXfDr7iNO+NIMkxcnHXVXhaJpaCgZfW3pQyZuXDZD =mPdP -----END PGP SIGNATURE----- --=-=-=-- From unknown Sun Sep 07 16:50:42 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 03 Oct 2021 11:24:10 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator