From patchwork Wed Apr 2 07:17:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 41155 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 25BA927BBE9; Wed, 2 Apr 2025 08:19:19 +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.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI, PDS_OTHER_BAD_TLD,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, 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 37CCD27BBE2 for ; Wed, 2 Apr 2025 08:19:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tzsNO-0000wD-Gj; Wed, 02 Apr 2025 03:19:06 -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 1tzsNL-0000uh-47 for guix-patches@gnu.org; Wed, 02 Apr 2025 03:19:03 -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 1tzsNK-00064A-QI for guix-patches@gnu.org; Wed, 02 Apr 2025 03:19:02 -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:References:In-Reply-To:Date:From:To:Subject; bh=0x3UJcF2XjBy1/OwsaNJoi9oYlVE4X5L0GQXoh4YOes=; b=lrI7J2n9bupMsjlR4aUkeYOrmyjGYVC1g3nqwi8CzxsemXdne4K0KLphwC6HR4GvYGxrTLZ3VFw3knE2Mt5ckJxM6ECJcCXakaMugM2CIMFvxib6P+CSkA1z6diuD+GTUoSmyix8NJoMzwIzUTsB2pJoACVwLMgYdNaeW+JuTbCvumd1jfdMW0FPVPecnXlBw/tTy6+sccyS0ktuiQkDqLlz4Pi8AO0n721aJ3NgryrO7UdMDZETyTfBGy4R9/KsNxls4Wkal9qjxP5dRACYOltAyRI8Swxb0C/9r8FFI4VAThdhJCYUikfVSeWvEgvgSt9BWIcv83keyG+bpNbUTQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tzsNK-0003tb-JR; Wed, 02 Apr 2025 03:19:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#76785] [PATCH v2 4/4] gnu: jamesdsp: Fix build. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: gabriel@erlikon.ch, guix-patches@gnu.org Resent-Date: Wed, 02 Apr 2025 07:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76785 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76785@debbugs.gnu.org Cc: Gabriel Wicki X-Debbugs-Original-Xcc: Gabriel Wicki Received: via spool by 76785-submit@debbugs.gnu.org id=B76785.174357828614574 (code B ref 76785); Wed, 02 Apr 2025 07:19:02 +0000 Received: (at 76785) by debbugs.gnu.org; 2 Apr 2025 07:18:06 +0000 Received: from localhost ([127.0.0.1]:54184 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tzsMP-0003mr-Gh for submit@debbugs.gnu.org; Wed, 02 Apr 2025 03:18:06 -0400 Received: from mail.z572.online ([88.99.160.180]:37040) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tzsMG-0003jP-Ks for 76785@debbugs.gnu.org; Wed, 02 Apr 2025 03:17:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=z572.online; s=me; t=1743578650; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0x3UJcF2XjBy1/OwsaNJoi9oYlVE4X5L0GQXoh4YOes=; b=pWDGkEJNgYiTVybZBZ3JO7EfXgAgj4K8t/OxsgLNPkJlHVLwXlmSyEfUYog7qyv9g5D+sU vnInvtuhh8hhJNfS93LT5xuCWO+G/BKPOIbz2vxuF8lAQLmjYMWtz0BUjeJ1WyecIDJW7C DDv5/1qBqYohVw4MtOGqoEEfuAMtXXQ= Received: from m.tailaa68d.ts.net (mail1.85362086.com [107.174.64.25]) by mail.z572.online (OpenSMTPD) with ESMTPSA id 91f7f0c3 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <76785@debbugs.gnu.org>; Wed, 2 Apr 2025 07:24:09 +0000 (UTC) From: Zheng Junjie Date: Wed, 2 Apr 2025 15:17:39 +0800 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/jamesdsp-fix-bulid-on-pipewire-1.4.0.patch: New file. * gnu/packages/audio.scm (jamesdsp): Add it. * gnu/local.mk (dist_patch_DATA): Register it. Change-Id: Ibae4956b3b97f785bb548ccd73d034834c7b573f --- gnu/local.mk | 1 + gnu/packages/audio.scm | 3 +- ...jamesdsp-fix-bulid-on-pipewire-1.4.0.patch | 60 +++++++++++++++++++ 3 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/jamesdsp-fix-bulid-on-pipewire-1.4.0.patch diff --git a/gnu/local.mk b/gnu/local.mk index a96ca42532d..e14ec0d3d6d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1623,6 +1623,7 @@ dist_patch_DATA = \ %D%/packages/patches/irrlicht-link-against-needed-libs.patch \ %D%/packages/patches/isl-0.11.1-aarch64-support.patch \ %D%/packages/patches/itk-snap-alt-glibc-compat.patch \ + %D%/packages/patches/jamesdsp-fix-bulid-on-pipewire-1.4.0.patch\ %D%/packages/patches/jami-enable-testing.patch \ %D%/packages/patches/jami-libjami-headers-search.patch \ %D%/packages/patches/jami-qwindowkit.patch \ diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index da59b03c8b6..61b76859ed4 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -835,7 +835,8 @@ (define-public jamesdsp "#include +Date: Fri, 21 Mar 2025 19:05:01 +0100 +Subject: [PATCH] fix: make compatible with newer versions of pipewire + +--- + src/audio/pipewire/PwPipelineManager.cpp | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/audio/pipewire/PwPipelineManager.cpp b/src/audio/pipewire/PwPipelineManager.cpp +index 81b10e26..c2e2c537 100644 +--- a/src/audio/pipewire/PwPipelineManager.cpp ++++ b/src/audio/pipewire/PwPipelineManager.cpp +@@ -1152,7 +1152,7 @@ void on_registry_global(void* data, + return; + } + +- pw_node_add_listener(proxy, &nd->object_listener, &node_events, nd); ++ pw_proxy_add_object_listener(proxy, &nd->object_listener, &node_events, nd); + pw_proxy_add_listener(proxy, &nd->proxy_listener, &node_proxy_events, nd); + + // sometimes PipeWire destroys the pointer before signal_idle is called, +@@ -1222,7 +1222,7 @@ void on_registry_global(void* data, + pd->id = id; + pd->serial = serial; + +- pw_link_add_listener(proxy, &pd->object_listener, &link_events, pd); ++ pw_proxy_add_object_listener(proxy, &pd->object_listener, &link_events, pd); + pw_proxy_add_listener(proxy, &pd->proxy_listener, &link_proxy_events, pd); + + auto link_info = link_info_from_props(props); +@@ -1297,7 +1297,7 @@ void on_registry_global(void* data, + pd->id = id; + pd->serial = serial; + +- pw_module_add_listener(proxy, &pd->object_listener, &module_events, pd); ++ pw_proxy_add_object_listener(proxy, &pd->object_listener, &module_events, pd); + pw_proxy_add_listener(proxy, &pd->proxy_listener, &module_proxy_events, pd); + + ModuleInfo m_info{.id = id, .serial = serial}; +@@ -1328,7 +1328,7 @@ void on_registry_global(void* data, + pd->id = id; + pd->serial = serial; + +- pw_client_add_listener(proxy, &pd->object_listener, &client_events, pd); ++ pw_proxy_add_object_listener(proxy, &pd->object_listener, &client_events, pd); + pw_proxy_add_listener(proxy, &pd->proxy_listener, &client_proxy_events, pd); + + ClientInfo c_info{.id = id, .serial = serial}; +@@ -1387,7 +1387,7 @@ void on_registry_global(void* data, + pd->id = id; + pd->serial = serial; + +- pw_device_add_listener(proxy, &pd->object_listener, &device_events, pd); ++ pw_proxy_add_object_listener(proxy, &pd->object_listener, &device_events, pd); + pw_proxy_add_listener(proxy, &pd->proxy_listener, &device_proxy_events, pd); + + DeviceInfo d_info{.id = id, .serial = serial, .media_class = media_class};