gentoo auto-resync : 02:02:2024 - 05:44:58

5 files changed, 25 insertions, 712 deletions

diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 70f1a4f00a19..2c0637b23a2e 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,19 +1,17 @@
-AUX 0.3.80/0001-aes-support-both-webrtc-versions.patch 9037 BLAKE2B 9222a1b9004cf410a06bfb29f17b749f2c940b9ce91973d7d58785ba47899bc0cd22b010818aaebb68af729972b8fe5f99c04926ea51af92960bf9567e87ac79 SHA512 34f005a38a99d8d06c1adf8d71a28142f8d4450ae72ffd8d19001485555f681a3ebcdfc094fea558e3c9610b7c5c6bbecad9acea73d0de3c5e9de905d6080044
 AUX 1.0.0/0001-fix-compile-with-no-examples.patch 1388 BLAKE2B 9cf02967d8723f41c0bb456a064d90237fffef66cf8cb3e6678b3bce1d58418a0b4e347e71cf4c45240c150cdd8d08b1448efd1fad594886e3041558730b20c2 SHA512 65e1d6e572dff5fe63a05580696b8ec304477e58726dc7e0723dcae9bc03332111af131f57584ad8d62ca1e6bada982387c1df47dfcb9cfed8a47bf86831a2b5
 AUX 1.0.0/0002-fix-x11-bell-segfault.patch 988 BLAKE2B 2281275262157fa2545820e155d1182873b05738b6314c6b9d73c89f928cddf34a135ca02a552c6d124402439636a986f8aaab899ee8e872bdd6582ce60327b2 SHA512 24732d8c8c9d0ac951a9d7d30da68488da1b8da3b94652492706dd02859f7beeb8499a08a130b10332f50f81854825c80cffc5dca951d93e2eeab43a0bc786fe
+AUX 1.0.2/0001-alsa-version-check.patch 804 BLAKE2B 6c0b8e3fd69fe0eef861bd6d41b0bc70a8be5220f0d94511cfde202e952ce6cba2472bb28583aadf0329fa3b9290954530ef1acf2778e14fae210053ad7cbea1 SHA512 79c5e12073d30a40ab6e431322bf4696d8105c9f7262a6abf3c457f2a68c30c2c45c75260ec1cfd8fbac6976e20704315b821993b2362a40768d5e9089ff2c27
 AUX 99-pipewire-default-hook.conf 540 BLAKE2B cec76e78db9db290054bf766774c284d7a7a1374c453802eb1bdc19db9289856ec7b8643acbab916a39ca859d543deca111e3b0f110d1904343221c1573ffc17 SHA512 ef891e38c6f40fce2904e240307147a58c48d780e8470dac8e28044cfb86ddeb163885a2362687791779379ad814f58ad5649b75ac4e82931c5bdd3f37a6ed01
 AUX gentoo-pipewire-launcher.1 1633 BLAKE2B 36c8888693bd0389dc9b1e49d0501d2679956d88f6b7ac42f0347c3fe2259775dd7082cb0bbdeb54a232fcc8902faa8086203e0fe2437c0eea5f1927ba2d0de4 SHA512 8085c9a989f21ee7f2528d56d5b104c0d14024df06f5cb6cd2aa8168b58469c71b91c788706b11021d9dbddb647a2203175603f4f8aa7b33a63a7b7cf8b59d1f
 AUX gentoo-pipewire-launcher.in-r3 2848 BLAKE2B 5e6b8ca2df88cef240ca1ff4de28cc8ed3590fabd29b903b37880baf9cf52c35ca01be25b031898d4ee06f4600a5f0c61025a244778577a562f4a4bfa14e2aca SHA512 43cf3e07058e86bf6651106f7f192022c05c5640ba8e101b88e98a83efcc5614f9474107b6d0daf3d5234a51ebcc0a3a7ae5b359d9ba36b648c125813f4e1334
 AUX pipewire-0.3.25-enable-failed-mlock-warning.patch 704 BLAKE2B dc0732b89b57a258ea6dc54941899134259469675f92ae93aebda09a796c73ace8bc4ed0ab2aef4ea1bcaa30c1bea8c3304288168421ce8f9939ec993c8aa438 SHA512 7456a24276b7b766ff5799acf5b80ef5f85ee7a78fc5b52adff3206c0b0aa1985a0bf72634aacf7818c90136c09bcc11cb0fecec291d961c8b3585c897869f65
 AUX pipewire.desktop-r2 333 BLAKE2B 6a8805bb4ea3f23af535867c0551b8f742543de1fa8d99d2b451575066c3394b01977587078356dab65a640899bf336252b7f81b83072c676110fce9b0732eff SHA512 292fbc7283b30454025be50c657803dcb0592c9a6f0757eebe4de5a98166c3bcfeb5563da3d72489762073fe782b5e1f913c01184fbd2e926d872fc7ade73eb7
-DIST pipewire-0.3.80.tar.bz2 1655137 BLAKE2B cf55e01b6fff29e7ef1f40e9a8f28788b9f538380232821b334359844b33b12b913375ae14e4589d7ae9cd26d22bc841d8103d41c7eb3ea1a9f0c1db1abc6507 SHA512 77e26b6cbefc091ea703b53d147accbd9495f97ba57618a21366b0747074de3ed1060c03e91362f5cf9dc5c256da6d541eccaff8de306b369730400c7b7f46b2
 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
-EBUILD pipewire-0.3.80.ebuild 18191 BLAKE2B a87afc4c2c3e54283aeeffa05840716518a1806e04543e1138229b87fb0c65ad419c60a584a2c2a36c2cb38519f79d51fab92e762e5fa84842f61d506354629e SHA512 dfc0c16da2f5e30934b2ce7b7a148fbe64a61aeae87af37dbff7f1bce4381a0b23f744087165982b9ce1d7eb257a8821fada081e9bea40cd66b86cccdf26a73b
 EBUILD pipewire-1.0.0-r1.ebuild 19657 BLAKE2B 3b82a4e466937ee6d1d0f21a5837071ff0730530e1bc7c09066ee1b666a36169b4284ae4296f693e60e2f11b1699140bb20cf1153f56f390a5e564b05235db0e SHA512 57c5c699a13cf8288e0cfbd08ef412405d50f6e5be9babe6d63a7a86cdc66b4c5e781364b83885925567e6ac4f91c09ebeeedcc55deb63ae02ac3a01f7022cdd
 EBUILD pipewire-1.0.1.ebuild 19582 BLAKE2B 6a71ac1d4cfb6057022fa9f4d8b9439318fe8c93b15b5fe56da5596444f2625e564fed035a76df232b97a2d3ddbdb5e86ae9446d7cfc9c6010737a7b45de50b9 SHA512 c3a408664a224ace0e2d0b72f0ee59c7f7b3b4d49a7f1771c1d7c95f6a657cc9191410765a17d378fd5b9180a53d1fdb0160710c18b8dc281034aa9e1fa51058
-EBUILD pipewire-1.0.2.ebuild 19582 BLAKE2B 6a71ac1d4cfb6057022fa9f4d8b9439318fe8c93b15b5fe56da5596444f2625e564fed035a76df232b97a2d3ddbdb5e86ae9446d7cfc9c6010737a7b45de50b9 SHA512 c3a408664a224ace0e2d0b72f0ee59c7f7b3b4d49a7f1771c1d7c95f6a657cc9191410765a17d378fd5b9180a53d1fdb0160710c18b8dc281034aa9e1fa51058
+EBUILD pipewire-1.0.2-r1.ebuild 19582 BLAKE2B 6a71ac1d4cfb6057022fa9f4d8b9439318fe8c93b15b5fe56da5596444f2625e564fed035a76df232b97a2d3ddbdb5e86ae9446d7cfc9c6010737a7b45de50b9 SHA512 c3a408664a224ace0e2d0b72f0ee59c7f7b3b4d49a7f1771c1d7c95f6a657cc9191410765a17d378fd5b9180a53d1fdb0160710c18b8dc281034aa9e1fa51058
 EBUILD pipewire-9999.ebuild 19573 BLAKE2B 591c2635574b9e383058a4d26cf80686d37ad06508b3940ac1d994de255cd21563b5e979d72359ce7c841675c011c6923dcd0f15da1e10749a97829668898d45 SHA512 496315b3c30a102fcf04fd720be05218dee2ca20e40b6f63c31b2d7fdaf1a23b908a34ecff5e785a144f95acbacc6ab4c94fc23892308475dc7b7bfe58c36721
 MISC metadata.xml 2156 BLAKE2B 974459115e0f3cf4e4c3ac15159740b42e01a093da37d8a27f80e122c9ab2a3fe9194443eaf08f9b66d613db90a14465abbe1b76816bce90e11a46c8409c7513 SHA512 cfe0fdb86c993f167507e22635878d6d7d5dcd48f4c23323231263551ceff986fc454700428ecb7d2ee2abe82093c35d8e7bd491020fd6dd3f3889c09e9020bb
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
deleted file mode 100644
index f2afdde4f4be..000000000000
--- a/media-video/pipewire/files/0.3.80/0001-aes-support-both-webrtc-versions.patch
+++ /dev/null
@@ -1,233 +0,0 @@
-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 <wtaymans@redhat.com>
-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 <arun@asymptotic.io> */
- /* SPDX-License-Identifier: MIT */
- 
-+#include "config.h"
-+
- #include <memory>
- #include <utility>
- 
-@@ -13,7 +15,13 @@
- #include <spa/utils/json.h>
- #include <spa/support/plugin.h>
- 
-+#ifdef HAVE_WEBRTC
-+#include <webrtc/modules/audio_processing/include/audio_processing.h>
-+#include <webrtc/modules/interface/module_common_types.h>
-+#include <webrtc/system_wrappers/include/trace.h>
-+#else
- #include <modules/audio_processing/include/audio_processing.h>
-+#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 ] */
-+static int parse_point(struct spa_json *it, float (&f)[3])
-+{
-+	struct spa_json arr;
-+	int i, res;
-+
-+	if (spa_json_enter_array(it, &arr) <= 0)
-+		return -EINVAL;
-+
-+	for (i = 0; i < 3; i++) {
-+		if ((res = spa_json_get_float(&arr, &f[i])) <= 0)
-+			return -EINVAL;
-+	}
-+	return 0;
-+}
-+
-+/* [ point1 point2 ... ] */
-+static int parse_mic_geometry(struct impl_data *impl, const char *mic_geometry,
-+		std::vector<webrtc::Point>& geometry)
-+{
-+	int res;
-+	size_t i;
-+	struct spa_json it[2];
-+
-+	spa_json_init(&it[0], mic_geometry, strlen(mic_geometry));
-+	if (spa_json_enter_array(&it[0], &it[1]) <= 0) {
-+		spa_log_error(impl->log, "Error: webrtc.mic-geometry expects an array");
-+		return -EINVAL;
-+	}
-+
-+	for (i = 0; i < geometry.size(); i++) {
-+		float f[3];
-+
-+		if ((res = parse_point(&it[1], f)) < 0) {
-+			spa_log_error(impl->log, "Error: can't parse webrtc.mic-geometry points: %d", res);
-+			return res;
-+		}
-+
-+		spa_log_info(impl->log, "mic %zd position: (%g %g %g)", i, f[0], f[1], f[2]);
-+		geometry[i].c[0] = f[0];
-+		geometry[i].c[1] = f[1];
-+		geometry[i].c[2] = f[2];
-+	}
-+	return 0;
-+}
-+#endif
-+
- static int webrtc_init2(void *object, const struct spa_dict *args,
- 		struct spa_audio_info_raw *rec_info, struct spa_audio_info_raw *out_info,
- 		struct spa_audio_info_raw *play_info)
-@@ -48,9 +104,18 @@ static int webrtc_init2(void *object, const struct spa_dict *args,
- 
- 	bool high_pass_filter = webrtc_get_spa_bool(args, "webrtc.high_pass_filter", true);
- 	bool noise_suppression = webrtc_get_spa_bool(args, "webrtc.noise_suppression", true);
--	bool transient_suppression = webrtc_get_spa_bool(args, "webrtc.transient_suppression", true);
- 	bool voice_detection = webrtc_get_spa_bool(args, "webrtc.voice_detection", true);
--
-+#ifdef HAVE_WEBRTC
-+	bool extended_filter = webrtc_get_spa_bool(args, "webrtc.extended_filter", true);
-+	bool delay_agnostic = webrtc_get_spa_bool(args, "webrtc.delay_agnostic", true);
-+	// Disable experimental flags by default
-+	bool experimental_agc = webrtc_get_spa_bool(args, "webrtc.experimental_agc", false);
-+	bool experimental_ns = webrtc_get_spa_bool(args, "webrtc.experimental_ns", false);
-+
-+	bool beamforming = webrtc_get_spa_bool(args, "webrtc.beamforming", false);
-+#else
-+	bool transient_suppression = webrtc_get_spa_bool(args, "webrtc.transient_suppression", true);
-+#endif
- 	// Note: AGC seems to mess up with Agnostic Delay Detection, especially with speech,
- 	// result in very poor performance, disable by default
- 	bool gain_control = webrtc_get_spa_bool(args, "webrtc.gain_control", false);
-@@ -59,6 +124,51 @@ static int webrtc_init2(void *object, const struct spa_dict *args,
- 	// This filter will modify playback buffer (when calling ProcessReverseStream), but now
- 	// playback buffer modifications are discarded.
- 
-+#ifdef HAVE_WEBRTC
-+	webrtc::Config config;
-+	config.Set<webrtc::ExtendedFilter>(new webrtc::ExtendedFilter(extended_filter));
-+	config.Set<webrtc::DelayAgnostic>(new webrtc::DelayAgnostic(delay_agnostic));
-+	config.Set<webrtc::ExperimentalAgc>(new webrtc::ExperimentalAgc(experimental_agc));
-+	config.Set<webrtc::ExperimentalNs>(new webrtc::ExperimentalNs(experimental_ns));
-+
-+	if (beamforming) {
-+		std::vector<webrtc::Point> geometry(rec_info->channels);
-+		const char *mic_geometry, *target_direction;
-+
-+		/* The beamformer gives a single mono channel */
-+		out_info->channels = 1;
-+		out_info->position[0] = SPA_AUDIO_CHANNEL_MONO;
-+
-+		if ((mic_geometry = spa_dict_lookup(args, "webrtc.mic-geometry")) == NULL) {
-+			spa_log_error(impl->log, "Error: webrtc.beamforming requires webrtc.mic-geometry");
-+			return -EINVAL;
-+		}
-+
-+		if ((res = parse_mic_geometry(impl, mic_geometry, geometry)) < 0)
-+			return res;
-+
-+		if ((target_direction = spa_dict_lookup(args, "webrtc.target-direction")) != NULL) {
-+			webrtc::SphericalPointf direction(0.0f, 0.0f, 0.0f);
-+			struct spa_json it;
-+			float f[3];
-+
-+			spa_json_init(&it, target_direction, strlen(target_direction));
-+			if (parse_point(&it, f) < 0) {
-+				spa_log_error(impl->log, "Error: can't parse target-direction %s",
-+						target_direction);
-+				return -EINVAL;
-+			}
-+
-+			direction.s[0] = f[0];
-+			direction.s[1] = f[1];
-+			direction.s[2] = f[2];
-+
-+			config.Set<webrtc::Beamforming>(new webrtc::Beamforming(true, geometry, direction));
-+		} else {
-+			config.Set<webrtc::Beamforming>(new webrtc::Beamforming(true, geometry));
-+		}
-+	}
-+#else
- 	webrtc::AudioProcessing::Config config;
- 	config.echo_canceller.enabled = true;
- 	// FIXME: Example code enables both gain controllers, but that seems sus
-@@ -73,6 +183,7 @@ static int webrtc_init2(void *object, const struct spa_dict *args,
- 	// FIXME: expose pre/postamp gain
- 	config.transient_suppression.enabled = transient_suppression;
- 	config.voice_detection.enabled = voice_detection;
-+#endif
- 
- 	webrtc::ProcessingConfig pconfig = {{
- 		webrtc::StreamConfig(rec_info->rate, rec_info->channels, false), /* input stream */
-@@ -81,15 +192,35 @@ static int webrtc_init2(void *object, const struct spa_dict *args,
- 		webrtc::StreamConfig(play_info->rate, play_info->channels, false), /* reverse output stream */
- 	}};
- 
-+#ifdef HAVE_WEBRTC
-+	auto apm = std::unique_ptr<webrtc::AudioProcessing>(webrtc::AudioProcessing::Create(config));
-+#else
- 	auto apm = std::unique_ptr<webrtc::AudioProcessing>(webrtc::AudioProcessingBuilder().Create());
- 
- 	apm->ApplyConfig(config);
-+#endif
- 
- 	if ((res = apm->Initialize(pconfig)) != webrtc::AudioProcessing::kNoError) {
- 		spa_log_error(impl->log, "Error initialising webrtc audio processing module: %d", res);
- 		return -EINVAL;
- 	}
- 
-+#ifdef HAVE_WEBRTC
-+	apm->high_pass_filter()->Enable(high_pass_filter);
-+	// Always disable drift compensation since PipeWire will already do
-+	// drift compensation on all sinks and sources linked to this echo-canceler
-+	apm->echo_cancellation()->enable_drift_compensation(false);
-+	apm->echo_cancellation()->Enable(true);
-+	// TODO: wire up supression levels to args
-+	apm->echo_cancellation()->set_suppression_level(webrtc::EchoCancellation::kHighSuppression);
-+	apm->noise_suppression()->set_level(webrtc::NoiseSuppression::kHigh);
-+	apm->noise_suppression()->Enable(noise_suppression);
-+	apm->voice_detection()->Enable(voice_detection);
-+	// TODO: wire up AGC parameters to args
-+	apm->gain_control()->set_analog_level_limits(0, 255);
-+	apm->gain_control()->set_mode(webrtc::GainControl::kAdaptiveDigital);
-+	apm->gain_control()->Enable(gain_control);
-+#endif
- 	impl->apm = std::move(apm);
- 	impl->rec_info = *rec_info;
- 	impl->out_info = *out_info;
--- 
-GitLab
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 000000000000..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 <wtaymans@redhat.com>
+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-0.3.80.ebuild b/media-video/pipewire/pipewire-0.3.80.ebuild
deleted file mode 100644
index 0715bcdb6aba..000000000000
--- a/media-video/pipewire/pipewire-0.3.80.ebuild
+++ /dev/null
@@ -1,475 +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.
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd tmpfiles udev
-
-if [[ ${PV} == 9999 ]]; 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 ffmpeg flatpak gstreamer gsettings ieee1394 jack-client jack-sdk liblc3 lv2"
-IUSE+=" modemmanager pipewire-alsa readline roc sound-server ssl system-service systemd test 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.
-# - ffmpeg is only used for pw-cat. We don't build the spa plugin which receives barely any activity.
-REQUIRED_USE="
-	ffmpeg? ( extra )
-	bluetooth? ( dbus )
-	jack-sdk? ( !jack-client )
-	modemmanager? ( bluetooth )
-	system-service? ( systemd )
-	!sound-server? ( !pipewire-alsa )
-	jack-client? ( dbus )
-"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	>=dev-build/meson-0.59
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
-	dbus? ( dev-util/gdbus-codegen )
-	doc? (
-		app-text/doxygen
-		media-gfx/graphviz
-	)
-"
-# While udev could technically be optional, it's needed for a numebr of options,
-# and not really worth it, bug #877769.
-RDEPEND="
-	acct-group/audio
-	acct-group/pipewire
-	media-libs/alsa-lib
-	sys-libs/ncurses:=[unicode(+)]
-	virtual/libintl[${MULTILIB_USEDEP}]
-	virtual/libudev[${MULTILIB_USEDEP}]
-	bluetooth? (
-		dev-libs/glib
-		media-libs/fdk-aac
-		media-libs/libldac
-		media-libs/libfreeaptx
-		media-libs/opus
-		media-libs/sbc
-		>=net-wireless/bluez-4.101:=
-		virtual/libusb:1
-	)
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	echo-cancel? ( media-libs/webrtc-audio-processing:0 )
-	extra? ( >=media-libs/libsndfile-1.0.20 )
-	ffmpeg? ( media-video/ffmpeg:= )
-	flatpak? ( dev-libs/glib )
-	gstreamer? (
-		>=dev-libs/glib-2.32.0:2
-		>=media-libs/gstreamer-1.10.0:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	gsettings? ( >=dev-libs/glib-2.26.0:2 )
-	ieee1394? ( media-libs/libffado[${MULTILIB_USEDEP}] )
-	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
-	jack-sdk? (
-		!media-sound/jack-audio-connection-kit
-		!media-sound/jack2
-	)
-	liblc3? ( media-sound/liblc3 )
-	lv2? ( media-libs/lilv )
-	modemmanager? ( >=net-misc/modemmanager-1.10.0 )
-	pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}] )
-	sound-server? ( !media-sound/pulseaudio-daemon )
-	roc? ( media-libs/roc-toolkit )
-	readline? ( sys-libs/readline:= )
-	ssl? ( dev-libs/openssl:= )
-	systemd? ( sys-apps/systemd )
-	system-service? ( acct-user/pipewire )
-	v4l? ( media-libs/libv4l )
-	X? (
-		media-libs/libcanberra
-		x11-libs/libX11
-		x11-libs/libXfixes
-	)
-	zeroconf? ( net-dns/avahi )
-"
-
-DEPEND="${RDEPEND}"
-
-# TODO: Consider use cases where pipewire is not used for driving audio
-# Doing so with WirePlumber currently involves editing Lua scripts
-PDEPEND=">=media-video/wireplumber-0.4.8-r3"
-
-# Present RDEPEND that are currently always disabled due to the PW
-# code using them being required to be disabled by Gentoo guidelines
-# (i.e. developer binaries not meant for users) and unready code
-#	media-libs/libsdl2
-#	>=media-libs/vulkan-loader-1.1.69
-#
-# Ditto for DEPEND
-#	>=dev-util/vulkan-headers-1.1.69
-
-DOCS=( {README,INSTALL}.md NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
-)
-
-python_check_deps() {
-	python_has_version "dev-python/docutils[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	default
-
-	# Used for upstream backports
-	[[ -d "${FILESDIR}"/${PV} ]] && eapply "${FILESDIR}"/${PV}
-}
-
-multilib_src_configure() {
-	# https://bugs.gentoo.org/838301
-	filter-flags -fno-semantic-interposition
-
-	local emesonargs=(
-		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
-
-		$(meson_feature dbus)
-		$(meson_native_use_feature zeroconf avahi)
-		$(meson_native_use_feature doc docs)
-		$(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone
-		$(meson_native_enabled man)
-		$(meson_feature test tests)
-		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
-		$(meson_feature ieee1394 libffado)
-		$(meson_native_use_feature gstreamer)
-		$(meson_native_use_feature gstreamer gstreamer-device-provider)
-		$(meson_native_use_feature gsettings)
-		$(meson_native_use_feature systemd)
-
-		$(meson_native_use_feature system-service systemd-system-service)
-		-Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)"
-		-Dsystemd-user-unit-dir="$(systemd_get_userunitdir)"
-
-		$(meson_native_use_feature systemd systemd-user-service)
-		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
-		-Dspa-plugins=enabled
-		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (NOTE: media-session is gone so IUSE=alsa/spa_alsa/alsa-backend might be possible)
-		-Dcompress-offload=disabled # TODO: tinycompress unpackaged
-		-Daudiomixer=enabled # Matches upstream
-		-Daudioconvert=enabled # Matches upstream
-		$(meson_native_use_feature bluetooth bluez5)
-		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
-		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
-		# https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1379
-		$(meson_native_use_feature modemmanager bluez5-backend-native-mm)
-		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
-		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
-		$(meson_native_use_feature bluetooth bluez5-codec-aac)
-		$(meson_native_use_feature bluetooth bluez5-codec-aptx)
-		$(meson_native_use_feature bluetooth bluez5-codec-ldac)
-		$(meson_native_use_feature bluetooth opus)
-		$(meson_native_use_feature bluetooth bluez5-codec-opus)
-		$(meson_native_use_feature bluetooth libusb) # At least for now only used by bluez5 native (quirk detection of adapters)
-		$(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889
-		-Dcontrol=enabled # Matches upstream
-		-Daudiotestsrc=enabled # Matches upstream
-		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
-		$(meson_native_use_feature ffmpeg pw-cat-ffmpeg)
-		$(meson_native_use_feature flatpak)
-		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
-		$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
-		$(meson_use jack-sdk jack-devel)
-		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
-		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
-		-Devl=disabled # Matches upstream
-		-Dtest=disabled # fakesink and fakesource plugins
-		-Dbluez5-codec-lc3plus=disabled # unpackaged
-		$(meson_native_use_feature liblc3 bluez5-codec-lc3)
-		$(meson_native_use_feature lv2)
-		$(meson_native_use_feature v4l v4l2)
-		-Dlibcamera=disabled # libcamera is not in Portage tree
-		$(meson_native_use_feature roc)
-		$(meson_native_use_feature readline)
-		$(meson_native_use_feature ssl raop)
-		-Dvideoconvert=enabled # Matches upstream
-		-Dvideotestsrc=enabled # Matches upstream
-		-Dvolume=enabled # Matches upstream
-		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
-		$(meson_native_use_feature extra pw-cat)
-		-Dudev=enabled
-		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
-		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
-		-Dlibmysofa=disabled # libmysofa is unpackaged
-		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
-		-Dsession-managers="[]" # All available session managers are now their own projects, so there's nothing to build
-
-		# We still have <5.16 kernels packaged in Gentoo and 6.1 (LTS) only
-		# just became stable, with 5.15 being the previous LTS. Many people
-		# are still on it.
-		-Dpam-defaults-install=true
-
-		# Just for bell sounds in X11 right now.
-		$(meson_native_use_feature X x11)
-		$(meson_native_use_feature X x11-xfixes)
-		$(meson_native_use_feature X libcanberra)
-	)
-
-	meson_src_configure
-}
-
-multilib_src_test() {
-	meson_src_test --timeout-multiplier 10
-}
-
-multilib_src_install() {
-	# Our custom DOCS do not exist in multilib source directory
-	DOCS= meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if use pipewire-alsa; then
-		dodir /etc/alsa/conf.d
-
-		# Install pipewire conf loader hook
-		insinto /usr/share/alsa/alsa.conf.d
-		doins "${FILESDIR}"/99-pipewire-default-hook.conf
-		eprefixify "${ED}"/usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf
-
-		# These will break if someone has /etc that is a symbolic link to a subfolder! See #724222
-		# And the current dosym8 -r implementation is likely affected by the same issue, too.
-		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
-		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf /etc/alsa/conf.d/99-pipewire-default-hook.conf
-	fi
-
-	# Enable required wireplumber alsa and bluez monitors
-	if use sound-server; then
-		dodir /etc/wireplumber/main.lua.d
-		echo "alsa_monitor.enabled = true" > "${ED}"/etc/wireplumber/main.lua.d/89-gentoo-sound-server-enable-alsa-monitor.lua || die
-
-		dodir /etc/wireplumber/bluetooth.lua.d
-		echo "bluez_monitor.enabled = true" > "${ED}"/etc/wireplumber/bluetooth.lua.d/89-gentoo-sound-server-enable-bluez-monitor.lua || die
-	fi
-
-	if use system-service; then
-		newtmpfiles - pipewire.conf <<-EOF || die
-			d /run/pipewire 0755 pipewire pipewire - -
-		EOF
-	fi
-
-	if ! use systemd; then
-		insinto /etc/xdg/autostart
-		newins "${FILESDIR}"/pipewire.desktop-r2 pipewire.desktop
-
-		exeinto /usr/bin
-		newexe "${FILESDIR}"/gentoo-pipewire-launcher.in-r3 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
-		fi
-
-		eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher
-	fi
-}
-
-pkg_postrm() {
-	udev_reload
-}
-
-pkg_preinst() {
-	HAD_SOUND_SERVER=0
-	HAD_SYSTEM_SERVICE=0
-
-	if has_version "media-video/pipewire[sound-server(-)]" ; then
-		HAD_SOUND_SERVER=1
-	fi
-
-	if has_version "media-video/pipewire[system-service(-)]" ; then
-		HAD_SYSTEM_SERVICE=1
-	fi
-}
-
-pkg_postinst() {
-	udev_reload
-
-	use system-service && tmpfiles_process pipewire.conf
-
-	local ver
-	for ver in ${REPLACING_VERSIONS} ; do
-		if has_version kde-plasma/kwin[screencast] || has_version x11-wm/mutter[screencast] ; then
-			# https://bugs.gentoo.org/908490
-			# https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/3243
-			ewarn "Please restart KWin/Mutter after upgrading PipeWire."
-			ewarn "Screencasting may not work until you do."
-		fi
-
-		if ver_test ${ver} -le 0.3.66-r1 ; then
-			elog ">=pipewire-0.3.66 uses the 'pipewire' group to manage permissions"
-			elog "and limits needed to function smoothly:"
-			elog
-			elog "1. Please make sure your user is in the 'pipewire' group for"
-			elog "the best experience with realtime scheduling (PAM limits behavior)!"
-			elog "You can add your account with:"
-			elog " usermod -aG pipewire <youruser>"
-			elog
-			elog "2. For the best experience with fast user switching, it is recommended"
-			elog "that you remove your user from the 'audio' group unless you rely on the"
-			elog "audio group for device access control or ACLs.:"
-			elog " usermod -rG audio <youruser>"
-			elog
-
-			if ! use jack-sdk ; then
-				elog
-				elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
-				elog "alternative libraries have been installed to a non-default location."
-				elog "To use them, put pw-jack <application> before every JACK application."
-				elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
-				elog "provider is still needed to compile the JACK applications themselves."
-				elog
-			fi
-
-			if use systemd ; then
-				ewarn
-				ewarn "PipeWire daemon startup has been moved to a launcher script!"
-				ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no"
-				ewarn "longer is set to start a session manager or PulseAudio compatibility daemon (all"
-				ewarn "lines similar to '{ path = /usr/bin/pipewire*' should be commented out)"
-				ewarn
-				ewarn "Those manually starting /usr/bin/pipewire via .xinitrc or similar _must_ from"
-				ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher instead! It is highly"
-				ewarn "advised that a D-Bus user session is set up before starting the script."
-				ewarn
-			fi
-
-			if use sound-server && ( has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon' ) ; then
-				elog
-				elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
-				elog "are recommended to edit pulseaudio client configuration files:"
-				elog "${EROOT}/etc/pulse/client.conf and ${EROOT}/etc/pulse/client.conf.d/enable-autospawn.conf"
-				elog "if it exists, and disable autospawning of the original daemon by setting:"
-				elog
-				elog "  autospawn = no"
-				elog
-				elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
-				elog
-				elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
-				elog "${EROOT}/usr/bin/gentoo-pipewire-launcher by commenting out the relevant"
-				elog "command:"
-				elog
-				elog "#${EROOT}/usr/bin/pipewire -c pipewire-pulse.conf &"
-				elog
-			fi
-
-			if has_version 'net-misc/ofono' ; then
-				ewarn "Native backend has become default. Please disable oFono via:"
-				if systemd_is_booted ; then
-					ewarn "systemctl disable ofono"
-				else
-					ewarn "rc-update delete ofono"
-				fi
-			fi
-		fi
-	done
-
-	if [[ ${HAD_SOUND_SERVER} -eq 0 || -z ${REPLACING_VERSIONS} ]] ; then
-		# TODO: We could drop most of this if we set up systemd presets?
-		# They're worth looking into because right now, the out-of-the-box experience
-		# is automatic on OpenRC, while it needs manual intervention on systemd.
-		if use sound-server && use systemd ; then
-			elog
-			elog "When switching from PulseAudio, you may need to disable PulseAudio:"
-			elog
-			elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
-			elog
-			elog "To use PipeWire, the user units must be manually enabled"
-			elog "by running this command as each user you use for desktop activities:"
-			elog
-			elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
-			elog
-			elog "A reboot is recommended to avoid interferences from still running"
-			elog "PulseAudio daemon."
-			elog
-			elog "Both new users and those upgrading need to enable WirePlumber"
-			elog "for relevant users:"
-			elog
-			elog "  systemctl --user disable pipewire-media-session.service"
-			elog "  systemctl --user --force enable wireplumber.service"
-			elog
-			elog "Root user may replace --user with --global to change system default"
-			elog "configuration for all of the above commands."
-			elog
-		fi
-
-		if ! use sound-server ; then
-			ewarn
-			ewarn "USE=sound-server is disabled! If you want PipeWire to provide"
-			ewarn "your sound, please enable it. See the wiki at"
-			ewarn "https://wiki.gentoo.org/wiki/PipeWire#Replacing_PulseAudio"
-			ewarn "for more details."
-			ewarn
-		fi
-	fi
-
-	if use system-service && [[ ${HAD_SYSTEM_SERVICE} -eq 0 || -z ${REPLACING_VERSIONS} ]] ; then
-		ewarn
-		ewarn "You have enabled the system-service USE flag, which installs"
-		ewarn "the system-wide systemd units that enable PipeWire to run as a system"
-		ewarn "service. This is more than likely NOT what you want. You are strongly"
-		ewarn "advised not to enable this mode and instead stick with systemd user"
-		ewarn "units. The default configuration files will likely not work out of the"
-		ewarn "box, and you are on your own with configuration."
-		ewarn
-	fi
-
-	elog "For latest tips and tricks, troubleshooting information, and documentation"
-	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
-	elog
-
-	optfeature_header "The following can be installed for optional runtime features:"
-	optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
-
-	if use sound-server && ! use pipewire-alsa; then
-		optfeature "ALSA plugin to use PulseAudio interface for output" "media-plugins/alsa-plugins[pulseaudio]"
-	fi
-}
diff --git a/media-video/pipewire/pipewire-1.0.2.ebuild b/media-video/pipewire/pipewire-1.0.2-r1.ebuild
index 1bdcaea902f0..1bdcaea902f0 100644
--- a/media-video/pipewire/pipewire-1.0.2.ebuild
+++ b/media-video/pipewire/pipewire-1.0.2-r1.ebuild