summaryrefslogtreecommitdiff
path: root/media-video/pipewire
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-07-23 20:53:51 +0100
committerV3n3RiX <venerix@koprulu.sector>2023-07-23 20:53:51 +0100
commit3018b5a4bd4777c51e2793818305d7af2409a7fd (patch)
tree614c2151adcf4d5a47d494f83ec3f57d35f8e0a7 /media-video/pipewire
parent2508f64d6edae6ffd910973df8285893a791b64a (diff)
gentoo auto-resync : 23:07:2023 - 20:53:51
Diffstat (limited to 'media-video/pipewire')
-rw-r--r--media-video/pipewire/Manifest4
-rw-r--r--media-video/pipewire/files/0.3.75/0001-module-rt-error-out-on-load-no-bus.patch83
-rw-r--r--media-video/pipewire/files/0.3.75/0002-thread-loop-only-signal-when-option-set.patch68
-rw-r--r--media-video/pipewire/pipewire-0.3.75-r1.ebuild (renamed from media-video/pipewire/pipewire-0.3.75.ebuild)0
4 files changed, 154 insertions, 1 deletions
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 94999d0cadcd..628a2d35290e 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -3,6 +3,8 @@ AUX 0.3.71/jack-update-bufsize-samplerate.patch 1577 BLAKE2B 1bb11301fa7c04482fc
AUX 0.3.72/001-opus-meson.patch 3622 BLAKE2B 3470eb21de06019dba38747896bcfa0703bc8213658f9e90fc4f4bd687a5a7dcc7c6818c8a4cd14f0ba840981e6e91d88a31def645573b246f9baf02e1d2ca4c SHA512 19d54bbd11bac426882ae69f81d880cc59d950a64fa88914bac00b16d62d29b99e629a92cae2b49b7dfcb5228c088274b6ee30378b8efa8a3f29190d806c377c
AUX 0.3.72/002-context-segfault-no-fallback.patch 991 BLAKE2B 33c3dbac479ba829a9c60161705ee584be1cefb02139d5cd01d56017b982421a2b4607b11bbf9345c13f630f36d9d4eb17a7dbceb31de7787051f1cc2fb08d20 SHA512 ad97cc99faa87842d607ab06cc3308ee2539663270b8901d8bc827e8b85f2b2c1461ef7d070447e824a83680bdeaa632ee05e9f66e263be8c6245fbf8558e55e
AUX 0.3.73/0001-impl-node-remove-node-target-peers.patch 1166 BLAKE2B 06d66961ba1bd186dfbe0a48eba48dd64436c0abab1986e1497e043c9889ee057449712e34575721c31cad9537444aeb23863227d2cc4d2ff3cca53753a8924c SHA512 83c48182de54872067f77b7751fe2affdc460d01983005041157d9a61607e86505c937547d9d9b9c86a30f35a3396a5afaa67d4ed5e88bb5e72a5d8acab6255a
+AUX 0.3.75/0001-module-rt-error-out-on-load-no-bus.patch 2928 BLAKE2B b39ccee82d17428f6a73b5f4b5f365a56e094fee2563cffca85393419e025557824a544c640f93e1656833b1f32acfed729b05595d0aa62c0b30de5043c01fee SHA512 3ffd389f97cc09938d28d0884c4e62dc79a0f9ce7a7103239b159cd70e7fd63b100f0d8f7abf266f09f4d94ff515217dab097d2cbc2517c7bc3739c6fb95b026
+AUX 0.3.75/0002-thread-loop-only-signal-when-option-set.patch 2180 BLAKE2B f4239fd8175dfdbee6b66631fd324f538e755be4c2c617959f5b9449eb06a30839c73a11b9a53dc09cb88c3c24a13038a339cfe86aed50d8510d16b8d663c39b SHA512 8f0b9f35f668cea7545fc255ae93035dee28714d65009a341201c6b2a79633ec59beb4e9d94760d8d4ad01353caff4daf95934e2d80dd909c76596aa8f2ef6ae
AUX 99-pipewire-default-hook.conf 540 BLAKE2B cec76e78db9db290054bf766774c284d7a7a1374c453802eb1bdc19db9289856ec7b8643acbab916a39ca859d543deca111e3b0f110d1904343221c1573ffc17 SHA512 ef891e38c6f40fce2904e240307147a58c48d780e8470dac8e28044cfb86ddeb163885a2362687791779379ad814f58ad5649b75ac4e82931c5bdd3f37a6ed01
AUX gentoo-pipewire-launcher.1 1400 BLAKE2B a469d6eb75e5362d44c2cad66169f89fdb93cdf511e3019f669531812b9fce007032388ef2b3927dce8977ab69bfdb51af357b0648c661c079175d5f62cc2ea9 SHA512 de1b4621b59f6505950324746090de21d5fdaced7cb45cae5b9bd6f312aba031590fd71e1c54ca4b8558649556fbab304c9b88ee1e3831ce29530ddb040d3abe
AUX gentoo-pipewire-launcher.in 1227 BLAKE2B 4316a991978fac653a00d076e9236d0ab6c01a6e4b800c82851e2bd6f9476369605c741aa7ffd47b10853653ef1d4222c449f0b912a0f7694fffd2b1611d7a47 SHA512 edbc03cec765d2307bcf33a14521c6f8beeae52d9fd6a4e181ba66b9f5dd0d64995fdef847453d1a4c682d701814b3afbe70931f55a0e4198fc5c9d87d7a95c5
@@ -22,6 +24,6 @@ EBUILD pipewire-0.3.71-r2.ebuild 17641 BLAKE2B f25bbbac377b63de4b9d73e2431a939a2
EBUILD pipewire-0.3.71-r3.ebuild 17696 BLAKE2B 6123a1a6d7664aaf5c6488b74267c92ba76f9a8cf96375f3f81d00fef0cd5005415bf7a8addb80200fd2ba8138d1c9c06bfc3daea11730a6baa9f6455e20a367 SHA512 1b812f71c1bc78b1364013996c9191429aac8811024bef1b12cbb0a24935f05f5d8177c796a9b83f102f25d22f4520456e03fdeafb2d2cfe74b2ac57752419d8
EBUILD pipewire-0.3.72.ebuild 17805 BLAKE2B 3c49f6649833e1b776ec5021d5e61f3190256047c86d4b60308f7cbea82bebce0155cc5d5a22aa2a08a43c45219a126e905c36a2358feb9883f19cc00dad2a94 SHA512 4cfbff2e244ceb0e580d2f471766030306ddd60a5471be50c14e5de9706cdb537b5d1cdd435d498ee324047ba5d62fae69a0835d5b0f494ec91279fb7e009348
EBUILD pipewire-0.3.74.ebuild 18124 BLAKE2B 9946939a41642cbf3e4e1bb31d756294983197a4d851fd11a57882a710794db2bfccaa8209d8be0e792e9cf6c694d8d4ec5134e4e0355b411efe0d9877b92dd0 SHA512 f2de41fd4264db087902f2d9abb0e9c7869021e3d1eb32e872ff625e7fcc1d64c548954aee29c502c37976159c0f34e56768da9d30fc4bf66b744a062b2ced73
-EBUILD pipewire-0.3.75.ebuild 18124 BLAKE2B 9946939a41642cbf3e4e1bb31d756294983197a4d851fd11a57882a710794db2bfccaa8209d8be0e792e9cf6c694d8d4ec5134e4e0355b411efe0d9877b92dd0 SHA512 f2de41fd4264db087902f2d9abb0e9c7869021e3d1eb32e872ff625e7fcc1d64c548954aee29c502c37976159c0f34e56768da9d30fc4bf66b744a062b2ced73
+EBUILD pipewire-0.3.75-r1.ebuild 18124 BLAKE2B 9946939a41642cbf3e4e1bb31d756294983197a4d851fd11a57882a710794db2bfccaa8209d8be0e792e9cf6c694d8d4ec5134e4e0355b411efe0d9877b92dd0 SHA512 f2de41fd4264db087902f2d9abb0e9c7869021e3d1eb32e872ff625e7fcc1d64c548954aee29c502c37976159c0f34e56768da9d30fc4bf66b744a062b2ced73
EBUILD pipewire-9999.ebuild 18124 BLAKE2B 9946939a41642cbf3e4e1bb31d756294983197a4d851fd11a57882a710794db2bfccaa8209d8be0e792e9cf6c694d8d4ec5134e4e0355b411efe0d9877b92dd0 SHA512 f2de41fd4264db087902f2d9abb0e9c7869021e3d1eb32e872ff625e7fcc1d64c548954aee29c502c37976159c0f34e56768da9d30fc4bf66b744a062b2ced73
MISC metadata.xml 1949 BLAKE2B 8163c9569efec70ed5792f7c82773492da7d888a781b599a48ef851e73c31944a5b437f1a03892300ccd88a386b4f405f847b2708818621b0c2d257940979508 SHA512 3f8037b2f0f06a39186f15bccc1972ec1f65df93ec0484fba2dd186ae529ac63c50047afcf26abbc208e30641181a87e2d98927696c59e624b6465718d083e59
diff --git a/media-video/pipewire/files/0.3.75/0001-module-rt-error-out-on-load-no-bus.patch b/media-video/pipewire/files/0.3.75/0001-module-rt-error-out-on-load-no-bus.patch
new file mode 100644
index 000000000000..8885eb8a564f
--- /dev/null
+++ b/media-video/pipewire/files/0.3.75/0001-module-rt-error-out-on-load-no-bus.patch
@@ -0,0 +1,83 @@
+https://bugs.gentoo.org/910714
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/55812195ce3b77317e7a2dc642b78271f3a45c8e
+
+From 55812195ce3b77317e7a2dc642b78271f3a45c8e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Joan=20Bruguera=20Mic=C3=B3?= <joanbrugueram@gmail.com>
+Date: Sat, 22 Jul 2023 01:20:58 +0000
+Subject: [PATCH] module-rt: error out on load if no bus is available
+
+Since the recent changes to the RT module in Pipewire 0.3.75, some
+applications such as those using OpenAL-Soft crash on startup if
+neither the session nor the system bus is available. For example:
+
+ bwrap --dev-bind / / \
+ --bind /dev/null /run/dbus/system_bus_socket \
+ --bind /dev/null $XDG_RUNTIME_DIR/bus \
+ openal-info
+
+Will result in a crash with the following error message:
+
+ dbus[1626147]: arguments to dbus_message_new_method_call() were
+ incorrect, assertion "path != NULL" failed in file dbus-message.c
+ line 1373.
+ This is normally a bug in some application using the D-Bus library.
+
+The RT module previously failed to load if no bus was available, but
+after the recent changes, the init. logic runs in a thread, and failing
+to obtain the bus no longer causes the module to fail to load.
+
+Then, functions called later such as `pw_rtkit_make_realtime` assume
+the bus is available and try to use it, causing the error above.
+
+Put the logic for obtaining and checking the bus back to `module_init`,
+so the module fails to load again if no bus is available.
+--- a/src/modules/module-rt.c
++++ b/src/modules/module-rt.c
+@@ -923,14 +923,11 @@ static int check_rtkit(struct impl *impl, struct pw_context *context, bool *can_
+ return 0;
+ }
+
+-static int do_rtkit_setup(struct spa_loop *loop, bool async, uint32_t seq,
+- const void *data, size_t size, void *user_data)
++static int rtkit_get_bus(struct impl *impl)
+ {
+- struct impl *impl = user_data;
+ int res;
+- long long retval;
+
+- pw_log_debug("enter rtkit setup");
++ pw_log_debug("enter rtkit get bus");
+
+ /* Checking xdg-desktop-portal. It works fine in all situations. */
+ if (impl->rtportal_enabled)
+@@ -967,6 +964,18 @@ static int do_rtkit_setup(struct spa_loop *loop, bool async, uint32_t seq,
+ return res;
+ }
+ }
++
++ return 0;
++}
++
++static int do_rtkit_setup(struct spa_loop *loop, bool async, uint32_t seq,
++ const void *data, size_t size, void *user_data)
++{
++ struct impl *impl = user_data;
++ long long retval;
++
++ pw_log_debug("enter rtkit setup");
++
+ /* get some properties */
+ if (rtkit_get_int_property(impl, "MaxRealtimePriority", &retval) < 0) {
+ retval = 1;
+@@ -1076,6 +1085,9 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
+ #ifdef HAVE_DBUS
+ impl->use_rtkit = use_rtkit;
+ if (impl->use_rtkit) {
++ if ((res = rtkit_get_bus(impl)) < 0)
++ goto error;
++
+ impl->thread_loop = pw_thread_loop_new("module-rt", NULL);
+ if (impl->thread_loop == NULL) {
+ res = -errno;
+--
+GitLab
diff --git a/media-video/pipewire/files/0.3.75/0002-thread-loop-only-signal-when-option-set.patch b/media-video/pipewire/files/0.3.75/0002-thread-loop-only-signal-when-option-set.patch
new file mode 100644
index 000000000000..670847b2f86a
--- /dev/null
+++ b/media-video/pipewire/files/0.3.75/0002-thread-loop-only-signal-when-option-set.patch
@@ -0,0 +1,68 @@
+https://github.com/mpv-player/mpv/issues/11995
+https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/3374
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/920bb7160e0be0ce5729d9538f6dea966f297603
+
+From 920bb7160e0be0ce5729d9538f6dea966f297603 Mon Sep 17 00:00:00 2001
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Sun, 23 Jul 2023 18:16:00 +0200
+Subject: [PATCH] thread-loop: only signal when option is set
+
+Add a thead-loop.start-signal option that will do a signal before
+entering the thread loop. Doing the signal in all cases can confuse
+apps that don't expect the signal.
+
+Make module-rt use the thread-loop.start-signal.
+
+Fixes #3374
+--- a/src/modules/module-rt.c
++++ b/src/modules/module-rt.c
+@@ -1085,10 +1085,14 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
+ #ifdef HAVE_DBUS
+ impl->use_rtkit = use_rtkit;
+ if (impl->use_rtkit) {
++ struct spa_dict_item items[] = {
++ { "thread-loop.start-signal", "true" }
++ };
+ if ((res = rtkit_get_bus(impl)) < 0)
+ goto error;
+
+- impl->thread_loop = pw_thread_loop_new("module-rt", NULL);
++ impl->thread_loop = pw_thread_loop_new("module-rt",
++ &SPA_DICT_INIT_ARRAY(items));
+ if (impl->thread_loop == NULL) {
+ res = -errno;
+ goto error;
+--- a/src/pipewire/thread-loop.c
++++ b/src/pipewire/thread-loop.c
+@@ -43,6 +43,7 @@ struct pw_thread_loop {
+ int n_waiting_for_accept;
+ unsigned int created:1;
+ unsigned int running:1;
++ unsigned int start_signal:1;
+ };
+ /** \endcond */
+
+@@ -143,6 +144,11 @@ static struct pw_thread_loop *loop_new(struct pw_loop *loop,
+ return NULL;
+
+ pw_log_debug("%p: new name:%s", this, name);
++ if (props != NULL) {
++ const char *str = spa_dict_lookup(props, "thread-loop.start-signal");
++ if (str != NULL)
++ this->start_signal = spa_atob(str);
++ }
+
+ if (loop == NULL) {
+ loop = pw_loop_new(props);
+@@ -282,7 +288,8 @@ static void *do_loop(void *user_data)
+ pw_log_debug("%p: enter thread", this);
+ pw_loop_enter(this->loop);
+
+- pw_thread_loop_signal(this, false);
++ if (this->start_signal)
++ pw_thread_loop_signal(this, false);
+
+ while (this->running) {
+ if ((res = pw_loop_iterate(this->loop, -1)) < 0) {
+--
+GitLab
diff --git a/media-video/pipewire/pipewire-0.3.75.ebuild b/media-video/pipewire/pipewire-0.3.75-r1.ebuild
index dfb5716fd7bf..dfb5716fd7bf 100644
--- a/media-video/pipewire/pipewire-0.3.75.ebuild
+++ b/media-video/pipewire/pipewire-0.3.75-r1.ebuild