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

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

[Sam James]

commit:     30bd9772a9ab6da8a9c0d6875fd08322d89cada1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 26 15:01:38 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 26 15:02:09 2021 +0000
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 <sam <AT> 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 <wtaymans@redhat.com>
@@ -29,3 +30,83 @@ index f47dfa6b3..1867fa4d3 100644
 -- 
 GitLab
 
+From c07f0ccb71a9d95944ce3e4d7e453cb50a26b0a2 Mon Sep 17 00:00:00 2001
+From: Wim Taymans <wtaymans@redhat.com>
+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 = &map->free_list;
+-			while (*current != SPA_ID_INVALID) {
+-				uint32_t current_id = (*current) >> 1;
+-				uint32_t *next = &pw_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] = {&data[0], &data[1], &data[3]};
+-	int *new_ptr = &new_data;
+ 	int idx[3];
+ 	int rc;
+ 
+@@ -225,21 +224,7 @@ PWTEST(map_insert_at_free)
+ 	}
+ 
+ 	rc = pw_map_insert_at(&map, item_idx, &new_data);
+-	pwtest_neg_errno_ok(rc);
+-	pwtest_ptr_eq(new_ptr, pw_map_lookup(&map, item_idx));
+-
+-	if (before_idx != SKIP && before_idx != item_idx) {
+-		rc = pw_map_insert_at(&map, before_idx, &ptr[before_idx]);
+-		pwtest_neg_errno_ok(rc);
+-		pwtest_ptr_eq(&ptr[before_idx], pw_map_lookup(&map, before_idx));
+-	}
+-
+-	if (after_idx != SKIP && after_idx != item_idx) {
+-		rc = pw_map_insert_at(&map, after_idx, &ptr[after_idx]);
+-		pwtest_neg_errno_ok(rc);
+-		pwtest_ptr_eq(&ptr[after_idx], pw_map_lookup(&map, after_idx));
+-	}
+-
++	pwtest_neg_errno(rc, -EINVAL);
+ 	pw_map_clear(&map);
+ 
+ 	return PWTEST_PASS;
+-- 
+GitLab
+

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

[Conrad Kostecki]

commit:     496d88d62d2ff25b17532dedd99c17a20c4b5619
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Jan 12 19:08:22 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed Feb  9 23:05:09 2022 +0000
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 <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> 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..000000000000
--- 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/

[Sam James]

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

media-video/pipewire: remove unused file

Signed-off-by: Michael Mair-Keimberger <mmk <AT> 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 <sam <AT> 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..000000000000
--- 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/

[Conrad Kostecki]

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

media-video/pipewire: remove unused files

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/32320
Signed-off-by: Conrad Kostecki <conikost <AT> 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..000000000000
--- 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..000000000000
--- 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..000000000000
--- 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
-X-systemd-skip=true

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

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

[Conrad Kostecki]

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

media-video/pipewire: remove unused file

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/34533
Signed-off-by: Conrad Kostecki <conikost <AT> 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..000000000000
--- 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