From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 6BLuDDlZNGGWVgAAgWs5BA (envelope-from ) for ; Sun, 05 Sep 2021 07:44:25 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id aCykCDlZNGFwQAAA1q6Kng (envelope-from ) for ; Sun, 05 Sep 2021 05:44:25 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 1FA0C17BE1 for ; Sun, 5 Sep 2021 07:44:24 +0200 (CEST) Received: from localhost ([::1]:59520 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mMkx5-0005VT-3i for larch@yhetil.org; Sun, 05 Sep 2021 01:44:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47414) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mMkwk-0005VH-Tg for guix-patches@gnu.org; Sun, 05 Sep 2021 01:44:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37433) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mMkwk-0005b4-I9 for guix-patches@gnu.org; Sun, 05 Sep 2021 01:44:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mMkwk-0007jq-8A for guix-patches@gnu.org; Sun, 05 Sep 2021 01:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50396] [PATCH core-updates-frozen] gnu: pipewire: Fix build with GCC 10. Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 05 Sep 2021 05:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 50396 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50396@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163082062729715 (code B ref -1); Sun, 05 Sep 2021 05:44:02 +0000 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 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-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-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: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1630820665; h=from:from:sender:sender: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:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=V6bK89F6uJ5M7l+//AwZ/T97UYOWz1tR5lggbpwIADI=; b=nDZ2qwkhsJubEtkrnjl5NhiKt5KFUB1XW4tpYj0kY/ODoVUqZDX//hY8AE1Dh6bGlPAiZ4 pnxeD0xInv9RnP830+ekn5TcrX0F2E7JhLAcH3hgmJev4qBz7cdN9zuS6jLyOoj+Pkx/0w LijFMxx/UF4DVE72EjKWti4HAJwQTKLb/k2ZlOwASEIr6BYia+VZc3zk/RKn7UFX22SZ2N h/dIHRRIs2giZLxhshvC2FBa2r23ioh2HMm8kqaPtEIsGT1zVHxvuZ+Zq1Wyl6Y02ryufG PqNyZAbRVbBM4D//lHcotYwQPOBqKyYJH7c2/ny/r79f3vfyVEKum068FUgcng== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1630820665; a=rsa-sha256; cv=none; b=fvnzrrAomJlGduHzJ7wxAzBNHxvftAB5P2yK0bGESOXytFNCOdJ33eicqSaivyywIheT6u sSKDnIe4SIEy2MfI5WqLXvfkDstmdTC6hDcq3mJA6y+Dq6PCIqDGNY95XlOV6XaNG2Qn7p q0CQbxEi9QJmPUBOTKIBednzWkTuQ7yCFK9+kfVmmD4r+aAfKfrDH79bubn760+r+M6ZzR 9I0sMQEsHv8Z0gLlRSvv/WLNUOWxfzj9meAsMqvUJiFcdXwVJYLb3kRposTf+dC3VCStGb q9SnB6hFl7orGAWHQtHPuyHF7l0Tf5Ytw2ePmqWKwrP3mPLhEa/YylGX0b8hWw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mgsn.dev header.s=key1 header.b=PDCGirLz; dmarc=fail reason="SPF not aligned (relaxed)" header.from=mgsn.dev (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 1.19 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mgsn.dev header.s=key1 header.b=PDCGirLz; dmarc=fail reason="SPF not aligned (relaxed)" header.from=mgsn.dev (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 1FA0C17BE1 X-Spam-Score: 1.19 X-Migadu-Scanner: scn0.migadu.com X-TUID: eNUpqTc/p8Ja * 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