[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/1.0.0/, media-video/pipewire/

2024-05-08 Thread Sam James 
commit: cb79a335075316bce5e7a8646fd8ae866392af2c
Author: Sam James  gentoo  org>
AuthorDate: Wed May  8 22:17:22 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May  8 22:17:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb79a335

media-video/pipewire: drop 1.0.0-r1, 1.0.3

Signed-off-by: Sam James  gentoo.org>

 media-video/pipewire/Manifest  |   2 -
 .../1.0.0/0001-fix-compile-with-no-examples.patch  |  59 ---
 .../files/1.0.0/0002-fix-x11-bell-segfault.patch   |  29 --
 media-video/pipewire/pipewire-1.0.0-r1.ebuild  | 509 -
 media-video/pipewire/pipewire-1.0.3.ebuild | 506 
 5 files changed, 1105 deletions(-)

diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 575861ba7b97..2d23ecda5dcc 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,5 +1,3 @@
 DIST pipewire-1.0.0-docs.tar.xz 33632 BLAKE2B 
be06aa7242f7d2f8627b3bf2a2ae491dbda456a24811a767218eb89b1fd5961a461697e5d8ae2782323fdb927985fa4fd5dd40c21268b1c7939f4cd3c9e1a9ab
 SHA512 
14f794c4152d7d9a4a7d9d4d5c2ff381c2a8262deaff034f993c4d28629fca8cc3d71d3a7c02982703e449fae5f58257fea0c20db02bf95b5aed88a4d99d2c58
-DIST pipewire-1.0.0.tar.bz2 1682155 BLAKE2B 
de48de0f486a530ee060acdc6d35e27bf298e195e2c3d21a9444da7459ef02b44d97147b3bd3a820bdf28ebffbee910f77306a28ffb1b12eeaf8ce37f8d97a6f
 SHA512 
8955bd16ba8508d5838e960ae8c089efaeb9dab0c08719baea8f8f8047cd53b84a46b2459ecd7f000f21b0025a52e93f052025e71c07dc4a2aef89237c5c87f1
-DIST pipewire-1.0.3.tar.bz2 1682330 BLAKE2B 
cf7f69ee8db703b3e441b6ca34aec4e41cc9cd5c0a21344adee2adcbf5b1b9d5fc3913dece88946e34cf7081402d21ea617cfcd0d09bc2780394bc20a5149296
 SHA512 
e568b9eb328d701c06a93c4f1556bf8db6e972877a7f2a5776fe77a20130a63972b3f78d52da66ccb1b2ee9df5451a403ab83aef5662dc5d93a6dfbedb23f66a
 DIST pipewire-1.0.4.tar.bz2 1698660 BLAKE2B 
0842a5fca65c8a91eadd9f0594864ae0f0d428b3c03d2c5fecc3b7f62ff6f5d24fc1190eb351279c002e26596148b23b4b576551502be21beb2eeaa0d2ad4dac
 SHA512 
42e8e28b1fd497f5329b5966abd5cfb7d7976fb0ca9f8f39bccf44195dd11f227cdec2448ba7db4559e866ea2dccf64b8172a2ae069c5204cd8f66c0f8a9e2d9
 DIST pipewire-1.0.5.tar.bz2 1698291 BLAKE2B 
0f919a01b5f84060fb2ce560a7790a0d59374671f52a941492930fe21ac39178688f27f00cad649d239901f88b392e16895648efae2ec2785c394c1f6d186ddf
 SHA512 
18fbbe36c8752eb0f1df5ee3f3fffee279addcec9825281bd165ad8316f17af7e91bb5759f63c16139c074b03e5a77ef9d596a87f584d1580bbb754101b70a0f

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..
--- 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 
-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..
--- 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 
-Date: Tue, 5 Dec 2023 16:18:30 +0100
-Subject: [PATCH] module-x11-bell: force pulse backend
-
-The libcanberra

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/1.0.2/, media-video/pipewire/

2024-02-24 Thread Sam James 
commit: 3b032870cde585a2ac7314eb902f916810948852
Author: Sam James  gentoo  org>
AuthorDate: Sat Feb 24 10:17:10 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Feb 24 10:17:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b032870

media-video/pipewire: drop 1.0.1, 1.0.2-r1

Signed-off-by: Sam James  gentoo.org>

 media-video/pipewire/Manifest  |   2 -
 .../files/1.0.2/0001-alsa-version-check.patch  |  23 -
 media-video/pipewire/pipewire-1.0.1.ebuild | 506 -
 media-video/pipewire/pipewire-1.0.2-r1.ebuild  | 506 -
 4 files changed, 1037 deletions(-)

diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index f073f1139d83..f768628cc15b 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,5 +1,3 @@
 DIST pipewire-1.0.0-docs.tar.xz 33632 BLAKE2B 
be06aa7242f7d2f8627b3bf2a2ae491dbda456a24811a767218eb89b1fd5961a461697e5d8ae2782323fdb927985fa4fd5dd40c21268b1c7939f4cd3c9e1a9ab
 SHA512 
14f794c4152d7d9a4a7d9d4d5c2ff381c2a8262deaff034f993c4d28629fca8cc3d71d3a7c02982703e449fae5f58257fea0c20db02bf95b5aed88a4d99d2c58
 DIST pipewire-1.0.0.tar.bz2 1682155 BLAKE2B 
de48de0f486a530ee060acdc6d35e27bf298e195e2c3d21a9444da7459ef02b44d97147b3bd3a820bdf28ebffbee910f77306a28ffb1b12eeaf8ce37f8d97a6f
 SHA512 
8955bd16ba8508d5838e960ae8c089efaeb9dab0c08719baea8f8f8047cd53b84a46b2459ecd7f000f21b0025a52e93f052025e71c07dc4a2aef89237c5c87f1
-DIST pipewire-1.0.1.tar.bz2 1681917 BLAKE2B 
8d0aacf55e6adf9aee4e5fcb5995939db3f901bfe2b9c43d5690df58a2186c4790b89e53c358a532a95627022ef5ff9b4b97a99acea562d3ceda68ee88dd8bb7
 SHA512 
434ff80ca99aa68553b6b404cb756c3bf11231654f9dde0d4a971dd0876489468df45be9275794746682c73bb03c51e1112e6d9b8aafe12468a4c5b0be16ac4d
-DIST pipewire-1.0.2.tar.bz2 1682351 BLAKE2B 
eebc3fddc47b8fbc89a27f8f55d030faa12fa854851fbf42543067c7d0cc04b45742c378f79a77e69498b2c37cae651dca38aca7ac93ee50440568e4985b7996
 SHA512 
c245cbd7c887ef5cb63ef4d95a80e6e2eeb23dc8c662be105217ad7185a5310aad4d252bae3443f4f15a5f0e22e23e16870f0366bf0cc165758eedf83e13adac
 DIST pipewire-1.0.3.tar.bz2 1682330 BLAKE2B 
cf7f69ee8db703b3e441b6ca34aec4e41cc9cd5c0a21344adee2adcbf5b1b9d5fc3913dece88946e34cf7081402d21ea617cfcd0d09bc2780394bc20a5149296
 SHA512 
e568b9eb328d701c06a93c4f1556bf8db6e972877a7f2a5776fe77a20130a63972b3f78d52da66ccb1b2ee9df5451a403ab83aef5662dc5d93a6dfbedb23f66a

diff --git a/media-video/pipewire/files/1.0.2/0001-alsa-version-check.patch 
b/media-video/pipewire/files/1.0.2/0001-alsa-version-check.patch
deleted file mode 100644
index 563ee9711bfe..
--- a/media-video/pipewire/files/1.0.2/0001-alsa-version-check.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/3830
-https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/3711
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/1e763b928f3cbf1a479974b6833706cc7b2e66d4
-
-From 1e763b928f3cbf1a479974b6833706cc7b2e66d4 Mon Sep 17 00:00:00 2001
-From: Wim Taymans 
-Date: Thu, 1 Feb 2024 21:42:07 +0100
-Subject: [PATCH] alsa: fix version check
-
-See #3711
 a/pipewire-alsa/alsa-plugins/pcm_pipewire.c
-+++ b/pipewire-alsa/alsa-plugins/pcm_pipewire.c
-@@ -1298,7 +1298,7 @@ SND_PCM_PLUGIN_DEFINE_FUNC(pipewire)
-   int err;
- 
-   pw_init(NULL, NULL);
--  if (strstr(pw_get_library_version(), "0.2") != NULL)
-+  if (spa_strstartswith(pw_get_library_version(), "0.2"))
-   return -ENOTSUP;
- 
-   props = pw_properties_new(NULL, NULL);
--- 
-GitLab

diff --git a/media-video/pipewire/pipewire-1.0.1.ebuild 
b/media-video/pipewire/pipewire-1.0.1.ebuild
deleted file mode 100644
index 1bdcaea902f0..
--- a/media-video/pipewire/pipewire-1.0.1.ebuild
+++ /dev/null
@@ -1,506 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# 1. Please regularly check (even at the point of bumping) Fedora's packaging
-# for needed backports at 
https://src.fedoraproject.org/rpms/pipewire/tree/rawhide.
-#
-# 2. Upstream also sometimes amend release notes for the previous release to 
mention
-# needed patches, e.g. 
https://gitlab.freedesktop.org/pipewire/pipewire/-/tags/0.3.55#distros
-#
-# 3. Keep an eye on git master (for both PipeWire and WirePlumber) as things
-# continue to move quickly. It's not uncommon for fixes to be made shortly
-# after releases.
-
-# TODO: Maybe get upstream to produce `meson dist` tarballs:
-# - https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/3663
-# - https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1788
-#
-# Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-pipewire-docs
-# Set to 1 if prebuilt, 0 if not
-# (the construct below is to allow overriding from env for script)
-: ${PIPEWIRE_DOCS_PREBUILT:=1}
-
-PIPEWIRE_DOCS_PREBUILT_DEV=sam

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/1.0.2/, media-video/pipewire/

2024-02-01 Thread Sam James 
commit: 4966263156f2f8ec013eb3be118aa59b05a4dedf
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb  2 03:24:36 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb  2 03:25:01 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49662631

media-video/pipewire: fix alsa version check for 1.0.2

See https://forums.gentoo.org/viewtopic-t-1167195.html.

Bug: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/3711 (see 
comment)
Bug: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/3830
Signed-off-by: Sam James  gentoo.org>

 .../files/1.0.2/0001-alsa-version-check.patch  | 23 ++
 ...ewire-1.0.2.ebuild => pipewire-1.0.2-r1.ebuild} |  0
 2 files changed, 23 insertions(+)

diff --git a/media-video/pipewire/files/1.0.2/0001-alsa-version-check.patch 
b/media-video/pipewire/files/1.0.2/0001-alsa-version-check.patch
new file mode 100644
index ..563ee9711bfe
--- /dev/null
+++ b/media-video/pipewire/files/1.0.2/0001-alsa-version-check.patch
@@ -0,0 +1,23 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/3830
+https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/3711
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/1e763b928f3cbf1a479974b6833706cc7b2e66d4
+
+From 1e763b928f3cbf1a479974b6833706cc7b2e66d4 Mon Sep 17 00:00:00 2001
+From: Wim Taymans 
+Date: Thu, 1 Feb 2024 21:42:07 +0100
+Subject: [PATCH] alsa: fix version check
+
+See #3711
+--- a/pipewire-alsa/alsa-plugins/pcm_pipewire.c
 b/pipewire-alsa/alsa-plugins/pcm_pipewire.c
+@@ -1298,7 +1298,7 @@ SND_PCM_PLUGIN_DEFINE_FUNC(pipewire)
+   int err;
+ 
+   pw_init(NULL, NULL);
+-  if (strstr(pw_get_library_version(), "0.2") != NULL)
++  if (spa_strstartswith(pw_get_library_version(), "0.2"))
+   return -ENOTSUP;
+ 
+   props = pw_properties_new(NULL, NULL);
+-- 
+GitLab

diff --git a/media-video/pipewire/pipewire-1.0.2.ebuild 
b/media-video/pipewire/pipewire-1.0.2-r1.ebuild
similarity index 100%
rename from media-video/pipewire/pipewire-1.0.2.ebuild
rename to media-video/pipewire/pipewire-1.0.2-r1.ebuild

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/

2023-12-30 Thread Conrad Kostecki 
commit: d2e9319faebd8b2fda63cb4edc12b0d63be510f0
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Fri Dec 29 14:08:27 2023 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Dec 31 02:37:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2e9319f

media-video/pipewire: remove unused file

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/34533
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../pipewire/files/gentoo-pipewire-launcher.in-r2  | 77 --
 1 file changed, 77 deletions(-)

diff --git a/media-video/pipewire/files/gentoo-pipewire-launcher.in-r2 
b/media-video/pipewire/files/gentoo-pipewire-launcher.in-r2
deleted file mode 100644
index a149b0d326c3..
--- a/media-video/pipewire/files/gentoo-pipewire-launcher.in-r2
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/sh
-
-# PipeWire launcher script for XDG compliant desktops on OpenRC.
-#
-# systemd users are very _STRONGLY_ advised to use the much
-# more reliable and predictable user units instead.
-
-# WARNING: This script assumes being run inside XDG compliant session,
-# which means D-Bus session instance is expected to be correctly set up
-# prior to this script starting. If that is not true, things may break!
-
-DATE_FORMAT='+%Y-%m-%dT%H:%M:%S%Z'
-
-CONF="${XDG_CONFIG_HOME:-${HOME}/.config}/gentoo-pipewire-launcher.conf"
-if [ -f "${CONF}" ]
-then
-. "${CONF}"
-else
-GENTOO_PIPEWIRE_LOG='/dev/null'
-GENTOO_PIPEWIRE_PULSE_LOG='/dev/null'
-GENTOO_WIREPLUMBER_LOG='/dev/null'
-fi
-for L in \
-"${GENTOO_PIPEWIRE_LOG}" \
-"${GENTOO_PIPEWIRE_PULSE_LOG}" \
-"${GENTOO_WIREPLUMBER_LOG}"
-do
-   if [ ! -e "${L}" ]
-   then
-   touch "${L}"
-   fi
-done
-
-restart () {
-echo "Terminating PipeWire processes ..."
-pkill -u "${USER}" -x pipewire\|wireplumber 1>/dev/null 2>&1
-pwait -u "${USER}" -x pipewire\|wireplumber
-echo "PipeWire terminated."
-}
-
-if [ "${#}" -gt 0 ]
-then
-if [ "${1}" = 'restart' ]
-then
-   restart
-else
-echo "Unrecognised argument." >&2
-echo "Usage: gentoo-pipewire-launcher [restart]" >&2
-   exit 1
-fi
-fi
-
-if pgrep -u "${USER}" -x pipewire\|wireplumber 1>/dev/null 2>&1
-then
-echo "PipeWire already running, exiting." >&2
-echo "(Use 'gentoo-pipewire-launcher restart' to restart PipeWire and 
WirePlumber.)" >&2
-exit 1
-fi
-
-# The core daemon which by itself does probably nothing.
-echo "[$(@GENTOO_PORTAGE_EPREFIX@/bin/date ${DATE_FORMAT})] Starting 
PipeWire." 1>>"${GENTOO_PIPEWIRE_LOG}"
-@GENTOO_PORTAGE_EPREFIX@/usr/bin/pipewire 1>>"${GENTOO_PIPEWIRE_LOG}" 2>&1 &
-
-# The so called pipewire-pulse daemon used for PulseAudio compatibility.
-# Commenting this out will stop the PA proxying daemon from starting,
-# however ALSA (with pipewire-alsa), JACK (with jack-sdk) and PW API using
-# clients will still have access to audio and may end up clashing with
-# non-PW apps over HW control (most notably, /usr/bin/pulseaudio daemon).
-echo "[$(@GENTOO_PORTAGE_EPREFIX@/bin/date ${DATE_FORMAT})] Starting 
PipeWire-Pulse." 1>>"${GENTOO_PIPEWIRE_PULSE_LOG}"
-@GENTOO_PORTAGE_EPREFIX@/usr/bin/pipewire -c pipewire-pulse.conf 
1>>"${GENTOO_PIPEWIRE_PULSE_LOG}" 2>&1 &
-
-# Hack for bug #822498
-sleep 1
-
-# Finally a session manager is required for PipeWire to do anything.
-echo "[$(@GENTOO_PORTAGE_EPREFIX@/bin/date ${DATE_FORMAT})] Starting 
WirePlumber." 1>>"${GENTOO_WIREPLUMBER_LOG}"
-exec @GENTOO_PORTAGE_EPREFIX@/usr/bin/wireplumber 
1>>"${GENTOO_WIREPLUMBER_LOG}" 2>&1

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/0.3.77/, media-video/pipewire/

2023-12-27 Thread Sam James 
commit: f2060f5f7834e6a29e6fce4e7ae6b6aa4c9e9521
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 28 03:32:48 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 28 03:32:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2060f5f

media-video/pipewire: drop 0.3.77-r2, 0.3.85

Signed-off-by: Sam James  gentoo.org>

 media-video/pipewire/Manifest  |   2 -
 ...st-prevent-crash-stopping-device-provider.patch |  34 --
 .../0.3.77/0002-pulse-prevent-duplicates.patch |  28 --
 media-video/pipewire/pipewire-0.3.77-r2.ebuild | 473 
 media-video/pipewire/pipewire-0.3.85.ebuild| 480 -
 5 files changed, 1017 deletions(-)

diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index e51ed91f9c38..962eb5372c13 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,5 +1,3 @@
-DIST pipewire-0.3.77.tar.bz2 1643767 BLAKE2B 
3a2df9cdedf77d5b4927e115ddd7da0d1eecc85322ce7995a49945d41cc83b9a543c1382ad304bdb549f67ac444f7bca6871248654fb4d2e21b25eb55411940c
 SHA512 
422c8504f608d6845b94351a336ab528f51195551418d0d245064972ed784817cacafc6afaad74eb0e0ea80474a9da33ef6917c1f60d3f8f45d70c54971f0760
 DIST pipewire-0.3.80.tar.bz2 1655137 BLAKE2B 
cf55e01b6fff29e7ef1f40e9a8f28788b9f538380232821b334359844b33b12b913375ae14e4589d7ae9cd26d22bc841d8103d41c7eb3ea1a9f0c1db1abc6507
 SHA512 
77e26b6cbefc091ea703b53d147accbd9495f97ba57618a21366b0747074de3ed1060c03e91362f5cf9dc5c256da6d541eccaff8de306b369730400c7b7f46b2
-DIST pipewire-0.3.85.tar.bz2 1675916 BLAKE2B 
a245ebeebdb283ce920d85a2d877ce27756a5fd5505ca6f4d5df1b83120272dfb1be36233a3b2a2cbe96dcc9fc06fae42198108c4e0dbe866836449b422e320c
 SHA512 
5613b41a98db45305aad8f9a84ef0a11b858815f45c6242bb648630e41a3ae5805bb605a543585b46e60d472086919d64e7d8c396ab6cc126d9889f92320f375
 DIST pipewire-1.0.0-docs.tar.xz 33632 BLAKE2B 
be06aa7242f7d2f8627b3bf2a2ae491dbda456a24811a767218eb89b1fd5961a461697e5d8ae2782323fdb927985fa4fd5dd40c21268b1c7939f4cd3c9e1a9ab
 SHA512 
14f794c4152d7d9a4a7d9d4d5c2ff381c2a8262deaff034f993c4d28629fca8cc3d71d3a7c02982703e449fae5f58257fea0c20db02bf95b5aed88a4d99d2c58
 DIST pipewire-1.0.0.tar.bz2 1682155 BLAKE2B 
de48de0f486a530ee060acdc6d35e27bf298e195e2c3d21a9444da7459ef02b44d97147b3bd3a820bdf28ebffbee910f77306a28ffb1b12eeaf8ce37f8d97a6f
 SHA512 
8955bd16ba8508d5838e960ae8c089efaeb9dab0c08719baea8f8f8047cd53b84a46b2459ecd7f000f21b0025a52e93f052025e71c07dc4a2aef89237c5c87f1

diff --git 
a/media-video/pipewire/files/0.3.77/0001-gst-prevent-crash-stopping-device-provider.patch
 
b/media-video/pipewire/files/0.3.77/0001-gst-prevent-crash-stopping-device-provider.patch
deleted file mode 100644
index 9b6373da1390..
--- 
a/media-video/pipewire/files/0.3.77/0001-gst-prevent-crash-stopping-device-provider.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/140374d2071e6204fded4ca65645d4e9a3dd053e
-https://bugs.webkit.org/show_bug.cgi?id=259735
-
-From 140374d2071e6204fded4ca65645d4e9a3dd053e Mon Sep 17 00:00:00 2001
-From: Philippe Normand 
-Date: Fri, 4 Aug 2023 10:01:07 +0100
-Subject: [PATCH] gst: Prevent a crash when stopping device provider
-
-The provider might fail to connect to the PipeWire core when starting up, so
-when stopping we need to check the core is valid before attempting to acquire a
-mutex on its loop.
 a/src/gst/gstpipewiredeviceprovider.c
-+++ b/src/gst/gstpipewiredeviceprovider.c
-@@ -665,11 +665,16 @@ gst_pipewire_device_provider_stop (GstDeviceProvider * 
provider)
- {
-   GstPipeWireDeviceProvider *self = GST_PIPEWIRE_DEVICE_PROVIDER (provider);
- 
--  pw_thread_loop_lock (self->core->loop);
-+  /* core might be NULL if we failed to connect in _start. */
-+  if (self->core != NULL) {
-+pw_thread_loop_lock (self->core->loop);
-+  }
-   GST_DEBUG_OBJECT (self, "stopping provider");
- 
-   g_clear_pointer ((struct pw_proxy**)>registry, pw_proxy_destroy);
--  pw_thread_loop_unlock (self->core->loop);
-+  if (self->core != NULL) {
-+pw_thread_loop_unlock (self->core->loop);
-+  }
-   g_clear_pointer (>core, gst_pipewire_core_release);
- }
- 
--- 
-GitLab

diff --git 
a/media-video/pipewire/files/0.3.77/0002-pulse-prevent-duplicates.patch 
b/media-video/pipewire/files/0.3.77/0002-pulse-prevent-duplicates.patch
deleted file mode 100644
index 5a0fcde67fed..
--- a/media-video/pipewire/files/0.3.77/0002-pulse-prevent-duplicates.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/820ca90705ae78124958f1b96de3bdc7889c2d1e
-https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/3414
-
-From 820ca90705ae78124958f1b96de3bdc7889c2d1e Mon Sep 17 00:00:00 2001
-From: Wim Taymans 
-Date: Tue, 8 Aug 2023 13:01:30 +0200
-Subject: [PATCH] pulse-server: set all change_mask flags when removing
-
-So that the logic to emit events will select sink and source objects.
-
-Fixes #3414

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/1.0.0/, media-video/pipewire/

2023-12-09 Thread Sam James 
commit: b46eb64181a50d28f6857949209ab7b12ccf77d8
Author: Sam James  gentoo  org>
AuthorDate: Sat Dec  9 18:30:44 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Dec  9 18:41:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b46eb641

media-video/pipewire: backport bell segfault fix

Closes: https://bugs.gentoo.org/919133
Signed-off-by: Sam James  gentoo.org>

 .../files/1.0.0/0002-fix-x11-bell-segfault.patch   | 29 ++
 ...ewire-1.0.0.ebuild => pipewire-1.0.0-r1.ebuild} |  0
 2 files changed, 29 insertions(+)

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
new file mode 100644
index ..ecf7ded220f4
--- /dev/null
+++ b/media-video/pipewire/files/1.0.0/0002-fix-x11-bell-segfault.patch
@@ -0,0 +1,29 @@
+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 
+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

diff --git a/media-video/pipewire/pipewire-1.0.0.ebuild 
b/media-video/pipewire/pipewire-1.0.0-r1.ebuild
similarity index 100%
rename from media-video/pipewire/pipewire-1.0.0.ebuild
rename to media-video/pipewire/pipewire-1.0.0-r1.ebuild

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/1.0.0/

2023-11-26 Thread Sam James 
commit: 740f2103f4637da2421ff3a5bafe0c5085a36678
Author: Sam James  gentoo  org>
AuthorDate: Sun Nov 26 23:33:31 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Nov 26 23:33:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=740f2103

media-video/pipewire: fix build w/ USE=-examples

Signed-off-by: Sam James  gentoo.org>

 .../1.0.0/0001-fix-compile-with-no-examples.patch  | 59 ++
 1 file changed, 59 insertions(+)

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
new file mode 100644
index ..fee0ac1bc328
--- /dev/null
+++ b/media-video/pipewire/files/1.0.0/0001-fix-compile-with-no-examples.patch
@@ -0,0 +1,59 @@
+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 
+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

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/0.3.83/, media-video/pipewire/, ...

2023-11-24 Thread Sam James 
commit: 6b3417d6ed256b2b31b28b157c14f6296c96c841
Author: Sam James  gentoo  org>
AuthorDate: Sat Nov 25 05:33:07 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Nov 25 05:33:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b3417d6

media-video/pipewire: drop 0.3.81, 0.3.82-r1, 0.3.83-r1, 0.3.84

Signed-off-by: Sam James  gentoo.org>

 media-video/pipewire/Manifest  |   4 -
 ...nore-PCM-devices-with-udev-env-ACP_IGNORE.patch |  69 ---
 ...alsa-don-t-try-to-link-when-prepare-fails.patch |  27 --
 ...3-context-relax-quantum-change-conditions.patch |  37 --
 ...1-stream-improve-queued_buffers-reporting.patch |  53 ---
 ...-module-echo-cancel-playback-source-async.patch |  36 --
 .../0003-alsa-guard-against-null-areas.patch   |  52 ---
 media-video/pipewire/pipewire-0.3.81.ebuild| 475 
 media-video/pipewire/pipewire-0.3.82-r1.ebuild | 477 
 media-video/pipewire/pipewire-0.3.83-r1.ebuild | 477 
 media-video/pipewire/pipewire-0.3.84.ebuild| 480 -
 11 files changed, 2187 deletions(-)

diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 104cc9709dc7..26a2e1b43cfc 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,8 +1,4 @@
 DIST pipewire-0.3.75.tar.bz2 1629466 BLAKE2B 
e69dbb93ebe50f037bc602aa86733c8ba9ccbe57db520cd34ea025c9bf153dbd848882dbb4c2a4e830785a302a7cb7d4b7c1856c9a4be6f1c5ada92f70d1729b
 SHA512 
19bf292f951f68de19cdfd3c76ee0e538a2ad3022e2669a4a19b40d26c2b16938799470b85def4b74b27b8c8137d03a05780d6bab0f38fb0835b528f2cd34f5d
 DIST pipewire-0.3.77.tar.bz2 1643767 BLAKE2B 
3a2df9cdedf77d5b4927e115ddd7da0d1eecc85322ce7995a49945d41cc83b9a543c1382ad304bdb549f67ac444f7bca6871248654fb4d2e21b25eb55411940c
 SHA512 
422c8504f608d6845b94351a336ab528f51195551418d0d245064972ed784817cacafc6afaad74eb0e0ea80474a9da33ef6917c1f60d3f8f45d70c54971f0760
 DIST pipewire-0.3.80.tar.bz2 1655137 BLAKE2B 
cf55e01b6fff29e7ef1f40e9a8f28788b9f538380232821b334359844b33b12b913375ae14e4589d7ae9cd26d22bc841d8103d41c7eb3ea1a9f0c1db1abc6507
 SHA512 
77e26b6cbefc091ea703b53d147accbd9495f97ba57618a21366b0747074de3ed1060c03e91362f5cf9dc5c256da6d541eccaff8de306b369730400c7b7f46b2
-DIST pipewire-0.3.81.tar.bz2 1658240 BLAKE2B 
8c67d6fbc5bc72354562e1628feb09e3baef3fd38be70bde24b145a6d57fe3a90b3bc466d4289be16fa36d936966d7d3e68759c38a7cd1383bd04b4f2a173687
 SHA512 
2366819d6ddad80d0db47aacc81c25c12bc69f4bd337b296bd9e8b417dd30c5e65b86d9cbb700f9aca0c464bcd2738284ee07f45f1cf68962ada9cf37799ebc7
-DIST pipewire-0.3.82.tar.bz2 1661085 BLAKE2B 
444cc55a7d1904f89527675fea3066ea782496da43ba0adf50976558e8ecf944fc4f0541c2f84730ee2f832435acd141474afd36e598ecec4fa0f92a3df0ad71
 SHA512 
3fd6203274367f2c081be6a079d096b86e3b43ce7d2f220007d6186c1d17c9ab44d79282612ee92808bc3a7741e43f5533267d63b11b33c1b2e77dc63fb9a4f7
-DIST pipewire-0.3.83.tar.bz2 1663247 BLAKE2B 
da62ad157d3475e3832ee2bff12aa4f33b4e585c409d9b6cfd8f31a6b275f93821eba5243e6e9fa9d75cd4162456e42ab51d5973c31ed6814e79906162b7765a
 SHA512 
87bab649e6e790bc484d7bd9bccf0a0808f3dc6495aae6455ea1e5db8d69cac5ad2adb48be8c1d03e3ea17592c8790930924d93360373f7d1dba045109d8640b
-DIST pipewire-0.3.84.tar.bz2 1668013 BLAKE2B 
5dbb24c565f5b3b58725c13ce8701b1f7abecb6404beffebd8a8a4a657d3b3a8392865a201d8f96766006092f66af4914913f99ba883f7b95615e3fc1baf50c1
 SHA512 
fa5b22de595a16e0b891b6944e494fd6b574ac0e99936f68970fd7bb82aeb351a87dd093d2182984b2c071a14e4747d46f3d03873e5e9ff51ee01936e6d7fd29
 DIST pipewire-0.3.85.tar.bz2 1675916 BLAKE2B 
a245ebeebdb283ce920d85a2d877ce27756a5fd5505ca6f4d5df1b83120272dfb1be36233a3b2a2cbe96dcc9fc06fae42198108c4e0dbe866836449b422e320c
 SHA512 
5613b41a98db45305aad8f9a84ef0a11b858815f45c6242bb648630e41a3ae5805bb605a543585b46e60d472086919d64e7d8c396ab6cc126d9889f92320f375

diff --git 
a/media-video/pipewire/files/0.3.82/0001-alsa-Ignore-PCM-devices-with-udev-env-ACP_IGNORE.patch
 
b/media-video/pipewire/files/0.3.82/0001-alsa-Ignore-PCM-devices-with-udev-env-ACP_IGNORE.patch
deleted file mode 100644
index 12192fc8678a..
--- 
a/media-video/pipewire/files/0.3.82/0001-alsa-Ignore-PCM-devices-with-udev-env-ACP_IGNORE.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/fd969dab2878836fd8e9ac7d8fb92d1ede594f37
-
-From fd969dab2878836fd8e9ac7d8fb92d1ede594f37 Mon Sep 17 00:00:00 2001
-From: Hector Martin 
-Date: Sat, 14 Oct 2023 14:11:15 +0900
-Subject: [PATCH] alsa: Ignore PCM devices with udev env ACP_IGNORE
-
-When checking that a card has all of its PCM devices available, ignore
-any specific device with the ACP_IGNORE udev environment variable. This
-mirrors how we ignore whole cards, but specifically allows non-PipeWire
-software to own specific PCM devices.
-
-Note that this does not actually stop PipeWire from using those
-subdevices right now, we assume UCM configs take care of that. This
-should

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/0.3.83/, media-video/pipewire/

2023-10-24 Thread Sam James 
commit: e78e092c510e751cab6bf1ea1a1d0b7c145c0be0
Author: Sam James  gentoo  org>
AuthorDate: Wed Oct 25 01:30:27 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct 25 01:31:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e78e092c

media-video/pipewire: backport recommended upstream patches to 0.3.83

Bug: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/3592
Bug: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/3593
Bug: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/3600
Signed-off-by: Sam James  gentoo.org>

 ...1-stream-improve-queued_buffers-reporting.patch | 53 ++
 ...-module-echo-cancel-playback-source-async.patch | 36 +++
 .../0003-alsa-guard-against-null-areas.patch   | 52 +
 ...ire-0.3.83.ebuild => pipewire-0.3.83-r1.ebuild} |  0
 4 files changed, 141 insertions(+)

diff --git 
a/media-video/pipewire/files/0.3.83/0001-stream-improve-queued_buffers-reporting.patch
 
b/media-video/pipewire/files/0.3.83/0001-stream-improve-queued_buffers-reporting.patch
new file mode 100644
index ..029a7930a60e
--- /dev/null
+++ 
b/media-video/pipewire/files/0.3.83/0001-stream-improve-queued_buffers-reporting.patch
@@ -0,0 +1,53 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/3592
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/3d8c7c40b5cc16eaf7bd1fb72c17783ce42e2d0e
+
+From 3d8c7c40b5cc16eaf7bd1fb72c17783ce42e2d0e Mon Sep 17 00:00:00 2001
+From: Wim Taymans 
+Date: Fri, 20 Oct 2023 09:57:52 +0200
+Subject: [PATCH] stream: improve queued_buffers reporting
+
+Also add the queued buffers in the converter to the pw_time.queued_buffers
+field. This means that queued_buffers + avail_buffers always equal the
+total amount of allocated buffers, which makes more sense.
+
+Fixes #3592
+--- a/src/pipewire/stream.c
 b/src/pipewire/stream.c
+@@ -2340,6 +2340,7 @@ int pw_stream_get_time_n(struct pw_stream *stream, 
struct pw_time *time, size_t
+   struct stream *impl = SPA_CONTAINER_OF(stream, struct stream, this);
+   uintptr_t seq1, seq2;
+   uint32_t buffered, quantum, index;
++  int32_t avail_buffers;
+ 
+   do {
+   seq1 = SPA_SEQ_READ(impl->seq);
+@@ -2358,19 +2359,23 @@ int pw_stream_get_time_n(struct pw_stream *stream, 
struct pw_time *time, size_t
+   time->delay += (impl->latency.min_rate + impl->latency.max_rate) / 2;
+   time->delay += ((impl->latency.min_ns + impl->latency.max_ns) / 2) * 
time->rate.denom / SPA_NSEC_PER_SEC;
+ 
++  avail_buffers = spa_ringbuffer_get_read_index(>dequeued.ring, 
);
++  avail_buffers = SPA_CLAMP(avail_buffers, 0, (int32_t)impl->n_buffers);
++
+   if (size >= offsetof(struct pw_time, queued_buffers))
+   time->buffered = buffered;
+   if (size >= offsetof(struct pw_time, avail_buffers))
+-  time->queued_buffers = 
spa_ringbuffer_get_read_index(>queued.ring, );
++  time->queued_buffers = impl->n_buffers - avail_buffers;
+   if (size >= sizeof(struct pw_time))
+-  time->avail_buffers = 
spa_ringbuffer_get_read_index(>dequeued.ring, );
++  time->avail_buffers = avail_buffers;
+ 
+   pw_log_trace_fp("%p: %"PRIi64" %"PRIi64" %"PRIu64" %d/%d %"PRIu64" %"
+-  PRIu64" %"PRIu64" %"PRIu64" %"PRIu64, stream,
++  PRIu64" %"PRIu64" %"PRIu64" %"PRIu64" %d/%d", stream,
+   time->now, time->delay, time->ticks,
+   time->rate.num, time->rate.denom, time->queued,
+   impl->dequeued.outcount, impl->dequeued.incount,
+-  impl->queued.outcount, impl->queued.incount);
++  impl->queued.outcount, impl->queued.incount,
++  avail_buffers, impl->n_buffers);
+   return 0;
+ }
+ 
+-- 
+GitLab

diff --git 
a/media-video/pipewire/files/0.3.83/0002-module-echo-cancel-playback-source-async.patch
 
b/media-video/pipewire/files/0.3.83/0002-module-echo-cancel-playback-source-async.patch
new file mode 100644
index ..ee96f949a2bb
--- /dev/null
+++ 
b/media-video/pipewire/files/0.3.83/0002-module-echo-cancel-playback-source-async.patch
@@ -0,0 +1,36 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/3593
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/93d5848031cd9101d830fb4c37c5a7404ac5f276
+
+From 93d5848031cd9101d830fb4c37c5a7404ac5f276 Mon Sep 17 00:00:00 2001
+From: Wim Taymans 
+Date: Sat, 21 Oct 2023 09:27:43 +0200
+Subject: [PATCH] module-echo-cancel: playback and source are async
+
+The playback and source streams don't dequeue/queue buffers from
+the process function and so need to be marked async.
+
+Fixes #3593
+--- a/src/modules/module-echo-cancel.c
 b/src/modules/module-echo-cancel.c
+@@ -1002,7 +1002,8 @@ static int setup_streams(struct impl *impl)
+   PW_DIRECTION_OUTPUT,
+

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/0.3.79/, media-video/pipewire/

2023-10-04 Thread Sam James 
commit: 6b76c8bb320ace22a2121ecbc6de849e2bd20583
Author: Sam James  gentoo  org>
AuthorDate: Wed Oct  4 09:04:31 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct  4 09:04:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b76c8bb

media-video/pipewire: drop 0.3.78-r1, 0.3.79-r1, 0.3.79-r2, 0.3.79-r3

Signed-off-by: Sam James  gentoo.org>

 media-video/pipewire/Manifest  |   2 -
 .../0001-meson-better-check-dlopen-dir.patch   |  33 --
 .../0.3.79/0002-alsa-non-portable-isinf-use.patch  |  30 --
 media-video/pipewire/pipewire-0.3.78-r1.ebuild | 473 
 media-video/pipewire/pipewire-0.3.79-r1.ebuild | 473 
 media-video/pipewire/pipewire-0.3.79-r2.ebuild | 475 -
 media-video/pipewire/pipewire-0.3.79-r3.ebuild | 475 -
 7 files changed, 1961 deletions(-)

diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 2b9157523e57..4b4d95a210e9 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,5 +1,3 @@
 DIST pipewire-0.3.75.tar.bz2 1629466 BLAKE2B 
e69dbb93ebe50f037bc602aa86733c8ba9ccbe57db520cd34ea025c9bf153dbd848882dbb4c2a4e830785a302a7cb7d4b7c1856c9a4be6f1c5ada92f70d1729b
 SHA512 
19bf292f951f68de19cdfd3c76ee0e538a2ad3022e2669a4a19b40d26c2b16938799470b85def4b74b27b8c8137d03a05780d6bab0f38fb0835b528f2cd34f5d
 DIST pipewire-0.3.77.tar.bz2 1643767 BLAKE2B 
3a2df9cdedf77d5b4927e115ddd7da0d1eecc85322ce7995a49945d41cc83b9a543c1382ad304bdb549f67ac444f7bca6871248654fb4d2e21b25eb55411940c
 SHA512 
422c8504f608d6845b94351a336ab528f51195551418d0d245064972ed784817cacafc6afaad74eb0e0ea80474a9da33ef6917c1f60d3f8f45d70c54971f0760
-DIST pipewire-0.3.78.tar.bz2 1643536 BLAKE2B 
44e04486850b0c68cea42ef911eaffae4c22bdedeff0783c119409d2e8d528c165f1f46f0a0e8b63e1c46cf8535b52b79291b54dd61496c6275c6e41f9d71edd
 SHA512 
2fe0113eaaba1ffe67d20cf10b9ee927cb2bfc7c2663937b131f479d35ca6af43b5659cf8a16db849ecc5881e47a56507e775aad06e9765a3ab8ec354636f8eb
-DIST pipewire-0.3.79.tar.bz2 1647590 BLAKE2B 
dd7c88219310c77fd5b64cbfa4ab8130d81c47ff3a35c03ecfd260bc1e7e24fb108b5100bdbc977e3cd8e74ccfe90c11310b195e804a7fe04a64e1d1637c7233
 SHA512 
5853d4d9d0c21265e0fc0fd68369530d76ae63bad1aa28f6eaa4a0f76e5c939ffc0dee2d81fdf0526da3473f69bddcdb77938597ad004abe04c842d798409b1d
 DIST pipewire-0.3.80.tar.bz2 1655137 BLAKE2B 
cf55e01b6fff29e7ef1f40e9a8f28788b9f538380232821b334359844b33b12b913375ae14e4589d7ae9cd26d22bc841d8103d41c7eb3ea1a9f0c1db1abc6507
 SHA512 
77e26b6cbefc091ea703b53d147accbd9495f97ba57618a21366b0747074de3ed1060c03e91362f5cf9dc5c256da6d541eccaff8de306b369730400c7b7f46b2

diff --git 
a/media-video/pipewire/files/0.3.79/0001-meson-better-check-dlopen-dir.patch 
b/media-video/pipewire/files/0.3.79/0001-meson-better-check-dlopen-dir.patch
deleted file mode 100644
index 1bcddd4277cb..
--- a/media-video/pipewire/files/0.3.79/0001-meson-better-check-dlopen-dir.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/9f7d960c66a2d5732958ee29934c7aef6decc0cb
-
-From 9f7d960c66a2d5732958ee29934c7aef6decc0cb Mon Sep 17 00:00:00 2001
-From: q66 
-Date: Thu, 31 Aug 2023 03:42:40 +0200
-Subject: [PATCH] meson: better check for module dlopen dir
-
-The ${LIB} token is a glibc extension, so it is incorrect to
-use it on all Linux. Doing so will break e.g. with musl libc.
 a/meson.build
-+++ b/meson.build
-@@ -49,7 +49,9 @@ pipewire_configdir = pipewire_sysconfdir / 'pipewire'
- pipewire_confdatadir = pipewire_datadir / 'pipewire'
- modules_install_dir = pipewire_libdir / pipewire_name
- 
--if host_machine.system() == 'linux'
-+cc = meson.get_compiler('c')
-+
-+if cc.has_header('features.h') and cc.get_define('__GLIBC__', prefix: 
'#include ') != ''
-   # glibc ld.so interprets ${LIB} in a library loading path with an
-   # appropriate value for the current architecture, typically something
-   # like lib, lib64 or lib/x86_64-linux-gnu.
-@@ -72,8 +74,6 @@ pipewire_headers_dir = pipewire_name / 'pipewire'
- 
- pkgconfig = import('pkgconfig')
- 
--cc = meson.get_compiler('c')
--
- common_flags = [
-   '-fvisibility=hidden',
-   '-fno-strict-aliasing',
--- 
-GitLab

diff --git 
a/media-video/pipewire/files/0.3.79/0002-alsa-non-portable-isinf-use.patch 
b/media-video/pipewire/files/0.3.79/0002-alsa-non-portable-isinf-use.patch
deleted file mode 100644
index 767c399bd515..
--- a/media-video/pipewire/files/0.3.79/0002-alsa-non-portable-isinf-use.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/aa11dbe10c0f2319a5c4c8dcfff1d5dccc03589e
-
-From aa11dbe10c0f2319a5c4c8dcfff1d5dccc03589e Mon Sep 17 00:00:00 2001
-From: q66 
-Date: Thu, 31 Aug 2023 03:17:54 +0200
-Subject: [PATCH] alsa: get rid of non-portable isinf use
-
-The isinf function returns -1 for negative infinity on glibc, but
-the standard guarantees no such behavior (e.g.

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/0.3.80/, media-video/pipewire/

2023-09-14 Thread Sam James 
commit: 2a1c7e22db6217616c18b145754e7ce7b4b0ff73
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep 15 04:21:05 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep 15 04:33:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a1c7e22

media-video/pipewire: add 0.3.80

Note that this includes an extra backported patch to work with older webrtc
for now, although it's somewhat automagic based on if you have the (masked)
SLOT=1 installed for media-libs/webrtc-audio-processing.

Bug: https://bugs.gentoo.org/913693
Signed-off-by: Sam James  gentoo.org>

 media-video/pipewire/Manifest  |   1 +
 .../0001-aes-support-both-webrtc-versions.patch| 233 ++
 media-video/pipewire/pipewire-0.3.80.ebuild| 475 +
 3 files changed, 709 insertions(+)

diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 49e8bcc2eabb..2b9157523e57 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -2,3 +2,4 @@ DIST pipewire-0.3.75.tar.bz2 1629466 BLAKE2B 
e69dbb93ebe50f037bc602aa86733c8ba9c
 DIST pipewire-0.3.77.tar.bz2 1643767 BLAKE2B 
3a2df9cdedf77d5b4927e115ddd7da0d1eecc85322ce7995a49945d41cc83b9a543c1382ad304bdb549f67ac444f7bca6871248654fb4d2e21b25eb55411940c
 SHA512 
422c8504f608d6845b94351a336ab528f51195551418d0d245064972ed784817cacafc6afaad74eb0e0ea80474a9da33ef6917c1f60d3f8f45d70c54971f0760
 DIST pipewire-0.3.78.tar.bz2 1643536 BLAKE2B 
44e04486850b0c68cea42ef911eaffae4c22bdedeff0783c119409d2e8d528c165f1f46f0a0e8b63e1c46cf8535b52b79291b54dd61496c6275c6e41f9d71edd
 SHA512 
2fe0113eaaba1ffe67d20cf10b9ee927cb2bfc7c2663937b131f479d35ca6af43b5659cf8a16db849ecc5881e47a56507e775aad06e9765a3ab8ec354636f8eb
 DIST pipewire-0.3.79.tar.bz2 1647590 BLAKE2B 
dd7c88219310c77fd5b64cbfa4ab8130d81c47ff3a35c03ecfd260bc1e7e24fb108b5100bdbc977e3cd8e74ccfe90c11310b195e804a7fe04a64e1d1637c7233
 SHA512 
5853d4d9d0c21265e0fc0fd68369530d76ae63bad1aa28f6eaa4a0f76e5c939ffc0dee2d81fdf0526da3473f69bddcdb77938597ad004abe04c842d798409b1d
+DIST pipewire-0.3.80.tar.bz2 1655137 BLAKE2B 
cf55e01b6fff29e7ef1f40e9a8f28788b9f538380232821b334359844b33b12b913375ae14e4589d7ae9cd26d22bc841d8103d41c7eb3ea1a9f0c1db1abc6507
 SHA512 
77e26b6cbefc091ea703b53d147accbd9495f97ba57618a21366b0747074de3ed1060c03e91362f5cf9dc5c256da6d541eccaff8de306b369730400c7b7f46b2

diff --git 
a/media-video/pipewire/files/0.3.80/0001-aes-support-both-webrtc-versions.patch 
b/media-video/pipewire/files/0.3.80/0001-aes-support-both-webrtc-versions.patch
new file mode 100644
index ..f2afdde4f4be
--- /dev/null
+++ 
b/media-video/pipewire/files/0.3.80/0001-aes-support-both-webrtc-versions.patch
@@ -0,0 +1,233 @@
+https://bugs.gentoo.org/913693
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/1f1c308c9766312e684f0b53fc2d1422c7414d31
+
+From 1f1c308c9766312e684f0b53fc2d1422c7414d31 Mon Sep 17 00:00:00 2001
+From: Wim Taymans 
+Date: Thu, 14 Sep 2023 15:35:40 +0200
+Subject: [PATCH] aec: support both webrtc versions
+
+Version 1 does not seem to be packaged in many distros and so they would
+need to revert the patch or disable AEC. Enabling both allows for things
+to move forwards gracefully.
+--- a/meson.build
 b/meson.build
+@@ -377,9 +377,17 @@ cdata.set('HAVE_GSTREAMER_DEVICE_PROVIDER', 
get_option('gstreamer-device-provide
+ 
+ webrtc_dep = dependency('webrtc-audio-processing-1',
+   version : ['>= 1.2' ],
+-  required : get_option('echo-cancel-webrtc'))
+-summary({'WebRTC Echo Canceling': webrtc_dep.found()}, bool_yn: true, 
section: 'Misc dependencies')
+-cdata.set('HAVE_WEBRTC', webrtc_dep.found())
++  required : false)
++cdata.set('HAVE_WEBRTC1', webrtc_dep.found())
++if webrtc_dep.found()
++  summary({'WebRTC Echo Canceling >= 1.2': webrtc_dep.found()}, bool_yn: 
true, section: 'Misc dependencies')
++else
++  webrtc_dep = dependency('webrtc-audio-processing',
++version : ['>= 0.2', '< 1.0'],
++required : get_option('echo-cancel-webrtc'))
++  cdata.set('HAVE_WEBRTC', webrtc_dep.found())
++  summary({'WebRTC Echo Canceling < 1.0': webrtc_dep.found()}, bool_yn: true, 
section: 'Misc dependencies')
++endif
+ 
+ # On FreeBSD and MidnightBSD, epoll-shim library is required for eventfd() 
and timerfd()
+ epoll_shim_dep = (host_machine.system() == 'freebsd' or host_machine.system() 
== 'midnightbsd'
+--- a/spa/plugins/aec/aec-webrtc.cpp
 b/spa/plugins/aec/aec-webrtc.cpp
+@@ -3,6 +3,8 @@
+ /* SPDX-FileCopyrightText: Copyright © 2021 Arun Raghavan 
 */
+ /* SPDX-License-Identifier: MIT */
+ 
++#include "config.h"
++
+ #include 
+ #include 
+ 
+@@ -13,7 +15,13 @@
+ #include 
+ #include 
+ 
++#ifdef HAVE_WEBRTC
++#include 
++#include 
++#include 
++#else
+ #include 
++#endif
+ 
+ struct impl_data {
+   struct spa_handle handle;
+@@ -39,6 +47,54 @@ static bool webrtc_get_spa_bool(const struct spa_dict 
*args, const char *key, bo
+   return default_value;
+ }
+ 
++#ifdef HAVE_WEBRTC
++/* [ f0 f1 f2 ]

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/0.3.79/, media-video/pipewire/

2023-09-01 Thread Sam James 
commit: 0d9e842266d72c4d9172e3867e0132fe077358e0
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep  1 10:31:31 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep  1 10:31:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d9e8422

media-video/pipewire: backport UB fix + musl module dir fix

Signed-off-by: Sam James  gentoo.org>

 .../0001-meson-better-check-dlopen-dir.patch   | 33 ++
 .../0.3.79/0002-alsa-non-portable-isinf-use.patch  | 30 
 ...ire-0.3.79.ebuild => pipewire-0.3.79-r1.ebuild} |  0
 3 files changed, 63 insertions(+)

diff --git 
a/media-video/pipewire/files/0.3.79/0001-meson-better-check-dlopen-dir.patch 
b/media-video/pipewire/files/0.3.79/0001-meson-better-check-dlopen-dir.patch
new file mode 100644
index ..1bcddd4277cb
--- /dev/null
+++ b/media-video/pipewire/files/0.3.79/0001-meson-better-check-dlopen-dir.patch
@@ -0,0 +1,33 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/9f7d960c66a2d5732958ee29934c7aef6decc0cb
+
+From 9f7d960c66a2d5732958ee29934c7aef6decc0cb Mon Sep 17 00:00:00 2001
+From: q66 
+Date: Thu, 31 Aug 2023 03:42:40 +0200
+Subject: [PATCH] meson: better check for module dlopen dir
+
+The ${LIB} token is a glibc extension, so it is incorrect to
+use it on all Linux. Doing so will break e.g. with musl libc.
+--- a/meson.build
 b/meson.build
+@@ -49,7 +49,9 @@ pipewire_configdir = pipewire_sysconfdir / 'pipewire'
+ pipewire_confdatadir = pipewire_datadir / 'pipewire'
+ modules_install_dir = pipewire_libdir / pipewire_name
+ 
+-if host_machine.system() == 'linux'
++cc = meson.get_compiler('c')
++
++if cc.has_header('features.h') and cc.get_define('__GLIBC__', prefix: 
'#include ') != ''
+   # glibc ld.so interprets ${LIB} in a library loading path with an
+   # appropriate value for the current architecture, typically something
+   # like lib, lib64 or lib/x86_64-linux-gnu.
+@@ -72,8 +74,6 @@ pipewire_headers_dir = pipewire_name / 'pipewire'
+ 
+ pkgconfig = import('pkgconfig')
+ 
+-cc = meson.get_compiler('c')
+-
+ common_flags = [
+   '-fvisibility=hidden',
+   '-fno-strict-aliasing',
+-- 
+GitLab

diff --git 
a/media-video/pipewire/files/0.3.79/0002-alsa-non-portable-isinf-use.patch 
b/media-video/pipewire/files/0.3.79/0002-alsa-non-portable-isinf-use.patch
new file mode 100644
index ..767c399bd515
--- /dev/null
+++ b/media-video/pipewire/files/0.3.79/0002-alsa-non-portable-isinf-use.patch
@@ -0,0 +1,30 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/aa11dbe10c0f2319a5c4c8dcfff1d5dccc03589e
+
+From aa11dbe10c0f2319a5c4c8dcfff1d5dccc03589e Mon Sep 17 00:00:00 2001
+From: q66 
+Date: Thu, 31 Aug 2023 03:17:54 +0200
+Subject: [PATCH] alsa: get rid of non-portable isinf use
+
+The isinf function returns -1 for negative infinity on glibc, but
+the standard guarantees no such behavior (e.g. in C++ it always
+returns a bool, on musl libc it's a macro that expands to a bool
+expression), saying just that it returns a non-zero value.
+
+This was added in pulseaudio around 15 years ago, and was never
+fixed; pipewire then got the code from it. However, we can portably
+check against -INFINITY instead (from math.h, already included).
+
+Ref https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/045c1d6
+--- a/spa/plugins/alsa/acp/volume.h
 b/spa/plugins/alsa/acp/volume.h
+@@ -83,7 +83,7 @@ static inline pa_volume_t pa_sw_volume_from_linear(double v)
+ 
+ static inline pa_volume_t pa_sw_volume_from_dB(double dB)
+ {
+-if (isinf(dB) < 0 || dB <= PA_DECIBEL_MININFTY)
++if (dB == -INFINITY || dB <= PA_DECIBEL_MININFTY)
+ return PA_VOLUME_MUTED;
+ return pa_sw_volume_from_linear(pa_volume_dB_to_linear(dB));
+ }
+-- 
+GitLab

diff --git a/media-video/pipewire/pipewire-0.3.79.ebuild 
b/media-video/pipewire/pipewire-0.3.79-r1.ebuild
similarity index 100%
rename from media-video/pipewire/pipewire-0.3.79.ebuild
rename to media-video/pipewire/pipewire-0.3.79-r1.ebuild

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/, media-video/pipewire/

2023-08-24 Thread Sam James 
commit: c1e0cc9215766a8fc6c13bce085910ba564a4e87
Author: Alexis  gmail  com>
AuthorDate: Thu Aug 10 09:30:26 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Aug 24 19:42:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1e0cc92

media-video/pipewire: gentoo-pipewire-launcher configuration.

Fall back to using ${HOME}/.config if XDG_CONFIG_HOME isn't set.

Closes: https://bugs.gentoo.org/911883
Signed-off-by: Alexis  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 media-video/pipewire/files/gentoo-pipewire-launcher.1| 9 +
 media-video/pipewire/files/gentoo-pipewire-launcher.in-r2| 2 +-
 .../{pipewire-0.3.75-r2.ebuild => pipewire-0.3.75-r3.ebuild} | 0
 .../{pipewire-0.3.77-r1.ebuild => pipewire-0.3.77-r2.ebuild} | 0
 .../{pipewire-0.3.78.ebuild => pipewire-0.3.78-r1.ebuild}| 0
 5 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/media-video/pipewire/files/gentoo-pipewire-launcher.1 
b/media-video/pipewire/files/gentoo-pipewire-launcher.1
index d2c30dc961bc..36e697c632cd 100644
--- a/media-video/pipewire/files/gentoo-pipewire-launcher.1
+++ b/media-video/pipewire/files/gentoo-pipewire-launcher.1
@@ -23,6 +23,10 @@ However, a restart can be forced by calling
 with an argument of \(oqrestart\(cq.
 .PP
 .B ${XDG_CONFIG_HOME}/gentoo\-pipewire\-launcher.conf
+(or, if
+.B ${XDG_CONFIG_HOME}
+is not set,
+.BR ${HOME}/.config/gentoo\-pipewire\-launcher.conf )
 can be used to specify absolute paths of files to which log output
 should be sent, by specifying values for one or more of the
 .B GENTOO_PIPEWIRE_LOG\fR,
@@ -36,6 +40,11 @@ Please report bugs via https://bugs.gentoo.org/
 .TP
 .B ${XDG_CONFIG_HOME}/gentoo\-pipewire\-launcher.conf
 configures locations of files for log output.
+.TP
+.B ${HOME}/.config/gentoo\-pipewire\-launcher.conf
+configures locations of files for log output if
+.B ${XDG_CONFIG_HOME}
+is not set.
 .SH "SEE ALSO"
 .BR pipewire (1),
 .BR pipewire-pulse (1),

diff --git a/media-video/pipewire/files/gentoo-pipewire-launcher.in-r2 
b/media-video/pipewire/files/gentoo-pipewire-launcher.in-r2
index ea2032b74b42..a149b0d326c3 100644
--- a/media-video/pipewire/files/gentoo-pipewire-launcher.in-r2
+++ b/media-video/pipewire/files/gentoo-pipewire-launcher.in-r2
@@ -11,7 +11,7 @@
 
 DATE_FORMAT='+%Y-%m-%dT%H:%M:%S%Z'
 
-CONF="${XDG_CONFIG_HOME}/gentoo-pipewire-launcher.conf"
+CONF="${XDG_CONFIG_HOME:-${HOME}/.config}/gentoo-pipewire-launcher.conf"
 if [ -f "${CONF}" ]
 then
 . "${CONF}"

diff --git a/media-video/pipewire/pipewire-0.3.75-r2.ebuild 
b/media-video/pipewire/pipewire-0.3.75-r3.ebuild
similarity index 100%
rename from media-video/pipewire/pipewire-0.3.75-r2.ebuild
rename to media-video/pipewire/pipewire-0.3.75-r3.ebuild

diff --git a/media-video/pipewire/pipewire-0.3.77-r1.ebuild 
b/media-video/pipewire/pipewire-0.3.77-r2.ebuild
similarity index 100%
rename from media-video/pipewire/pipewire-0.3.77-r1.ebuild
rename to media-video/pipewire/pipewire-0.3.77-r2.ebuild

diff --git a/media-video/pipewire/pipewire-0.3.78.ebuild 
b/media-video/pipewire/pipewire-0.3.78-r1.ebuild
similarity index 100%
rename from media-video/pipewire/pipewire-0.3.78.ebuild
rename to media-video/pipewire/pipewire-0.3.78-r1.ebuild

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/

2023-08-15 Thread Conrad Kostecki 
commit: bf8e89822d6a1c63ae957cdb3ea2110024857b2d
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Tue Aug 15 12:12:47 2023 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Tue Aug 15 22:41:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf8e8982

media-video/pipewire: remove unused files

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/32320
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../pipewire/files/gentoo-pipewire-launcher.in | 29 
 .../pipewire/files/gentoo-pipewire-launcher.in-r1  | 52 --
 media-video/pipewire/files/pipewire.desktop| 12 -
 media-video/pipewire/files/pipewire.desktop-r1 | 12 -
 4 files changed, 105 deletions(-)

diff --git a/media-video/pipewire/files/gentoo-pipewire-launcher.in 
b/media-video/pipewire/files/gentoo-pipewire-launcher.in
deleted file mode 100644
index 495c47f6c7e1..
--- a/media-video/pipewire/files/gentoo-pipewire-launcher.in
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-# PipeWire launcher script for XDG compliant desktops on OpenRC.
-#
-# systemd users are very _STRONGLY_ advised to use the much
-# more reliable and predictable user units instead.
-
-# WARNING: This script assumes being run inside XDG compliant session,
-# which means D-Bus session instance is expected to be correctly set up
-# prior to this script starting. If that is not true, things may break!
-
-# Best to reap any existing daemons and only then try to start a new set.
-pkill -u "${USER}" -x pipewire\|wireplumber 1>/dev/null 2>&1
-
-# The core daemon which by itself does probably nothing.
-@GENTOO_PORTAGE_EPREFIX@/usr/bin/pipewire &
-
-# The so called pipewire-pulse daemon used for PulseAudio compatibility.
-# Commenting this out will stop the PA proxying daemon from starting,
-# however ALSA (with pipewire-alsa), JACK (with jack-sdk) and PW API using
-# clients will still have access to audio and may end up clashing with
-# non-PW apps over HW control (most notably, /usr/bin/pulseaudio daemon).
-@GENTOO_PORTAGE_EPREFIX@/usr/bin/pipewire -c pipewire-pulse.conf &
-
-# Hack for bug #822498
-sleep 1
-
-# Finally a session manager is required for PipeWire to do anything.
-exec @GENTOO_PORTAGE_EPREFIX@/usr/bin/wireplumber

diff --git a/media-video/pipewire/files/gentoo-pipewire-launcher.in-r1 
b/media-video/pipewire/files/gentoo-pipewire-launcher.in-r1
deleted file mode 100644
index 51f70293c383..
--- a/media-video/pipewire/files/gentoo-pipewire-launcher.in-r1
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-
-# PipeWire launcher script for XDG compliant desktops on OpenRC.
-#
-# systemd users are very _STRONGLY_ advised to use the much
-# more reliable and predictable user units instead.
-
-# WARNING: This script assumes being run inside XDG compliant session,
-# which means D-Bus session instance is expected to be correctly set up
-# prior to this script starting. If that is not true, things may break!
-
-restart () {
-echo "Terminating PipeWire processes ..."
-pkill -u "${USER}" -x pipewire\|wireplumber 1>/dev/null 2>&1
-pwait -u "${USER}" -x pipewire\|wireplumber
-echo "PipeWire terminated."
-}
-
-if [ "${#}" -gt 0 ]
-then
-if [ "${1}" = 'restart' ]
-then
-   restart
-else
-echo "Unrecognised argument." >&2
-echo "Usage: gentoo-pipewire-launcher [restart]" >&2
-   exit 1
-fi
-fi
-
-if pgrep -u "${USER}" -x pipewire\|wireplumber 1>/dev/null 2>&1
-then
-echo "PipeWire already running, exiting." >&2
-echo "(Use 'gentoo-pipewire-launcher restart' to restart PipeWire and 
WirePlumber.)" >&2
-exit 1
-fi
-
-# The core daemon which by itself does probably nothing.
-@GENTOO_PORTAGE_EPREFIX@/usr/bin/pipewire &
-
-# The so called pipewire-pulse daemon used for PulseAudio compatibility.
-# Commenting this out will stop the PA proxying daemon from starting,
-# however ALSA (with pipewire-alsa), JACK (with jack-sdk) and PW API using
-# clients will still have access to audio and may end up clashing with
-# non-PW apps over HW control (most notably, /usr/bin/pulseaudio daemon).
-@GENTOO_PORTAGE_EPREFIX@/usr/bin/pipewire -c pipewire-pulse.conf &
-
-# Hack for bug #822498
-sleep 1
-
-# Finally a session manager is required for PipeWire to do anything.
-exec @GENTOO_PORTAGE_EPREFIX@/usr/bin/wireplumber

diff --git a/media-video/pipewire/files/pipewire.desktop 
b/media-video/pipewire/files/pipewire.desktop
deleted file mode 100644
index d3786e74f82b..
--- a/media-video/pipewire/files/pipewire.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[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

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/0.3.71/, media-video/pipewire/files/0.3.70/, ...

2023-08-12 Thread Sam James 
commit: 477ccc534e140ceb915ddf05dfc4c9034e92785c
Author: Sam James  gentoo  org>
AuthorDate: Sun Aug 13 03:27:16 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Aug 13 03:27:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=477ccc53

media-video/pipewire: drop 0.3.70-r2, 0.3.71-r2, 0.3.71-r3, 0.3.76

Signed-off-by: Sam James  gentoo.org>

 media-video/pipewire/Manifest  |   3 -
 .../files/0.3.70/parser-check-pointer.patch|  21 -
 .../0.3.71/jack-update-bufsize-samplerate.patch|  46 --
 .../pipewire/files/0.3.72/001-opus-meson.patch |  95 -
 .../0.3.72/002-context-segfault-no-fallback.patch  |  32 --
 .../0001-impl-node-remove-node-target-peers.patch  |  30 --
 media-video/pipewire/pipewire-0.3.70-r2.ebuild | 474 -
 media-video/pipewire/pipewire-0.3.71-r2.ebuild | 463 
 media-video/pipewire/pipewire-0.3.71-r3.ebuild | 465 
 media-video/pipewire/pipewire-0.3.76.ebuild| 473 
 10 files changed, 2102 deletions(-)

diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index c30911bf0e6e..60de335d062b 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,5 +1,2 @@
-DIST pipewire-0.3.70.tar.bz2 1573378 BLAKE2B 
3824106cba9c1b0a82c6d8889b2b1473f4bfc5d0994ee9dd8b46a454c287bbd4e0ad5dc508df5d4a9b7c5f683898ed756947788e561f2bf51a3116b12e46d075
 SHA512 
8b25d90232d07d5b1e210bd8f24240438a7dcece23a5be59a4e49fc3daf51ebf659f2cc343a0d913310a4659792590ef981ab7a59890506557f9510d902a0cff
-DIST pipewire-0.3.71.tar.bz2 1592332 BLAKE2B 
ff6483a040285cd7a7cc10878cc88b61a0e01c0376ab64ef84f753b300b61da23211bc1b50208da7f1054d6ddf08092e81cbf29df508aad3bc93f20742a2f735
 SHA512 
465388faaf0f7fcce21fdbcd7a1705ef524c35e267c3f123b1025c34133fc418194abb9e22d89e60c9acc1417b25d655112fd9ef342e26ca9b8bc26013b09cb3
 DIST pipewire-0.3.75.tar.bz2 1629466 BLAKE2B 
e69dbb93ebe50f037bc602aa86733c8ba9ccbe57db520cd34ea025c9bf153dbd848882dbb4c2a4e830785a302a7cb7d4b7c1856c9a4be6f1c5ada92f70d1729b
 SHA512 
19bf292f951f68de19cdfd3c76ee0e538a2ad3022e2669a4a19b40d26c2b16938799470b85def4b74b27b8c8137d03a05780d6bab0f38fb0835b528f2cd34f5d
-DIST pipewire-0.3.76.tar.bz2 1641577 BLAKE2B 
64805d69ca402cf10b9d95faa25c22198582493111d5286cd6237df263038c41af770b3339a7d356d78d5fec7f4b12003b15f66f85a8c283cf2d145ddf1391c9
 SHA512 
f61278868da2b23e3160a00d9fdc7efe5f37f79c580c40656e604975f5aae72fc171cbef8d112fd04e293b990851ace3053c980de9b34e6d36b196d6ced284cd
 DIST pipewire-0.3.77.tar.bz2 1643767 BLAKE2B 
3a2df9cdedf77d5b4927e115ddd7da0d1eecc85322ce7995a49945d41cc83b9a543c1382ad304bdb549f67ac444f7bca6871248654fb4d2e21b25eb55411940c
 SHA512 
422c8504f608d6845b94351a336ab528f51195551418d0d245064972ed784817cacafc6afaad74eb0e0ea80474a9da33ef6917c1f60d3f8f45d70c54971f0760

diff --git a/media-video/pipewire/files/0.3.70/parser-check-pointer.patch 
b/media-video/pipewire/files/0.3.70/parser-check-pointer.patch
deleted file mode 100644
index 7409d83e7ebb..
--- a/media-video/pipewire/files/0.3.70/parser-check-pointer.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/83d2e85f490ea97e4ae94b95f20dd06566a14c31
-
-From 83d2e85f490ea97e4ae94b95f20dd06566a14c31 Mon Sep 17 00:00:00 2001
-From: Wim Taymans 
-Date: Thu, 20 Apr 2023 12:32:07 +0200
-Subject: [PATCH] parser: add extra check to make coverity happy
-
-Fixes !1473
 a/spa/include/spa/pod/parser.h
-+++ b/spa/include/spa/pod/parser.h
-@@ -455,7 +455,7 @@ static inline int spa_pod_parser_getv(struct 
spa_pod_parser *parser, va_list arg
-   const struct spa_pod *pod = NULL;
-   const char *format;
- 
--  if (ftype == SPA_TYPE_Object) {
-+  if (f && ftype == SPA_TYPE_Object) {
-   uint32_t key = va_arg(args, uint32_t);
-   const struct spa_pod_object *object;
- 
--- 
-GitLab

diff --git 
a/media-video/pipewire/files/0.3.71/jack-update-bufsize-samplerate.patch 
b/media-video/pipewire/files/0.3.71/jack-update-bufsize-samplerate.patch
deleted file mode 100644
index 59fb89a3e017..
--- a/media-video/pipewire/files/0.3.71/jack-update-bufsize-samplerate.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/3226
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/ce71b37b58d5e251ae7acda0799f696688df11c2
-
-From ce71b37b58d5e251ae7acda0799f696688df11c2 Mon Sep 17 00:00:00 2001
-From: Wim Taymans 
-Date: Thu, 18 May 2023 09:59:26 +0200
-Subject: [PATCH] jack: update bufsize and samplerate when skipping notify
-
-When we skip the notify because we are not active or we don't have a
-callback, still update the buffer_size and sample_rate fields or else
-we will keep on trying forever.
-
-Fixes #3226
 a/pipewire-jack/src/pipewire-jack.c
-+++ b/pipewire-jack/src/pipewire-jack.c
-@@ -1027,8 +1027,6 @@

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/0.3.77/, media-video/pipewire/

2023-08-04 Thread Sam James 
commit: a19db7f4df1a3360d70b338f31174de5e87d5114
Author: Sam James  gentoo  org>
AuthorDate: Fri Aug  4 09:25:18 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Aug  4 09:25:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a19db7f4

media-video/pipewire: add 0.3.77

Signed-off-by: Sam James  gentoo.org>

 media-video/pipewire/Manifest  |   1 +
 ...st-prevent-crash-stopping-device-provider.patch |  34 ++
 media-video/pipewire/pipewire-0.3.77.ebuild| 473 +
 3 files changed, 508 insertions(+)

diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 7617cb6e88c1..c30911bf0e6e 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -2,3 +2,4 @@ DIST pipewire-0.3.70.tar.bz2 1573378 BLAKE2B 
3824106cba9c1b0a82c6d8889b2b1473f4b
 DIST pipewire-0.3.71.tar.bz2 1592332 BLAKE2B 
ff6483a040285cd7a7cc10878cc88b61a0e01c0376ab64ef84f753b300b61da23211bc1b50208da7f1054d6ddf08092e81cbf29df508aad3bc93f20742a2f735
 SHA512 
465388faaf0f7fcce21fdbcd7a1705ef524c35e267c3f123b1025c34133fc418194abb9e22d89e60c9acc1417b25d655112fd9ef342e26ca9b8bc26013b09cb3
 DIST pipewire-0.3.75.tar.bz2 1629466 BLAKE2B 
e69dbb93ebe50f037bc602aa86733c8ba9ccbe57db520cd34ea025c9bf153dbd848882dbb4c2a4e830785a302a7cb7d4b7c1856c9a4be6f1c5ada92f70d1729b
 SHA512 
19bf292f951f68de19cdfd3c76ee0e538a2ad3022e2669a4a19b40d26c2b16938799470b85def4b74b27b8c8137d03a05780d6bab0f38fb0835b528f2cd34f5d
 DIST pipewire-0.3.76.tar.bz2 1641577 BLAKE2B 
64805d69ca402cf10b9d95faa25c22198582493111d5286cd6237df263038c41af770b3339a7d356d78d5fec7f4b12003b15f66f85a8c283cf2d145ddf1391c9
 SHA512 
f61278868da2b23e3160a00d9fdc7efe5f37f79c580c40656e604975f5aae72fc171cbef8d112fd04e293b990851ace3053c980de9b34e6d36b196d6ced284cd
+DIST pipewire-0.3.77.tar.bz2 1643767 BLAKE2B 
3a2df9cdedf77d5b4927e115ddd7da0d1eecc85322ce7995a49945d41cc83b9a543c1382ad304bdb549f67ac444f7bca6871248654fb4d2e21b25eb55411940c
 SHA512 
422c8504f608d6845b94351a336ab528f51195551418d0d245064972ed784817cacafc6afaad74eb0e0ea80474a9da33ef6917c1f60d3f8f45d70c54971f0760

diff --git 
a/media-video/pipewire/files/0.3.77/0001-gst-prevent-crash-stopping-device-provider.patch
 
b/media-video/pipewire/files/0.3.77/0001-gst-prevent-crash-stopping-device-provider.patch
new file mode 100644
index ..9b6373da1390
--- /dev/null
+++ 
b/media-video/pipewire/files/0.3.77/0001-gst-prevent-crash-stopping-device-provider.patch
@@ -0,0 +1,34 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/140374d2071e6204fded4ca65645d4e9a3dd053e
+https://bugs.webkit.org/show_bug.cgi?id=259735
+
+From 140374d2071e6204fded4ca65645d4e9a3dd053e Mon Sep 17 00:00:00 2001
+From: Philippe Normand 
+Date: Fri, 4 Aug 2023 10:01:07 +0100
+Subject: [PATCH] gst: Prevent a crash when stopping device provider
+
+The provider might fail to connect to the PipeWire core when starting up, so
+when stopping we need to check the core is valid before attempting to acquire a
+mutex on its loop.
+--- a/src/gst/gstpipewiredeviceprovider.c
 b/src/gst/gstpipewiredeviceprovider.c
+@@ -665,11 +665,16 @@ gst_pipewire_device_provider_stop (GstDeviceProvider * 
provider)
+ {
+   GstPipeWireDeviceProvider *self = GST_PIPEWIRE_DEVICE_PROVIDER (provider);
+ 
+-  pw_thread_loop_lock (self->core->loop);
++  /* core might be NULL if we failed to connect in _start. */
++  if (self->core != NULL) {
++pw_thread_loop_lock (self->core->loop);
++  }
+   GST_DEBUG_OBJECT (self, "stopping provider");
+ 
+   g_clear_pointer ((struct pw_proxy**)>registry, pw_proxy_destroy);
+-  pw_thread_loop_unlock (self->core->loop);
++  if (self->core != NULL) {
++pw_thread_loop_unlock (self->core->loop);
++  }
+   g_clear_pointer (>core, gst_pipewire_core_release);
+ }
+ 
+-- 
+GitLab

diff --git a/media-video/pipewire/pipewire-0.3.77.ebuild 
b/media-video/pipewire/pipewire-0.3.77.ebuild
new file mode 100644
index ..dfb5716fd7bf
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.77.ebuild
@@ -0,0 +1,473 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 1. Please regularly check (even at the point of bumping) Fedora's packaging
+# for needed backports at 
https://src.fedoraproject.org/rpms/pipewire/tree/rawhide.
+#
+# 2. Upstream also sometimes amend release notes for the previous release to 
mention
+# needed patches, e.g. 
https://gitlab.freedesktop.org/pipewire/pipewire/-/tags/0.3.55#distros
+#
+# 3. Keep an eye on git master (for both PipeWire and WirePlumber) as things
+# continue to move quickly. It's not uncommon for fixes to be made shortly
+# after releases.
+
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd 
tmpfiles udev
+
+if [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git;
+   inherit git-r3
+else
+   if [[ ${PV}

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/0.3.75/, media-video/pipewire/

2023-07-27 Thread Sam James 
commit: c2351b1123866a33d58d60c4313464bb5bd1a6ba
Author: Sam James  gentoo  org>
AuthorDate: Thu Jul 27 09:18:49 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jul 27 09:18:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2351b11

media-video/pipewire: backport version.h include fix for 0.3.75

Signed-off-by: Sam James  gentoo.org>

 .../0.3.75/0003-missing-include-version.h.patch | 21 +
 ...e-0.3.75-r1.ebuild => pipewire-0.3.75-r2.ebuild} |  0
 2 files changed, 21 insertions(+)

diff --git 
a/media-video/pipewire/files/0.3.75/0003-missing-include-version.h.patch 
b/media-video/pipewire/files/0.3.75/0003-missing-include-version.h.patch
new file mode 100644
index ..b1c688bba343
--- /dev/null
+++ b/media-video/pipewire/files/0.3.75/0003-missing-include-version.h.patch
@@ -0,0 +1,21 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/193384b26aba3917d086ac3f009aa2cab9d197d2
+
+From 193384b26aba3917d086ac3f009aa2cab9d197d2 Mon Sep 17 00:00:00 2001
+From: "Tom A. Wagner" 
+Date: Mon, 24 Jul 2023 12:48:33 +0200
+Subject: [PATCH] pipewire: add missing stdbool.h include to version.h.in
+
+The header file only works when included in a file where stdbool.h was already 
included otherwise.
+--- a/src/pipewire/version.h.in
 b/src/pipewire/version.h.in
+@@ -11,6 +11,8 @@
+ extern "C" {
+ #endif
+ 
++#include 
++
+ /** Return the version of the header files. Keep in mind that this is
+ a macro and not a function, so it is impossible to get the pointer of
+ it. */
+-- 
+GitLab

diff --git a/media-video/pipewire/pipewire-0.3.75-r1.ebuild 
b/media-video/pipewire/pipewire-0.3.75-r2.ebuild
similarity index 100%
rename from media-video/pipewire/pipewire-0.3.75-r1.ebuild
rename to media-video/pipewire/pipewire-0.3.75-r2.ebuild

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/0.3.75/, media-video/pipewire/

2023-07-23 Thread Sam James 
commit: e29598d80e5b6f0e45eccdcab2f920304f2ed0b7
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 23 17:39:52 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 23 17:39:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e29598d8

media-video/pipewire: backport two fixes to 0.3.75

1. Crash fix for when can't connect to dbus (bug #910714)
2. Help out software misusing API, like older mpv (new fixed mpv will be in tree
shortly anyway) (https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/3374)

Closes: https://bugs.gentoo.org/910714
Signed-off-by: Sam James  gentoo.org>

 .../0001-module-rt-error-out-on-load-no-bus.patch  | 83 ++
 ...2-thread-loop-only-signal-when-option-set.patch | 68 ++
 ...ire-0.3.75.ebuild => pipewire-0.3.75-r1.ebuild} |  0
 3 files changed, 151 insertions(+)

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 ..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?= 
+Date: Sat, 22 Jul 2023 01:20:58 +
+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", ) < 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 ..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

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/0.3.72/, media-video/pipewire/

2023-06-26 Thread Sam James 
commit: 4417f8054897d3a23112545d0f564062f7f01d58
Author: Sam James  gentoo  org>
AuthorDate: Mon Jun 26 15:45:04 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jun 26 16:47:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4417f805

media-video/pipewire: add 0.3.72

Signed-off-by: Sam James  gentoo.org>

 media-video/pipewire/Manifest  |  1 +
 .../pipewire/files/0.3.72/001-opus-meson.patch | 95 ++
 .../0.3.72/002-context-segfault-no-fallback.patch  | 32 
 ...pipewire-.ebuild => pipewire-0.3.72.ebuild} |  8 +-
 media-video/pipewire/pipewire-.ebuild  |  8 +-
 5 files changed, 138 insertions(+), 6 deletions(-)

diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index c042e20afb9c..39f01c37fa35 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,2 +1,3 @@
 DIST pipewire-0.3.70.tar.bz2 1573378 BLAKE2B 
3824106cba9c1b0a82c6d8889b2b1473f4bfc5d0994ee9dd8b46a454c287bbd4e0ad5dc508df5d4a9b7c5f683898ed756947788e561f2bf51a3116b12e46d075
 SHA512 
8b25d90232d07d5b1e210bd8f24240438a7dcece23a5be59a4e49fc3daf51ebf659f2cc343a0d913310a4659792590ef981ab7a59890506557f9510d902a0cff
 DIST pipewire-0.3.71.tar.bz2 1592332 BLAKE2B 
ff6483a040285cd7a7cc10878cc88b61a0e01c0376ab64ef84f753b300b61da23211bc1b50208da7f1054d6ddf08092e81cbf29df508aad3bc93f20742a2f735
 SHA512 
465388faaf0f7fcce21fdbcd7a1705ef524c35e267c3f123b1025c34133fc418194abb9e22d89e60c9acc1417b25d655112fd9ef342e26ca9b8bc26013b09cb3
+DIST pipewire-0.3.72.tar.bz2 1622951 BLAKE2B 
e3334410b551ba155dc79baecdd85fa5f214483ab53d11cc9b59ec2a0549957b67048d621ff1881ea927ba315d41c32ba3df97435453ff68173e2c450bf216aa
 SHA512 
f105a2afdc00a81cb8c95c57645257109fd3ac1bd0608eb59969473fd94600c8ecf1d3f51abebcf7f9d70307568b2f5f66c7480a014b3955bcb992d92ca3ff43

diff --git a/media-video/pipewire/files/0.3.72/001-opus-meson.patch 
b/media-video/pipewire/files/0.3.72/001-opus-meson.patch
new file mode 100644
index ..a505336e0a31
--- /dev/null
+++ b/media-video/pipewire/files/0.3.72/001-opus-meson.patch
@@ -0,0 +1,95 @@
+From 14ebb9a568f3d8e1351181300dda93099b52742c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Nikl=C4=81vs=20Ko=C4=BCes=C5=86ikovs?=
+ <89q1r1...@relay.firefox.com>
+Date: Mon, 26 Jun 2023 17:07:04 +0300
+Subject: [PATCH 1/2] spa/plugins/bluez5/meson: removed some unneeded redefines
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+As far as I can tell, the code in question was not doing anything there
+and was also breaking the new code elsewhere, so it was put on the
+chopping block. Don't mind the squirming tentacles.
+
+Signed-off-by: NiklÄvs Koļesņikovs <89q1r1...@relay.firefox.com>
+---
+ spa/plugins/bluez5/meson.build | 5 +
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/spa/plugins/bluez5/meson.build b/spa/plugins/bluez5/meson.build
+index e6c52ccc57..80493cfe61 100644
+--- a/spa/plugins/bluez5/meson.build
 b/spa/plugins/bluez5/meson.build
+@@ -118,16 +118,14 @@ endif
+ 
+ if ldac_dep.found()
+   ldac_args = codec_args
+-  ldac_dep = [ ldac_dep ]
+   if ldac_abr_dep.found()
+ ldac_args += [ '-DENABLE_LDAC_ABR' ]
+-ldac_dep += ldac_abr_dep
+   endif
+   bluez_codec_ldac = shared_library('spa-codec-bluez5-ldac',
+ [ 'a2dp-codec-ldac.c', 'media-codecs.c' ],
+ include_directories : [ configinc ],
+ c_args : ldac_args,
+-dependencies : [ spa_dep, ldac_dep ],
++dependencies : [ spa_dep, ldac_dep, ldac_abr_dep ],
+ install : true,
+ install_dir : spa_plugindir / 'bluez5')
+ endif
+@@ -144,7 +142,6 @@ endif
+ 
+ if get_option('bluez5-codec-opus').allowed() and opus_dep.found()
+   opus_args = codec_args
+-  opus_dep = [ opus_dep ]
+   bluez_codec_opus = shared_library('spa-codec-bluez5-opus',
+ [ 'a2dp-codec-opus.c', 'media-codecs.c' ],
+ include_directories : [ configinc ],
+-- 
+GitLab
+
+
+From 23a10a8abb324809d1ebc5d33e36cdfa570390ed Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Nikl=C4=81vs=20Ko=C4=BCes=C5=86ikovs?=
+ <89q1r1...@relay.firefox.com>
+Date: Mon, 26 Jun 2023 16:35:01 +0300
+Subject: [PATCH 2/2] src/modules/meson: ensure Opus libs were actually found,
+ too
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The old way fails, if a distro has the header but not the library,
+which can happen on at least Gentoo with multilib deployments,
+where the shared header is present but non-native libraries might not.
+
+This could still fail, if a distro had some but not all libraries for
+some architectures but hopefully no one did that. In that case, a compile
+test would likely be required via cc.check_header() instead but let's try
+the faster fix first.
+
+Reported-by: Sam James 
+Thanks-to: Barnabás Pőcze 
+Thanks-to: Xavier Claessens 
+Signed-off-by: NiklÄvs Koļesņikovs <89q1r1...@relay.firefox.com>
+---
+

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/, media-video/pipewire/

2023-06-16 Thread Sam James 
commit: 868c215ffeb611c667c3464fabd24c5ac59fff32
Author: Alexis  gmail  com>
AuthorDate: Thu Jun 15 01:06:47 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun 17 02:48:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=868c215f

media-video/pipewire: Add gentoo-pipewire-launcher.1 man page

Closes: https://bugs.gentoo.org/908510
Signed-off-by: Alexis  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 .../pipewire/files/gentoo-pipewire-launcher.1  | 43 ++
 ...ewire-.ebuild => pipewire-0.3.71-r3.ebuild} |  2 +
 media-video/pipewire/pipewire-.ebuild  |  2 +
 3 files changed, 47 insertions(+)

diff --git a/media-video/pipewire/files/gentoo-pipewire-launcher.1 
b/media-video/pipewire/files/gentoo-pipewire-launcher.1
new file mode 100644
index ..d2c30dc961bc
--- /dev/null
+++ b/media-video/pipewire/files/gentoo-pipewire-launcher.1
@@ -0,0 +1,43 @@
+.TH "gentoo-pipewire-launcher" "1" "2023-06-15"
+.SH "NAME"
+gentoo\-pipewire\-launcher \- start instances of PipeWire, PipeWire-Pulse and 
WirePlumber
+.SH "SYNOPSIS"
+.BR gentoo\-pipewire\-launcher
+[restart]
+.SH "DESCRIPTION"
+\fIgentoo\-pipewire\-launcher\fR starts instances of PipeWire and
+WirePlumber.
+Two instances of PipeWire are started: one as the core sound-server, and
+one for PulseAudio emulation (cf.\&
+.BR pipewire-pulse (1)\fR).
+.PP
+It must be run in an environment with an active D-Bus session bus,
+i.e. one in which the
+.B DBUS_SESSION_BUS_ADDRESS
+environment variable is set appropriately.
+.PP
+\fIgentoo\-pipewire\-launcher\fR
+tries to avoid restarting, in order to avoid audio dropouts.
+However, a restart can be forced by calling
+\fIgentoo\-pipewire\-launcher\fR
+with an argument of \(oqrestart\(cq.
+.PP
+.B ${XDG_CONFIG_HOME}/gentoo\-pipewire\-launcher.conf
+can be used to specify absolute paths of files to which log output
+should be sent, by specifying values for one or more of the
+.B GENTOO_PIPEWIRE_LOG\fR,
+.B GENTOO_PIPEWIRE_PULSE_LOG\fR,
+and
+.B GENTOO_WIREPLUMBER_LOG
+variables, one per line.
+.SH "REPORTING BUGS"
+Please report bugs via https://bugs.gentoo.org/
+.SH "FILES"
+.TP
+.B ${XDG_CONFIG_HOME}/gentoo\-pipewire\-launcher.conf
+configures locations of files for log output.
+.SH "SEE ALSO"
+.BR pipewire (1),
+.BR pipewire-pulse (1),
+.BR wireplumber (1),
+.BR pipewire.conf (5)

diff --git a/media-video/pipewire/pipewire-.ebuild 
b/media-video/pipewire/pipewire-0.3.71-r3.ebuild
similarity index 99%
copy from media-video/pipewire/pipewire-.ebuild
copy to media-video/pipewire/pipewire-0.3.71-r3.ebuild
index 7289c71e58b0..33887a9e61c1 100644
--- a/media-video/pipewire/pipewire-.ebuild
+++ b/media-video/pipewire/pipewire-0.3.71-r3.ebuild
@@ -299,6 +299,8 @@ multilib_src_install_all() {
exeinto /usr/bin
newexe "${FILESDIR}"/gentoo-pipewire-launcher.in-r2 
gentoo-pipewire-launcher
 
+   doman "${FILESDIR}"/gentoo-pipewire-launcher.1
+
# Disable pipewire-pulse if sound-server is disabled.
if ! use sound-server ; then
sed -i -s '/pipewire -c pipewire-pulse.conf/s/^/#/' 
"${ED}"/usr/bin/gentoo-pipewire-launcher || die

diff --git a/media-video/pipewire/pipewire-.ebuild 
b/media-video/pipewire/pipewire-.ebuild
index 7289c71e58b0..33887a9e61c1 100644
--- a/media-video/pipewire/pipewire-.ebuild
+++ b/media-video/pipewire/pipewire-.ebuild
@@ -299,6 +299,8 @@ multilib_src_install_all() {
exeinto /usr/bin
newexe "${FILESDIR}"/gentoo-pipewire-launcher.in-r2 
gentoo-pipewire-launcher
 
+   doman "${FILESDIR}"/gentoo-pipewire-launcher.1
+
# Disable pipewire-pulse if sound-server is disabled.
if ! use sound-server ; then
sed -i -s '/pipewire -c pipewire-pulse.conf/s/^/#/' 
"${ED}"/usr/bin/gentoo-pipewire-launcher || die

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/, media-video/pipewire/

2023-06-07 Thread Sam James 
commit: 18e66b5f484739b45fcc12f8fa89c4d45acd8b80
Author: Alexis  gmail  com>
AuthorDate: Mon Jun  5 09:43:26 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun  7 09:49:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18e66b5f

media-video/pipewire: Add logging support to gentoo-pipewire-launcher

Closes: https://bugs.gentoo.org/907891
Signed-off-by: Alexis  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 .../pipewire/files/gentoo-pipewire-launcher.in-r2  | 77 ++
 media-video/pipewire/pipewire-0.3.71-r2.ebuild |  2 +-
 media-video/pipewire/pipewire-.ebuild  |  2 +-
 3 files changed, 79 insertions(+), 2 deletions(-)

diff --git a/media-video/pipewire/files/gentoo-pipewire-launcher.in-r2 
b/media-video/pipewire/files/gentoo-pipewire-launcher.in-r2
new file mode 100644
index ..ea2032b74b42
--- /dev/null
+++ b/media-video/pipewire/files/gentoo-pipewire-launcher.in-r2
@@ -0,0 +1,77 @@
+#!/bin/sh
+
+# PipeWire launcher script for XDG compliant desktops on OpenRC.
+#
+# systemd users are very _STRONGLY_ advised to use the much
+# more reliable and predictable user units instead.
+
+# WARNING: This script assumes being run inside XDG compliant session,
+# which means D-Bus session instance is expected to be correctly set up
+# prior to this script starting. If that is not true, things may break!
+
+DATE_FORMAT='+%Y-%m-%dT%H:%M:%S%Z'
+
+CONF="${XDG_CONFIG_HOME}/gentoo-pipewire-launcher.conf"
+if [ -f "${CONF}" ]
+then
+. "${CONF}"
+else
+GENTOO_PIPEWIRE_LOG='/dev/null'
+GENTOO_PIPEWIRE_PULSE_LOG='/dev/null'
+GENTOO_WIREPLUMBER_LOG='/dev/null'
+fi
+for L in \
+"${GENTOO_PIPEWIRE_LOG}" \
+"${GENTOO_PIPEWIRE_PULSE_LOG}" \
+"${GENTOO_WIREPLUMBER_LOG}"
+do
+   if [ ! -e "${L}" ]
+   then
+   touch "${L}"
+   fi
+done
+
+restart () {
+echo "Terminating PipeWire processes ..."
+pkill -u "${USER}" -x pipewire\|wireplumber 1>/dev/null 2>&1
+pwait -u "${USER}" -x pipewire\|wireplumber
+echo "PipeWire terminated."
+}
+
+if [ "${#}" -gt 0 ]
+then
+if [ "${1}" = 'restart' ]
+then
+   restart
+else
+echo "Unrecognised argument." >&2
+echo "Usage: gentoo-pipewire-launcher [restart]" >&2
+   exit 1
+fi
+fi
+
+if pgrep -u "${USER}" -x pipewire\|wireplumber 1>/dev/null 2>&1
+then
+echo "PipeWire already running, exiting." >&2
+echo "(Use 'gentoo-pipewire-launcher restart' to restart PipeWire and 
WirePlumber.)" >&2
+exit 1
+fi
+
+# The core daemon which by itself does probably nothing.
+echo "[$(@GENTOO_PORTAGE_EPREFIX@/bin/date ${DATE_FORMAT})] Starting 
PipeWire." 1>>"${GENTOO_PIPEWIRE_LOG}"
+@GENTOO_PORTAGE_EPREFIX@/usr/bin/pipewire 1>>"${GENTOO_PIPEWIRE_LOG}" 2>&1 &
+
+# The so called pipewire-pulse daemon used for PulseAudio compatibility.
+# Commenting this out will stop the PA proxying daemon from starting,
+# however ALSA (with pipewire-alsa), JACK (with jack-sdk) and PW API using
+# clients will still have access to audio and may end up clashing with
+# non-PW apps over HW control (most notably, /usr/bin/pulseaudio daemon).
+echo "[$(@GENTOO_PORTAGE_EPREFIX@/bin/date ${DATE_FORMAT})] Starting 
PipeWire-Pulse." 1>>"${GENTOO_PIPEWIRE_PULSE_LOG}"
+@GENTOO_PORTAGE_EPREFIX@/usr/bin/pipewire -c pipewire-pulse.conf 
1>>"${GENTOO_PIPEWIRE_PULSE_LOG}" 2>&1 &
+
+# Hack for bug #822498
+sleep 1
+
+# Finally a session manager is required for PipeWire to do anything.
+echo "[$(@GENTOO_PORTAGE_EPREFIX@/bin/date ${DATE_FORMAT})] Starting 
WirePlumber." 1>>"${GENTOO_WIREPLUMBER_LOG}"
+exec @GENTOO_PORTAGE_EPREFIX@/usr/bin/wireplumber 
1>>"${GENTOO_WIREPLUMBER_LOG}" 2>&1

diff --git a/media-video/pipewire/pipewire-0.3.71-r2.ebuild 
b/media-video/pipewire/pipewire-0.3.71-r2.ebuild
index f8791a4a2601..39e2c38af13b 100644
--- a/media-video/pipewire/pipewire-0.3.71-r2.ebuild
+++ b/media-video/pipewire/pipewire-0.3.71-r2.ebuild
@@ -297,7 +297,7 @@ multilib_src_install_all() {
newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop
 
exeinto /usr/bin
-   newexe "${FILESDIR}"/gentoo-pipewire-launcher.in-r1 
gentoo-pipewire-launcher
+   newexe "${FILESDIR}"/gentoo-pipewire-launcher.in-r2 
gentoo-pipewire-launcher
 
# Disable pipewire-pulse if sound-server is disabled.
if ! use sound-server ; then

diff --git a/media-video/pipewire/pipewire-.ebuild 
b/media-video/pipewire/pipewire-.ebuild
index f8791a4a2601..39e2c38af13b 100644
--- a/media-video/pipewire/pipewire-.ebuild
+++ b/media-video/pipewire/pipewire-.ebuild
@@ -297,7 +297,7 @@ multilib_src_install_all() {
newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop
 
exeinto /usr/bin
-   newexe "${FILESDIR}"/gentoo-pipewire-launcher.in-r1 
gentoo-pipewire-launcher
+   newexe "${FILESDIR}"/gentoo-pipewire-launcher.in-r2

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/, media-video/pipewire/

2023-06-07 Thread Sam James 
commit: b96e100121529b7fbc6c23afdae5de8d425dd3ed
Author: Alexis  gmail  com>
AuthorDate: Wed Jun  7 07:23:47 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun  7 09:51:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b96e1001

media-video/pipewire: pipewire.desktop: Add 'restart' to call of 
gentoo-pipewire-launcher.

Closes: https://bugs.gentoo.org/907966
Signed-off-by: Alexis  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 media-video/pipewire/files/pipewire.desktop-r2 | 12 
 media-video/pipewire/pipewire-0.3.71-r2.ebuild |  2 +-
 media-video/pipewire/pipewire-.ebuild  |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/media-video/pipewire/files/pipewire.desktop-r2 
b/media-video/pipewire/files/pipewire.desktop-r2
new file mode 100644
index ..1e8564dbe370
--- /dev/null
+++ b/media-video/pipewire/files/pipewire.desktop-r2
@@ -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/bin/gentoo-pipewire-launcher restart
+Terminal=false
+Type=Application
+X-GNOME-HiddenUnderSystemd=true
+X-KDE-HiddenUnderSystemd=true
+X-systemd-skip=true

diff --git a/media-video/pipewire/pipewire-0.3.71-r2.ebuild 
b/media-video/pipewire/pipewire-0.3.71-r2.ebuild
index 39e2c38af13b..314ca3397ea7 100644
--- a/media-video/pipewire/pipewire-0.3.71-r2.ebuild
+++ b/media-video/pipewire/pipewire-0.3.71-r2.ebuild
@@ -294,7 +294,7 @@ multilib_src_install_all() {
 
if ! use systemd; then
insinto /etc/xdg/autostart
-   newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop
+   newins "${FILESDIR}"/pipewire.desktop-r2 pipewire.desktop
 
exeinto /usr/bin
newexe "${FILESDIR}"/gentoo-pipewire-launcher.in-r2 
gentoo-pipewire-launcher

diff --git a/media-video/pipewire/pipewire-.ebuild 
b/media-video/pipewire/pipewire-.ebuild
index 39e2c38af13b..314ca3397ea7 100644
--- a/media-video/pipewire/pipewire-.ebuild
+++ b/media-video/pipewire/pipewire-.ebuild
@@ -294,7 +294,7 @@ multilib_src_install_all() {
 
if ! use systemd; then
insinto /etc/xdg/autostart
-   newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop
+   newins "${FILESDIR}"/pipewire.desktop-r2 pipewire.desktop
 
exeinto /usr/bin
newexe "${FILESDIR}"/gentoo-pipewire-launcher.in-r2 
gentoo-pipewire-launcher

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/, media-video/pipewire/

2023-05-05 Thread Sam James 
commit: 460a8f68d767b8a634aed94cd7478e384b456f1c
Author: Alexis  gmail  com>
AuthorDate: Fri May  5 08:03:57 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May  5 08:35:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=460a8f68

media-video/pipewire: gentoo-pipewire-launcher.in: Add restart functionality.

Closes: https://bugs.gentoo.org/904851
Signed-off-by: Alexis  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 .../pipewire/files/gentoo-pipewire-launcher.in-r1  | 52 ++
 ...ewire-.ebuild => pipewire-0.3.70-r1.ebuild} |  2 +-
 media-video/pipewire/pipewire-.ebuild  |  2 +-
 3 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/media-video/pipewire/files/gentoo-pipewire-launcher.in-r1 
b/media-video/pipewire/files/gentoo-pipewire-launcher.in-r1
new file mode 100644
index ..345298c0b6ae
--- /dev/null
+++ b/media-video/pipewire/files/gentoo-pipewire-launcher.in-r1
@@ -0,0 +1,52 @@
+#!/bin/sh
+
+# PipeWire launcher script for XDG compliant desktops on OpenRC.
+#
+# systemd users are very _STRONGLY_ advised to use the much
+# more reliable and predictable user units instead.
+
+# WARNING: This script assumes being run inside XDG compliant session,
+# which means D-Bus session instance is expected to be correctly set up
+# prior to this script starting. If that is not true, things may break!
+
+restart () {
+echo "Terminating PipeWire processes ..."
+pkill -u "${USER}" -x pipewire\|wireplumber 1>/dev/null 2>&1
+pwait -u "${USER}" -x pipewire\|wireplumber
+echo "PipeWire terminated."
+}
+
+if [ "${#}" -gt 0 ]
+then
+if [ "${1}" = 'restart' ]
+then
+   restart
+else
+echo "Unrecognised argument."
+   echo "Usage: gentoo-pipewire-launcher [restart]"
+   exit 1
+fi
+fi
+
+if pgrep -u "${USER}" -x pipewire\|wireplumber 1>/dev/null 2>&1
+then
+echo "PipeWire already running, exiting."
+echo "(Use 'gentoo-pipewire-launcher restart' to restart PipeWire and 
WirePlumber.)"
+exit 1
+fi
+
+# The core daemon which by itself does probably nothing.
+@GENTOO_PORTAGE_EPREFIX@/usr/bin/pipewire &
+
+# The so called pipewire-pulse daemon used for PulseAudio compatibility.
+# Commenting this out will stop the PA proxying daemon from starting,
+# however ALSA (with pipewire-alsa), JACK (with jack-sdk) and PW API using
+# clients will still have access to audio and may end up clashing with
+# non-PW apps over HW control (most notably, /usr/bin/pulseaudio daemon).
+@GENTOO_PORTAGE_EPREFIX@/usr/bin/pipewire -c pipewire-pulse.conf &
+
+# Hack for bug #822498
+sleep 1
+
+# Finally a session manager is required for PipeWire to do anything.
+exec @GENTOO_PORTAGE_EPREFIX@/usr/bin/wireplumber

diff --git a/media-video/pipewire/pipewire-.ebuild 
b/media-video/pipewire/pipewire-0.3.70-r1.ebuild
similarity index 99%
copy from media-video/pipewire/pipewire-.ebuild
copy to media-video/pipewire/pipewire-0.3.70-r1.ebuild
index a54b5c2d65dd..bfad8bec183e 100644
--- a/media-video/pipewire/pipewire-.ebuild
+++ b/media-video/pipewire/pipewire-0.3.70-r1.ebuild
@@ -310,7 +310,7 @@ multilib_src_install_all() {
newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop
 
exeinto /usr/bin
-   newexe "${FILESDIR}"/gentoo-pipewire-launcher.in 
gentoo-pipewire-launcher
+   newexe "${FILESDIR}"/gentoo-pipewire-launcher.in-r1 
gentoo-pipewire-launcher
 
# Disable pipewire-pulse if sound-server is disabled.
if ! use sound-server ; then

diff --git a/media-video/pipewire/pipewire-.ebuild 
b/media-video/pipewire/pipewire-.ebuild
index a54b5c2d65dd..bfad8bec183e 100644
--- a/media-video/pipewire/pipewire-.ebuild
+++ b/media-video/pipewire/pipewire-.ebuild
@@ -310,7 +310,7 @@ multilib_src_install_all() {
newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop
 
exeinto /usr/bin
-   newexe "${FILESDIR}"/gentoo-pipewire-launcher.in 
gentoo-pipewire-launcher
+   newexe "${FILESDIR}"/gentoo-pipewire-launcher.in-r1 
gentoo-pipewire-launcher
 
# Disable pipewire-pulse if sound-server is disabled.
if ! use sound-server ; then

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/0.3.65/, media-video/pipewire/

2023-04-13 Thread Sam James 
commit: ab10254f1d69dc66f7b0bd21a541fbc784c9f720
Author: Sam James  gentoo  org>
AuthorDate: Thu Apr 13 19:27:25 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Apr 13 19:27:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab10254f

media-video/pipewire: drop 0.3.65-r3, 0.3.66-r1

Signed-off-by: Sam James  gentoo.org>

 media-video/pipewire/Manifest  |   2 -
 ...odules-also-install-module-combine-stream.patch |  21 -
 ...ez5-fix-dependency-on-glib-in-bluez5_deps.patch |  28 --
 media-video/pipewire/pipewire-0.3.65-r3.ebuild | 462 
 media-video/pipewire/pipewire-0.3.66-r1.ebuild | 470 -
 5 files changed, 983 deletions(-)

diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index ebc997547285..cb341d56dad6 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,4 +1,2 @@
-DIST pipewire-0.3.65.tar.bz2 1522095 BLAKE2B 
d991820e8780773ccf1cd68baa3156428eb099703b82c3e3ad24a86bc634ad43fb474fe362de5e5704ee8b35832b75995fd56096b6539835e8b1f31710450d08
 SHA512 
0c2402044a04ab6ba724b0808279498e2126dd567920f3241d7d3d5e13ea676e353fc85a73634cf4cae5429454250dfce5cd18ba4a5444a7ed1a5ca2e0ae1eef
-DIST pipewire-0.3.66.tar.bz2 1532022 BLAKE2B 
aa0db6426a04728b633ce9a40aa1b10eca69423925b1a06b70cc65e4b8466b9de23c4f16ebdc5bd6c14d41866deec66ed166053299b9bc6f5b9e81fcc06010e2
 SHA512 
9e43159fec81dddad618be6ea44304aba4013be14992476e54cbb01e8699c9d6291012879e1c6717e1095be2d73390f900f6d54d8d9c689b50baf93c820c2129
 DIST pipewire-0.3.67.tar.bz2 1531871 BLAKE2B 
59ea184ae11ad2999f37f0ded785551894ce6fbf478146c53f1dc6cdfeae7aa50cf6151b1e5e9c63c4f288682e5da7fde523251096af7da9d79bf96dd9d94809
 SHA512 
538b8ee905760775a0522dd3883d5db9bcaafe93d80eb5b588e21e73de22637a49cd139d3ed4dcfd1a5822af85e4cede624eee899c1e51a115f1ba0a6966c7a5
 DIST pipewire-0.3.69.tar.bz2 1567927 BLAKE2B 
1b62e7cd359a4b1ee75793939026eef2c09d87cf7f0537fe77c081cd1b029463681b8838c9e4c0b82686ba628d74316e38d6471dbfab21ebb4d159fd052f2d6d
 SHA512 
95e91006928b9596b47a1becfcd975dfa6bcfb2286fc6007a5bed4f127d2fd2b7477573facdb73f3ebd5cb6b77b8e9ef714e5c0c2aec97ef9d3a768b477b6477

diff --git 
a/media-video/pipewire/files/0.3.65/0001-modules-also-install-module-combine-stream.patch
 
b/media-video/pipewire/files/0.3.65/0001-modules-also-install-module-combine-stream.patch
deleted file mode 100644
index 6e7dc42c2704..
--- 
a/media-video/pipewire/files/0.3.65/0001-modules-also-install-module-combine-stream.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/fba7083f8ceb210c7c20aceafeb5c9a8767cf705
-
-From fba7083f8ceb210c7c20aceafeb5c9a8767cf705 Mon Sep 17 00:00:00 2001
-From: Wim Taymans 
-Date: Thu, 26 Jan 2023 11:57:45 +0100
-Subject: [PATCH] modules: also install module-combine-stream
-
 a/src/modules/meson.build
-+++ b/src/modules/meson.build
-@@ -139,7 +139,7 @@ pipewire_module_echo_cancel_sources = [
- pipewire_module_combine_stream = 
shared_library('pipewire-module-combine-stream',
-   [ 'module-combine-stream.c' ],
-   include_directories : [configinc],
--  install : false,
-+  install : true,
-   install_dir : modules_install_dir,
-   install_rpath: modules_install_dir,
-   dependencies : [spa_dep, dl_lib, pipewire_dep],
--- 
-2.39.1
-

diff --git 
a/media-video/pipewire/files/0.3.65/0002-spa-bluez5-fix-dependency-on-glib-in-bluez5_deps.patch
 
b/media-video/pipewire/files/0.3.65/0002-spa-bluez5-fix-dependency-on-glib-in-bluez5_deps.patch
deleted file mode 100644
index 2763236693d7..
--- 
a/media-video/pipewire/files/0.3.65/0002-spa-bluez5-fix-dependency-on-glib-in-bluez5_deps.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1511
-
-From 18fa7a555cc43c7219a53d836d9561faec6d6310 Mon Sep 17 00:00:00 2001
-From: Sam James 
-Date: Sat, 28 Jan 2023 11:04:48 +
-Subject: [PATCH] spa: bluez5: fix dependency on glib in bluez5_deps
-
-In de595a78ff958b8314d853f6266d5832529d9729, we started to require glib
-for building bluez and introduced dependencies for the needed gio* bits,
-but we only ever check for glib itself for gstreamer or flatpak.
-
-Drop glib from the dep list to match the summary() & subsequent 
bluez_deps_found
-logic in spa/meson.build.
-
-Fixes: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/2999
 a/spa/plugins/bluez5/meson.build
-+++ b/spa/plugins/bluez5/meson.build
-@@ -1,6 +1,6 @@
- gnome = import('gnome')
- 
--bluez5_deps = [ mathlib, dbus_dep, glib2_dep, sbc_dep, bluez_dep, gio_dep, 
gio_unix_dep ]
-+bluez5_deps = [ mathlib, dbus_dep, sbc_dep, bluez_dep, gio_dep, gio_unix_dep ]
- foreach dep: bluez5_deps
-   if not dep.found()
- subdir_done()
--- 
-2.39.1
-

diff --git a/media-video/pipewire/pipewire-0.3.65-r3.ebuild 
b/media-video/pipewire/pipewire-0.3.65-r3.ebuild
deleted file mode 100644
index c96649f89edb..
---

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/0.3.68/, media-video/pipewire/

2023-04-13 Thread Sam James 
commit: 9f9e570758369b4d06c1d89984a6f1bb6242e272
Author: Sam James  gentoo  org>
AuthorDate: Thu Apr 13 19:13:27 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Apr 13 19:13:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f9e5707

media-video/pipewire: drop 0.3.68-r1

This ended up being a bad release. Use 0.3.69 instead.

Signed-off-by: Sam James  gentoo.org>

 media-video/pipewire/Manifest  |   1 -
 media-video/pipewire/files/0.3.68/nodes-idle.patch |  35 --
 media-video/pipewire/pipewire-0.3.68-r1.ebuild | 474 -
 3 files changed, 510 deletions(-)

diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index e9634166b9e9..ebc997547285 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,5 +1,4 @@
 DIST pipewire-0.3.65.tar.bz2 1522095 BLAKE2B 
d991820e8780773ccf1cd68baa3156428eb099703b82c3e3ad24a86bc634ad43fb474fe362de5e5704ee8b35832b75995fd56096b6539835e8b1f31710450d08
 SHA512 
0c2402044a04ab6ba724b0808279498e2126dd567920f3241d7d3d5e13ea676e353fc85a73634cf4cae5429454250dfce5cd18ba4a5444a7ed1a5ca2e0ae1eef
 DIST pipewire-0.3.66.tar.bz2 1532022 BLAKE2B 
aa0db6426a04728b633ce9a40aa1b10eca69423925b1a06b70cc65e4b8466b9de23c4f16ebdc5bd6c14d41866deec66ed166053299b9bc6f5b9e81fcc06010e2
 SHA512 
9e43159fec81dddad618be6ea44304aba4013be14992476e54cbb01e8699c9d6291012879e1c6717e1095be2d73390f900f6d54d8d9c689b50baf93c820c2129
 DIST pipewire-0.3.67.tar.bz2 1531871 BLAKE2B 
59ea184ae11ad2999f37f0ded785551894ce6fbf478146c53f1dc6cdfeae7aa50cf6151b1e5e9c63c4f288682e5da7fde523251096af7da9d79bf96dd9d94809
 SHA512 
538b8ee905760775a0522dd3883d5db9bcaafe93d80eb5b588e21e73de22637a49cd139d3ed4dcfd1a5822af85e4cede624eee899c1e51a115f1ba0a6966c7a5
-DIST pipewire-0.3.68.tar.bz2 1562968 BLAKE2B 
9ce79b5798728a4e3216ba7e49d5ac1e238292563e9aee2fe278cc1a03c6a4ec30ba9c94171d8a48d5a364a448b0d5b8f8c7315653e6ea891e408e7492fc650b
 SHA512 
a4a6f954157fbca7f7a5271448f5bdb62580a720ccfc1d582aba07e136d29876ad88662c56cf7f9965d1c858052c7a37881537b447109983a1916445dcd49f02
 DIST pipewire-0.3.69.tar.bz2 1567927 BLAKE2B 
1b62e7cd359a4b1ee75793939026eef2c09d87cf7f0537fe77c081cd1b029463681b8838c9e4c0b82686ba628d74316e38d6471dbfab21ebb4d159fd052f2d6d
 SHA512 
95e91006928b9596b47a1becfcd975dfa6bcfb2286fc6007a5bed4f127d2fd2b7477573facdb73f3ebd5cb6b77b8e9ef714e5c0c2aec97ef9d3a768b477b6477

diff --git a/media-video/pipewire/files/0.3.68/nodes-idle.patch 
b/media-video/pipewire/files/0.3.68/nodes-idle.patch
deleted file mode 100644
index 33936ff3bf59..
--- a/media-video/pipewire/files/0.3.68/nodes-idle.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/3145
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/8748c77451ce332dd24549b414200499ede4f184
-
-From 8748c77451ce332dd24549b414200499ede4f184 Mon Sep 17 00:00:00 2001
-From: Wim Taymans 
-Date: Tue, 11 Apr 2023 16:31:44 +0200
-Subject: [PATCH] context: make driver runnable when we add a runnable node
-
-Explicitly make the driver runnable when we add a runnable node to it.
-
-We have to do this because the runnable node might not be directly linked
-to this driver.
-
-In the case of the echo-canceler, for example, a playback stream
-can be linked to the sink before the echo canceled virtual sink.
-All echo-cancel nodes are added to a source driver, which would not be
-activated because there is no direct path from the playback stream
-to the source river.
-
-Fixes #3145
 a/src/pipewire/context.c
-+++ b/src/pipewire/context.c
-@@ -943,6 +943,8 @@ static void move_to_driver(struct pw_context *context, 
struct spa_list *nodes,
-   spa_list_consume(n, nodes, sort_link) {
-   spa_list_remove(>sort_link);
- 
-+  driver->runnable |= n->runnable;
-+
-   pw_log_debug(" follower: %p %s runnable:%u driver-runnable:%u", 
n, n->name,
-   n->runnable, driver->runnable);
-   pw_impl_node_set_driver(n, driver);
--- 
-GitLab
-
-

diff --git a/media-video/pipewire/pipewire-0.3.68-r1.ebuild 
b/media-video/pipewire/pipewire-0.3.68-r1.ebuild
deleted file mode 100644
index a54b5c2d65dd..
--- a/media-video/pipewire/pipewire-0.3.68-r1.ebuild
+++ /dev/null
@@ -1,474 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# 1. Please regularly check (even at the point of bumping) Fedora's packaging
-# for needed backports at 
https://src.fedoraproject.org/rpms/pipewire/tree/rawhide.
-#
-# 2. Upstream also sometimes amend release notes for the previous release to 
mention
-# needed patches, e.g. 
https://gitlab.freedesktop.org/pipewire/pipewire/-/tags/0.3.55#distros
-#
-# 3. Keep an eye on git master (for both PipeWire and WirePlumber) as things
-# continue to move quickly. It's not uncommon for fixes to be made shortly
-# after releases.
-
-PYTHON_COMPAT=(

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/0.3.68/, media-video/pipewire/

2023-04-12 Thread Sam James 
commit: e703665c1f442a3f3e30b3210a606cc62534a611
Author: Sam James  gentoo  org>
AuthorDate: Wed Apr 12 05:29:38 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Apr 12 06:06:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e703665c

media-video/pipewire: backport patch for idle nodes (gamescope)

Recommended upstream.

Signed-off-by: Sam James  gentoo.org>

 media-video/pipewire/files/0.3.68/nodes-idle.patch | 35 ++
 ...ire-0.3.68.ebuild => pipewire-0.3.68-r1.ebuild} |  0
 2 files changed, 35 insertions(+)

diff --git a/media-video/pipewire/files/0.3.68/nodes-idle.patch 
b/media-video/pipewire/files/0.3.68/nodes-idle.patch
new file mode 100644
index ..33936ff3bf59
--- /dev/null
+++ b/media-video/pipewire/files/0.3.68/nodes-idle.patch
@@ -0,0 +1,35 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/3145
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/8748c77451ce332dd24549b414200499ede4f184
+
+From 8748c77451ce332dd24549b414200499ede4f184 Mon Sep 17 00:00:00 2001
+From: Wim Taymans 
+Date: Tue, 11 Apr 2023 16:31:44 +0200
+Subject: [PATCH] context: make driver runnable when we add a runnable node
+
+Explicitly make the driver runnable when we add a runnable node to it.
+
+We have to do this because the runnable node might not be directly linked
+to this driver.
+
+In the case of the echo-canceler, for example, a playback stream
+can be linked to the sink before the echo canceled virtual sink.
+All echo-cancel nodes are added to a source driver, which would not be
+activated because there is no direct path from the playback stream
+to the source river.
+
+Fixes #3145
+--- a/src/pipewire/context.c
 b/src/pipewire/context.c
+@@ -943,6 +943,8 @@ static void move_to_driver(struct pw_context *context, 
struct spa_list *nodes,
+   spa_list_consume(n, nodes, sort_link) {
+   spa_list_remove(>sort_link);
+ 
++  driver->runnable |= n->runnable;
++
+   pw_log_debug(" follower: %p %s runnable:%u driver-runnable:%u", 
n, n->name,
+   n->runnable, driver->runnable);
+   pw_impl_node_set_driver(n, driver);
+-- 
+GitLab
+
+

diff --git a/media-video/pipewire/pipewire-0.3.68.ebuild 
b/media-video/pipewire/pipewire-0.3.68-r1.ebuild
similarity index 100%
rename from media-video/pipewire/pipewire-0.3.68.ebuild
rename to media-video/pipewire/pipewire-0.3.68-r1.ebuild

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/0.3.65/, media-video/pipewire/

2023-01-28 Thread Sam James 
commit: 2e2a6e6b671334116948249b8c3583bcd2350a81
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 28 11:11:37 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 28 11:21:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e2a6e6b

media-video/pipewire: fix bluez detection/installation

Closes: https://bugs.gentoo.org/892373
Signed-off-by: Sam James  gentoo.org>

 ...ez5-fix-dependency-on-glib-in-bluez5_deps.patch | 28 ++
 ...-0.3.65-r2.ebuild => pipewire-0.3.65-r3.ebuild} |  0
 2 files changed, 28 insertions(+)

diff --git 
a/media-video/pipewire/files/0.3.65/0002-spa-bluez5-fix-dependency-on-glib-in-bluez5_deps.patch
 
b/media-video/pipewire/files/0.3.65/0002-spa-bluez5-fix-dependency-on-glib-in-bluez5_deps.patch
new file mode 100644
index ..2763236693d7
--- /dev/null
+++ 
b/media-video/pipewire/files/0.3.65/0002-spa-bluez5-fix-dependency-on-glib-in-bluez5_deps.patch
@@ -0,0 +1,28 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1511
+
+From 18fa7a555cc43c7219a53d836d9561faec6d6310 Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Sat, 28 Jan 2023 11:04:48 +
+Subject: [PATCH] spa: bluez5: fix dependency on glib in bluez5_deps
+
+In de595a78ff958b8314d853f6266d5832529d9729, we started to require glib
+for building bluez and introduced dependencies for the needed gio* bits,
+but we only ever check for glib itself for gstreamer or flatpak.
+
+Drop glib from the dep list to match the summary() & subsequent 
bluez_deps_found
+logic in spa/meson.build.
+
+Fixes: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/2999
+--- a/spa/plugins/bluez5/meson.build
 b/spa/plugins/bluez5/meson.build
+@@ -1,6 +1,6 @@
+ gnome = import('gnome')
+ 
+-bluez5_deps = [ mathlib, dbus_dep, glib2_dep, sbc_dep, bluez_dep, gio_dep, 
gio_unix_dep ]
++bluez5_deps = [ mathlib, dbus_dep, sbc_dep, bluez_dep, gio_dep, gio_unix_dep ]
+ foreach dep: bluez5_deps
+   if not dep.found()
+ subdir_done()
+-- 
+2.39.1
+

diff --git a/media-video/pipewire/pipewire-0.3.65-r2.ebuild 
b/media-video/pipewire/pipewire-0.3.65-r3.ebuild
similarity index 100%
rename from media-video/pipewire/pipewire-0.3.65-r2.ebuild
rename to media-video/pipewire/pipewire-0.3.65-r3.ebuild

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/0.3.64/, media-video/pipewire/

2023-01-18 Thread Sam James 
commit: 01e20d6c31ad656256ae2dc6fa4b2e49fe4d30e7
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan 18 22:37:23 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 18 22:38:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01e20d6c

media-video/pipewire: backport misc. patches for 0.3.64

Signed-off-by: Sam James  gentoo.org>

 ...pa-Fix-audioconvert-overflow-when-scaling.patch | 65 ++
 ...ter-chain-fix-AVX-dsp_sum-index-increment.patch | 22 
 ...on-t-remove-deprecated-symbols-by-default.patch | 61 
 ...ewire-.ebuild => pipewire-0.3.64-r1.ebuild} |  3 +
 media-video/pipewire/pipewire-.ebuild  |  3 +
 5 files changed, 154 insertions(+)

diff --git 
a/media-video/pipewire/files/0.3.64/0001-spa-Fix-audioconvert-overflow-when-scaling.patch
 
b/media-video/pipewire/files/0.3.64/0001-spa-Fix-audioconvert-overflow-when-scaling.patch
new file mode 100644
index ..e24b8153ef6d
--- /dev/null
+++ 
b/media-video/pipewire/files/0.3.64/0001-spa-Fix-audioconvert-overflow-when-scaling.patch
@@ -0,0 +1,65 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/1d9640af5a7906620f214aa0a39c63128c8506a6.
+
+From 1d9640af5a7906620f214aa0a39c63128c8506a6 Mon Sep 17 00:00:00 2001
+From: Wim Taymans 
+Date: Mon, 16 Jan 2023 18:28:31 +0100
+Subject: [PATCH] spa: Fix audioconvert overflow when scaling
+
+Add SPA_SCALE32_UP that scales a uint32 without overflow.
+Use this for scaling the threshold in ALSA.
+Fix the scaling in audioconvert of the buffer size, the scaling was
+wrong and it was also causing an overflow resulting in choppy sound in
+some cases.
+
+See #2680
+--- a/spa/include/spa/utils/defs.h
 b/spa/include/spa/utils/defs.h
+@@ -274,6 +274,14 @@ struct spa_fraction {
+ #define SPA_ROUND_DOWN_N(num,align)   ((num) & ~SPA_ROUND_MASK(num, align))
+ #define SPA_ROUND_UP_N(num,align) num)-1) | SPA_ROUND_MASK(num, 
align))+1)
+ 
++#define SPA_SCALE32_UP(val,num,denom) \
++({\
++  uint64_t _val = (val);  \
++  uint64_t _denom = (denom);  \
++  (uint32_t)(((_val) * (num) + (_denom)-1) / (_denom));   \
++})
++
++
+ #define SPA_PTR_ALIGNMENT(p,align)((intptr_t)(p) & ((align)-1))
+ #define SPA_IS_ALIGNED(p,align)   (SPA_PTR_ALIGNMENT(p,align) == 
0)
+ #define SPA_PTR_ALIGN(p,align,type)   ((type*)SPA_ROUND_UP_N((intptr_t)(p), 
(intptr_t)(align)))
+--- a/spa/plugins/alsa/alsa-pcm.c
 b/spa/plugins/alsa/alsa-pcm.c
+@@ -1999,7 +1999,7 @@ static inline void check_position_config(struct state 
*state)
+   (state->rate_denom != state->position->clock.rate.denom))) {
+   state->duration = state->position->clock.duration;
+   state->rate_denom = state->position->clock.rate.denom;
+-  state->threshold = (state->duration * state->rate + 
state->rate_denom-1) / state->rate_denom;
++  state->threshold = SPA_SCALE32_UP(state->duration, state->rate, 
state->rate_denom);
+   state->max_error = SPA_MAX(256.0f, state->threshold / 2.0f);
+   state->resample = ((uint32_t)state->rate != state->rate_denom) 
|| state->matching;
+   state->alsa_sync = true;
+@@ -2569,7 +2569,7 @@ int spa_alsa_start(struct state *state)
+   setup_matching(state);
+ 
+   spa_dll_init(>dll);
+-  state->threshold = (state->duration * state->rate + 
state->rate_denom-1) / state->rate_denom;
++  state->threshold = SPA_SCALE32_UP(state->duration, state->rate, 
state->rate_denom);
+   state->last_threshold = state->threshold;
+   state->max_error = SPA_MAX(256.0f, state->threshold / 2.0f);
+ 
+--- a/spa/plugins/audioconvert/audioconvert.c
 b/spa/plugins/audioconvert/audioconvert.c
+@@ -1755,7 +1755,7 @@ impl_node_port_enum_params(void *object, int seq,
+   size = this->quantum_limit * 2;
+   /*  scale the buffer size when we can. */
+   if (irate != 0 && orate != 0)
+-  size = size * (irate + orate - 1) / orate;
++  size = SPA_SCALE32_UP(size, irate, orate);
+   }
+ 
+   param = spa_pod_builder_add_object(,
+-- 
+2.39.1
+

diff --git 
a/media-video/pipewire/files/0.3.64/0002-filter-chain-fix-AVX-dsp_sum-index-increment.patch
 
b/media-video/pipewire/files/0.3.64/0002-filter-chain-fix-AVX-dsp_sum-index-increment.patch
new file mode 100644
index ..f33a83ab7a10
--- /dev/null
+++ 
b/media-video/pipewire/files/0.3.64/0002-filter-chain-fix-AVX-dsp_sum-index-increment.patch
@@ -0,0 +1,22 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/ccedf1722ae44c97ec0d058b349494c67a0b56dc
+
+From ccedf1722ae44c97ec0d058b349494c67a0b56dc Mon Sep 17 00:00:00 2001
+From: Wim Taymans 
+Date: Tue, 17 Jan

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/, media-video/pipewire/

2022-12-29 Thread Sam James 
commit: d2d6ff0a99a795e07bbfb19f501db28584fb7481
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec 30 06:59:22 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec 30 06:59:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2d6ff0a

media-video/pipewire: backport more patches to 0.3.63

Bug: https://bugs.gentoo.org/888643
Signed-off-by: Sam James  gentoo.org>

 .../files/pipewire-0.3.63-alsa-node-target.patch   |  28 ++
 .../files/pipewire-0.3.63-rate-update.patch|  39 ++
 media-video/pipewire/pipewire-0.3.63-r2.ebuild | 443 +
 3 files changed, 510 insertions(+)

diff --git a/media-video/pipewire/files/pipewire-0.3.63-alsa-node-target.patch 
b/media-video/pipewire/files/pipewire-0.3.63-alsa-node-target.patch
new file mode 100644
index ..8a4169b57af5
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.63-alsa-node-target.patch
@@ -0,0 +1,28 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/89ac6b353521fb9a6d6eb6bb74724c4fa968f75c
+https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/2893
+
+From 89ac6b353521fb9a6d6eb6bb74724c4fa968f75c Mon Sep 17 00:00:00 2001
+From: Wim Taymans 
+Date: Sat, 17 Dec 2022 18:17:33 +0100
+Subject: [PATCH] =?UTF-8?q?alsa:=20don=C2=B4t=20set=20-1=20as=20node.targe?=
+ =?UTF-8?q?t?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Leave the target unset when -1, just like what pw-stream does.
+
+See #2893
+--- a/pipewire-alsa/alsa-plugins/pcm_pipewire.c
 b/pipewire-alsa/alsa-plugins/pcm_pipewire.c
+@@ -579,7 +579,7 @@ static int snd_pcm_pipewire_prepare(snd_pcm_ioplug_t *io)
+   pw_properties_setf(props, PW_KEY_NODE_LATENCY, "%lu/%u", 
pw->min_avail, io->rate);
+   if (pw_properties_get(props, PW_KEY_NODE_RATE) == NULL)
+   pw_properties_setf(props, PW_KEY_NODE_RATE, "1/%u", io->rate);
+-  if (pw->target != NULL &&
++  if (pw->target != NULL && !spa_streq(pw->target, "-1") &&
+   pw_properties_get(props, PW_KEY_NODE_TARGET) == NULL)
+   pw_properties_setf(props, PW_KEY_NODE_TARGET, "%s", pw->target);
+ 
+-- 
+GitLab

diff --git a/media-video/pipewire/files/pipewire-0.3.63-rate-update.patch 
b/media-video/pipewire/files/pipewire-0.3.63-rate-update.patch
new file mode 100644
index ..91487def58e2
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.63-rate-update.patch
@@ -0,0 +1,39 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/860b8fc27ffbfd0a095e3fa4b0cd125d536283d3
+https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/2915
+https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/2891
+
+From 860b8fc27ffbfd0a095e3fa4b0cd125d536283d3 Mon Sep 17 00:00:00 2001
+From: Wim Taymans 
+Date: Thu, 29 Dec 2022 12:22:56 +0100
+Subject: [PATCH] modules: fix rate update
+
+Setting the rate with the PROP_rate would actually result in a rate
+adjustment of 1.0f / rate, so do the same here.
+
+See #2891
+--- a/src/modules/module-pulse-tunnel.c
 b/src/modules/module-pulse-tunnel.c
+@@ -270,7 +270,7 @@ static void update_rate(struct impl *impl, bool playback)
+   impl->current_latency, impl->target_latency);
+ 
+   SPA_FLAG_SET(impl->rate_match->flags, SPA_IO_RATE_MATCH_FLAG_ACTIVE);
+-  impl->rate_match->rate = corr;
++  impl->rate_match->rate = 1.0f / corr;
+ }
+ 
+ static void playback_stream_process(void *d)
+--- a/src/modules/module-rtp-source.c
 b/src/modules/module-rtp-source.c
+@@ -272,7 +272,7 @@ static void stream_process(void *data)
+ 
+   if (sess->rate_match) {
+   SPA_FLAG_SET(sess->rate_match->flags, 
SPA_IO_RATE_MATCH_FLAG_ACTIVE);
+-  sess->rate_match->rate = corr;
++  sess->rate_match->rate = 1.0f / corr;
+   }
+   }
+   spa_ringbuffer_read_data(>ring,
+-- 
+GitLab
+
+

diff --git a/media-video/pipewire/pipewire-0.3.63-r2.ebuild 
b/media-video/pipewire/pipewire-0.3.63-r2.ebuild
new file mode 100644
index ..c73900f8e6fb
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.63-r2.ebuild
@@ -0,0 +1,443 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 1. Please regularly check (even at the point of bumping) Fedora's packaging
+# for needed backports at 
https://src.fedoraproject.org/rpms/pipewire/tree/rawhide.
+#
+# 2. Upstream also sometimes amend release notes for the previous release to 
mention
+# needed patches, e.g. 
https://gitlab.freedesktop.org/pipewire/pipewire/-/tags/0.3.55#distros
+#
+# 3. Keep an eye on git master (for both PipeWire and WirePlumber) as things
+# continue to move quickly. It's not uncommon for fixes to be made shortly
+# after releases.
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit flag-o-matic meson-multilib

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/, media-video/pipewire/

2022-12-27 Thread Sam James 
commit: 64151f42d338500d6075c197037368db46368ca6
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec 27 14:17:35 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec 27 14:17:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64151f42

media-video/pipewire: backport bluetooth regression fix

Signed-off-by: Sam James  gentoo.org>

 .../files/pipewire-0.3.63-bluetooth-typo.patch |  21 +
 media-video/pipewire/pipewire-0.3.63-r1.ebuild | 441 +
 2 files changed, 462 insertions(+)

diff --git a/media-video/pipewire/files/pipewire-0.3.63-bluetooth-typo.patch 
b/media-video/pipewire/files/pipewire-0.3.63-bluetooth-typo.patch
new file mode 100644
index ..78993a57831e
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.63-bluetooth-typo.patch
@@ -0,0 +1,21 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/c7b3ef0d9ff16a1e69a299870860bebcb628e298
+
+From c7b3ef0d9ff16a1e69a299870860bebcb628e298 Mon Sep 17 00:00:00 2001
+From: Pauli Virtanen 
+Date: Wed, 21 Dec 2022 12:54:52 +0200
+Subject: [PATCH] bluez5: backend-native: fix missing brace in CIND reply
+
+It should look like ...,("battchg,(0-5)) not ...,"battchg",(0-5))
+--- a/spa/plugins/bluez5/backend-native.c
 b/spa/plugins/bluez5/backend-native.c
+@@ -74,7 +74,7 @@ enum {
+   HFP_AG_INITIAL_CODEC_SETUP_WAIT
+ };
+ 
+-#define CIND_INDICATORS 
"(\"service\",(0-1)),(\"call\",(0-1)),(\"callsetup\",(0-3)),(\"callheld\",(0-2)),(\"signal\",(0-5)),(\"roam\",(0-1)),\"battchg\",(0-5))"
++#define CIND_INDICATORS 
"(\"service\",(0-1)),(\"call\",(0-1)),(\"callsetup\",(0-3)),(\"callheld\",(0-2)),(\"signal\",(0-5)),(\"roam\",(0-1)),(\"battchg\",(0-5))"
+ enum {
+   CIND_SERVICE = 1,
+   CIND_CALL,
+-- 
+GitLab

diff --git a/media-video/pipewire/pipewire-0.3.63-r1.ebuild 
b/media-video/pipewire/pipewire-0.3.63-r1.ebuild
new file mode 100644
index ..b693bccb95c8
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.63-r1.ebuild
@@ -0,0 +1,441 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 1. Please regularly check (even at the point of bumping) Fedora's packaging
+# for needed backports at 
https://src.fedoraproject.org/rpms/pipewire/tree/rawhide.
+#
+# 2. Upstream also sometimes amend release notes for the previous release to 
mention
+# needed patches, e.g. 
https://gitlab.freedesktop.org/pipewire/pipewire/-/tags/0.3.55#distros
+#
+# 3. Keep an eye on git master (for both PipeWire and WirePlumber) as things
+# continue to move quickly. It's not uncommon for fixes to be made shortly
+# after releases.
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd 
udev
+
+if [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git;
+   inherit git-r3
+else
+   if [[ ${PV} == *_p* ]] ; then
+   MY_COMMIT=""
+   
SRC_URI="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${MY_COMMIT}/pipewire-${MY_COMMIT}.tar.bz2
 -> ${P}.tar.bz2"
+   S="${WORKDIR}"/${PN}-${MY_COMMIT}
+   else
+   
SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2;
+   fi
+
+   KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/;
+
+LICENSE="MIT LGPL-2.1+ GPL-2"
+# ABI was broken in 0.3.42 for 
https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
+SLOT="0/0.4"
+IUSE="bluetooth dbus doc echo-cancel extra flatpak gstreamer gsettings 
jack-client jack-sdk lv2
+modemmanager pipewire-alsa readline sound-server ssl system-service systemd 
test udev v4l X zeroconf"
+
+# Once replacing system JACK libraries is possible, it's likely that
+# jack-client IUSE will need blocking to avoid users accidentally
+# configuring their systems to send PW sink output to the emulated
+# JACK's sink - doing so is likely to yield no audio, cause a CPU
+# cycles consuming loop (and may even cause GUI crashes)!
+
+# TODO: There should be "sound-server? ( || ( alsa bluetooth ) )" here, but 
ALSA is always enabled
+# TODO: Pulseaudio alsa plugin performs runtime check that pulseaudio server 
connection will work
+# which provides adequate guarantee that alsa-lib will be able to provide 
audio services.
+# If that works, pulseaudio defaults are loaded into alsa-lib runtime 
replacing default PCM and CTL.
+# When pipewire-alsa will be able to perform similar check, pipewire-alsa can 
be enabled unconditionally.
+REQUIRED_USE="
+   jack-sdk? ( !jack-client )
+   modemmanager? ( bluetooth )
+   system-service? ( systemd )
+   !sound-server? ( !pipewire-alsa )
+   jack-client? ( dbus )
+"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+   >=dev-util/meson-0.59
+   virtual/pkgconfig
+   ${PYTHON_DEPS}
+

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/, media-video/pipewire/

2022-12-15 Thread Sam James 
commit: 8ea8aa1c9332813077b3aaf13ddf79988041f403
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec 16 04:55:05 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec 16 04:55:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ea8aa1c

media-video/pipewire: drop 0.3.60-r1, 0.3.62, 0.3.62-r1

0.3.62 was very short-lived, we'd backported the critical stuff in
0.3.62-r1, but 0.3.63 is one of those pure bug fixes releases anyway
so let's clenaup immediately.

Signed-off-by: Sam James  gentoo.org>

 media-video/pipewire/Manifest  |   2 -
 .../pipewire-0.3.60-profile-switch-crash.patch |  28 --
 ...ver-also-advance-read-pointer-in-underrun.patch |  29 --
 .../pipewire/files/pipewire-0.3.60-qemu.patch  |  22 -
 .../files/pipewire-0.3.62-distorted-avx2.patch |  41 --
 .../files/pipewire-0.3.62-use-after-free.patch | 185 -
 media-video/pipewire/pipewire-0.3.60-r1.ebuild | 438 
 media-video/pipewire/pipewire-0.3.62-r1.ebuild | 442 -
 media-video/pipewire/pipewire-0.3.62.ebuild| 439 
 9 files changed, 1626 deletions(-)

diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index d48a4c4d3804..2bef025bea38 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,5 +1,3 @@
 DIST pipewire-0.3.59.tar.bz2 1443372 BLAKE2B 
5e2d82c0bfdb7c030d8be525152c38115438caeb990afd7757424efcf2a7391a6a4891b0f58347ab0b7446707e8ad88baffa0c11c5acc42e086f23c9de3cb354
 SHA512 
f42bfab6e1bb227431119b44887af818a25eb0cdbcca917433162af87c942eb105a2b6e100de877d188941a24f1c8e2e9ae79f499fc20f0a32e2f7cc5de54162
-DIST pipewire-0.3.60.tar.bz2 1478952 BLAKE2B 
a7cda37a35ea58079b5297949239fd05b895b59d397f36a68c75c9392c65ad060926caf2e61c5511ab27f02da6c1c2044e4e86009f9c5f18d2744cad63585900
 SHA512 
8a1c022a283f3cbe7488658563440ff6b426f0b894f519ccd5c7d73bdb5437902fbd4d7d572d5840d48bd7a2f037f0f14dd244fe36b8be891a2d2843f4a99b5c
 DIST pipewire-0.3.61.tar.bz2 1480364 BLAKE2B 
df940896189b986e1d63ce6d5ec6cb554ae030ef2ed217a5310f06d959b8c28bff12bc48d847ce5bc6ff007b3652f9ae6e35fd15ef39283348c010cd341bcea6
 SHA512 
8fe5b6ce0fd1ef2a20b1253436fb97aab9da168ce243400b0291051e97809d75793d9446fd4aafc835f82fd257009ec6df9e181d375b492ee72d7f90275ab917
-DIST pipewire-0.3.62.tar.bz2 1482986 BLAKE2B 
008f57e0e01971aa27af7a7c1e4ddcc72326845534fd8c9257b14078acdde1abf44629b93532ba340c5d446ef47b402bfa22ffbfc28cd44a75131b05e06ce3c8
 SHA512 
3132b18fc3d1269587216301a9e5a87ee74c1583f17da466a82e9446b57a8a9b77e7dfdea84f04320940c637ea6ce5c1c9caca6a449fb1e55e946259820b2084
 DIST pipewire-0.3.63.tar.bz2 1485423 BLAKE2B 
8629bce6d11959d4b3930d7db4e0ad201981002d52c6b73b3ee2b0ac141518f553f7b0e47aef4157b3c3ef71c6b544889f60f4be0fadb01b8a35c1d457edb1aa
 SHA512 
0a45e9017bbcd74f21c6a1f388c5b58123deec083bbc9a9e695948ea95e67b6384acfff6e5ab685ea7287b4696e01176e257b73286ecd03c2d2e43d80fd60805

diff --git 
a/media-video/pipewire/files/pipewire-0.3.60-profile-switch-crash.patch 
b/media-video/pipewire/files/pipewire-0.3.60-profile-switch-crash.patch
deleted file mode 100644
index cd126d627d20..
--- a/media-video/pipewire/files/pipewire-0.3.60-profile-switch-crash.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/bf3516ba0496b644b3944b114253f23964178897
-
-From bf3516ba0496b644b3944b114253f23964178897 Mon Sep 17 00:00:00 2001
-From: Wim Taymans 
-Date: Tue, 15 Nov 2022 15:40:47 +0100
-Subject: [PATCH] audioadapter: perform setup again after a PortConfig
-
-After the ports are reconfigured, we need to perform the setup again so
-that buffers and processing can happen with the right settings.
-
-This fixes an issue when autoswitching between A2DP and HFP with
-bluetooth headsets when there is also a stereo capture device available.
-The input stream of the browser is quickly reconfigured between stereo
-and mono with only a Pause command in between, clearing the setup state
-is enough to redo the setup when going back to Playing.
-
-Fixes #2764
 a/spa/plugins/audioconvert/audioconvert.c
-+++ b/spa/plugins/audioconvert/audioconvert.c
-@@ -979,6 +979,7 @@ static int reconfigure_mode(struct impl *this, enum 
spa_param_port_config_mode m
-   }
- 
-   this->monitor = monitor;
-+  this->setup = false;
-   dir->control = control;
-   dir->have_profile = true;
-   dir->mode = mode;
-GitLab

diff --git 
a/media-video/pipewire/files/pipewire-0.3.60-pulse-server-also-advance-read-pointer-in-underrun.patch
 
b/media-video/pipewire/files/pipewire-0.3.60-pulse-server-also-advance-read-pointer-in-underrun.patch
deleted file mode 100644
index 99e752391885..
--- 
a/media-video/pipewire/files/pipewire-0.3.60-pulse-server-also-advance-read-pointer-in-underrun.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/b720da771efa950cf380101bed42d5d5ee177908
-
-From

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/, media-video/pipewire/

2022-12-09 Thread Sam James 
commit: 2c55a48f17db8dfe66a495d5399348a4976eabf8
Author: Sam James  gentoo  org>
AuthorDate: Sat Dec 10 04:34:55 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Dec 10 04:35:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c55a48f

media-video/pipewire: drop 0.3.56

Signed-off-by: Sam James  gentoo.org>

 media-video/pipewire/Manifest  |   1 -
 .../files/pipewire-0.3.56-big-endian.patch |  55 ---
 media-video/pipewire/pipewire-0.3.56.ebuild| 424 -
 3 files changed, 480 deletions(-)

diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index dd5472274968..9e785ebba91f 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,4 +1,3 @@
-DIST pipewire-0.3.56.tar.gz 1856321 BLAKE2B 
62fb5d5a83b3cfc0555f09da42c8d4fbe69f34432add57f91a9c001535340a84f54572af4a5ba138251888cba9be0c038317dfe929d2e2ef36ff62f4679c6ea0
 SHA512 
a1ba598c56130a30e573d3ce3ac5879d800d3005a47075c45353d968c97c12f74d85802cd171b61558c06c474a03bbe4885396ca430a0af6c5672ed00f43d108
 DIST pipewire-0.3.59.tar.bz2 1443372 BLAKE2B 
5e2d82c0bfdb7c030d8be525152c38115438caeb990afd7757424efcf2a7391a6a4891b0f58347ab0b7446707e8ad88baffa0c11c5acc42e086f23c9de3cb354
 SHA512 
f42bfab6e1bb227431119b44887af818a25eb0cdbcca917433162af87c942eb105a2b6e100de877d188941a24f1c8e2e9ae79f499fc20f0a32e2f7cc5de54162
 DIST pipewire-0.3.60.tar.bz2 1478952 BLAKE2B 
a7cda37a35ea58079b5297949239fd05b895b59d397f36a68c75c9392c65ad060926caf2e61c5511ab27f02da6c1c2044e4e86009f9c5f18d2744cad63585900
 SHA512 
8a1c022a283f3cbe7488658563440ff6b426f0b894f519ccd5c7d73bdb5437902fbd4d7d572d5840d48bd7a2f037f0f14dd244fe36b8be891a2d2843f4a99b5c
 DIST pipewire-0.3.61.tar.bz2 1480364 BLAKE2B 
df940896189b986e1d63ce6d5ec6cb554ae030ef2ed217a5310f06d959b8c28bff12bc48d847ce5bc6ff007b3652f9ae6e35fd15ef39283348c010cd341bcea6
 SHA512 
8fe5b6ce0fd1ef2a20b1253436fb97aab9da168ce243400b0291051e97809d75793d9446fd4aafc835f82fd257009ec6df9e181d375b492ee72d7f90275ab917

diff --git a/media-video/pipewire/files/pipewire-0.3.56-big-endian.patch 
b/media-video/pipewire/files/pipewire-0.3.56-big-endian.patch
deleted file mode 100644
index d7742d26cead..
--- a/media-video/pipewire/files/pipewire-0.3.56-big-endian.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/aaa015d0c0c66b64c7198a34ad3c4b43445667d2
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/1a5ec4452fa21592eaeeb823ad95a1db6eb60376
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/f857fd46262b1a90ad94f86e34216a1a886d9463
-
-From aaa015d0c0c66b64c7198a34ad3c4b43445667d2 Mon Sep 17 00:00:00 2001
-From: Wim Taymans 
-Date: Tue, 19 Jul 2022 13:06:52 +0200
-Subject: [PATCH] avb: fix compilation on big endian
-
 a/spa/plugins/avb/avbtp/packets.h
-+++ b/spa/plugins/avb/avbtp/packets.h
-@@ -116,7 +116,7 @@ struct spa_avbtp_packet_aaf {
-   unsigned gv:1;
-   unsigned tv:1;
- 
--  uint8_t seq_number;
-+  uint8_t seq_num;
- 
-   unsigned _r2:7;
-   unsigned tu:1;
-GitLab
-From 1a5ec4452fa21592eaeeb823ad95a1db6eb60376 Mon Sep 17 00:00:00 2001
-From: Wim Taymans 
-Date: Tue, 19 Jul 2022 13:49:42 +0200
-Subject: [PATCH] avb: fix compilation on big endian
-
 a/src/modules/module-avb/aaf.h
-+++ b/src/modules/module-avb/aaf.h
-@@ -35,7 +35,7 @@ struct avb_packet_aaf {
-   unsigned gv:1;
-   unsigned tv:1;
- 
--  uint8_t seq_number;
-+  uint8_t seq_num;
- 
-   unsigned _r2:7;
-   unsigned tu:1;
-GitLab
-From f857fd46262b1a90ad94f86e34216a1a886d9463 Mon Sep 17 00:00:00 2001
-From: Wim Taymans 
-Date: Tue, 19 Jul 2022 14:07:16 +0200
-Subject: [PATCH] avb: fix compilation on big endian
-
 a/src/modules/module-avb/iec61883.h
-+++ b/src/modules/module-avb/iec61883.h
-@@ -37,7 +37,7 @@ struct avb_packet_iec61883 {
-   unsigned gv:1;
-   unsigned tv:1;
- 
--  uint8_t seq_number;
-+  uint8_t seq_num;
- 
-   unsigned _r2:7;
-   unsigned tu:1;
-GitLab

diff --git a/media-video/pipewire/pipewire-0.3.56.ebuild 
b/media-video/pipewire/pipewire-0.3.56.ebuild
deleted file mode 100644
index d60731301153..
--- a/media-video/pipewire/pipewire-0.3.56.ebuild
+++ /dev/null
@@ -1,424 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# 1. Please regularly check (even at the point of bumping) Fedora's packaging
-# for needed backports at 
https://src.fedoraproject.org/rpms/pipewire/tree/rawhide.
-#
-# 2. Upstream also sometimes amend release notes for the previous release to 
mention
-# needed patches, e.g. 
https://gitlab.freedesktop.org/pipewire/pipewire/-/tags/0.3.55#distros
-#
-# 3. Keep an eye on git master (for both PipeWire and WirePlumber) as things
-# continue to move quickly. It's not uncommon for fixes to be made shortly
-# after releases.
-
-PYTHON_COMPAT=( python3_{8..11} )
-

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/, media-video/pipewire/

2022-11-10 Thread Sam James 
commit: d6e4b2a3de4e36b0ea71e777afabb3f37e0ddb92
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov 11 04:22:26 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 11 04:23:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6e4b2a3

media-video/pipewire: make modemmanager, readline optional

Signed-off-by: Sam James  gentoo.org>

 ...0-pulse-server-also-advance-read-pointer-in-underrun.patch | 11 ++-
 media-video/pipewire/metadata.xml |  1 +
 media-video/pipewire/pipewire-0.3.60.ebuild   | 10 +++---
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git 
a/media-video/pipewire/files/pipewire-0.3.60-pulse-server-also-advance-read-pointer-in-underrun.patch
 
b/media-video/pipewire/files/pipewire-0.3.60-pulse-server-also-advance-read-pointer-in-underrun.patch
index 255a3143e93f..99e752391885 100644
--- 
a/media-video/pipewire/files/pipewire-0.3.60-pulse-server-also-advance-read-pointer-in-underrun.patch
+++ 
b/media-video/pipewire/files/pipewire-0.3.60-pulse-server-also-advance-read-pointer-in-underrun.patch
@@ -1,3 +1,5 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/b720da771efa950cf380101bed42d5d5ee177908
+
 From b720da771efa950cf380101bed42d5d5ee177908 Mon Sep 17 00:00:00 2001
 From: Wim Taymans 
 Date: Thu, 10 Nov 2022 16:13:33 +0100
@@ -8,12 +10,6 @@ So that we ask for more data from the client.
 Also retested with #2799 that caused this regression.
 
 Fixes #2821

- src/modules/module-protocol-pulse/pulse-server.c | 7 ---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/modules/module-protocol-pulse/pulse-server.c 
b/src/modules/module-protocol-pulse/pulse-server.c
-index b18273e98..07f664ba1 100644
 --- a/src/modules/module-protocol-pulse/pulse-server.c
 +++ b/src/modules/module-protocol-pulse/pulse-server.c
 @@ -1433,10 +1433,11 @@ static void stream_process(void *data)
@@ -31,6 +27,3 @@ index b18273e98..07f664ba1 100644
pd.playing_for = size;
}
pw_log_debug("%p: [%s] underrun read:%u avail:%d 
max:%u",
--- 
-2.38.1
-

diff --git a/media-video/pipewire/metadata.xml 
b/media-video/pipewire/metadata.xml
index f5b7e177d5f3..af21a7316abc 100644
--- a/media-video/pipewire/metadata.xml
+++ b/media-video/pipewire/metadata.xml
@@ -22,6 +22,7 @@
Install a plugin for running PipeWire 
as a JACK client
Use PipeWire as JACK replacement
Allow loading LV2 plugins via 
media-libs/lv2
+   Combined with USE=bluetooth, allows 
PipeWire to perform telephony on mobile devices.
Replace PulseAudio's ALSA plugin 
with PipeWire's plugin
Enable raop-sink support (needs 
dev-libs/openssl)
Install systemd unit files for 
running as a system service. Not recommended.

diff --git a/media-video/pipewire/pipewire-0.3.60.ebuild 
b/media-video/pipewire/pipewire-0.3.60.ebuild
index ac164c770bbb..ca8bc505b0d0 100644
--- a/media-video/pipewire/pipewire-0.3.60.ebuild
+++ b/media-video/pipewire/pipewire-0.3.60.ebuild
@@ -39,7 +39,7 @@ LICENSE="MIT LGPL-2.1+ GPL-2"
 # ABI was broken in 0.3.42 for 
https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
 SLOT="0/0.4"
 IUSE="bluetooth dbus doc echo-cancel extra flatpak gstreamer jack-client 
jack-sdk lv2
-pipewire-alsa sound-server ssl system-service systemd test udev v4l X zeroconf"
+modemmanager pipewire-alsa readline sound-server ssl system-service systemd 
test udev v4l X zeroconf"
 
 # Once replacing system JACK libraries is possible, it's likely that
 # jack-client IUSE will need blocking to avoid users accidentally
@@ -54,6 +54,7 @@ pipewire-alsa sound-server ssl system-service systemd test 
udev v4l X zeroconf"
 # When pipewire-alsa will be able to perform similar check, pipewire-alsa can 
be enabled unconditionally.
 REQUIRED_USE="
jack-sdk? ( !jack-client )
+   modemmanager? ( bluetooth )
system-service? ( systemd )
!sound-server? ( !pipewire-alsa )
jack-client? ( dbus )
@@ -74,7 +75,6 @@ BDEPEND="
 RDEPEND="
acct-group/audio
media-libs/alsa-lib
-   sys-libs/readline:=
sys-libs/ncurses:=[unicode(+)]
virtual/libintl[${MULTILIB_USEDEP}]
bluetooth? (
@@ -105,6 +105,7 @@ RDEPEND="
!media-sound/jack2
)
lv2? ( media-libs/lilv )
+   modemmanager? ( >=net-misc/modemmanager-1.10.0 )
pipewire-alsa? (
>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
)
@@ -112,6 +113,7 @@ RDEPEND="
!media-sound/pulseaudio[daemon(+)]
!media-sound/pulseaudio-daemon
)
+   readline? ( sys-libs/readline:= )
ssl? ( dev-libs/openssl:= )
systemd? ( sys-apps/systemd )
system-service? (
@@ -209,7 +211,8 @@ multilib_src_configure() {

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/, media-video/pipewire/

2022-11-10 Thread Sam James 
commit: 59fae5c077e34c4dccfd1df0be8215d0e9ab55aa
Author: Guillermo Joandet  gmail  com>
AuthorDate: Thu Nov 10 23:23:17 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 11 03:54:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59fae5c0

media-video/pipewire: Version bump to 0.3.60

Signed-off-by: Guillermo Joandet  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/28217
Signed-off-by: Sam James  gentoo.org>

 media-video/pipewire/Manifest  |   1 +
 ...ver-also-advance-read-pointer-in-underrun.patch |  36 ++
 media-video/pipewire/pipewire-0.3.60.ebuild| 432 +
 3 files changed, 469 insertions(+)

diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 9ec8dba458f7..30bac3733f85 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,2 +1,3 @@
 DIST pipewire-0.3.56.tar.gz 1856321 BLAKE2B 
62fb5d5a83b3cfc0555f09da42c8d4fbe69f34432add57f91a9c001535340a84f54572af4a5ba138251888cba9be0c038317dfe929d2e2ef36ff62f4679c6ea0
 SHA512 
a1ba598c56130a30e573d3ce3ac5879d800d3005a47075c45353d968c97c12f74d85802cd171b61558c06c474a03bbe4885396ca430a0af6c5672ed00f43d108
 DIST pipewire-0.3.59.tar.bz2 1443372 BLAKE2B 
5e2d82c0bfdb7c030d8be525152c38115438caeb990afd7757424efcf2a7391a6a4891b0f58347ab0b7446707e8ad88baffa0c11c5acc42e086f23c9de3cb354
 SHA512 
f42bfab6e1bb227431119b44887af818a25eb0cdbcca917433162af87c942eb105a2b6e100de877d188941a24f1c8e2e9ae79f499fc20f0a32e2f7cc5de54162
+DIST pipewire-0.3.60.tar.bz2 1478952 BLAKE2B 
a7cda37a35ea58079b5297949239fd05b895b59d397f36a68c75c9392c65ad060926caf2e61c5511ab27f02da6c1c2044e4e86009f9c5f18d2744cad63585900
 SHA512 
8a1c022a283f3cbe7488658563440ff6b426f0b894f519ccd5c7d73bdb5437902fbd4d7d572d5840d48bd7a2f037f0f14dd244fe36b8be891a2d2843f4a99b5c

diff --git 
a/media-video/pipewire/files/pipewire-0.3.60-pulse-server-also-advance-read-pointer-in-underrun.patch
 
b/media-video/pipewire/files/pipewire-0.3.60-pulse-server-also-advance-read-pointer-in-underrun.patch
new file mode 100644
index ..255a3143e93f
--- /dev/null
+++ 
b/media-video/pipewire/files/pipewire-0.3.60-pulse-server-also-advance-read-pointer-in-underrun.patch
@@ -0,0 +1,36 @@
+From b720da771efa950cf380101bed42d5d5ee177908 Mon Sep 17 00:00:00 2001
+From: Wim Taymans 
+Date: Thu, 10 Nov 2022 16:13:33 +0100
+Subject: [PATCH] pulse-server: also advance read pointer in underrun
+
+So that we ask for more data from the client.
+
+Also retested with #2799 that caused this regression.
+
+Fixes #2821
+---
+ src/modules/module-protocol-pulse/pulse-server.c | 7 ---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/modules/module-protocol-pulse/pulse-server.c 
b/src/modules/module-protocol-pulse/pulse-server.c
+index b18273e98..07f664ba1 100644
+--- a/src/modules/module-protocol-pulse/pulse-server.c
 b/src/modules/module-protocol-pulse/pulse-server.c
+@@ -1433,10 +1433,11 @@ static void stream_process(void *data)
+   stream->buffer, MAXLENGTH,
+   index % MAXLENGTH,
+   p, avail);
+-  index += avail;
+-  pd.read_inc = avail;
+-  
spa_ringbuffer_read_update(>ring, index);
+   }
++  index += size;
++  pd.read_inc = size;
++  spa_ringbuffer_read_update(>ring, 
index);
++
+   pd.playing_for = size;
+   }
+   pw_log_debug("%p: [%s] underrun read:%u avail:%d 
max:%u",
+-- 
+2.38.1
+

diff --git a/media-video/pipewire/pipewire-0.3.60.ebuild 
b/media-video/pipewire/pipewire-0.3.60.ebuild
new file mode 100644
index ..ac164c770bbb
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.60.ebuild
@@ -0,0 +1,432 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 1. Please regularly check (even at the point of bumping) Fedora's packaging
+# for needed backports at 
https://src.fedoraproject.org/rpms/pipewire/tree/rawhide.
+#
+# 2. Upstream also sometimes amend release notes for the previous release to 
mention
+# needed patches, e.g. 
https://gitlab.freedesktop.org/pipewire/pipewire/-/tags/0.3.55#distros
+#
+# 3. Keep an eye on git master (for both PipeWire and WirePlumber) as things
+# continue to move quickly. It's not uncommon for fixes to be made shortly
+# after releases.
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd 
udev
+
+if [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git;
+   inherit git-r3
+else
+   if [[ ${PV} == *_p* ]]

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/

2022-08-22 Thread Sam James 
commit: bba2893f1623ceb93ab71d6be6135581fcbb9b32
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Tue Aug  2 16:52:50 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Aug 23 05:25:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bba2893f

media-video/pipewire: remove unused file

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Portage 3.0.34 / pkgdev 0.2.1 / pkgcheck 0.10.11
Closes: https://github.com/gentoo/gentoo/pull/26707
Signed-off-by: Sam James  gentoo.org>

 media-video/pipewire/files/pipewire-launcher.sh | 6 --
 1 file changed, 6 deletions(-)

diff --git a/media-video/pipewire/files/pipewire-launcher.sh 
b/media-video/pipewire/files/pipewire-launcher.sh
deleted file mode 100644
index ecff3e7e7082..
--- a/media-video/pipewire/files/pipewire-launcher.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/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

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/, media-video/pipewire/

2022-07-19 Thread Sam James 
commit: 8684e3ee03c4b801948391e1c87d596138b49972
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul 19 21:17:41 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul 19 21:17:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8684e3ee

media-video/pipewire: add 0.3.56

Signed-off-by: Sam James  gentoo.org>

 media-video/pipewire/Manifest  |   1 +
 .../files/pipewire-0.3.56-big-endian.patch |  55 +++
 media-video/pipewire/pipewire-0.3.56.ebuild| 424 +
 3 files changed, 480 insertions(+)

diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 3d5272fb98b5..5e3c5005ee95 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -2,3 +2,4 @@ DIST pipewire-0.3.51.tar.gz 1789070 BLAKE2B 
8538eb9f2178efa26365f30b324b707826e5
 DIST pipewire-0.3.52.tar.gz 1810238 BLAKE2B 
bb75eff5fe7700d0a303fbfed7910aebd82346a5a21c4a0d17c06e6991bc90bb6d4f6b9559c25788494cb11faff957523dcd7f0c4c8a40be11b81c63a5a9e5ef
 SHA512 
30e9cf74c92babafe386f02a03bb5c41a8ee5591a02f15845cca1ee44f091ce68eb14d48943d43b680cb525026a19e0290997670f9a82156eaa72e974fe6d01a
 DIST pipewire-0.3.53_p20220705.tar.bz2 1358645 BLAKE2B 
365e81ab114fb9b4abbd5351145d0558c7c00bdbccefc2f7bacb965018c1e7009b7b26b8e95baf35534b74cf9ce49483604841aa7ba949d6a94e720e8ec4233c
 SHA512 
631e737e3517cb4d4c3f84e9540acde2cf94bde472626c61e0223ff4ac5cc2118a35dae79d009558384e24b955cf002d209db1bcf1465056757234725213f152
 DIST pipewire-0.3.55.tar.gz 1801857 BLAKE2B 
ee8d75bffba5f6b2e6ccd4da518339aa8e00e6afd8a4e8b6839bc0e4422b587f7543916ef161c9995bb7bfdf20032af984ac2fe9238ac9ad6160ab5d5942f700
 SHA512 
a139e51bc0d4144ae3bd3511962e541ae5c8a76d344d472805819e5bda6e62ec9807489c2a9e9f42bd9a25eff243f8a794b71d629438bf732a5cd92b85eaa9fc
+DIST pipewire-0.3.56.tar.gz 1856321 BLAKE2B 
62fb5d5a83b3cfc0555f09da42c8d4fbe69f34432add57f91a9c001535340a84f54572af4a5ba138251888cba9be0c038317dfe929d2e2ef36ff62f4679c6ea0
 SHA512 
a1ba598c56130a30e573d3ce3ac5879d800d3005a47075c45353d968c97c12f74d85802cd171b61558c06c474a03bbe4885396ca430a0af6c5672ed00f43d108

diff --git a/media-video/pipewire/files/pipewire-0.3.56-big-endian.patch 
b/media-video/pipewire/files/pipewire-0.3.56-big-endian.patch
new file mode 100644
index ..d7742d26cead
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.56-big-endian.patch
@@ -0,0 +1,55 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/aaa015d0c0c66b64c7198a34ad3c4b43445667d2
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/1a5ec4452fa21592eaeeb823ad95a1db6eb60376
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/f857fd46262b1a90ad94f86e34216a1a886d9463
+
+From aaa015d0c0c66b64c7198a34ad3c4b43445667d2 Mon Sep 17 00:00:00 2001
+From: Wim Taymans 
+Date: Tue, 19 Jul 2022 13:06:52 +0200
+Subject: [PATCH] avb: fix compilation on big endian
+
+--- a/spa/plugins/avb/avbtp/packets.h
 b/spa/plugins/avb/avbtp/packets.h
+@@ -116,7 +116,7 @@ struct spa_avbtp_packet_aaf {
+   unsigned gv:1;
+   unsigned tv:1;
+ 
+-  uint8_t seq_number;
++  uint8_t seq_num;
+ 
+   unsigned _r2:7;
+   unsigned tu:1;
+GitLab
+From 1a5ec4452fa21592eaeeb823ad95a1db6eb60376 Mon Sep 17 00:00:00 2001
+From: Wim Taymans 
+Date: Tue, 19 Jul 2022 13:49:42 +0200
+Subject: [PATCH] avb: fix compilation on big endian
+
+--- a/src/modules/module-avb/aaf.h
 b/src/modules/module-avb/aaf.h
+@@ -35,7 +35,7 @@ struct avb_packet_aaf {
+   unsigned gv:1;
+   unsigned tv:1;
+ 
+-  uint8_t seq_number;
++  uint8_t seq_num;
+ 
+   unsigned _r2:7;
+   unsigned tu:1;
+GitLab
+From f857fd46262b1a90ad94f86e34216a1a886d9463 Mon Sep 17 00:00:00 2001
+From: Wim Taymans 
+Date: Tue, 19 Jul 2022 14:07:16 +0200
+Subject: [PATCH] avb: fix compilation on big endian
+
+--- a/src/modules/module-avb/iec61883.h
 b/src/modules/module-avb/iec61883.h
+@@ -37,7 +37,7 @@ struct avb_packet_iec61883 {
+   unsigned gv:1;
+   unsigned tv:1;
+ 
+-  uint8_t seq_number;
++  uint8_t seq_num;
+ 
+   unsigned _r2:7;
+   unsigned tu:1;
+GitLab

diff --git a/media-video/pipewire/pipewire-0.3.56.ebuild 
b/media-video/pipewire/pipewire-0.3.56.ebuild
new file mode 100644
index ..c5e583a53c24
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.56.ebuild
@@ -0,0 +1,424 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 1. Please regularly check (even at the point of bumping) Fedora's packaging
+# for needed backports at 
https://src.fedoraproject.org/rpms/pipewire/tree/rawhide.
+#
+# 2. Upstream also sometimes amend release notes for the previous release to 
mention
+# needed patches, e.g. 
https://gitlab.freedesktop.org/pipewire/pipewire/-/tags/0.3.55#distros
+#
+# 3. Keep an eye on git master (for both PipeWire and WirePlumber) as things
+# continue to move quickly. It's not uncommon for fixes to

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/, media-video/pipewire/

2022-07-10 Thread Sam James 
commit: 0de895e872b03a682e49c886807e247e1658f62f
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 10 20:22:49 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 10 20:23:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0de895e8

media-video/pipewire: fix build w/ -Ofast & FORTIFY_SOURCE

Not strictly limited to -Ofast paired w/ >= FORTIFY_SOURCE=2, can
happen with other optimisation levels, just that -Ofast encourages
it to do the inlining which then blows up.

Revbump b/c of the obvious possible runtime nature of the bug
(given the patch may change behaviour).

Closes: https://bugs.gentoo.org/857201
Signed-off-by: Sam James  gentoo.org>

 .../files/pipewire-0.3.54-fortify-source.patch |  33 ++
 media-video/pipewire/pipewire-0.3.54-r2.ebuild | 422 +
 2 files changed, 455 insertions(+)

diff --git a/media-video/pipewire/files/pipewire-0.3.54-fortify-source.patch 
b/media-video/pipewire/files/pipewire-0.3.54-fortify-source.patch
new file mode 100644
index ..0c93f105375a
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.54-fortify-source.patch
@@ -0,0 +1,33 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/240d21282271dce7d2eeff03185a61ffca0c12c5
+https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/2526
+https://bugs.gentoo.org/857201
+
+From 240d21282271dce7d2eeff03185a61ffca0c12c5 Mon Sep 17 00:00:00 2001
+From: Pauli Virtanen 
+Date: Sun, 10 Jul 2022 16:05:27 +0300
+Subject: [PATCH] pipewire-v4l2: disable _FORTIFY_SOURCE when defining override
+ functions
+
+_FORTIFY_SOURCE defines always_inline versions of open etc. functions,
+which conflict with our exported override versions.  Disable it for the
+file that defines the override functions.
+--- a/pipewire-v4l2/src/v4l2-func.c
 b/pipewire-v4l2/src/v4l2-func.c
+@@ -22,6 +22,16 @@
+  * DEALINGS IN THE SOFTWARE.
+  */
+ 
++
++/*
++ * We need to export open* etc., but _FORTIFY_SOURCE defines conflicting
++ * always_inline versions. Disable _FORTIFY_SOURCE for this file, so we
++ * can define our overrides.
++ */
++#ifdef _FORTIFY_SOURCE
++#undef _FORTIFY_SOURCE
++#endif
++
+ #include 
+ #include 
+ #include 
+GitLab

diff --git a/media-video/pipewire/pipewire-0.3.54-r2.ebuild 
b/media-video/pipewire/pipewire-0.3.54-r2.ebuild
new file mode 100644
index ..56828f47128f
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.54-r2.ebuild
@@ -0,0 +1,422 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 1. Please regularly check (even at the point of bumping) Fedora's packaging
+# for needed backports at 
https://src.fedoraproject.org/rpms/pipewire/tree/rawhide.
+#
+# 2. Keep an eye on git master (for both PipeWire and WirePlumber) as things
+# continue to move quickly. It's not uncommon for fixes to be made shortly
+# after releases.
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd 
udev
+
+if [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git;
+   inherit git-r3
+else
+   if [[ ${PV} == *_p* ]] ; then
+   MY_COMMIT=""
+   
SRC_URI="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${MY_COMMIT}/pipewire-${MY_COMMIT}.tar.bz2
 -> ${P}.tar.bz2"
+   S="${WORKDIR}"/${PN}-${MY_COMMIT}
+   else
+   
SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz;
+   fi
+
+   KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/;
+
+LICENSE="MIT LGPL-2.1+ GPL-2"
+# ABI was broken in 0.3.42 for 
https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
+SLOT="0/0.4"
+IUSE="bluetooth dbus doc echo-cancel extra gstreamer jack-client jack-sdk lv2
+pipewire-alsa sound-server ssl system-service systemd test udev v4l X zeroconf"
+
+# Once replacing system JACK libraries is possible, it's likely that
+# jack-client IUSE will need blocking to avoid users accidentally
+# configuring their systems to send PW sink output to the emulated
+# JACK's sink - doing so is likely to yield no audio, cause a CPU
+# cycles consuming loop (and may even cause GUI crashes)!
+
+# TODO: There should be "sound-server? ( || ( alsa bluetooth ) )" here, but 
ALSA is always enabled
+# TODO: Pulseaudio alsa plugin performs runtime check that pulseaudio server 
connection will work
+# which provides adequate guarantee that alsa-lib will be able to provide 
audio services.
+# If that works, pulseaudio defaults are loaded into alsa-lib runtime 
replacing default PCM and CTL.
+# When pipewire-alsa will be able to perform similar check, pipewire-alsa can 
be enabled unconditionally.
+REQUIRED_USE="
+   jack-sdk? ( !jack-client )
+   system-service? ( systemd )
+   !sound-server? (

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/, media-video/pipewire/

2022-07-08 Thread Sam James 
commit: ac20d8886516281bb2b3a2b83cc294a2d2192757
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul  9 00:57:46 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul  9 01:07:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac20d888

media-video/pipewire: add 0.3.54, 0.3.54-r1

0.3.54-r1 contains an addiional patch for mpv but
nobody else seems to have backported it, so
doing it in an additional revision to allow
easy testing.

Bug: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/2519
Signed-off-by: Sam James  gentoo.org>

 media-video/pipewire/Manifest  |  1 +
 .../pipewire-0.3.54-audioconvert-samples.patch | 23 ++
 ...ewire-.ebuild => pipewire-0.3.54-r1.ebuild} |  8 
 ...pipewire-.ebuild => pipewire-0.3.54.ebuild} |  7 +++
 media-video/pipewire/pipewire-.ebuild  |  7 +++
 5 files changed, 46 insertions(+)

diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 18ff21b93d7c..390bafb6a9da 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -3,3 +3,4 @@ DIST pipewire-0.3.52.tar.gz 1810238 BLAKE2B 
bb75eff5fe7700d0a303fbfed7910aebd823
 DIST pipewire-0.3.53.tar.gz 1783505 BLAKE2B 
269466c6ba78cb85516dc714f3aa5d71cdf72a859b6e1a11c60062da6dcd56eefc78958fe026b9fd11d61fd6fbe6f2aac54a2a9fd77d4ee474687f5d54628c38
 SHA512 
50f23a7b71f3eb20657ff75de54a9f3056270bf05a5472ec9c7dea1c9d0ed391b6b09496d58b065c3cbc40f9be8088b6737cbf0731973498bcd5a8176c42d443
 DIST pipewire-0.3.53_p20220704.tar.bz2 1351516 BLAKE2B 
3d4e4859c66e9cbe47adc0f1c0e2e512632793d70853e0105984c06d2e66744b68d1c01dc7a85784ca2007a96aa5fd1c62c7f47ea6360df58ff76b87de4d3ee2
 SHA512 
87819aa5bdd3caa685c0fc93b0ddcf8212f115cecc130155918876c10883bd98ce923fef3f9716b2562ef5ae2b5465d9e39816f4b6e0c48cf9f28303755584b6
 DIST pipewire-0.3.53_p20220705.tar.bz2 1358645 BLAKE2B 
365e81ab114fb9b4abbd5351145d0558c7c00bdbccefc2f7bacb965018c1e7009b7b26b8e95baf35534b74cf9ce49483604841aa7ba949d6a94e720e8ec4233c
 SHA512 
631e737e3517cb4d4c3f84e9540acde2cf94bde472626c61e0223ff4ac5cc2118a35dae79d009558384e24b955cf002d209db1bcf1465056757234725213f152
+DIST pipewire-0.3.54.tar.gz 1789544 BLAKE2B 
66b28b36aee0672a1bc8059beb18bf0868d8c01f01823151a732ca8e616860beb1ff4c8eb611f6f17bc99e4201bd1ba8ef44fb8968cedd56be3370e279c75bed
 SHA512 
affb8b4fefd8c1cd3064df0987117931a03e967461d6b8125e3f390b83f6dda1a11d6b30e81590f4780f607b763061dd7a26a7686816dd2801f03d64d43ab8f2

diff --git 
a/media-video/pipewire/files/pipewire-0.3.54-audioconvert-samples.patch 
b/media-video/pipewire/files/pipewire-0.3.54-audioconvert-samples.patch
new file mode 100644
index ..9c231a9f28f5
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.54-audioconvert-samples.patch
@@ -0,0 +1,23 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/7b0106883716cb0fa72a2b3c4715175607ec658a
+
+From: Wim Taymans 
+Date: Fri, 8 Jul 2022 09:23:31 +0200
+Subject: [PATCH] audioconvert: consume right amount of input samples
+
+When we are not using the resampler, we consume the same amount of
+input samples as output samples.
+
+Fixes #2519
+--- a/spa/plugins/audioconvert/audioconvert.c
 b/spa/plugins/audioconvert/audioconvert.c
+@@ -2542,8 +2542,8 @@ static int impl_node_process(void *object)
+   this->in_offset += in_len;
+   n_samples = out_len;
+   } else {
+-  this->in_offset += n_samples;
+   n_samples = SPA_MIN(n_samples, n_out);
++  this->in_offset += n_samples;
+   }
+   this->out_offset += n_samples;
+ 
+GitLab

diff --git a/media-video/pipewire/pipewire-.ebuild 
b/media-video/pipewire/pipewire-0.3.54-r1.ebuild
similarity index 97%
copy from media-video/pipewire/pipewire-.ebuild
copy to media-video/pipewire/pipewire-0.3.54-r1.ebuild
index f831949d2b1c..f8b1bc7b1bc0 100644
--- a/media-video/pipewire/pipewire-.ebuild
+++ b/media-video/pipewire/pipewire-0.3.54-r1.ebuild
@@ -3,6 +3,13 @@
 
 EAPI=8
 
+# 1. Please regularly check (even at the point of bumping) Fedora's packaging
+# for needed backports at 
https://src.fedoraproject.org/rpms/pipewire/tree/rawhide.
+#
+# 2. Keep an eye on git master (for both PipeWire and WirePlumber) as things
+# continue to move quickly. It's not uncommon for fixes to be made shortly
+# after releases.
+
 PYTHON_COMPAT=( python3_{8..11} )
 
 inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd 
udev
@@ -134,6 +141,7 @@ DOCS=( {README,INSTALL}.md NEWS )
 
 PATCHES=(
"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+   "${FILESDIR}"/${P}-audioconvert-samples.patch
 )
 
 # limitsdfile related code taken from =sys-auth/realtime-base-0.1

diff --git a/media-video/pipewire/pipewire-.ebuild 
b/media-video/pipewire/pipewire-0.3.54.ebuild
similarity index 97%
copy from media-video/pipewire/pipewire-.ebuild
copy to

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/, media-video/pipewire/

2022-07-04 Thread Sam James 
commit: 95d40c5fba17cf3aca380449620c386ba20e6f7f
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul  4 23:53:32 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul  4 23:53:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95d40c5f

media-video/pipewire: drop 0.3.49-r2

Signed-off-by: Sam James  gentoo.org>

 media-video/pipewire/Manifest  |   1 -
 .../pipewire/files/pipewire-0.3.49-x86-cast.patch  |  20 --
 media-video/pipewire/pipewire-0.3.49-r2.ebuild | 360 -
 3 files changed, 381 deletions(-)

diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 4d01a2bceef0..de58b4a0f18d 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,4 +1,3 @@
-DIST pipewire-0.3.49.tar.gz 1769037 BLAKE2B 
2567bc98933bfbb295358886e8f97db2af2f0a6ee3c2586c1718e39f7eedaed8528a4663753ba56d3295e42576da015ce9278f22aff9bbd9ca43d883bff5a2f6
 SHA512 
36398872f7d7b31193d7a8885bbdfb415a122bd779874107a0642202dfd8408f39fddf769bfbae4533c2cc99fe9ef67903d50cc721e936aa4802229f1c46d809
 DIST pipewire-0.3.51.tar.gz 1789070 BLAKE2B 
8538eb9f2178efa26365f30b324b707826e580caa1fd9c09b62c561c140c14186e0d2b04808fa78eb5642ddccf1a347def19934ecd654be06b215a693075b6fc
 SHA512 
a762fd260b4b14ad9ef142be11ab1c22268da6726e2179559ffb254f0ce7daf7a502779e33c64313a9c6a9fc1bd15150b76be04ec81aa27c35dbb4333cecdb4a
 DIST pipewire-0.3.52.tar.gz 1810238 BLAKE2B 
bb75eff5fe7700d0a303fbfed7910aebd82346a5a21c4a0d17c06e6991bc90bb6d4f6b9559c25788494cb11faff957523dcd7f0c4c8a40be11b81c63a5a9e5ef
 SHA512 
30e9cf74c92babafe386f02a03bb5c41a8ee5591a02f15845cca1ee44f091ce68eb14d48943d43b680cb525026a19e0290997670f9a82156eaa72e974fe6d01a
 DIST pipewire-0.3.53.tar.gz 1783505 BLAKE2B 
269466c6ba78cb85516dc714f3aa5d71cdf72a859b6e1a11c60062da6dcd56eefc78958fe026b9fd11d61fd6fbe6f2aac54a2a9fd77d4ee474687f5d54628c38
 SHA512 
50f23a7b71f3eb20657ff75de54a9f3056270bf05a5472ec9c7dea1c9d0ed391b6b09496d58b065c3cbc40f9be8088b6737cbf0731973498bcd5a8176c42d443

diff --git a/media-video/pipewire/files/pipewire-0.3.49-x86-cast.patch 
b/media-video/pipewire/files/pipewire-0.3.49-x86-cast.patch
deleted file mode 100644
index 58b4b331e03e..
--- a/media-video/pipewire/files/pipewire-0.3.49-x86-cast.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/5a023c8c84fb053d452983a64a33a41b931fc99b
-https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/2271
-
-From: Wim Taymans 
-Date: Thu, 21 Apr 2022 22:12:38 +0200
-Subject: [PATCH] alsa: fix argument type for Long
-
-Fixes #2271
 a/spa/plugins/alsa/alsa-pcm.c
-+++ b/spa/plugins/alsa/alsa-pcm.c
-@@ -311,7 +311,7 @@ struct spa_pod *spa_alsa_enum_propinfo(struct state *state,
-   SPA_PROP_INFO_name, 
SPA_POD_String("latency.internal.ns"),
-   SPA_PROP_INFO_description, SPA_POD_String("Internal 
latency in nanoseconds"),
-   SPA_PROP_INFO_type, 
SPA_POD_CHOICE_RANGE_Long(state->process_latency.ns,
--  0, 2 * SPA_NSEC_PER_SEC),
-+  0LL, 2 * SPA_NSEC_PER_SEC),
-   SPA_PROP_INFO_params, SPA_POD_Bool(true));
-   break;
-   case 15:
-GitLab

diff --git a/media-video/pipewire/pipewire-0.3.49-r2.ebuild 
b/media-video/pipewire/pipewire-0.3.49-r2.ebuild
deleted file mode 100644
index b7acb4f37fa8..
--- a/media-video/pipewire/pipewire-0.3.49-r2.ebuild
+++ /dev/null
@@ -1,360 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd 
udev
-
-if [[ ${PV} ==  ]]; then
-   EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git;
-   inherit git-r3
-else
-   if [[ ${PV} == *_p* ]] ; then
-   MY_COMMIT=""
-   
SRC_URI="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${MY_COMMIT}/pipewire-${MY_COMMIT}.tar.bz2
 -> ${P}.tar.bz2"
-   S="${WORKDIR}"/${PN}-${MY_COMMIT}
-   else
-   
SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz;
-   fi
-
-   KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
-fi
-
-DESCRIPTION="Multimedia processing graphs"
-HOMEPAGE="https://pipewire.org/;
-
-LICENSE="MIT LGPL-2.1+ GPL-2"
-# ABI was broken in 0.3.42 for 
https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
-SLOT="0/0.4"
-IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 
pipewire-alsa ssl system-service systemd test udev v4l X zeroconf"
-
-# Once replacing system JACK libraries is possible, it's likely that
-# jack-client IUSE will need blocking to avoid users accidentally
-# configuring their systems to send PW sink output to the emulated
-# JACK's sink - doing so is likely to yield

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/, media-video/pipewire/

2022-06-15 Thread Sam James 
commit: 7cdc0a83c67485ddab63e320b5e9e0012c81445f
Author: Niklāvs Koļesņikovs <89q1r14hd  relay  firefox  com>
AuthorDate: Wed Jun 15 19:39:05 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun 15 21:56:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cdc0a83

media-video/pipewire: clean up 0.3.50

PipeWire 0.3.50 was by no means a bad release but 0.3.51 should be
even better, and it already has been in the tree for long enough to
go stable, so no point in keeping 0.3.50 around.

Signed-off-by: Niklāvs Koļesņikovs <89q1r14hd  relay.firefox.com>
Closes: https://github.com/gentoo/gentoo/pull/25916
Signed-off-by: Sam James  gentoo.org>

 media-video/pipewire/Manifest  |   1 -
 .../files/pipewire-0.3.50-fix-spa-header.patch |  39 ---
 ...pewire-0.3.50-treewide-retain-sections-to.patch |  70 
 media-video/pipewire/pipewire-0.3.50-r3.ebuild | 362 -
 4 files changed, 472 deletions(-)

diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 9f0efb7e7c58..7ac36027d575 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,6 +1,5 @@
 DIST pipewire-0.3.30.tar.gz 1540950 BLAKE2B 
69b35743e3ad9a8caf68d9bb16cf395203efed6c3046b3f4ea33bbcdd6649f5d425d813042c12396a7cd5ff4e8ed91dbc395a96fe55935ad50f9c3f3918b0407
 SHA512 
ec525e0fb7e5c5313245fcc745b971fd7d4a1caa7ab9fe1fa38dc20d50f03e5969197e86b60659971676bec0f79aa7b7951c8209bfe9565a3fd1dcac1b8535b3
 DIST pipewire-0.3.36.tar.gz 1708209 BLAKE2B 
20fce0d7f88347fe594491d4fae7b6a8edee67ff7749f1a40b807a5d5094d792e61e3efd05dca2221f781c263e34ff0a50ad3c162231911d4b1d87704df6c775
 SHA512 
f0fc68ea005018b420a4f65a24dc9c85eb6263c24e66852a7ce2b03f966990d62487b388c7d73ff5adfc10c80c439b1200ae876e41d78f91db190036a1799a14
 DIST pipewire-0.3.49.tar.gz 1769037 BLAKE2B 
2567bc98933bfbb295358886e8f97db2af2f0a6ee3c2586c1718e39f7eedaed8528a4663753ba56d3295e42576da015ce9278f22aff9bbd9ca43d883bff5a2f6
 SHA512 
36398872f7d7b31193d7a8885bbdfb415a122bd779874107a0642202dfd8408f39fddf769bfbae4533c2cc99fe9ef67903d50cc721e936aa4802229f1c46d809
-DIST pipewire-0.3.50.tar.gz 1773182 BLAKE2B 
d286b73553471795ea8ed60c82e12c955f1835a7a3a8d45baeda6b1e20a795221230b50c21619af4ef5b2b4962d2783de00b1ab2b22b091220970c334de8b9dc
 SHA512 
e29a626258ab28d74e35e310037fac374fe009fb56e0fa41cef7abb1ec6abb26f828cff1b17500f92f1dd4c95c1e0e98f6af497d315dd463f81c2649d1e8ee23
 DIST pipewire-0.3.51.tar.gz 1789070 BLAKE2B 
8538eb9f2178efa26365f30b324b707826e580caa1fd9c09b62c561c140c14186e0d2b04808fa78eb5642ddccf1a347def19934ecd654be06b215a693075b6fc
 SHA512 
a762fd260b4b14ad9ef142be11ab1c22268da6726e2179559ffb254f0ce7daf7a502779e33c64313a9c6a9fc1bd15150b76be04ec81aa27c35dbb4333cecdb4a
 DIST pipewire-0.3.52.tar.gz 1810238 BLAKE2B 
bb75eff5fe7700d0a303fbfed7910aebd82346a5a21c4a0d17c06e6991bc90bb6d4f6b9559c25788494cb11faff957523dcd7f0c4c8a40be11b81c63a5a9e5ef
 SHA512 
30e9cf74c92babafe386f02a03bb5c41a8ee5591a02f15845cca1ee44f091ce68eb14d48943d43b680cb525026a19e0290997670f9a82156eaa72e974fe6d01a

diff --git a/media-video/pipewire/files/pipewire-0.3.50-fix-spa-header.patch 
b/media-video/pipewire/files/pipewire-0.3.50-fix-spa-header.patch
deleted file mode 100644
index 5b9ad3cf2d7c..
--- a/media-video/pipewire/files/pipewire-0.3.50-fix-spa-header.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/d3ea3142e1a4de206e616bc18f63a529e6b4986a.patch
-https://bugs.gentoo.org/838427
-
-From: psykose 
-Date: Wed, 13 Apr 2022 21:57:49 +
-Subject: [PATCH] spa: fix c90 header include
-
-placing declarations after code is invalid under ISO c90
-
-Fixes !1211
 a/spa/include/spa/utils/string.h
-+++ b/spa/include/spa/utils/string.h
-@@ -276,10 +276,11 @@ static inline int spa_scnprintf(char *buffer, size_t 
size, const char *format, .
- static inline float spa_strtof(const char *str, char **endptr)
- {
-   static locale_t locale = NULL;
-+  locale_t prev;
-   float v;
-   if (SPA_UNLIKELY(locale == NULL))
-   locale = newlocale(LC_ALL_MASK, "C", NULL);
--  locale_t prev = uselocale(locale);
-+  prev = uselocale(locale);
-   v = strtof(str, endptr);
-   uselocale(prev);
-   return v;
-@@ -319,10 +320,11 @@ static inline bool spa_atof(const char *str, float *val)
- static inline double spa_strtod(const char *str, char **endptr)
- {
-   static locale_t locale = NULL;
-+  locale_t prev;
-   double v;
-   if (SPA_UNLIKELY(locale == NULL))
-   locale = newlocale(LC_ALL_MASK, "C", NULL);
--  locale_t prev = uselocale(locale);
-+  prev = uselocale(locale);
-   v = strtod(str, endptr);
-   uselocale(prev);
-   return v;
-GitLab

diff --git 
a/media-video/pipewire/files/pipewire-0.3.50-treewide-retain-sections-to.patch 
b/media-video/pipewire/files/pipewire-0.3.50-treewide-retain-sections-to.patch
deleted file mode 100644
index

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/, media-video/pipewire/

2022-06-09 Thread Sam James 
commit: 87479b842a4c5af883517256f14f3dbb19f3b113
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun 10 00:36:17 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 10 00:38:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87479b84

media-video/pipewire: add 0.3.52

Signed-off-by: Sam James  gentoo.org>

 media-video/pipewire/Manifest  |  1 +
 .../files/pipewire-0.3.52-pulse-path.patch | 78 ++
 ...pipewire-.ebuild => pipewire-0.3.52.ebuild} | 16 +++--
 media-video/pipewire/pipewire-.ebuild  | 15 +++--
 4 files changed, 102 insertions(+), 8 deletions(-)

diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 528468dc49d8..9f0efb7e7c58 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -3,3 +3,4 @@ DIST pipewire-0.3.36.tar.gz 1708209 BLAKE2B 
20fce0d7f88347fe594491d4fae7b6a8edee
 DIST pipewire-0.3.49.tar.gz 1769037 BLAKE2B 
2567bc98933bfbb295358886e8f97db2af2f0a6ee3c2586c1718e39f7eedaed8528a4663753ba56d3295e42576da015ce9278f22aff9bbd9ca43d883bff5a2f6
 SHA512 
36398872f7d7b31193d7a8885bbdfb415a122bd779874107a0642202dfd8408f39fddf769bfbae4533c2cc99fe9ef67903d50cc721e936aa4802229f1c46d809
 DIST pipewire-0.3.50.tar.gz 1773182 BLAKE2B 
d286b73553471795ea8ed60c82e12c955f1835a7a3a8d45baeda6b1e20a795221230b50c21619af4ef5b2b4962d2783de00b1ab2b22b091220970c334de8b9dc
 SHA512 
e29a626258ab28d74e35e310037fac374fe009fb56e0fa41cef7abb1ec6abb26f828cff1b17500f92f1dd4c95c1e0e98f6af497d315dd463f81c2649d1e8ee23
 DIST pipewire-0.3.51.tar.gz 1789070 BLAKE2B 
8538eb9f2178efa26365f30b324b707826e580caa1fd9c09b62c561c140c14186e0d2b04808fa78eb5642ddccf1a347def19934ecd654be06b215a693075b6fc
 SHA512 
a762fd260b4b14ad9ef142be11ab1c22268da6726e2179559ffb254f0ce7daf7a502779e33c64313a9c6a9fc1bd15150b76be04ec81aa27c35dbb4333cecdb4a
+DIST pipewire-0.3.52.tar.gz 1810238 BLAKE2B 
bb75eff5fe7700d0a303fbfed7910aebd82346a5a21c4a0d17c06e6991bc90bb6d4f6b9559c25788494cb11faff957523dcd7f0c4c8a40be11b81c63a5a9e5ef
 SHA512 
30e9cf74c92babafe386f02a03bb5c41a8ee5591a02f15845cca1ee44f091ce68eb14d48943d43b680cb525026a19e0290997670f9a82156eaa72e974fe6d01a

diff --git a/media-video/pipewire/files/pipewire-0.3.52-pulse-path.patch 
b/media-video/pipewire/files/pipewire-0.3.52-pulse-path.patch
new file mode 100644
index ..09d8699f
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.52-pulse-path.patch
@@ -0,0 +1,78 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/4821c7ca2fe5e25ba018e9f5d4967f08d6bb816f
+
+From: Wim Taymans 
+Date: Thu, 9 Jun 2022 17:06:07 +0200
+Subject: [PATCH] pulse-server: don't append "/pulse" to PULSE_RUNTIME_PATH
+
+Fixes #2431
+--- a/src/modules/module-protocol-pulse/server.c
 b/src/modules/module-protocol-pulse/server.c
+@@ -460,7 +460,7 @@ static int parse_unix_address(const char *address, struct 
sockaddr_storage *addr
+   if (address[0] != '/') {
+   char runtime_dir[PATH_MAX];
+ 
+-  if ((res = get_runtime_dir(runtime_dir, sizeof(runtime_dir), 
"pulse")) < 0)
++  if ((res = get_runtime_dir(runtime_dir, sizeof(runtime_dir))) < 
0)
+   return res;
+ 
+   res = snprintf(addr.sun_path, sizeof(addr.sun_path),
+--- a/src/modules/module-protocol-pulse/utils.c
 b/src/modules/module-protocol-pulse/utils.c
+@@ -50,27 +50,30 @@
+ #include "log.h"
+ #include "utils.h"
+ 
+-int get_runtime_dir(char *buf, size_t buflen, const char *dir)
++int get_runtime_dir(char *buf, size_t buflen)
+ {
+-  const char *runtime_dir;
++  const char *runtime_dir, *dir = NULL;
+   struct stat stat_buf;
+   int res, size;
+ 
+   runtime_dir = getenv("PULSE_RUNTIME_PATH");
+-  if (runtime_dir == NULL)
++  if (runtime_dir == NULL) {
+   runtime_dir = getenv("XDG_RUNTIME_DIR");
+-
++  dir = "pulse";
++  }
+   if (runtime_dir == NULL) {
+   pw_log_error("could not find a suitable runtime directory in"
+   "$PULSE_RUNTIME_PATH and $XDG_RUNTIME_DIR");
+   return -ENOENT;
+   }
+ 
+-  size = snprintf(buf, buflen, "%s/%s", runtime_dir, dir);
++  size = snprintf(buf, buflen, "%s%s%s", runtime_dir,
++  dir ? "/" : "", dir ? dir : "");
+   if (size < 0)
+   return -errno;
+   if ((size_t) size >= buflen) {
+-  pw_log_error("path %s/%s too long", runtime_dir, dir);
++  pw_log_error("path %s%s%s too long", runtime_dir,
++  dir ? "/" : "", dir ? dir : "");
+   return -ENAMETOOLONG;
+   }
+ 
+@@ -182,7 +185,7 @@ int create_pid_file(void) {
+   FILE *f;
+   int res;
+ 
+-  if ((res = get_runtime_dir(pid_file, sizeof(pid_file), "pulse")) < 0)
++  if ((res = get_runtime_dir(pid_file, sizeof(pid_file))) < 0)
+   return res;
+ 
+   if

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/, media-video/pipewire/

2022-04-21 Thread Sam James 
commit: cf0839e62df9f2442250f0ccb5bf82a6e7bf
Author: Sam James  gentoo  org>
AuthorDate: Thu Apr 21 22:03:14 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Apr 21 22:03:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf0839e6

media-video/pipewire: backport x86 fix

Bug: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/2271
Bug: https://bugs.gentoo.org/827546
Bug: https://bugs.gentoo.org/839525
Signed-off-by: Sam James  gentoo.org>

 .../pipewire/files/pipewire-0.3.49-x86-cast.patch| 20 
 ...ewire-0.3.49.ebuild => pipewire-0.3.49-r1.ebuild} |  2 ++
 ...re-0.3.50-r2.ebuild => pipewire-0.3.50-r3.ebuild} |  2 ++
 3 files changed, 24 insertions(+)

diff --git a/media-video/pipewire/files/pipewire-0.3.49-x86-cast.patch 
b/media-video/pipewire/files/pipewire-0.3.49-x86-cast.patch
new file mode 100644
index ..58b4b331e03e
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.49-x86-cast.patch
@@ -0,0 +1,20 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/5a023c8c84fb053d452983a64a33a41b931fc99b
+https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/2271
+
+From: Wim Taymans 
+Date: Thu, 21 Apr 2022 22:12:38 +0200
+Subject: [PATCH] alsa: fix argument type for Long
+
+Fixes #2271
+--- a/spa/plugins/alsa/alsa-pcm.c
 b/spa/plugins/alsa/alsa-pcm.c
+@@ -311,7 +311,7 @@ struct spa_pod *spa_alsa_enum_propinfo(struct state *state,
+   SPA_PROP_INFO_name, 
SPA_POD_String("latency.internal.ns"),
+   SPA_PROP_INFO_description, SPA_POD_String("Internal 
latency in nanoseconds"),
+   SPA_PROP_INFO_type, 
SPA_POD_CHOICE_RANGE_Long(state->process_latency.ns,
+-  0, 2 * SPA_NSEC_PER_SEC),
++  0LL, 2 * SPA_NSEC_PER_SEC),
+   SPA_PROP_INFO_params, SPA_POD_Bool(true));
+   break;
+   case 15:
+GitLab

diff --git a/media-video/pipewire/pipewire-0.3.49.ebuild 
b/media-video/pipewire/pipewire-0.3.49-r1.ebuild
similarity index 99%
rename from media-video/pipewire/pipewire-0.3.49.ebuild
rename to media-video/pipewire/pipewire-0.3.49-r1.ebuild
index 2c5d7c42cf3d..72a8b570d996 100644
--- a/media-video/pipewire/pipewire-0.3.49.ebuild
+++ b/media-video/pipewire/pipewire-0.3.49-r1.ebuild
@@ -124,6 +124,8 @@ DOCS=( {README,INSTALL}.md NEWS )
 
 PATCHES=(
"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+
+   "${FILESDIR}"/${PN}-0.3.49-x86-cast.patch
 )
 
 # limitsdfile related code taken from =sys-auth/realtime-base-0.1

diff --git a/media-video/pipewire/pipewire-0.3.50-r2.ebuild 
b/media-video/pipewire/pipewire-0.3.50-r3.ebuild
similarity index 99%
rename from media-video/pipewire/pipewire-0.3.50-r2.ebuild
rename to media-video/pipewire/pipewire-0.3.50-r3.ebuild
index 19259baf68c8..2e5d0001fa23 100644
--- a/media-video/pipewire/pipewire-0.3.50-r2.ebuild
+++ b/media-video/pipewire/pipewire-0.3.50-r3.ebuild
@@ -124,8 +124,10 @@ DOCS=( {README,INSTALL}.md NEWS )
 
 PATCHES=(
"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+
"${FILESDIR}"/${P}-fix-spa-header.patch
"${FILESDIR}"/${P}-treewide-retain-sections-to.patch
+   "${FILESDIR}"/${PN}-0.3.49-x86-cast.patch
 )
 
 # limitsdfile related code taken from =sys-auth/realtime-base-0.1

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/, media-video/pipewire/

2022-04-21 Thread Sam James 
commit: 96fb2bc79341829bef096cd1dcc0c139db6d2483
Author: Niklāvs Koļesņikovs <89q1r14hd  relay  firefox  com>
AuthorDate: Thu Apr 21 18:40:03 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Apr 21 21:57:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96fb2bc7

media-video/pipewire: add 0.3.50-r2 to fix issues with weird CFLAGS

When using weird and unusual CFLAGS, PipeWire may end up failing to
link due to missing symbols. This commit backports a fix for that.

Bug: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/2292
Signed-off-by: Niklāvs Koļesņikovs <89q1r14hd  relay.firefox.com>
Closes: https://github.com/gentoo/gentoo/pull/25145
Signed-off-by: Sam James  gentoo.org>

 ...pewire-0.3.50-treewide-retain-sections-to.patch |  70 
 media-video/pipewire/pipewire-0.3.50-r2.ebuild | 357 +
 2 files changed, 427 insertions(+)

diff --git 
a/media-video/pipewire/files/pipewire-0.3.50-treewide-retain-sections-to.patch 
b/media-video/pipewire/files/pipewire-0.3.50-treewide-retain-sections-to.patch
new file mode 100644
index ..1e1a8198ef26
--- /dev/null
+++ 
b/media-video/pipewire/files/pipewire-0.3.50-treewide-retain-sections-to.patch
@@ -0,0 +1,70 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/e28a052105f8ef35b3f469d3b85e1fcb25106f26
+
+From e28a052105f8ef35b3f469d3b85e1fcb25106f26 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= 
+Date: Wed, 13 Apr 2022 18:13:12 +0200
+Subject: [PATCH] treewide: retain sections to prevent linker garbage
+ collection
+
+The linker may remove sections that are actually used when
+"--gc-sections" and "-z start-stop-gc" is set. Add the `retain`
+attribute to prevent that.
+
+Furthermore, fix the alignment for `pwtest_suite_decl` objects.
+
+See: #2292
+See: https://lld.llvm.org/ELF/start-stop-gc.html
+See: https://github.com/systemd/systemd/issues/21847
+See: https://github.com/systemd/systemd/pull/21855
+---
+ src/modules/module-protocol-pulse/module.h | 1 +
+ test/pwtest-implementation.h   | 2 +-
+ test/pwtest.h  | 6 --
+ 3 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/src/modules/module-protocol-pulse/module.h 
b/src/modules/module-protocol-pulse/module.h
+index c1153640e..f75d8786c 100644
+--- a/src/modules/module-protocol-pulse/module.h
 b/src/modules/module-protocol-pulse/module.h
+@@ -47,6 +47,7 @@ struct module_info {
+ 
+ #define DEFINE_MODULE_INFO(name)  \
+   __attribute__((used))   \
++  __attribute__((retain)) \
+   __attribute__((section("pw_mod_pulse_modules")))\
+   __attribute__((aligned(__alignof__(struct module_info   \
+   const struct module_info name
+diff --git a/test/pwtest-implementation.h b/test/pwtest-implementation.h
+index 7bfad01cf..1525d2056 100644
+--- a/test/pwtest-implementation.h
 b/test/pwtest-implementation.h
+@@ -131,7 +131,7 @@ void _pwtest_add(struct pwtest_context *ctx,
+ struct pwtest_suite_decl {
+   const char *name;
+   enum pwtest_result (*setup)(struct pwtest_context *, struct 
pwtest_suite *);
+-} __attribute__((aligned(16)));
++};
+ 
+ 
+ #endif /* PWTEST_IMPLEMENTATION_H */
+diff --git a/test/pwtest.h b/test/pwtest.h
+index 9c0737523..6d3070b79 100644
+--- a/test/pwtest.h
 b/test/pwtest.h
+@@ -494,9 +494,11 @@ enum pwtest_arg {
+  */
+ #define PWTEST_SUITE(cname) \
+   static enum pwtest_result (cname##__setup)(struct pwtest_context *ctx, 
struct pwtest_suite *suite); \
+-  static const struct pwtest_suite_decl _test_suite \
+   __attribute__((used)) \
+-  __attribute((section("pwtest_suite_section"))) = { \
++  __attribute__((retain)) \
++  __attribute__((section("pwtest_suite_section"))) \
++  __attribute__((aligned(__alignof__(struct pwtest_suite_decl \
++  static const struct pwtest_suite_decl _test_suite = { \
+  .name = #cname, \
+  .setup = cname##__setup, \
+   }; \
+-- 
+GitLab
+

diff --git a/media-video/pipewire/pipewire-0.3.50-r2.ebuild 
b/media-video/pipewire/pipewire-0.3.50-r2.ebuild
new file mode 100644
index ..19259baf68c8
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.50-r2.ebuild
@@ -0,0 +1,357 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd 
udev
+
+if [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git;
+   inherit git-r3
+else
+   if [[ ${PV} == *_p* ]] ; then
+   MY_COMMIT=""
+   
SRC_URI="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${MY_COMMIT}/pipewire-${MY_COMMIT}.tar.bz2
 ->

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/, media-video/pipewire/

2022-04-17 Thread Sam James 
commit: 8bb12a1227815570c32be1525a30ed2189e72df9
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 17 16:36:52 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 17 16:36:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bb12a12

media-video/pipewire: drop versions

Signed-off-by: Sam James  gentoo.org>

 media-video/pipewire/Manifest  |   5 -
 .../pipewire-0.3.43-systemd-user-unit-dir.patch|  30 --
 .../files/pipewire-0.3.44-musl-build.patch |  33 --
 ...7-pulse-server-pending-sample-reply-crash.patch | 101 --
 3.47-revert-loop-remove-destroy-list-mpd.patch | 187 ---
 media-video/pipewire/pipewire-0.3.43-r3.ebuild | 316 --
 media-video/pipewire/pipewire-0.3.44-r1.ebuild | 324 ---
 .../pipewire/pipewire-0.3.45_p20220205.ebuild  | 353 
 media-video/pipewire/pipewire-0.3.47-r1.ebuild | 356 -
 media-video/pipewire/pipewire-0.3.48-r1.ebuild | 355 
 10 files changed, 2060 deletions(-)

diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index fc29fdaa1047..b4c347b1fd6a 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,9 +1,4 @@
 DIST pipewire-0.3.30.tar.gz 1540950 BLAKE2B 
69b35743e3ad9a8caf68d9bb16cf395203efed6c3046b3f4ea33bbcdd6649f5d425d813042c12396a7cd5ff4e8ed91dbc395a96fe55935ad50f9c3f3918b0407
 SHA512 
ec525e0fb7e5c5313245fcc745b971fd7d4a1caa7ab9fe1fa38dc20d50f03e5969197e86b60659971676bec0f79aa7b7951c8209bfe9565a3fd1dcac1b8535b3
 DIST pipewire-0.3.36.tar.gz 1708209 BLAKE2B 
20fce0d7f88347fe594491d4fae7b6a8edee67ff7749f1a40b807a5d5094d792e61e3efd05dca2221f781c263e34ff0a50ad3c162231911d4b1d87704df6c775
 SHA512 
f0fc68ea005018b420a4f65a24dc9c85eb6263c24e66852a7ce2b03f966990d62487b388c7d73ff5adfc10c80c439b1200ae876e41d78f91db190036a1799a14
-DIST pipewire-0.3.43.tar.gz 1713131 BLAKE2B 
3fa167d74e6104685760a9eac721bc359f1245897e1a5f9b09b4b9591fc459d19549e209990ca478a10ad6c2a4dfaecc3546d996ab7f7d64fe880fb0c1c1dfca
 SHA512 
d3804cdb1d94977bb4e2757e46829e1e51fca52b018007afa3bbfabff4dc33538cedad015c91154e28b879fc2edeb4e1fadf633b0af9a0d3bfd930c53b1bc2c0
-DIST pipewire-0.3.44.tar.gz 1731260 BLAKE2B 
5dd4fbffa21c34984836d097028e48654e2c9005e2f167b964bba2a8a2b9a7aad658853f03acce2f7967f884cfbea740ca427e9d373f00bcea2f122337835e02
 SHA512 
9a356b1d63e996e3725b6d126d7f0a972f83d0db0a95e923d9a7ec5432ff04688d51332f5c83826069e593e021bf514937ae5daf9cc6ad7307fe8baab964a244
-DIST pipewire-0.3.45_p20220205.tar.bz2 1296767 BLAKE2B 
2dbdb1db9ffdaa36579d7a6ee459fa001997ecd7b4ece006cf1265267ce956b65c752e8dd51affbff9c17b2934480e1fb86c6950c70ab5ecc8d61063c31a410b
 SHA512 
eae64ccf484c051a10a7a7ac11522de6cd3760c87414febe4868b76f22a8651b1bf94c04cd305fbacd1c6e7233fedb8008933c0dbd6809d4507eb27e633c3930
-DIST pipewire-0.3.47.tar.gz 1746286 BLAKE2B 
a34e5378d99b2b3c98731baaabf695b7aab882e557635b1a7f1cf542a5012014685bcf4254e4a81d4aab2ec2c8dd804115d5a57eaf13cbb042db2d4232f4bdfc
 SHA512 
2f188910b6a04ebc6ebf288e2f6eab8a227056fd9c5c97a8a279ebff0f88cd6b98b9bfc3bf6aff55104fa537ca04f2c89a8d45da7f2104e07e1b2e531f6cc21c
-DIST pipewire-0.3.48.tar.gz 1754730 BLAKE2B 
2ba562cdfdb179ab7c36e1227405dd83cc2a9fda3b3496e8d9339a4efc607cfbc1866eb2a9b2be9d44a2e3e4412a2c8af593028086c7c6b81dd14aa7158f19a5
 SHA512 
67699015612dfafd12f8e0908fa028a1ae91f8ce3a6cd7aeaf313ce991c6cfa206ace24a559bf64631c0a690ea8aa03f878c7f73e3c123881f1b015cf6627c50
 DIST pipewire-0.3.49.tar.gz 1769037 BLAKE2B 
2567bc98933bfbb295358886e8f97db2af2f0a6ee3c2586c1718e39f7eedaed8528a4663753ba56d3295e42576da015ce9278f22aff9bbd9ca43d883bff5a2f6
 SHA512 
36398872f7d7b31193d7a8885bbdfb415a122bd779874107a0642202dfd8408f39fddf769bfbae4533c2cc99fe9ef67903d50cc721e936aa4802229f1c46d809
 DIST pipewire-0.3.50.tar.gz 1773182 BLAKE2B 
d286b73553471795ea8ed60c82e12c955f1835a7a3a8d45baeda6b1e20a795221230b50c21619af4ef5b2b4962d2783de00b1ab2b22b091220970c334de8b9dc
 SHA512 
e29a626258ab28d74e35e310037fac374fe009fb56e0fa41cef7abb1ec6abb26f828cff1b17500f92f1dd4c95c1e0e98f6af497d315dd463f81c2649d1e8ee23

diff --git 
a/media-video/pipewire/files/pipewire-0.3.43-systemd-user-unit-dir.patch 
b/media-video/pipewire/files/pipewire-0.3.43-systemd-user-unit-dir.patch
deleted file mode 100644
index 93c3ffe3e053..
--- a/media-video/pipewire/files/pipewire-0.3.43-systemd-user-unit-dir.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/814d409501aca3e044ad53063eb3f433b8aff6f9.patch
-
-From 814d409501aca3e044ad53063eb3f433b8aff6f9 Mon Sep 17 00:00:00 2001
-From: Timo Gurr 
-Date: Thu, 6 Jan 2022 12:17:10 +
-Subject: [PATCH] systemd: Add systemd-system-unit-dir override
-
 a/meson_options.txt
-+++ b/meson_options.txt
-@@ -179,6 +179,9 @@ option('udev',
- option('udevrulesdir',
-type : 'string',
-description : 'Directory for udev rules (defaults to 
/lib/udev/rules.d)')

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/, media-video/pipewire/

2022-04-15 Thread Sam James 
commit: 8f1fed6f96c53251186f0f7fd8e2c2bc3a73ea9d
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr 15 07:58:31 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 15 07:58:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f1fed6f

media-video/pipewire: fix spa header

Closes: https://bugs.gentoo.org/838427
Signed-off-by: Sam James  gentoo.org>

 .../files/pipewire-0.3.50-fix-spa-header.patch | 39 ++
 ...ire-0.3.50.ebuild => pipewire-0.3.50-r1.ebuild} |  1 +
 2 files changed, 40 insertions(+)

diff --git a/media-video/pipewire/files/pipewire-0.3.50-fix-spa-header.patch 
b/media-video/pipewire/files/pipewire-0.3.50-fix-spa-header.patch
new file mode 100644
index ..5b9ad3cf2d7c
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.50-fix-spa-header.patch
@@ -0,0 +1,39 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/d3ea3142e1a4de206e616bc18f63a529e6b4986a.patch
+https://bugs.gentoo.org/838427
+
+From: psykose 
+Date: Wed, 13 Apr 2022 21:57:49 +
+Subject: [PATCH] spa: fix c90 header include
+
+placing declarations after code is invalid under ISO c90
+
+Fixes !1211
+--- a/spa/include/spa/utils/string.h
 b/spa/include/spa/utils/string.h
+@@ -276,10 +276,11 @@ static inline int spa_scnprintf(char *buffer, size_t 
size, const char *format, .
+ static inline float spa_strtof(const char *str, char **endptr)
+ {
+   static locale_t locale = NULL;
++  locale_t prev;
+   float v;
+   if (SPA_UNLIKELY(locale == NULL))
+   locale = newlocale(LC_ALL_MASK, "C", NULL);
+-  locale_t prev = uselocale(locale);
++  prev = uselocale(locale);
+   v = strtof(str, endptr);
+   uselocale(prev);
+   return v;
+@@ -319,10 +320,11 @@ static inline bool spa_atof(const char *str, float *val)
+ static inline double spa_strtod(const char *str, char **endptr)
+ {
+   static locale_t locale = NULL;
++  locale_t prev;
+   double v;
+   if (SPA_UNLIKELY(locale == NULL))
+   locale = newlocale(LC_ALL_MASK, "C", NULL);
+-  locale_t prev = uselocale(locale);
++  prev = uselocale(locale);
+   v = strtod(str, endptr);
+   uselocale(prev);
+   return v;
+GitLab

diff --git a/media-video/pipewire/pipewire-0.3.50.ebuild 
b/media-video/pipewire/pipewire-0.3.50-r1.ebuild
similarity index 99%
rename from media-video/pipewire/pipewire-0.3.50.ebuild
rename to media-video/pipewire/pipewire-0.3.50-r1.ebuild
index 6a066b48013e..486d6073c4d1 100644
--- a/media-video/pipewire/pipewire-0.3.50.ebuild
+++ b/media-video/pipewire/pipewire-0.3.50-r1.ebuild
@@ -124,6 +124,7 @@ DOCS=( {README,INSTALL}.md NEWS )
 
 PATCHES=(
"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+   "${FILESDIR}"/${P}-fix-spa-header.patch
 )
 
 # limitsdfile related code taken from =sys-auth/realtime-base-0.1

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/

2022-02-09 Thread Conrad Kostecki 
commit: 496d88d62d2ff25b17532dedd99c17a20c4b5619
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Wed Jan 12 19:08:22 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Wed Feb  9 23:05:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=496d88d6

media-video/pipewire: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/23759
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../pipewire-0.3.36-non-systemd-integration.patch | 19 ---
 1 file changed, 19 deletions(-)

diff --git 
a/media-video/pipewire/files/pipewire-0.3.36-non-systemd-integration.patch 
b/media-video/pipewire/files/pipewire-0.3.36-non-systemd-integration.patch
deleted file mode 100644
index b8d3271eecdd..
--- a/media-video/pipewire/files/pipewire-0.3.36-non-systemd-integration.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in
-index 648e13069..d985208b4 100644
 a/src/daemon/pipewire.conf.in
-+++ b/src/daemon/pipewire.conf.in
-@@ -235,12 +235,12 @@ context.exec = [
- # but it is better to start it as a systemd service.
- # Run the session manager with -h for options.
- #
--@sm_comment@{ path = "@session_manager_path@" args = 
"@session_manager_args@" }
-+{ path = "@session_manager_path@" args = "@session_manager_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).
- #
--@pulse_comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" 
}
-+{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" }
- ]

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/, media-video/pipewire/

2022-01-28 Thread Sam James 
commit: 96be3828c908677f4e839d1aca7c75f7019d3408
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 29 00:49:12 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 29 00:49:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96be3828

media-video/pipewire: backport musl patch for 0.3.44

Signed-off-by: Sam James  gentoo.org>

 .../files/pipewire-0.3.44-musl-build.patch | 33 ++
 media-video/pipewire/pipewire-0.3.44-r1.ebuild |  2 ++
 2 files changed, 35 insertions(+)

diff --git a/media-video/pipewire/files/pipewire-0.3.44-musl-build.patch 
b/media-video/pipewire/files/pipewire-0.3.44-musl-build.patch
new file mode 100644
index ..6ebcc5db8feb
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.44-musl-build.patch
@@ -0,0 +1,33 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/3256c6e5e7e2cef1f765dc05a001114359cc3134
+
+From: Wim Taymans 
+Date: Thu, 27 Jan 2022 14:59:11 +0100
+Subject: [PATCH] tools: fix compilation with musl
+
+--- a/src/tools/pw-cli.c
 b/src/tools/pw-cli.c
+@@ -36,6 +36,10 @@
+ #include 
+ #include 
+ 
++#if !defined(FNM_EXTMATCH)
++#define FNM_EXTMATCH 0
++#endif
++
+ #define spa_debug(...) fprintf(stdout,__VA_ARGS__);fputc('\n', stdout)
+ 
+ #include 
+--- a/src/tools/pw-dump.c
 b/src/tools/pw-dump.c
+@@ -32,6 +32,10 @@
+ #include 
+ #include 
+ 
++#if !defined(FNM_EXTMATCH)
++#define FNM_EXTMATCH 0
++#endif
++
+ #include 
+ #include 
+ #include 
+GitLab

diff --git a/media-video/pipewire/pipewire-0.3.44-r1.ebuild 
b/media-video/pipewire/pipewire-0.3.44-r1.ebuild
index 033d3614a241..14762acb4998 100644
--- a/media-video/pipewire/pipewire-0.3.44-r1.ebuild
+++ b/media-video/pipewire/pipewire-0.3.44-r1.ebuild
@@ -109,6 +109,8 @@ DOCS=( {README,INSTALL}.md NEWS )
 
 PATCHES=(
"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+
+   "${FILESDIR}"/${PN}-0.3.44-musl-build.patch
 )
 
 # limitsdfile related code taken from =sys-auth/realtime-base-0.1

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/, media-video/pipewire/

2022-01-06 Thread Sam James 
commit: 422e7ff15be8fcb48d90dea3d7dca0c2833938fc
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan  6 20:33:53 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan  6 20:53:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=422e7ff1

media-video/pipewire: add 0.3.43

Signed-off-by: Sam James  gentoo.org>

 media-video/pipewire/Manifest  |  1 +
 .../pipewire-0.3.43-systemd-user-unit-dir.patch| 30 ++
 media-video/pipewire/metadata.xml  |  1 +
 ...pipewire-.ebuild => pipewire-0.3.43.ebuild} | 21 ---
 media-video/pipewire/pipewire-.ebuild  | 21 ---
 5 files changed, 66 insertions(+), 8 deletions(-)

diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index a1d886e79e61..6bba82bf0703 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,3 +1,4 @@
 DIST pipewire-0.3.30.tar.gz 1540950 BLAKE2B 
69b35743e3ad9a8caf68d9bb16cf395203efed6c3046b3f4ea33bbcdd6649f5d425d813042c12396a7cd5ff4e8ed91dbc395a96fe55935ad50f9c3f3918b0407
 SHA512 
ec525e0fb7e5c5313245fcc745b971fd7d4a1caa7ab9fe1fa38dc20d50f03e5969197e86b60659971676bec0f79aa7b7951c8209bfe9565a3fd1dcac1b8535b3
 DIST pipewire-0.3.36.tar.gz 1708209 BLAKE2B 
20fce0d7f88347fe594491d4fae7b6a8edee67ff7749f1a40b807a5d5094d792e61e3efd05dca2221f781c263e34ff0a50ad3c162231911d4b1d87704df6c775
 SHA512 
f0fc68ea005018b420a4f65a24dc9c85eb6263c24e66852a7ce2b03f966990d62487b388c7d73ff5adfc10c80c439b1200ae876e41d78f91db190036a1799a14
 DIST pipewire-0.3.42.tar.gz 1705295 BLAKE2B 
afd397e75be4f776b9d3042258e8091d6e1722f374e62417274238e5017e268c986ac7624e1b91ec8a97fc9078e8aa6d46a22f30c0834f99e5cd3112a096aded
 SHA512 
bbf00ad5cee8ac872d8c2ef6b9499233100dba04c127b435894cf16c349188ae11edf918479a58039becc1b493c6f53a318d8fb483043dde074dc21ec32984c1
+DIST pipewire-0.3.43.tar.gz 1713131 BLAKE2B 
3fa167d74e6104685760a9eac721bc359f1245897e1a5f9b09b4b9591fc459d19549e209990ca478a10ad6c2a4dfaecc3546d996ab7f7d64fe880fb0c1c1dfca
 SHA512 
d3804cdb1d94977bb4e2757e46829e1e51fca52b018007afa3bbfabff4dc33538cedad015c91154e28b879fc2edeb4e1fadf633b0af9a0d3bfd930c53b1bc2c0

diff --git 
a/media-video/pipewire/files/pipewire-0.3.43-systemd-user-unit-dir.patch 
b/media-video/pipewire/files/pipewire-0.3.43-systemd-user-unit-dir.patch
new file mode 100644
index ..93c3ffe3e053
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.43-systemd-user-unit-dir.patch
@@ -0,0 +1,30 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/814d409501aca3e044ad53063eb3f433b8aff6f9.patch
+
+From 814d409501aca3e044ad53063eb3f433b8aff6f9 Mon Sep 17 00:00:00 2001
+From: Timo Gurr 
+Date: Thu, 6 Jan 2022 12:17:10 +
+Subject: [PATCH] systemd: Add systemd-system-unit-dir override
+
+--- a/meson_options.txt
 b/meson_options.txt
+@@ -179,6 +179,9 @@ option('udev',
+ option('udevrulesdir',
+type : 'string',
+description : 'Directory for udev rules (defaults to 
/lib/udev/rules.d)')
++option('systemd-system-unit-dir',
++   type : 'string',
++   description : 'Directory for system systemd units (defaults to 
/usr/lib/systemd/system)')
+ option('systemd-user-unit-dir',
+type : 'string',
+description : 'Directory for user systemd units (defaults to 
/usr/lib/systemd/user)')
+--- a/src/daemon/systemd/system/meson.build
 b/src/daemon/systemd/system/meson.build
+@@ -1,4 +1,7 @@
+ systemd_system_services_dir = systemd.get_variable(pkgconfig: 
'systemdsystemunitdir', pkgconfig_define : [ 'rootprefix', prefix])
++if get_option('systemd-system-unit-dir') != ''
++  systemd_system_services_dir = get_option('systemd-system-unit-dir')
++endif
+ 
+ install_data(sources : 'pipewire.socket',
+  install_dir : systemd_system_services_dir)
+GitLab

diff --git a/media-video/pipewire/metadata.xml 
b/media-video/pipewire/metadata.xml
index dfdfec054d9e..0629898f6956 100644
--- a/media-video/pipewire/metadata.xml
+++ b/media-video/pipewire/metadata.xml
@@ -28,5 +28,6 @@
Install a plugin for running PipeWire 
as a JACK client
Use PipeWire as JACK replacement
Replace PulseAudio's ALSA plugin 
with PipeWire's plugin
+   Enable raop-sink support (needs 
dev-libs/openssl)

 

diff --git a/media-video/pipewire/pipewire-.ebuild 
b/media-video/pipewire/pipewire-0.3.43.ebuild
similarity index 95%
copy from media-video/pipewire/pipewire-.ebuild
copy to media-video/pipewire/pipewire-0.3.43.ebuild
index e74fc97557fb..35187723a20e 100644
--- a/media-video/pipewire/pipewire-.ebuild
+++ b/media-video/pipewire/pipewire-0.3.43.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 
@@ -12,7 +12,7 @@ if [[ ${PV} ==  ]]; then
inherit

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/, media-video/pipewire/

2021-12-17 Thread Sam James 
commit: f11611de548f4ede3dd5cc524cad2b16f241c15c
Author: Sam James  gentoo  org>
AuthorDate: Sat Dec 18 06:38:27 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Dec 18 06:38:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f11611de

media-video/pipewire: drop 0.3.38, 0.3.40-r1, 0.3.41

Signed-off-by: Sam James  gentoo.org>

 media-video/pipewire/Manifest  |   3 -
 .../files/pipewire-0.3.38-find-readline.patch  |  36 ---
 .../files/pipewire-0.3.38-fix-arm-build.patch  |  18 --
 .../pipewire-0.3.38-libcamera-null-deref.patch |  70 -
 media-video/pipewire/pipewire-0.3.38.ebuild| 290 
 media-video/pipewire/pipewire-0.3.40-r1.ebuild | 297 -
 media-video/pipewire/pipewire-0.3.41.ebuild| 297 -
 7 files changed, 1011 deletions(-)

diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 0908d6b41340..a1d886e79e61 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,6 +1,3 @@
 DIST pipewire-0.3.30.tar.gz 1540950 BLAKE2B 
69b35743e3ad9a8caf68d9bb16cf395203efed6c3046b3f4ea33bbcdd6649f5d425d813042c12396a7cd5ff4e8ed91dbc395a96fe55935ad50f9c3f3918b0407
 SHA512 
ec525e0fb7e5c5313245fcc745b971fd7d4a1caa7ab9fe1fa38dc20d50f03e5969197e86b60659971676bec0f79aa7b7951c8209bfe9565a3fd1dcac1b8535b3
 DIST pipewire-0.3.36.tar.gz 1708209 BLAKE2B 
20fce0d7f88347fe594491d4fae7b6a8edee67ff7749f1a40b807a5d5094d792e61e3efd05dca2221f781c263e34ff0a50ad3c162231911d4b1d87704df6c775
 SHA512 
f0fc68ea005018b420a4f65a24dc9c85eb6263c24e66852a7ce2b03f966990d62487b388c7d73ff5adfc10c80c439b1200ae876e41d78f91db190036a1799a14
-DIST pipewire-0.3.38.tar.gz 1727371 BLAKE2B 
dac7f3e1992b9690195df1dbc04575d386d21d06d1727b004b851e300709b3707806b7b20d36c1e74225d91a2df5428c913376903b286592f87083857347e53e
 SHA512 
c3c6c822bf4e5e77fed8d6ef09059d3e43195957692ab7baddc349af3d759d892a9af0e7802d389e2a9a15e5fece4c08ec963ac42df931233eec6057bad67eb6
-DIST pipewire-0.3.40.tar.gz 1675384 BLAKE2B 
b7df4f1ca363b764a5230099d32dd5ba5dceaadc8ca2d4ce55f42810a91628b4e32891757b22fd5eb7a7f497163936c63b86330ab2d5efa261a82d450660c371
 SHA512 
63109b87d50be160a6cde632470849564d4743f4cb469f5e3713bb1cbefc08f80416210ddedc09439555b702193c0266a1b9724e366a3b850bdf1a346c5e80cb
-DIST pipewire-0.3.41.tar.gz 1704856 BLAKE2B 
69370630055daf381e9700faf0c153fc2aaeef4fd1da9a4010e2b52ed1edb3d01fd33a3ddb74a697d0ab320b3a820f195f8c077c4deed5b6d31003604cf9c3f1
 SHA512 
ecd9ef5c0cf2edc583606d0b8633d5060e251aa04b8f562b8214a6685d6e29ec211bac4c19dec35c993bc51d98b252e8926217b48f879f06c625282637abea77
 DIST pipewire-0.3.42.tar.gz 1705295 BLAKE2B 
afd397e75be4f776b9d3042258e8091d6e1722f374e62417274238e5017e268c986ac7624e1b91ec8a97fc9078e8aa6d46a22f30c0834f99e5cd3112a096aded
 SHA512 
bbf00ad5cee8ac872d8c2ef6b9499233100dba04c127b435894cf16c349188ae11edf918479a58039becc1b493c6f53a318d8fb483043dde074dc21ec32984c1

diff --git a/media-video/pipewire/files/pipewire-0.3.38-find-readline.patch 
b/media-video/pipewire/files/pipewire-0.3.38-find-readline.patch
deleted file mode 100644
index 6b56304f5d17..
--- a/media-video/pipewire/files/pipewire-0.3.38-find-readline.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/ddfbd684e78e2b8b9ad40bedb4612ea0197d231a.patch
-
-From: Joshua Strobl 
-Date: Thu, 30 Sep 2021 23:11:50 +0300
-Subject: [PATCH] Fix readline detection by allowing fallback to cc
- find_library
-
 a/meson.build
-+++ b/meson.build
-@@ -326,6 +326,11 @@ dbus_dep = dependency('dbus-1')
- sdl_dep = dependency('sdl2', required : get_option('sdl2'))
- summary({'SDL 2': sdl_dep.found()}, bool_yn: true, section: 'Misc 
dependencies')
- readline_dep = dependency('readline', required : false)
-+
-+if not readline_dep.found()
-+  readline_dep = cc.find_library('readline', required: false)
-+endif
-+
- summary({'readline (for pw-cli)': readline_dep.found()}, bool_yn: true, 
section: 'Misc dependencies')
- ncurses_dep = dependency('ncursesw', required : false)
- sndfile_dep = dependency('sndfile', version : '>= 1.0.20', required : 
get_option('sndfile'))
-@@ -406,7 +411,12 @@ libinotify_dep = (build_machine.system() == 'freebsd'
- : dependency('', required: false))
- 
- # On FreeBSD, libintl library is required for gettext
--libintl_dep = cc.find_library('intl', required: false)
-+libintl_dep = dependency('intl', required: false)
-+
-+if not libintl_dep.found()
-+libintl_dep = cc.find_library('intl', required: false)
-+endif
-+summary({'intl support': libintl_dep.found()}, bool_yn: true)
- 
- need_alsa = get_option('pipewire-alsa').enabled() or 
get_option('session-managers').contains('media-session')
- alsa_dep = dependency('alsa', version : '>=1.1.7', required: need_alsa)
-GitLab

diff --git a/media-video/pipewire/files/pipewire-0.3.38-fix-arm-build.patch 
b/media-video/pipewire/files/pipewire-0.3.38-fix-arm-build.patch
deleted

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/, media-video/pipewire/

2021-11-11 Thread Sam James 
commit: a40dd1e71f92c43e6622053bf785fa2b791e6cd1
Author: Sam James  gentoo  org>
AuthorDate: Thu Nov 11 22:09:08 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Nov 11 22:09:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a40dd1e7

media-video/pipewire: add 0.3.40

Signed-off-by: Sam James  gentoo.org>

 media-video/pipewire/Manifest  |   1 +
 .../pipewire/files/gentoo-pipewire-launcher.in |   3 +
 media-video/pipewire/pipewire-0.3.40.ebuild| 293 +
 3 files changed, 297 insertions(+)

diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index a0b3f562fc3..1b23f97fe97 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -3,3 +3,4 @@ DIST pipewire-0.3.36.tar.gz 1708209 BLAKE2B 
20fce0d7f88347fe594491d4fae7b6a8edee
 DIST pipewire-0.3.37.tar.gz 1716320 BLAKE2B 
ce98b28015de69a0c91953a4839d5f86a29cfa19e2058ba0a2476a75a03b782ae67239b418306e4ed7dab81fe7e77928a417b966ff3c72ac552006cea66e3218
 SHA512 
3f4cf1ac66117a56a7a264262e2e238a54060457da6a986bd9227f51cc7e8d1a8fd282aef8462c096819282c5baec22779d2025c2e1918bbfb3d6ff75829aea6
 DIST pipewire-0.3.38.tar.gz 1727371 BLAKE2B 
dac7f3e1992b9690195df1dbc04575d386d21d06d1727b004b851e300709b3707806b7b20d36c1e74225d91a2df5428c913376903b286592f87083857347e53e
 SHA512 
c3c6c822bf4e5e77fed8d6ef09059d3e43195957692ab7baddc349af3d759d892a9af0e7802d389e2a9a15e5fece4c08ec963ac42df931233eec6057bad67eb6
 DIST pipewire-0.3.39.tar.gz 1671751 BLAKE2B 
6ed56d43a45244c29a29f714eba1dbf911997f91d3e3df2cc1547051d52a2853f4d4c745aaf866ae18b63668f3fb9b7d3338deaad90d229c5fab1641482c6761
 SHA512 
75ed35177577efe7559341394605777be21d0f3952b9379a23c8d4c71d35ed88ec45c3e9ad58832099c8f370753d8b47a5767f47453a599c4f4a4b641b2b0d9d
+DIST pipewire-0.3.40.tar.gz 1675384 BLAKE2B 
b7df4f1ca363b764a5230099d32dd5ba5dceaadc8ca2d4ce55f42810a91628b4e32891757b22fd5eb7a7f497163936c63b86330ab2d5efa261a82d450660c371
 SHA512 
63109b87d50be160a6cde632470849564d4743f4cb469f5e3713bb1cbefc08f80416210ddedc09439555b702193c0266a1b9724e366a3b850bdf1a346c5e80cb

diff --git a/media-video/pipewire/files/gentoo-pipewire-launcher.in 
b/media-video/pipewire/files/gentoo-pipewire-launcher.in
index 4e66e2fe317..495c47f6c7e 100644
--- a/media-video/pipewire/files/gentoo-pipewire-launcher.in
+++ b/media-video/pipewire/files/gentoo-pipewire-launcher.in
@@ -22,5 +22,8 @@ pkill -u "${USER}" -x pipewire\|wireplumber 1>/dev/null 2>&1
 # non-PW apps over HW control (most notably, /usr/bin/pulseaudio daemon).
 @GENTOO_PORTAGE_EPREFIX@/usr/bin/pipewire -c pipewire-pulse.conf &
 
+# Hack for bug #822498
+sleep 1
+
 # Finally a session manager is required for PipeWire to do anything.
 exec @GENTOO_PORTAGE_EPREFIX@/usr/bin/wireplumber

diff --git a/media-video/pipewire/pipewire-0.3.40.ebuild 
b/media-video/pipewire/pipewire-0.3.40.ebuild
new file mode 100644
index 000..2e84b38f88d
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.40.ebuild
@@ -0,0 +1,293 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit meson-multilib optfeature prefix python-any-r1 systemd udev
+
+if [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git;
+   inherit git-r3
+else
+   
SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz;
+   KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/;
+
+LICENSE="MIT LGPL-2.1+ GPL-2"
+SLOT="0/0.3"
+IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk 
pipewire-alsa systemd test v4l"
+
+# Once replacing system JACK libraries is possible, it's likely that
+# jack-client IUSE will need blocking to avoid users accidentally
+# configuring their systems to send PW sink output to the emulated
+# JACK's sink - doing so is likely to yield no audio, cause a CPU
+# cycles consuming loop (and may even cause GUI crashes)!
+
+REQUIRED_USE="jack-sdk? ( !jack-client )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+   >=dev-util/meson-0.59
+   virtual/pkgconfig
+   ${PYTHON_DEPS}
+   $(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
+   doc? (
+   app-doc/doxygen
+   media-gfx/graphviz
+   )
+"
+RDEPEND="
+   acct-group/audio
+   media-libs/alsa-lib
+   sys-apps/dbus[${MULTILIB_USEDEP}]
+   sys-libs/readline:=
+   sys-libs/ncurses:=[unicode(+)]
+   virtual/libintl[${MULTILIB_USEDEP}]
+   virtual/libudev[${MULTILIB_USEDEP}]
+   bluetooth? (
+   media-libs/fdk-aac
+   media-libs/libldac
+   media-libs/libfreeaptx
+   media-libs/sbc
+   >=net-wireless/bluez-4.101:=
+   )
+   echo-cancel? ( media-libs/webrtc-audio-processing:0 )
+   extra? (
+

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/

2021-10-26 Thread Sam James 
commit: 30bd9772a9ab6da8a9c0d6875fd08322d89cada1
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct 26 15:01:38 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 26 15:02:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30bd9772

media-video/pipewire: add another upstream patch to fix build failure

Closes: https://bugs.gentoo.org/820365
Signed-off-by: Sam James  gentoo.org>

 .../files/pipewire-0.3.39-endian-test-fix.patch| 81 ++
 1 file changed, 81 insertions(+)

diff --git a/media-video/pipewire/files/pipewire-0.3.39-endian-test-fix.patch 
b/media-video/pipewire/files/pipewire-0.3.39-endian-test-fix.patch
index a8febb81491..2687299b235 100644
--- a/media-video/pipewire/files/pipewire-0.3.39-endian-test-fix.patch
+++ b/media-video/pipewire/files/pipewire-0.3.39-endian-test-fix.patch
@@ -1,4 +1,5 @@
 
https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/5dfc3494dc4635918e74b9f3d717a39a74b28554.patch
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/c07f0ccb71a9d95944ce3e4d7e453cb50a26b0a2.patch
 
 From 5dfc3494dc4635918e74b9f3d717a39a74b28554 Mon Sep 17 00:00:00 2001
 From: Wim Taymans 
@@ -29,3 +30,83 @@ index f47dfa6b3..1867fa4d3 100644
 -- 
 GitLab
 
+From c07f0ccb71a9d95944ce3e4d7e453cb50a26b0a2 Mon Sep 17 00:00:00 2001
+From: Wim Taymans 
+Date: Mon, 25 Oct 2021 16:11:56 +0200
+Subject: [PATCH] map: make _insert_at() fail on a removed item
+
+You are only supposed to use _insert_new()/_remove() or _insert_at()
+on the map, If we detect a _insert_at() to a removed item,
+return an error because else we might corrupt the free list.
+
+Update unit test accordingly.
+---
+ src/pipewire/map.h | 15 ++-
+ test/test-map.c| 17 +
+ 2 files changed, 3 insertions(+), 29 deletions(-)
+
+diff --git a/src/pipewire/map.h b/src/pipewire/map.h
+index fd57f7f7c..f47dfa6b3 100644
+--- a/src/pipewire/map.h
 b/src/pipewire/map.h
+@@ -182,20 +182,9 @@ static inline int pw_map_insert_at(struct pw_map *map, 
uint32_t id, void *data)
+   if (item == NULL)
+   return -errno;
+   } else {
+-  if (pw_map_id_is_free(map, id)) {
+-  uint32_t *current = >free_list;
+-  while (*current != SPA_ID_INVALID) {
+-  uint32_t current_id = (*current) >> 1;
+-  uint32_t *next = _map_get_item(map, 
current_id)->next;
+-
+-  if (current_id == id) {
+-  *current = *next;
+-  break;
+-  }
+-  current = next;
+-  }
+-  }
+   item = pw_map_get_item(map, id);
++  if (pw_map_item_is_free(item))
++  return -EINVAL;
+   }
+   item->data = data;
+   return 0;
+diff --git a/test/test-map.c b/test/test-map.c
+index dd1df77a8..b6d7681ce 100644
+--- a/test/test-map.c
 b/test/test-map.c
+@@ -188,7 +188,6 @@ PWTEST(map_insert_at_free)
+   int data[3] = {1, 2, 3};
+   int new_data = 4;
+   int *ptr[3] = {[0], [1], [3]};
+-  int *new_ptr = _data;
+   int idx[3];
+   int rc;
+ 
+@@ -225,21 +224,7 @@ PWTEST(map_insert_at_free)
+   }
+ 
+   rc = pw_map_insert_at(, item_idx, _data);
+-  pwtest_neg_errno_ok(rc);
+-  pwtest_ptr_eq(new_ptr, pw_map_lookup(, item_idx));
+-
+-  if (before_idx != SKIP && before_idx != item_idx) {
+-  rc = pw_map_insert_at(, before_idx, [before_idx]);
+-  pwtest_neg_errno_ok(rc);
+-  pwtest_ptr_eq([before_idx], pw_map_lookup(, 
before_idx));
+-  }
+-
+-  if (after_idx != SKIP && after_idx != item_idx) {
+-  rc = pw_map_insert_at(, after_idx, [after_idx]);
+-  pwtest_neg_errno_ok(rc);
+-  pwtest_ptr_eq([after_idx], pw_map_lookup(, after_idx));
+-  }
+-
++  pwtest_neg_errno(rc, -EINVAL);
+   pw_map_clear();
+ 
+   return PWTEST_PASS;
+-- 
+GitLab
+

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/, media-video/pipewire/

2021-10-26 Thread Sam James 
commit: ed43ceec5a8e60307c3582dc123acbef6088e725
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct 26 09:03:04 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 26 09:03:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed43ceec

media-video/pipewire: add big endian patch for 0.3.39

Signed-off-by: Sam James  gentoo.org>

 .../files/pipewire-0.3.39-endian-test-fix.patch| 31 ++
 ...-0.3.39-r1.ebuild => pipewire-0.3.39-r2.ebuild} |  1 +
 2 files changed, 32 insertions(+)

diff --git a/media-video/pipewire/files/pipewire-0.3.39-endian-test-fix.patch 
b/media-video/pipewire/files/pipewire-0.3.39-endian-test-fix.patch
new file mode 100644
index 000..a8febb81491
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.39-endian-test-fix.patch
@@ -0,0 +1,31 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/5dfc3494dc4635918e74b9f3d717a39a74b28554.patch
+
+From 5dfc3494dc4635918e74b9f3d717a39a74b28554 Mon Sep 17 00:00:00 2001
+From: Wim Taymans 
+Date: Mon, 25 Oct 2021 16:15:17 +0200
+Subject: [PATCH] map: use uintptr_t for the next pointer
+
+This aligns the low bits of the next field with the low bits of the
+pointer on big endian cpus.
+
+Fixes #1747
+---
+ src/pipewire/map.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/pipewire/map.h b/src/pipewire/map.h
+index f47dfa6b3..1867fa4d3 100644
+--- a/src/pipewire/map.h
 b/src/pipewire/map.h
+@@ -74,7 +74,7 @@ extern "C" {
+  * first item to get re-used on the next insert.
+  */
+ union pw_map_item {
+-  uint32_t next;  /* next free index */
++  uintptr_t next; /* next free index */
+   void *data; /* data of this item, must be an even address */
+ };
+ 
+-- 
+GitLab
+

diff --git a/media-video/pipewire/pipewire-0.3.39-r1.ebuild 
b/media-video/pipewire/pipewire-0.3.39-r2.ebuild
similarity index 99%
rename from media-video/pipewire/pipewire-0.3.39-r1.ebuild
rename to media-video/pipewire/pipewire-0.3.39-r2.ebuild
index 0b9ee48f090..ffb2156cd8f 100644
--- a/media-video/pipewire/pipewire-0.3.39-r1.ebuild
+++ b/media-video/pipewire/pipewire-0.3.39-r2.ebuild
@@ -102,6 +102,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
# Upstream
"${FILESDIR}"/${P}-fix-build-some-arches.patch
+   "${FILESDIR}"/${P}-endian-test-fix.patch
 )
 
 # limitsdfile related code taken from =sys-auth/realtime-base-0.1

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/, media-video/pipewire/

2021-10-26 Thread Sam James 
commit: 0d5a3a7b354d34e05c92a2a8dba66510122d8b0a
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct 26 08:59:41 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 26 08:59:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d5a3a7b

media-video/pipewire: add build fixes for some arches

Signed-off-by: Sam James  gentoo.org>

 .../pipewire-0.3.39-fix-build-some-arches.patch| 35 ++
 media-video/pipewire/pipewire-0.3.39-r1.ebuild |  2 ++
 2 files changed, 37 insertions(+)

diff --git 
a/media-video/pipewire/files/pipewire-0.3.39-fix-build-some-arches.patch 
b/media-video/pipewire/files/pipewire-0.3.39-fix-build-some-arches.patch
new file mode 100644
index 000..fe5392e29a3
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.39-fix-build-some-arches.patch
@@ -0,0 +1,35 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/651f0decea5f83730c271e9bed03cdd0048fcd49.patch
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/2cddd4a775c145570f4a8a30d28b57f551d43206.patch
+
+From: Wim Taymans 
+Date: Thu, 21 Oct 2021 11:09:48 +0200
+Subject: [PATCH] cpu: fix compilation on some architectures
+
+--- a/spa/plugins/support/cpu.c
 b/spa/plugins/support/cpu.c
+@@ -270,7 +270,7 @@ impl_init(const struct spa_handle_factory *factory,
+   if ((str = spa_dict_lookup(info, SPA_KEY_CPU_VM_TYPE)) != NULL)
+   this->vm_type = atoi(str);
+   if ((str = spa_dict_lookup(info, SPA_KEY_CPU_ZERO_DENORMALS)) 
!= NULL)
+-  impl_cpu_zero_denormals(this, spa_atob(str));
++  spa_cpu_zero_denormals(>cpu, spa_atob(str));
+   }
+ 
+   spa_log_debug(this->log, "%p: count:%d align:%d flags:%08x",
+
+From: Wim Taymans 
+Date: Mon, 25 Oct 2021 16:32:16 +0200
+Subject: [PATCH] cpu: disable VFP asm when not available
+
+Fixes #1746
+--- a/spa/plugins/support/cpu-arm.c
 b/spa/plugins/support/cpu-arm.c
+@@ -143,7 +143,7 @@ static int arm_zero_denormals(void *object, bool enable)
+   "msrfpcr, %0\n"
+   "isb\n"
+   : "=r"(cw)::"memory");
+-#else
++#elif (defined(__VFP_FP__) && !defined(__SOFTFP__))
+   uint32_t cw;
+   if (enable)
+   __asm__ __volatile__(

diff --git a/media-video/pipewire/pipewire-0.3.39-r1.ebuild 
b/media-video/pipewire/pipewire-0.3.39-r1.ebuild
index 3c425733a52..0b9ee48f090 100644
--- a/media-video/pipewire/pipewire-0.3.39-r1.ebuild
+++ b/media-video/pipewire/pipewire-0.3.39-r1.ebuild
@@ -100,6 +100,8 @@ DOCS=( {README,INSTALL}.md NEWS )
 
 PATCHES=(
"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+   # Upstream
+   "${FILESDIR}"/${P}-fix-build-some-arches.patch
 )
 
 # limitsdfile related code taken from =sys-auth/realtime-base-0.1

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/, media-video/pipewire/

2021-10-25 Thread Patrick McLean 
commit: bafdb109acd7c3eec16dde18fd06f0983d73527f
Author: Patrick McLean  gentoo  org>
AuthorDate: Mon Oct 25 17:12:08 2021 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Mon Oct 25 17:12:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bafdb109

media-video/pipewire-0.3.39-r1: Revbump, fix desktop (bug 820185)

The desktop file was still launching /usr/libexec/pipewire-launcher but
as of 0.3.39, it should be launching /usr/bin/gentoo-pipewire-launcher.
Revbump the desktop file and install the updated version.

Closes: https://bugs.gentoo.org/820185
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Patrick McLean  gentoo.org>

 media-video/pipewire/files/pipewire.desktop-r1   | 12 
 .../{pipewire-0.3.39.ebuild => pipewire-0.3.39-r1.ebuild}|  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/media-video/pipewire/files/pipewire.desktop-r1 
b/media-video/pipewire/files/pipewire.desktop-r1
new file mode 100644
index 000..d950312930f
--- /dev/null
+++ b/media-video/pipewire/files/pipewire.desktop-r1
@@ -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/bin/gentoo-pipewire-launcher
+Terminal=false
+Type=Application
+X-GNOME-HiddenUnderSystemd=true
+X-KDE-HiddenUnderSystemd=true
+X-systemd-skip=true

diff --git a/media-video/pipewire/pipewire-0.3.39.ebuild 
b/media-video/pipewire/pipewire-0.3.39-r1.ebuild
similarity index 99%
rename from media-video/pipewire/pipewire-0.3.39.ebuild
rename to media-video/pipewire/pipewire-0.3.39-r1.ebuild
index 7dabfed1cb8..3c425733a52 100644
--- a/media-video/pipewire/pipewire-0.3.39.ebuild
+++ b/media-video/pipewire/pipewire-0.3.39-r1.ebuild
@@ -198,7 +198,7 @@ multilib_src_install_all() {
 
if ! use systemd; then
insinto /etc/xdg/autostart
-   newins "${FILESDIR}"/pipewire.desktop pipewire.desktop
+   newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop
 
exeinto /usr/bin
newexe "${FILESDIR}"/gentoo-pipewire-launcher.in 
gentoo-pipewire-launcher

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/, media-video/pipewire/

2021-09-21 Thread Miroslav Šulc 
commit: d11f8bda09cccd132c9141913918d8b5a0857ad7
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Sep 21 06:32:31 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Sep 21 06:32:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d11f8bda

media-video/pipewire: updated non-systemd patch in live

Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../pipewire-0.3.36-non-systemd-integration.patch | 19 +++
 media-video/pipewire/pipewire-.ebuild |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git 
a/media-video/pipewire/files/pipewire-0.3.36-non-systemd-integration.patch 
b/media-video/pipewire/files/pipewire-0.3.36-non-systemd-integration.patch
new file mode 100644
index 000..b8d3271eecd
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.36-non-systemd-integration.patch
@@ -0,0 +1,19 @@
+diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in
+index 648e13069..d985208b4 100644
+--- a/src/daemon/pipewire.conf.in
 b/src/daemon/pipewire.conf.in
+@@ -235,12 +235,12 @@ context.exec = [
+ # but it is better to start it as a systemd service.
+ # Run the session manager with -h for options.
+ #
+-@sm_comment@{ path = "@session_manager_path@" args = 
"@session_manager_args@" }
++{ path = "@session_manager_path@" args = "@session_manager_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).
+ #
+-@pulse_comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" 
}
++{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" }
+ ]

diff --git a/media-video/pipewire/pipewire-.ebuild 
b/media-video/pipewire/pipewire-.ebuild
index d20512a9507..d3fba11aee6 100644
--- a/media-video/pipewire/pipewire-.ebuild
+++ b/media-video/pipewire/pipewire-.ebuild
@@ -112,7 +112,7 @@ src_prepare() {
if ! use systemd; then
# This can be applied non-conditionally but would make for a
# significantly worse user experience on systemd then.
-   eapply "${FILESDIR}"/${PN}-0.3.35-non-systemd-integration.patch
+   eapply "${FILESDIR}"/${PN}-0.3.36-non-systemd-integration.patch
fi
 
einfo "Generating ${limitsdfile}"

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/, media-video/pipewire/

2021-09-18 Thread Sam James 
commit: 6798bf035f8fb7a2688a0f824568fe1bea17fadb
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep 19 01:17:54 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep 19 01:18:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6798bf03

media-video/pipewire: add missing include patch to 0.3.36

Signed-off-by: Sam James  gentoo.org>

 .../files/pipewire-0.3.36-missing-limits-include.patch  | 17 +
 media-video/pipewire/pipewire-0.3.36.ebuild |  1 +
 2 files changed, 18 insertions(+)

diff --git 
a/media-video/pipewire/files/pipewire-0.3.36-missing-limits-include.patch 
b/media-video/pipewire/files/pipewire-0.3.36-missing-limits-include.patch
new file mode 100644
index 000..c7ed7b973a9
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.36-missing-limits-include.patch
@@ -0,0 +1,17 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/6168067cb2a45ffa3c92aff1135659feaf9c1240
+
+From: Leonardo Neumann 
+Date: Sat, 18 Sep 2021 04:36:20 -0300
+Subject: [PATCH] fix missing limits.h include
+
+--- a/src/pipewire/impl-module.c
 b/src/pipewire/impl-module.c
+@@ -28,6 +28,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ 
+GitLab

diff --git a/media-video/pipewire/pipewire-0.3.36.ebuild 
b/media-video/pipewire/pipewire-0.3.36.ebuild
index 727450ab578..255220766c0 100644
--- a/media-video/pipewire/pipewire-0.3.36.ebuild
+++ b/media-video/pipewire/pipewire-0.3.36.ebuild
@@ -98,6 +98,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
"${FILESDIR}"/${P}-fix-crash-uaf-media-session.patch
"${FILESDIR}"/${P}-fix-version.patch
+   "${FILESDIR}"/${P}-missing-limits-include.patch
 )
 
 # limitsdfile related code taken from =sys-auth/realtime-base-0.1

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/, media-video/pipewire/

2021-08-27 Thread Lars Wendler 
commit: 8eb357fa7cdb4377fa47c7dfedefa247ff992724
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Aug 27 09:18:39 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Aug 27 10:49:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8eb357fa

media-video/pipewire: Removed old

Removed unused local USE descriptions

Signed-off-by: Lars Wendler  gentoo.org>

 media-video/pipewire/Manifest  |   7 -
 .../files/pipewire-0.3.25-fix-docdir-path.patch|  32 ---
 ...pewire-0.3.28-revert-openaptx-restriction.patch |  20 --
 media-video/pipewire/metadata.xml  |   6 -
 media-video/pipewire/pipewire-0.3.22.ebuild| 128 --
 media-video/pipewire/pipewire-0.3.25-r1.ebuild | 236 --
 media-video/pipewire/pipewire-0.3.26-r1.ebuild | 243 --
 media-video/pipewire/pipewire-0.3.27-r2.ebuild | 269 
 media-video/pipewire/pipewire-0.3.28-r1.ebuild | 270 
 media-video/pipewire/pipewire-0.3.29-r1.ebuild | 271 
 media-video/pipewire/pipewire-0.3.31-r1.ebuild | 274 -
 11 files changed, 1756 deletions(-)

diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 70f935c1428..cbbf718c524 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,10 +1,3 @@
-DIST pipewire-0.3.22.tar.gz 1263844 BLAKE2B 
3fb90c0b1c17ed108e8c390873f5c4527e1ff9241d1c5964ad5b7c01fbfefda901ef1228f178cf3c9899e6e8e75969a470f8fba63473ff203cba612c6c0553ca
 SHA512 
a6587e0afd5c90be1733ecf62c6fc68e735ab3b84f2cbbf844bbe1be93e7a23dee07b041ed6b273cab6ab207d2388ae6f2027d0380928555a0155a7cc9ca4a7e
-DIST pipewire-0.3.25.tar.gz 1351257 BLAKE2B 
3c4d6d98e3255df8baf50eb548bcf77b5c027a50f6acedd83cd63481ed5b642c174589f34314f150b07116cea8a3458c3f8b770df4081585d7f75cc8dde4decd
 SHA512 
0f84be21bfcd70f25900c53a8ce399c29ce2d4d10f8b56e5103603cf0c80673aab0b16492e55b42985283adf46343cdca01626225db85a2263f06c309f68f2d7
-DIST pipewire-0.3.26.tar.gz 1447673 BLAKE2B 
67feb1288fcdc9ac5578b97ab2567b46a7431921291584bc9db2c2e60db074c3a61c3af9859d3b2f9044cfba6c15e9bfde9edc001b753f8fc47965eb55d751c8
 SHA512 
d771956a42801a6e07fac48a175363eb4107a9fba13d649ff5c2cdc40044c84a61bf56050783507f6dd8efae8c59a2be07ec67433827335ae60f8116c4a4e178
-DIST pipewire-0.3.27.tar.gz 1459913 BLAKE2B 
b6db73de85c41932b630e62b3dcc589529ae5457cae6731a8ec5db50f20b541e7e9596976a368c4bb654b1443071c53f8fe4a9ddfc1ee8a0ecc04d69b683456a
 SHA512 
a2df1df8e43846b91fbeedeb1cda9c73b970ac9de58d8b4e97ada54ee74a8f26a168504289c7392c94cc7ea54aa01ada4791c66a5d3159a2bc980df633f6bcfe
-DIST pipewire-0.3.28.tar.gz 1474219 BLAKE2B 
d20b39c8ed49cd44f2109aab6453aac547ff66dc2ef4a52fb71fea27eb07920efc58498e5ddd82e9f6d86981185e37313748d9157c9a09a3ae1e8ae48d5d45d6
 SHA512 
f2ed23609c6a45fb80f54caabaa304ba4f318c905a28350c89c65f179a95cc2022f1acbb0c2ec558baf4dc6bcc5623b8daa6678d52cdb9179a88c67b6c1fe0ff
-DIST pipewire-0.3.29.tar.gz 1504935 BLAKE2B 
fe3984ec4b02fe91683d382e3891e174748b52c5e2f609dc838837f1ac0fea736e06395a022b8ec152fe015cca24c54d4c1896acde3a2ac66eb700dc2336fe4f
 SHA512 
bc163ad3e2d7696295fd3720e8f9cc4d478a55c0694c0faa03a40333e3b65fcbff27e4e296eb9dd0191ca2782e04934915c46e04a2444b458491cd2905823ddd
 DIST pipewire-0.3.30.tar.gz 1540950 BLAKE2B 
69b35743e3ad9a8caf68d9bb16cf395203efed6c3046b3f4ea33bbcdd6649f5d425d813042c12396a7cd5ff4e8ed91dbc395a96fe55935ad50f9c3f3918b0407
 SHA512 
ec525e0fb7e5c5313245fcc745b971fd7d4a1caa7ab9fe1fa38dc20d50f03e5969197e86b60659971676bec0f79aa7b7951c8209bfe9565a3fd1dcac1b8535b3
-DIST pipewire-0.3.31.tar.gz 1594284 BLAKE2B 
0ff358c53ea4357a72ac58ee45ccac792161d3ddd7a9dbcd6933be88e0ddc5d9c49468a3b1eb0cdf9ea81ec4272ad53078f6cae1fd20358bbeed108139e217ce
 SHA512 
ff21e281bb3e5f6da1001e0c64b33368e96d31f0ec2d395cdfcfac105b0442d8fedd2225e6e5d1c93fdbd5e0108accecebbb7c294c55803a4ea853f1efa0c069
 DIST pipewire-0.3.32.tar.gz 1604622 BLAKE2B 
cab83a17a2b27f710e1377a2ad2ad7003053ef3e8b55423362f0b428e22d52c2ce564da00aab71cc93262d4cb21f239fffea195d05937fdf3489dc540b77d58d
 SHA512 
8a7fe26a78071fdd8d4c9e2d9bf3791af8e0cb53b976b45d39dcab4ad08196808f416911fb1b366cc85e3fa80592ec79c4e4556bb3a390f4a10229b4bf9893f7
 DIST pipewire-0.3.33.tar.gz 1629559 BLAKE2B 
de48956ac87ed6d63a08dd354b1e4abf81b9db99825ca65cbb5b522e71eb6920b35173e1c3abd9a710c28709e2b0a459db67654cfeac42149cdfa91c84833a8b
 SHA512 
bc3d5658d6fda11dd55f22ba5293b4ff6c3e9a8d083b0cf7b3356bc18f4f65967557602a0d6603a2a2a548ecb42c6b7fbb9d315ed0fce435f4bb884ab4dd263b

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
deleted file mode 100644
index 9c7a55c95e2..000
--- a/media-video/pipewire/files/pipewire-0.3.25-fix-docdir-path.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/doc/meson.build b/doc/meson.build
-index 05c7ed35..ce9b52ea 100644
 a/doc/meson.build
-+++ b/doc/meson.build
-@@

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/, media-video/pipewire/

2021-08-24 Thread Thomas Deutschmann 
commit: b0f9b2915c3e98ef272f613515afc74a53286b28
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Aug 24 12:51:17 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Aug 24 12:52:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0f9b291

media-video/pipewire: bump to v0.3.33

Stick to libaptx for now and delay decision since both
aptx libs haven't diverged yet.

Closes: https://bugs.gentoo.org/809591
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann  gentoo.org>

 media-video/pipewire/Manifest  |  1 +
 ...pipewire-0.3.33-revert-libfreeaptx-switch.patch | 38 ++
 ...pipewire-.ebuild => pipewire-0.3.33.ebuild} |  3 +-
 media-video/pipewire/pipewire-.ebuild  |  1 +
 4 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index f9d9215564a..70f935c1428 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -7,3 +7,4 @@ DIST pipewire-0.3.29.tar.gz 1504935 BLAKE2B 
fe3984ec4b02fe91683d382e3891e174748b
 DIST pipewire-0.3.30.tar.gz 1540950 BLAKE2B 
69b35743e3ad9a8caf68d9bb16cf395203efed6c3046b3f4ea33bbcdd6649f5d425d813042c12396a7cd5ff4e8ed91dbc395a96fe55935ad50f9c3f3918b0407
 SHA512 
ec525e0fb7e5c5313245fcc745b971fd7d4a1caa7ab9fe1fa38dc20d50f03e5969197e86b60659971676bec0f79aa7b7951c8209bfe9565a3fd1dcac1b8535b3
 DIST pipewire-0.3.31.tar.gz 1594284 BLAKE2B 
0ff358c53ea4357a72ac58ee45ccac792161d3ddd7a9dbcd6933be88e0ddc5d9c49468a3b1eb0cdf9ea81ec4272ad53078f6cae1fd20358bbeed108139e217ce
 SHA512 
ff21e281bb3e5f6da1001e0c64b33368e96d31f0ec2d395cdfcfac105b0442d8fedd2225e6e5d1c93fdbd5e0108accecebbb7c294c55803a4ea853f1efa0c069
 DIST pipewire-0.3.32.tar.gz 1604622 BLAKE2B 
cab83a17a2b27f710e1377a2ad2ad7003053ef3e8b55423362f0b428e22d52c2ce564da00aab71cc93262d4cb21f239fffea195d05937fdf3489dc540b77d58d
 SHA512 
8a7fe26a78071fdd8d4c9e2d9bf3791af8e0cb53b976b45d39dcab4ad08196808f416911fb1b366cc85e3fa80592ec79c4e4556bb3a390f4a10229b4bf9893f7
+DIST pipewire-0.3.33.tar.gz 1629559 BLAKE2B 
de48956ac87ed6d63a08dd354b1e4abf81b9db99825ca65cbb5b522e71eb6920b35173e1c3abd9a710c28709e2b0a459db67654cfeac42149cdfa91c84833a8b
 SHA512 
bc3d5658d6fda11dd55f22ba5293b4ff6c3e9a8d083b0cf7b3356bc18f4f65967557602a0d6603a2a2a548ecb42c6b7fbb9d315ed0fce435f4bb884ab4dd263b

diff --git 
a/media-video/pipewire/files/pipewire-0.3.33-revert-libfreeaptx-switch.patch 
b/media-video/pipewire/files/pipewire-0.3.33-revert-libfreeaptx-switch.patch
new file mode 100644
index 000..94d4b7dcb0c
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.33-revert-libfreeaptx-switch.patch
@@ -0,0 +1,38 @@
+commit f405a4e6069725934f9ae0f1b978497a34197d8d
+Author: Thomas Deutschmann 
+AuthorDate: Tue Aug 24 14:22:36 2021 +0200
+Commit: Thomas Deutschmann 
+CommitDate: Tue Aug 24 14:22:43 2021 +0200
+
+Revert "bluez5: Use libfreeaptx instead of libopenaptx"
+
+This reverts commit 1216371f8c06f548f8ade6468b66612f43df1436.
+
+Delay decision for now since both aptx libs haven't diverged yet.
+
+diff --git a/spa/meson.build b/spa/meson.build
+index 483536b54..e13802e94 100644
+--- a/spa/meson.build
 b/spa/meson.build
+@@ -28,7 +28,7 @@ if not get_option('spa-plugins').disabled()
+ summary({'LDAC': ldac_dep.found()}, bool_yn: true, section: 'Bluetooth 
audio codecs')
+ ldac_abr_dep = dependency('ldacBT-abr', required : 
get_option('bluez5-codec-ldac'))
+ summary({'LDAC ABR': ldac_abr_dep.found()}, bool_yn: true, section: 
'Bluetooth audio codecs')
+-aptx_dep = dependency('libfreeaptx', required : 
get_option('bluez5-codec-aptx'))
++aptx_dep = dependency('libopenaptx', version : '< 0.2.1', required : 
get_option('bluez5-codec-aptx'))
+ summary({'aptX': aptx_dep.found()}, bool_yn: true, section: 'Bluetooth 
audio codecs')
+ fdk_aac_dep = dependency('fdk-aac', required : 
get_option('bluez5-codec-aac'))
+ summary({'AAC': fdk_aac_dep.found()}, bool_yn: true, section: 'Bluetooth 
audio codecs')
+diff --git a/spa/plugins/bluez5/a2dp-codec-aptx.c 
b/spa/plugins/bluez5/a2dp-codec-aptx.c
+index f8d7d6dd8..62ecde348 100644
+--- a/spa/plugins/bluez5/a2dp-codec-aptx.c
 b/spa/plugins/bluez5/a2dp-codec-aptx.c
+@@ -32,7 +32,7 @@
+ 
+ #include 
+ 
+-#include 
++#include 
+ 
+ #include "defs.h"
+ #include "rtp.h"

diff --git a/media-video/pipewire/pipewire-.ebuild 
b/media-video/pipewire/pipewire-0.3.33.ebuild
similarity index 98%
copy from media-video/pipewire/pipewire-.ebuild
copy to media-video/pipewire/pipewire-0.3.33.ebuild
index ca8a33f0f30..6668891d3bb 100644
--- a/media-video/pipewire/pipewire-.ebuild
+++ b/media-video/pipewire/pipewire-0.3.33.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} ==  ]]; then
inherit git-r3
 else

SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz;
-   KEYWORDS="~amd64 ~arm ~arm64 ~ppc

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/, media-video/pipewire/

2021-06-30 Thread Lars Wendler 
commit: 1078f2a85b1b3f256d04db4ff165d98a3dce309f
Author: Jaco Kroon  uls  co  za>
AuthorDate: Wed Jun 30 20:28:39 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Jun 30 20:40:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1078f2a8

media-video/pipewire: Rebased non-systemd integration patch.

Closes: https://bugs.gentoo.org/799353
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Jaco Kroon  uls.co.za>
Closes: https://github.com/gentoo/gentoo/pull/21491
Signed-off-by: Lars Wendler  gentoo.org>

 .../files/pipewire-0.3.31-non-systemd-integration.patch | 17 +
 media-video/pipewire/pipewire-.ebuild   |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git 
a/media-video/pipewire/files/pipewire-0.3.31-non-systemd-integration.patch 
b/media-video/pipewire/files/pipewire-0.3.31-non-systemd-integration.patch
new file mode 100644
index 000..ccc89f1310b
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.31-non-systemd-integration.patch
@@ -0,0 +1,17 @@
+--- a/src/daemon/pipewire.conf.in  2021-06-30 22:22:09.520402459 +0200
 b/src/daemon/pipewire.conf.in  2021-06-30 22:22:30.620404999 +0200
+@@ -234,12 +234,12 @@
+ # but it is better to start it as a systemd service.
+ # Run the session manager with -h for options.
+ #
+-@comment@{ path = "@session_manager_path@"  args = 
"@session_manager_args@" }
++{ path = "@session_manager_path@"  args = "@session_manager_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/pipewire-.ebuild 
b/media-video/pipewire/pipewire-.ebuild
index acb7e554b78..4520c807491 100644
--- a/media-video/pipewire/pipewire-.ebuild
+++ b/media-video/pipewire/pipewire-.ebuild
@@ -114,7 +114,7 @@ src_prepare() {
if ! use systemd; then
# This can be applied non-conditionally but would make for a
# significantly worse user experience on systemd then.
-   eapply "${FILESDIR}"/${PN}-0.3.25-non-systemd-integration.patch
+   eapply "${FILESDIR}"/${PN}-0.3.31-non-systemd-integration.patch
fi
 
einfo "Generating ${limitsdfile}"

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/, media-video/pipewire/

2021-06-30 Thread Lars Wendler 
commit: 6b8dc9b2ecd430c571f9d0a7bbde7e43b90f0ed5
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Jun 30 20:14:59 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Jun 30 20:14:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b8dc9b2

media-video/pipewire: Fixed openaptx revert patch again

Closes: https://bugs.gentoo.org/799353
Signed-off-by: Lars Wendler  gentoo.org>

 ...pewire-0.3.31-revert-openaptx-restriction.patch | 30 ++
 media-video/pipewire/pipewire-.ebuild  |  2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git 
a/media-video/pipewire/files/pipewire-0.3.31-revert-openaptx-restriction.patch 
b/media-video/pipewire/files/pipewire-0.3.31-revert-openaptx-restriction.patch
new file mode 100644
index 000..d8496bc5a69
--- /dev/null
+++ 
b/media-video/pipewire/files/pipewire-0.3.31-revert-openaptx-restriction.patch
@@ -0,0 +1,30 @@
+From 3449214466c4dac866ec9f47ecc573efaf4505bb Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann 
+Date: Fri, 21 May 2021 10:32:52 +0200
+Subject: [PATCH] Revert "openaptx: Blacklist >= 0.2.1 due to license change"
+
+This reverts commit d08b6fac6bec0d334ee9fc785d551a67832f95fe.
+
+Doesn't apply to us.
+
+Bug: https://bugs.gentoo.org/785634
+---
+ spa/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/spa/meson.build b/spa/meson.build
+index e13802e94..885b25405 100644
+--- a/spa/meson.build
 b/spa/meson.build
+@@ -28,7 +28,7 @@ if not get_option('spa-plugins').disabled()
+ summary({'LDAC': ldac_dep.found()}, bool_yn: true, section: 'Bluetooth 
audio codecs')
+ ldac_abr_dep = dependency('ldacBT-abr', required : 
get_option('bluez5-codec-ldac'))
+ summary({'LDAC ABR': ldac_abr_dep.found()}, bool_yn: true, section: 
'Bluetooth audio codecs')
+-aptx_dep = dependency('libopenaptx', version : '< 0.2.1', required : 
get_option('bluez5-codec-aptx'))
++aptx_dep = dependency('libopenaptx', required : 
get_option('bluez5-codec-aptx'))
+ summary({'aptX': aptx_dep.found()}, bool_yn: true, section: 'Bluetooth 
audio codecs')
+ fdk_aac_dep = dependency('fdk-aac', required : 
get_option('bluez5-codec-aac'))
+ summary({'AAC': fdk_aac_dep.found()}, bool_yn: true, section: 'Bluetooth 
audio codecs')
+-- 
+2.32.0
+

diff --git a/media-video/pipewire/pipewire-.ebuild 
b/media-video/pipewire/pipewire-.ebuild
index d2c5423d5e5..acb7e554b78 100644
--- a/media-video/pipewire/pipewire-.ebuild
+++ b/media-video/pipewire/pipewire-.ebuild
@@ -101,7 +101,7 @@ DOCS=( {README,INSTALL}.md NEWS )
 
 PATCHES=(
"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
-   "${FILESDIR}"/${PN}-0.3.29-revert-openaptx-restriction.patch
+   "${FILESDIR}"/${PN}-0.3.31-revert-openaptx-restriction.patch
 )
 
 # limitsdfile related code taken from =sys-auth/realtime-base-0.1

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/, media-video/pipewire/

2021-06-04 Thread Thomas Deutschmann 
commit: 9d7deec91048ab3f0c83ae17afe642b77d6dc493
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Jun  4 07:32:26 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Jun  4 07:32:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d7deec9

media-video/pipewire: bump to v0.3.29

Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann  gentoo.org>

 media-video/pipewire/Manifest  |   1 +
 ...pewire-0.3.29-revert-openaptx-restriction.patch |  30 +++
 media-video/pipewire/pipewire-0.3.29.ebuild| 271 +
 3 files changed, 302 insertions(+)

diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 3ecd570692f..94d25adbc07 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -3,3 +3,4 @@ DIST pipewire-0.3.25.tar.gz 1351257 BLAKE2B 
3c4d6d98e3255df8baf50eb548bcf77b5c02
 DIST pipewire-0.3.26.tar.gz 1447673 BLAKE2B 
67feb1288fcdc9ac5578b97ab2567b46a7431921291584bc9db2c2e60db074c3a61c3af9859d3b2f9044cfba6c15e9bfde9edc001b753f8fc47965eb55d751c8
 SHA512 
d771956a42801a6e07fac48a175363eb4107a9fba13d649ff5c2cdc40044c84a61bf56050783507f6dd8efae8c59a2be07ec67433827335ae60f8116c4a4e178
 DIST pipewire-0.3.27.tar.gz 1459913 BLAKE2B 
b6db73de85c41932b630e62b3dcc589529ae5457cae6731a8ec5db50f20b541e7e9596976a368c4bb654b1443071c53f8fe4a9ddfc1ee8a0ecc04d69b683456a
 SHA512 
a2df1df8e43846b91fbeedeb1cda9c73b970ac9de58d8b4e97ada54ee74a8f26a168504289c7392c94cc7ea54aa01ada4791c66a5d3159a2bc980df633f6bcfe
 DIST pipewire-0.3.28.tar.gz 1474219 BLAKE2B 
d20b39c8ed49cd44f2109aab6453aac547ff66dc2ef4a52fb71fea27eb07920efc58498e5ddd82e9f6d86981185e37313748d9157c9a09a3ae1e8ae48d5d45d6
 SHA512 
f2ed23609c6a45fb80f54caabaa304ba4f318c905a28350c89c65f179a95cc2022f1acbb0c2ec558baf4dc6bcc5623b8daa6678d52cdb9179a88c67b6c1fe0ff
+DIST pipewire-0.3.29.tar.gz 1504935 BLAKE2B 
fe3984ec4b02fe91683d382e3891e174748b52c5e2f609dc838837f1ac0fea736e06395a022b8ec152fe015cca24c54d4c1896acde3a2ac66eb700dc2336fe4f
 SHA512 
bc163ad3e2d7696295fd3720e8f9cc4d478a55c0694c0faa03a40333e3b65fcbff27e4e296eb9dd0191ca2782e04934915c46e04a2444b458491cd2905823ddd

diff --git 
a/media-video/pipewire/files/pipewire-0.3.29-revert-openaptx-restriction.patch 
b/media-video/pipewire/files/pipewire-0.3.29-revert-openaptx-restriction.patch
new file mode 100644
index 000..9da495f12d0
--- /dev/null
+++ 
b/media-video/pipewire/files/pipewire-0.3.29-revert-openaptx-restriction.patch
@@ -0,0 +1,30 @@
+From 6d2e45a67cadd9498b24e8e4ea7adc6cf627333d Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann 
+Date: Thu, 3 Jun 2021 14:15:44 +0200
+Subject: [PATCH] Revert "openaptx: Blacklist >= 0.2.1 due to license change"
+
+This reverts commit d08b6fac6bec0d334ee9fc785d551a67832f95fe.
+
+Doesn't apply to us.
+
+Bug: https://bugs.gentoo.org/785634
+---
+ spa/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/spa/meson.build b/spa/meson.build
+index 263af4c2..7671c74b 100644
+--- a/spa/meson.build
 b/spa/meson.build
+@@ -23,7 +23,7 @@ if not get_option('spa-plugins').disabled()
+ sbc_dep = dependency('sbc', required: get_option('bluez5'))
+ ldac_dep = dependency('ldacBT-enc', required : 
get_option('bluez5-codec-ldac'))
+ ldac_abr_dep = dependency('ldacBT-abr', required : 
get_option('bluez5-codec-ldac'))
+-aptx_dep = dependency('libopenaptx', version : '< 0.2.1', required : 
get_option('bluez5-codec-aptx'))
++aptx_dep = dependency('libopenaptx', required : 
get_option('bluez5-codec-aptx'))
+ fdk_aac_dep = dependency('fdk-aac', required : 
get_option('bluez5-codec-aac'))
+   endif
+   avcodec_dep = dependency('libavcodec', required: get_option('ffmpeg'))
+-- 
+2.32.0.rc3
+

diff --git a/media-video/pipewire/pipewire-0.3.29.ebuild 
b/media-video/pipewire/pipewire-0.3.29.ebuild
new file mode 100644
index 000..ed54b0ec601
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.29.ebuild
@@ -0,0 +1,271 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit meson-multilib optfeature udev
+
+if [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git;
+   inherit git-r3
+else
+   
SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz;
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/;
+
+LICENSE="MIT LGPL-2.1+ GPL-2"
+SLOT="0/0.3"
+IUSE="aac aptx bluetooth doc extra gstreamer jack-client jack-sdk ldac 
pipewire-alsa systemd test v4l"
+
+# Once replacing system JACK libraries is possible, it's likely that
+# jack-client IUSE will need blocking to avoid users accidentally
+# configuring their systems to send PW sink output to the emulated
+# JACK's sink - doing so is likely to yield no audio, cause a CPU
+# cycles

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/, media-video/pipewire/

2021-05-21 Thread Thomas Deutschmann 
commit: 3e5e2c5e7337086a3aba193bfe11dabb687760f6
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri May 21 23:04:22 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri May 21 23:05:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e5e2c5e

media-video/pipewire: allow >openaptx-0.2

Closes: https://bugs.gentoo.org/791259
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann  gentoo.org>

 ...pipewire-0.3.28-revert-openaptx-restriction.patch | 20 
 media-video/pipewire/pipewire-0.3.28.ebuild  |  1 +
 media-video/pipewire/pipewire-.ebuild|  1 +
 3 files changed, 22 insertions(+)

diff --git 
a/media-video/pipewire/files/pipewire-0.3.28-revert-openaptx-restriction.patch 
b/media-video/pipewire/files/pipewire-0.3.28-revert-openaptx-restriction.patch
new file mode 100644
index 000..f624191b442
--- /dev/null
+++ 
b/media-video/pipewire/files/pipewire-0.3.28-revert-openaptx-restriction.patch
@@ -0,0 +1,20 @@
+Revert "openaptx: Blacklist >= 0.2.1 due to license change"
+
+This reverts commit d08b6fac6bec0d334ee9fc785d551a67832f95fe.
+
+Doesn't apply to us.
+
+Bug: https://bugs.gentoo.org/785634
+
+--- a/spa/meson.build
 b/spa/meson.build
+@@ -22,7 +22,7 @@ if not get_option('spa-plugins').disabled()
+   sbc_dep = dependency('sbc', required: get_option('bluez5'))
+   ldac_dep = dependency('ldacBT-enc', required : 
get_option('bluez5-codec-ldac'))
+   ldac_abr_dep = dependency('ldacBT-abr', required : 
get_option('bluez5-codec-ldac'))
+-  aptx_dep = dependency('libopenaptx', version : '< 0.2.1', required : 
get_option('bluez5-codec-aptx'))
++  aptx_dep = dependency('libopenaptx', required : 
get_option('bluez5-codec-aptx'))
+   fdk_aac_dep = dependency('fdk-aac', required : 
get_option('bluez5-codec-aac'))
+   avcodec_dep = dependency('libavcodec', required: get_option('ffmpeg'))
+   jack_dep = dependency('jack', version : '>= 1.9.10', required: 
get_option('jack'))
+ 

diff --git a/media-video/pipewire/pipewire-0.3.28.ebuild 
b/media-video/pipewire/pipewire-0.3.28.ebuild
index 5504603123f..9568402650e 100644
--- a/media-video/pipewire/pipewire-0.3.28.ebuild
+++ b/media-video/pipewire/pipewire-0.3.28.ebuild
@@ -97,6 +97,7 @@ DOCS=( {README,INSTALL}.md NEWS )
 
 PATCHES=(
"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+   "${FILESDIR}"/${PN}-0.3.28-revert-openaptx-restriction.patch
 )
 
 # limitsdfile related code taken from =sys-auth/realtime-base-0.1

diff --git a/media-video/pipewire/pipewire-.ebuild 
b/media-video/pipewire/pipewire-.ebuild
index 5504603123f..9568402650e 100644
--- a/media-video/pipewire/pipewire-.ebuild
+++ b/media-video/pipewire/pipewire-.ebuild
@@ -97,6 +97,7 @@ DOCS=( {README,INSTALL}.md NEWS )
 
 PATCHES=(
"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+   "${FILESDIR}"/${PN}-0.3.28-revert-openaptx-restriction.patch
 )
 
 # limitsdfile related code taken from =sys-auth/realtime-base-0.1

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/, media-video/pipewire/

2021-04-24 Thread Thomas Deutschmann 
commit: f788f389419678d2f2399eeb65fd2eedd7956196
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sat Apr 24 21:13:26 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sat Apr 24 21:15:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f788f389

media-video/pipewire: bump to v0.3.26

Closes: https://bugs.gentoo.org/775386
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann  gentoo.org>

 media-video/pipewire/Manifest   |   1 +
 media-video/pipewire/files/pipewire-launcher.sh |   6 +
 media-video/pipewire/files/pipewire.desktop |  12 ++
 media-video/pipewire/pipewire-0.3.26.ebuild | 243 
 4 files changed, 262 insertions(+)

diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 0fc9725e04f..4b42b099c84 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,2 +1,3 @@
 DIST pipewire-0.3.22.tar.gz 1263844 BLAKE2B 
3fb90c0b1c17ed108e8c390873f5c4527e1ff9241d1c5964ad5b7c01fbfefda901ef1228f178cf3c9899e6e8e75969a470f8fba63473ff203cba612c6c0553ca
 SHA512 
a6587e0afd5c90be1733ecf62c6fc68e735ab3b84f2cbbf844bbe1be93e7a23dee07b041ed6b273cab6ab207d2388ae6f2027d0380928555a0155a7cc9ca4a7e
 DIST pipewire-0.3.25.tar.gz 1351257 BLAKE2B 
3c4d6d98e3255df8baf50eb548bcf77b5c027a50f6acedd83cd63481ed5b642c174589f34314f150b07116cea8a3458c3f8b770df4081585d7f75cc8dde4decd
 SHA512 
0f84be21bfcd70f25900c53a8ce399c29ce2d4d10f8b56e5103603cf0c80673aab0b16492e55b42985283adf46343cdca01626225db85a2263f06c309f68f2d7
+DIST pipewire-0.3.26.tar.gz 1447673 BLAKE2B 
67feb1288fcdc9ac5578b97ab2567b46a7431921291584bc9db2c2e60db074c3a61c3af9859d3b2f9044cfba6c15e9bfde9edc001b753f8fc47965eb55d751c8
 SHA512 
d771956a42801a6e07fac48a175363eb4107a9fba13d649ff5c2cdc40044c84a61bf56050783507f6dd8efae8c59a2be07ec67433827335ae60f8116c4a4e178

diff --git a/media-video/pipewire/files/pipewire-launcher.sh 
b/media-video/pipewire/files/pipewire-launcher.sh
new file mode 100644
index 000..ecff3e7e708
--- /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 000..d3786e74f82
--- /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

diff --git a/media-video/pipewire/pipewire-0.3.26.ebuild 
b/media-video/pipewire/pipewire-0.3.26.ebuild
new file mode 100644
index 000..a90b445a81d
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.26.ebuild
@@ -0,0 +1,243 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson optfeature udev
+
+if [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git;
+#  EGIT_BRANCH="master"
+   inherit git-r3
+else
+   
SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz;
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/;
+
+LICENSE="LGPL-2.1+"
+SLOT="0/0.3"
+IUSE="aac aptx bluetooth doc extra gstreamer jack-client ldac pipewire-alsa 
systemd test v4l"
+
+# Once replacing system JACK libraries is possible, it's likely that
+# jack-client IUSE will need blocking to avoid users accidentally
+# configuring their systems to send PW sink output to the emulated
+# JACK's sink - doing so is likely to yield no audio, cause a CPU
+# cycles consuming loop (and may even cause GUI crashes)!
+
+REQUIRED_USE="
+   aac? ( bluetooth )
+   aptx? ( bluetooth )
+   ldac? ( bluetooth )
+"
+
+BDEPEND="
+   app-doc/xmltoman
+   doc? (
+   app-doc/doxygen
+   media-gfx/graphviz
+   )
+"
+RDEPEND="
+   media-libs/alsa-lib
+   sys-apps/dbus
+   sys-libs/ncurses[unicode]
+   virtual/libudev
+   bluetooth? (
+   aac? ( media-libs/fdk-aac )
+   aptx? ( media-libs/libopenaptx )
+   ldac? ( media-libs/libldac )
+   media-libs/sbc
+   >=net-wireless/bluez-4.101:=
+   )
+   extra? (
+   >=media-libs/libsndfile-1.0.20
+   )
+   gstreamer? (
+   >=dev-libs/glib-2.32.0:2
+   >=media-libs/gstreamer-1.10.0:1.0
+   media-libs/gst-plugins-base:1.0
+   )
+   jack-client? (

[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/, media-video/pipewire/

2019-10-21 Thread Andreas Sturmlechner 
commit: ffcf2e1a011c72bdd3d5122ccd44987a3d536d2a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Oct 21 21:10:52 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Oct 21 23:38:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffcf2e1a

media-video/pipewire: Drop 0.2.6

Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-video/pipewire/Manifest  |   1 -
 .../files/pipewire-0.2.6-alsa-lib-1.1.9.patch  |  66 --
 ...pewire-0.2.6-fix-probing-without-starting.patch |  63 --
 .../pipewire-0.2.6-reuse-fd-in-pipewiresrc.patch   | 137 -
 .../pipewire-0.2.6-revert-combine-all-perms.patch  |  34 -
 media-video/pipewire/pipewire-0.2.6.ebuild |  88 -
 6 files changed, 389 deletions(-)

diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index e5f74aabbe5..b13f9d2704c 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,2 +1 @@
-DIST pipewire-0.2.6.tar.gz 421137 BLAKE2B 
155667d14fe5380e21f0b70accea72dc4478085916a9126185136f6d33bd7729d91b790c171dcf7b6aea2c52894462d16516f8821229ca0bf9f6cde15df524d9
 SHA512 
3d1db41f5beb42a0ee15ae7bc8afb89b54a37c3a6a414e88b5e33ceaf98ec6dda0d9a2d03ac47a8dfce48e9637e647291919e6670bb70589b0d1951fbcbd3ff8
 DIST pipewire-0.2.7.tar.gz 421644 BLAKE2B 
d2ccb56a9ea5ea7782678deb6eae0b0a70da1fa69e807398062d388733901839f15a2f0f7db982fbebd2b2759f443709e6c1950b6367f3ed4801d6c2d6109e73
 SHA512 
10d3e20cc3d233fbcd1fc39702ae3043a656ebcd9cd3c39c77f0cc2bf42ff4956fc03e7933c7b397bca446c63f45ddacea948d5ec7e4a3300499fa2794f14334

diff --git a/media-video/pipewire/files/pipewire-0.2.6-alsa-lib-1.1.9.patch 
b/media-video/pipewire/files/pipewire-0.2.6-alsa-lib-1.1.9.patch
deleted file mode 100644
index 7b2b4c894da..000
--- a/media-video/pipewire/files/pipewire-0.2.6-alsa-lib-1.1.9.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 37613b67ba52b5ad4e81d7ea38adc04027d9f9e5 Mon Sep 17 00:00:00 2001
-From: Wim Taymans 
-Date: Thu, 23 May 2019 09:25:51 +0200
-Subject: [PATCH] alsa: handle alsa-lib 1.1.9
-
-alsa-lib 1.1.9 removed /usr/include/alsa from the include path, we
-must include 

- spa/plugins/alsa/alsa-monitor.c | 2 +-
- spa/plugins/alsa/alsa-sink.c| 2 +-
- spa/plugins/alsa/alsa-source.c  | 2 +-
- spa/plugins/alsa/alsa-utils.h   | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/spa/plugins/alsa/alsa-monitor.c b/spa/plugins/alsa/alsa-monitor.c
-index d8935cd7..16a01302 100644
 a/spa/plugins/alsa/alsa-monitor.c
-+++ b/spa/plugins/alsa/alsa-monitor.c
-@@ -25,7 +25,7 @@
- #include 
- 
- #include 
--#include 
-+#include 
- 
- #include 
- #include 
-diff --git a/spa/plugins/alsa/alsa-sink.c b/spa/plugins/alsa/alsa-sink.c
-index c31fe3e2..3c252fab 100644
 a/spa/plugins/alsa/alsa-sink.c
-+++ b/spa/plugins/alsa/alsa-sink.c
-@@ -19,7 +19,7 @@
- 
- #include 
- 
--#include 
-+#include 
- 
- #include 
- #include 
-diff --git a/spa/plugins/alsa/alsa-source.c b/spa/plugins/alsa/alsa-source.c
-index 74bbb3c0..8efc8fde 100644
 a/spa/plugins/alsa/alsa-source.c
-+++ b/spa/plugins/alsa/alsa-source.c
-@@ -19,7 +19,7 @@
- 
- #include 
- 
--#include 
-+#include 
- 
- #include 
- #include 
-diff --git a/spa/plugins/alsa/alsa-utils.h b/spa/plugins/alsa/alsa-utils.h
-index 5ba57bc5..3b590007 100644
 a/spa/plugins/alsa/alsa-utils.h
-+++ b/spa/plugins/alsa/alsa-utils.h
-@@ -26,7 +26,7 @@ extern "C" {
- 
- #include 
- 
--#include 
-+#include 
- 
- #include 
- #include 

diff --git 
a/media-video/pipewire/files/pipewire-0.2.6-fix-probing-without-starting.patch 
b/media-video/pipewire/files/pipewire-0.2.6-fix-probing-without-starting.patch
deleted file mode 100644
index 9b3aed33b96..000
--- 
a/media-video/pipewire/files/pipewire-0.2.6-fix-probing-without-starting.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 37e66c9e55f556558088d9f6b2200d4341a37f04 Mon Sep 17 00:00:00 2001
-From: Michael Olbrich 
-Date: Tue, 18 Jun 2019 09:53:12 +0200
-Subject: [PATCH] deviceprovider: fix probing without starting
-
-self->type is needed in registry_event_global() so it must be set in
-gst_pipewire_device_provider_probe() as well.
-
-self->devices is initialized as NULL when probing is started. So it should
-be just a simple GList* pointer.
-
-Signed-off-by: Michael Olbrich 

- src/gst/gstpipewiredeviceprovider.c | 8 ++--
- src/gst/gstpipewiredeviceprovider.h | 2 +-
- 2 files changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/src/gst/gstpipewiredeviceprovider.c 
b/src/gst/gstpipewiredeviceprovider.c
-index b6472d96..02b38c2e 100644
 a/src/gst/gstpipewiredeviceprovider.c
-+++ b/src/gst/gstpipewiredeviceprovider.c
-@@ -265,7 +265,7 @@ static void do_add_node(void *data)
-   nd->dev = new_node (self, nd);
-   if (nd->dev) {
- if(self->list_only)
--  *self->devices = g_list_prepend (*self->devices, gst_object_ref_sink