git: 7697c377cad9 - main - multimedia/qt6-multimedia: Adapt to local pipewire symbols

From: Jason E. Hale <jhale_at_FreeBSD.org>
Date: Thu, 13 Feb 2025 03:09:49 UTC
The branch main has been updated by jhale:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7697c377cad948a7f9a479c29b426bbd711b851e

commit 7697c377cad948a7f9a479c29b426bbd711b851e
Author:     Denis Shaposhnikov <dsh@bamus.cz>
AuthorDate: 2025-02-10 18:30:38 +0000
Commit:     Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2025-02-13 03:09:02 +0000

    multimedia/qt6-multimedia: Adapt to local pipewire symbols
    
    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
---
 ...dia_pipewire_qpipewire__screencapturehelper.cpp | 19 +++++++++++++++
 ...multimedia_pipewire_qpipewire__symbolloader.cpp | 28 ++++++++++++++++++++++
 2 files changed, 47 insertions(+)

diff --git a/multimedia/qt6-multimedia/files/patch-src_multimedia_pipewire_qpipewire__screencapturehelper.cpp b/multimedia/qt6-multimedia/files/patch-src_multimedia_pipewire_qpipewire__screencapturehelper.cpp
new file mode 100644
index 000000000000..cc8aaec88e6a
--- /dev/null
+++ b/multimedia/qt6-multimedia/files/patch-src_multimedia_pipewire_qpipewire__screencapturehelper.cpp
@@ -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)
diff --git a/multimedia/qt6-multimedia/files/patch-src_multimedia_pipewire_qpipewire__symbolloader.cpp b/multimedia/qt6-multimedia/files/patch-src_multimedia_pipewire_qpipewire__symbolloader.cpp
new file mode 100644
index 000000000000..bbf64560e0a7
--- /dev/null
+++ b/multimedia/qt6-multimedia/files/patch-src_multimedia_pipewire_qpipewire__symbolloader.cpp
@@ -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);