diff options
Diffstat (limited to 'media-video/pipewire/files/1.0.0')
-rw-r--r-- | media-video/pipewire/files/1.0.0/0001-fix-compile-with-no-examples.patch | 59 | ||||
-rw-r--r-- | media-video/pipewire/files/1.0.0/0002-fix-x11-bell-segfault.patch | 29 |
2 files changed, 0 insertions, 88 deletions
diff --git a/media-video/pipewire/files/1.0.0/0001-fix-compile-with-no-examples.patch b/media-video/pipewire/files/1.0.0/0001-fix-compile-with-no-examples.patch deleted file mode 100644 index fee0ac1bc328..000000000000 --- a/media-video/pipewire/files/1.0.0/0001-fix-compile-with-no-examples.patch +++ /dev/null @@ -1,59 +0,0 @@ -https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/3675 -https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1790 - -From 6b4cdab57a0678e88992fb4e5b216e481b051808 Mon Sep 17 00:00:00 2001 -From: Pauli Virtanen <pav@iki.fi> -Date: Sun, 26 Nov 2023 18:31:43 +0200 -Subject: [PATCH] meson.build: fix compile with -Dexamples=disabled - ---- a/spa/examples/meson.build -+++ b/spa/examples/meson.build -@@ -6,6 +6,10 @@ spa_examples = [ - 'local-v4l2', - ] - -+if not get_option('examples').allowed() -+ subdir_done() -+endif -+ - spa_examples_extra_deps = { - 'local-v4l2': [sdl_dep], - 'local-libcamera': [sdl_dep, libcamera_dep], ---- a/spa/meson.build -+++ b/spa/meson.build -@@ -113,6 +113,4 @@ endif - - subdir('tools') - subdir('tests') --if get_option('examples').allowed() -- subdir('examples') --endif -+subdir('examples') ---- a/src/examples/meson.build -+++ b/src/examples/meson.build -@@ -22,6 +22,10 @@ examples = [ - 'local-v4l2', - ] - -+if not get_option('examples').allowed() -+ subdir_done() -+endif -+ - examples_extra_deps = { - 'video-src-fixate': [drm_dep], - 'video-play': [sdl_dep], ---- a/src/meson.build -+++ b/src/meson.build -@@ -3,9 +3,7 @@ subdir('pipewire') - subdir('daemon') - subdir('tools') - subdir('modules') --if get_option('examples').allowed() -- subdir('examples') --endif -+subdir('examples') - if get_option('tests').allowed() - subdir('tests') - endif --- -GitLab diff --git a/media-video/pipewire/files/1.0.0/0002-fix-x11-bell-segfault.patch b/media-video/pipewire/files/1.0.0/0002-fix-x11-bell-segfault.patch deleted file mode 100644 index ecf7ded220f4..000000000000 --- a/media-video/pipewire/files/1.0.0/0002-fix-x11-bell-segfault.patch +++ /dev/null @@ -1,29 +0,0 @@ -https://bugs.gentoo.org/919133 -https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/3688 -https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/8ecc61e1177c94e78fa171ee359cfbbd239942bc - -From 8ecc61e1177c94e78fa171ee359cfbbd239942bc Mon Sep 17 00:00:00 2001 -From: Wim Taymans <wtaymans@redhat.com> -Date: Tue, 5 Dec 2023 16:18:30 +0100 -Subject: [PATCH] module-x11-bell: force pulse backend - -The libcanberra ALSA backend has some races and causes crashes, we -should try to not use that one. - -Fixes #3688 ---- a/src/modules/module-x11-bell.c -+++ b/src/modules/module-x11-bell.c -@@ -104,6 +104,11 @@ static int play_sample(struct impl *impl) - res = -EIO; - goto exit; - } -+ if ((res = ca_context_set_driver(ca, "pulse")) < 0) { -+ pw_log_error("canberra context set backend error: %s", ca_strerror(res)); -+ res = -EIO; -+ goto exit_destroy; -+ } - if ((res = ca_context_open(ca)) < 0) { - pw_log_error("canberra context open error: %s", ca_strerror(res)); - res = -EIO; --- -GitLab |