sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-05-06 02:47:37 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

multimedia/qt6-multimedia: Adapt to local pipewire symbols

Browse source 
pw_init and pw_deinit were changed to pipewire_init and pipewire_deinit,
respectively, in mulimedia/pipewire so as not to conflict with symbols
from libutil.

PR:		284719
MFH:		2025Q1
This commit is contained in:
Denis Shaposhnikov 2025-02-10 19:30:38 +01:00 • committed by Jason E. Hale
parent 641b06801d
commit 7697c377ca
2 changed files with 47 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
multimedia/qt6-multimedia/files/patch-src_multimedia_pipewire_qpipewire__screencapturehelper.cpp Normal file
View file

@ -0,0 +1,19 @@
Adapt to local symbols from multimedia/pipewire
PR: 284719
--- src/multimedia/pipewire/qpipewire_screencapturehelper.cpp.orig 2025-01-24 11:58:42 UTC
+++ src/multimedia/pipewire/qpipewire_screencapturehelper.cpp
@@ -54,10 +54,10 @@ class Pipewire (public)
{
public:
Pipewire() {
- pw_init(nullptr, nullptr);
+ pipewire_init(nullptr, nullptr);
};
~Pipewire() {
- pw_deinit();
+ pipewire_deinit();
}
Q_DISABLE_COPY(Pipewire)

28
multimedia/qt6-multimedia/files/patch-src_multimedia_pipewire_qpipewire__symbolloader.cpp Normal file
View file

@ -0,0 +1,28 @@
Adapt to local symbols from multimedia/pipewire
PR: 284719
--- src/multimedia/pipewire/qpipewire_symbolloader.cpp.orig 2025-01-24 11:58:42 UTC
+++ src/multimedia/pipewire/qpipewire_symbolloader.cpp
@@ -8,8 +8,8 @@ BEGIN_INIT_FUNCS("pipewire-" PW_API_VERSION, "0")
//BEGIN_INIT_FUNCS("pipewire-0.3", "0")
BEGIN_INIT_FUNCS("pipewire-" PW_API_VERSION, "0")
-INIT_FUNC(pw_init);
-INIT_FUNC(pw_deinit);
+INIT_FUNC(pipewire_init);
+INIT_FUNC(pipewire_deinit);
INIT_FUNC(pw_thread_loop_new);
INIT_FUNC(pw_thread_loop_get_loop);
INIT_FUNC(pw_context_new);
@@ -37,8 +37,8 @@ END_INIT_FUNCS()
END_INIT_FUNCS()
-DEFINE_FUNC(pw_init, 2);
-DEFINE_FUNC(pw_deinit, 0);
+DEFINE_FUNC(pipewire_init, 2);
+DEFINE_FUNC(pipewire_deinit, 0);
DEFINE_FUNC(pw_thread_loop_new, 2);
DEFINE_FUNC(pw_thread_loop_get_loop, 1);
DEFINE_FUNC(pw_context_new, 3);