mirror/guix
mirror/guix
1
Fork 0
mirror of https://https.git.savannah.gnu.org/git/guix.git/ synced 2025-07-12 18:10:47 +02:00
Code Releases Activity

gnu: jamesdsp: Fix build.

Browse source 
* 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
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
This commit is contained in:
Zheng Junjie 2025-04-02 15:17:39 +08:00 • committed by Maxim Cournoyer
parent c8924384ba
commit 3d33f6ea88
No known key found for this signature in database
GPG key ID: 1260E46482E63562
3 changed files with 63 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -1621,6 +1621,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 \

3
gnu/packages/audio.scm
View file

@ -843,7 +843,8 @@ purposes developed at Queen Mary, University of London.")
"#include <QCodeEditor/QHighlightRule")
(("#include <QLanguage") "#include <QCodeEditor/QLanguage")
(("#include <QCodeEditor\\.hpp")
"#include <QCodeEditor/QCodeEditor.hpp"))))))))
"#include <QCodeEditor/QCodeEditor.hpp"))))))
(patches (search-patches "jamesdsp-fix-bulid-on-pipewire-1.4.0.patch"))))
(build-system qt-build-system)
(arguments
(list #:qtbase qtbase

60
gnu/packages/patches/jamesdsp-fix-bulid-on-pipewire-1.4.0.patch Normal file
View file

@ -0,0 +1,60 @@
from https://github.com/Audio4Linux/JDSP4Linux/commit/b7d06cf197d1c02ff8cbd30cec5494dd20288b5f.patch
From b7d06cf197d1c02ff8cbd30cec5494dd20288b5f Mon Sep 17 00:00:00 2001
From: Toast <39011842+toast003@users.noreply.github.com>
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};