gentoo resync : 28.04.2021

5 files changed, 80 insertions, 0 deletions

diff --git a/media-video/pipewire/files/pipewire-0.3.25-enable-failed-mlock-warning.patch b/media-video/pipewire/files/pipewire-0.3.25-enable-failed-mlock-warning.patch
new file mode 100644
index 000000000000..bdb43fe551d2
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.25-enable-failed-mlock-warning.patch
@@ -0,0 +1,12 @@
+diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in
+--- a/src/daemon/pipewire.conf.in
++++ b/src/daemon/pipewire.conf.in
+@@ -6,7 +6,7 @@ context.properties = {
+     #support.dbus                          = true
+     #link.max-buffers                      = 64
+     link.max-buffers                       = 16                       # version < 3 clients can't handle more
+-    #mem.warn-mlock                        = false
++    mem.warn-mlock                         = true                     # Gentoo should have good RLIMITs now
+     #mem.allow-mlock                       = true
+     #mem.mlock-all                         = false
+     #clock.power-of-two-quantum            = true
diff --git a/media-video/pipewire/files/pipewire-0.3.25-fix-docdir-path.patch b/media-video/pipewire/files/pipewire-0.3.25-fix-docdir-path.patch
new file mode 100644
index 000000000000..9c7a55c95e26
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.25-fix-docdir-path.patch
@@ -0,0 +1,32 @@
+diff --git a/doc/meson.build b/doc/meson.build
+index 05c7ed35..ce9b52ea 100644
+--- a/doc/meson.build
++++ b/doc/meson.build
+@@ -24,11 +24,14 @@ doxyfile = configure_file(input: 'Doxyfile.in',
+                           output: 'Doxyfile',
+                           configuration: doxyfile_conf)
+ 
+-docdir = join_paths(pipewire_datadir, 'doc')
++docdir = get_option('docdir')
++if docdir == ''
++  docdir = join_paths(pipewire_datadir, 'doc', meson.project_name())
++endif
+ 
+ html_target = custom_target('pipewire-docs',
+                             input: [ doxyfile ],
+                             output: [ 'html' ],
+                             command: [ doxygen, doxyfile ],
+                             install: true,
+-                            install_dir: join_paths(docdir, 'pipewire'))
++                            install_dir: docdir)
+diff --git a/meson_options.txt b/meson_options.txt
+index 858283f2..d51e693f 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,3 +1,6 @@
++option('docdir',
++	type : 'string',
++	description : 'Directory for installing documentation to (defaults to pipewire_datadir/doc/meson.project_name() )')
+ option('docs',
+        description: 'Build documentation',
+        type: 'feature',
diff --git a/media-video/pipewire/files/pipewire-0.3.25-non-systemd-integration.patch b/media-video/pipewire/files/pipewire-0.3.25-non-systemd-integration.patch
new file mode 100644
index 000000000000..51455a3b84b8
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.25-non-systemd-integration.patch
@@ -0,0 +1,18 @@
+diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in
+--- a/src/daemon/pipewire.conf.in
++++ b/src/daemon/pipewire.conf.in
+@@ -204,12 +204,12 @@ context.exec = [
+     # but it is better to start it as a systemd service.
+     # Run the session manager with -h for options.
+     #
+-    @comment@{ path = "@media_session_path@"  args = "" }
++    { path = "@media_session_path@"  args = "" }
+     #
+     # You can optionally start the pulseaudio-server here as well
+     # but it is better to start it as a systemd service.
+     # It can be interesting to start another daemon here that listens
+     # on another address with the -a option (eg. -a tcp:4713).
+     #
+-    @comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" }
++    { path = "@pipewire_path@" args = "-c pipewire-pulse.conf" }
+ ]
diff --git a/media-video/pipewire/files/pipewire-launcher.sh b/media-video/pipewire/files/pipewire-launcher.sh
new file mode 100644
index 000000000000..ecff3e7e7082
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-launcher.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# We need to kill any existing pipewire instance to restore sound
+pkill -u "${USER}" -x pipewire 1>/dev/null 2>&1
+
+exec /usr/bin/pipewire
diff --git a/media-video/pipewire/files/pipewire.desktop b/media-video/pipewire/files/pipewire.desktop
new file mode 100644
index 000000000000..d3786e74f82b
--- /dev/null
+++ b/media-video/pipewire/files/pipewire.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Name[de]=PipeWire Mediensystem
+Name=PipeWire Media System
+Comment[de]=Das PipeWire Mediensystem starten
+Comment=Start the PipeWire Media System
+Exec=/usr/libexec/pipewire-launcher
+Terminal=false
+Type=Application
+X-GNOME-HiddenUnderSystemd=true
+X-KDE-HiddenUnderSystemd=true
+X-systemd-skip=true