From cf5d856691cbc347f5816a181e5bf767792afa55 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 15 Mar 2023 12:21:13 +0000
Subject: gentoo auto-resync : 15:03:2023 - 12:21:13
---
media-video/Manifest.gz | Bin 25212 -> 25216 bytes
media-video/pipewire/Manifest | 17 +-
...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 ---
.../files/pipewire-0.3.63-alsa-node-target.patch | 28 --
.../files/pipewire-0.3.63-bluetooth-typo.patch | 21 -
.../files/pipewire-0.3.63-bluez-ldac_abr.patch | 22 -
.../files/pipewire-0.3.63-rate-update.patch | 39 --
media-video/pipewire/pipewire-0.3.63-r3.ebuild | 454 ---------------------
media-video/pipewire/pipewire-0.3.64-r2.ebuild | 449 --------------------
media-video/pipewire/pipewire-0.3.66-r1.ebuild | 2 +-
media-video/pipewire/pipewire-0.3.67.ebuild | 2 +-
media-video/pipewire/pipewire-9999.ebuild | 2 +-
14 files changed, 6 insertions(+), 1178 deletions(-)
delete mode 100644 media-video/pipewire/files/0.3.64/0001-spa-Fix-audioconvert-overflow-when-scaling.patch
delete mode 100644 media-video/pipewire/files/0.3.64/0002-filter-chain-fix-AVX-dsp_sum-index-increment.patch
delete mode 100644 media-video/pipewire/files/0.3.64/0003-keys-don-t-remove-deprecated-symbols-by-default.patch
delete mode 100644 media-video/pipewire/files/pipewire-0.3.63-alsa-node-target.patch
delete mode 100644 media-video/pipewire/files/pipewire-0.3.63-bluetooth-typo.patch
delete mode 100644 media-video/pipewire/files/pipewire-0.3.63-bluez-ldac_abr.patch
delete mode 100644 media-video/pipewire/files/pipewire-0.3.63-rate-update.patch
delete mode 100644 media-video/pipewire/pipewire-0.3.63-r3.ebuild
delete mode 100644 media-video/pipewire/pipewire-0.3.64-r2.ebuild
(limited to 'media-video')
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 14199cdcda4d..34a196cc7588 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index fed8669a8234..88509ce1729e 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,26 +1,15 @@
-AUX 0.3.64/0001-spa-Fix-audioconvert-overflow-when-scaling.patch 2802 BLAKE2B a7e1735f1d9eecd27a8e317026a872f57844e8f6dfc4b273ddc98c47844086a4dbe4e7977862f38bea491bf15876d5f666d01fc652ba3a974916ddeca9c72254 SHA512 dbb0caf43d55265e6e7d6ecdd9807988a7c05401fbd82f98b8599cd7cdb57602c3cbce621a82b0a770cf44669d305dda65e5cd6b1aed1824c3c8410431ff340f
-AUX 0.3.64/0002-filter-chain-fix-AVX-dsp_sum-index-increment.patch 790 BLAKE2B d4ec77a8aa37d090a153d05adbdab2a9664827d554cf325dabfa3ebad18028f02e0645b8a3c7795d9b57604cd31b1d9f847bf798a5c36b99cafeaf7793feea64 SHA512 14b60490c33764fbf9ba63e19325d5441a4604de967fad88210354544f683bdf31e5371af4aef3ef41cf40386a09d69ab3513f10ef012cfa70b0ce1fbe8a3d1f
-AUX 0.3.64/0003-keys-don-t-remove-deprecated-symbols-by-default.patch 2026 BLAKE2B 1320fda269952cccf85490d52b3b1e88d1d118297f9369e1bd4eb3f81ba6d2b0c3db01e2fb4d9b39f422427805ef01b752b4503633883d6c50a81617c6ee9119 SHA512 4e825e7977e5d272b23078f6c2ebc25ee83ff14afae10e70ecf1a7476528f6759047790fc346fd2ee9669a205cdf75a79b07881dc8c2f159110b7b7a92200a3a
AUX 0.3.65/0001-modules-also-install-module-combine-stream.patch 765 BLAKE2B 6bff3215436405743b53aa7bf1c65ff31d01df2df32262bf168f052b0c77978c1da1158c3c9f4365521f8e277172de1277562d4c61f83ae6a83cc31af8ab67b5 SHA512 5097dae990b8eedcc6f33eb729151d48c377316f1488a09bfcfdc3a4e1416af5e9d825a5bcb42831d2d8830cdcdd911732561f9c593908e8509084e97a135b27
AUX 0.3.65/0002-spa-bluez5-fix-dependency-on-glib-in-bluez5_deps.patch 1039 BLAKE2B 9b4cb2901379e8761826d60f1fc0dd4d23c952c3ec96326d45e7d4a6a65010396f17aea49733c394e9d5530fd2bdb2ac5eea8155c368a683cab00f941d5ea617 SHA512 18d7c78862166afec039823076190e2cff0977defba52ef54b8cfb49d3caaee5cd66429d9f6aa132d86059adfb5d43bc410084ab0dc11456c48f3f1d362fcb1e
AUX 99-pipewire-default-hook.conf 540 BLAKE2B cec76e78db9db290054bf766774c284d7a7a1374c453802eb1bdc19db9289856ec7b8643acbab916a39ca859d543deca111e3b0f110d1904343221c1573ffc17 SHA512 ef891e38c6f40fce2904e240307147a58c48d780e8470dac8e28044cfb86ddeb163885a2362687791779379ad814f58ad5649b75ac4e82931c5bdd3f37a6ed01
AUX gentoo-pipewire-launcher.in 1227 BLAKE2B 4316a991978fac653a00d076e9236d0ab6c01a6e4b800c82851e2bd6f9476369605c741aa7ffd47b10853653ef1d4222c449f0b912a0f7694fffd2b1611d7a47 SHA512 edbc03cec765d2307bcf33a14521c6f8beeae52d9fd6a4e181ba66b9f5dd0d64995fdef847453d1a4c682d701814b3afbe70931f55a0e4198fc5c9d87d7a95c5
AUX pipewire-0.3.25-enable-failed-mlock-warning.patch 704 BLAKE2B dc0732b89b57a258ea6dc54941899134259469675f92ae93aebda09a796c73ace8bc4ed0ab2aef4ea1bcaa30c1bea8c3304288168421ce8f9939ec993c8aa438 SHA512 7456a24276b7b766ff5799acf5b80ef5f85ee7a78fc5b52adff3206c0b0aa1985a0bf72634aacf7818c90136c09bcc11cb0fecec291d961c8b3585c897869f65
-AUX pipewire-0.3.63-alsa-node-target.patch 1179 BLAKE2B 49e081d50b7f8e783e0f852ac70f27e989ae99ebc3ceff43c8cbb990eb77434e507c0478b61a80394aa06b616d5745190747331068cd238292e6d252841ae03b SHA512 6b89b1fe290f2d001c021c9a9f837f492b7e6419af1839c1ed79cd8d5c8cdfbf1b9eae5bd446739a95f1cf9961381d40106ec10659cb3be81b8c2131a07de217
-AUX pipewire-0.3.63-bluetooth-typo.patch 909 BLAKE2B 3c7fa8d5e7b1f41b5fef69c0d80eca41b22116c5e5cfe51633aa2dcd74e427c1eec2adf10ccc9a2e7ca0fe43fe236113a9d5a893af67ac7a804f50f5db3370ec SHA512 a361f1b219c10bb1bd398e949e5fa7b31f2ac090d8697880dadf733eb8c66210b547f8980f065947fdb7d31470318ce3ff6e5c9613f3c802573b0e24b358d552
-AUX pipewire-0.3.63-bluez-ldac_abr.patch 835 BLAKE2B 9ba6316674c70fd9a92d81ef8bc78eb3600744de8f34819388e92d5a04814a76cd297cfd9802aa15129753de7e9fef22d68a5154a56f0aefd2729fcfc3c196fd SHA512 6ddc794787d4cc5d56d2a025dd8a59f59c50e1d05506d68d08fd2107826adee17bb74c74bc87efc281c0e1c7e46b79b0ebf1ff1c2d919d2b9ef2cb53a26ab0f0
-AUX pipewire-0.3.63-rate-update.patch 1335 BLAKE2B 2db8a566581bd2b74b5c98e9c347885fa4a7e692d9831a2c54a588eda94d886adfc4175975eac2947a5971b50531af787993fa90eb51abb81b8af16619857456 SHA512 2a62ad3b345a3c1863aeb13c7f59fc1f1e3c9d82eb37eeadb70569e2c078595fd981071186b12d38dae7dddd2616dde7749c5e8e22f51cfdf4134dbece035994
AUX pipewire.desktop 322 BLAKE2B 0299b9054cf881a5cbbdb128a5e8a51308cf0b5a98260dca756e704504ef057e403b2fb4aa2d58f52dde4be59e416c95d8fce21bc3ca6b6447ecab58263a3f21 SHA512 c13ea531cfdd3798f8d6cd20f5fa8c0a5040c27a6ef3850fdd41102a3bf0bcb73176e3300845af77804a98842fb736841223bc9ac1c92eb2034e9d46e41fc344
AUX pipewire.desktop-r1 325 BLAKE2B 7d823a264e5147bf8669127df22f468518fd54375ed57910f0143821894b33cfee8925b1cf8b9c5b1d219453a5c62fffa50d111b78bc5e151e23aed84d0a577e SHA512 e51ba049484daba3e4cdc5890748267f0c23ea6e57f31f3bb8a49c011e1a61b47b68eea742e5e7bcd58bfeddb96dd4064079fd9787cb66c78bd5eff10799a7bf
-DIST pipewire-0.3.63.tar.bz2 1485423 BLAKE2B 8629bce6d11959d4b3930d7db4e0ad201981002d52c6b73b3ee2b0ac141518f553f7b0e47aef4157b3c3ef71c6b544889f60f4be0fadb01b8a35c1d457edb1aa SHA512 0a45e9017bbcd74f21c6a1f388c5b58123deec083bbc9a9e695948ea95e67b6384acfff6e5ab685ea7287b4696e01176e257b73286ecd03c2d2e43d80fd60805
-DIST pipewire-0.3.64.tar.bz2 1490475 BLAKE2B 9a4d9e23a5d60da7c5788ce5145ce083f13fe771f3f5bcb3dfd1e9560d982f20415f32f756b875081464e1b175ef80af56d7babb3bbbd7a5eaf034c9c43b810a SHA512 4dff77cf1ab9fefffad1b6f7182115dbb5e4f0339f052dcfcc34b62687b461d25a6f891d1ad0246dab5a8cb80ca190d97d358a6494da8c6a8cc64e0b38452093
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
-EBUILD pipewire-0.3.63-r3.ebuild 16602 BLAKE2B 882e4f7a63c045a6fa8851e6bfb0bd656297f48519f70187dce4e87f45aa305a00d3551acd3c455c298136573e83fb479d91e85bd8ccb82a727d48e03dd8c277 SHA512 2adbd7d5581429c05a6b7ca507590d595e637c8a4d2e6b949f6cbf539dadd4e0a00add5fe90b7da2cf2e8346b60b95f19e8ce92a6a702fb04769f65a2c6404ec
-EBUILD pipewire-0.3.64-r2.ebuild 16440 BLAKE2B cc5b8286c48e92ca74f733fb8f3a609c40e5b4b9cd76c22a0b6817913a99d016c585e85a197a4d6da84dc2bf440a96e4331c94bb009c7ec170e40d3b0849d67e SHA512 bd6848cb68dd5106cb70a22d2a7b84e14c7d065484be51b68c460244852ce953a7cd4fa5500e73b915edc3a35d78beac52ed39c649c02da6e88a68b8df8c2ca6
EBUILD pipewire-0.3.65-r3.ebuild 16976 BLAKE2B f0f75822c4ddf0a9f1e4ff6e78f069075222343f24c0cefb4a2a965cd17b71eed75b7d25a8410f905e792590df65fe00752d02669be66c9f6fa968508be27742 SHA512 e1ae16ec05931256d9ea5fafedea8a0f7240ba64701ab957aa994356075518c635b83ad470dd110865b7a16a6d04d5c5f8bba4636bb20aa256a7c5d7c07c8533
-EBUILD pipewire-0.3.66-r1.ebuild 17332 BLAKE2B 60d271e98248e3905740baa7f27a20b28037e0b53e3beb6ed44199e58d6f22b2b9c87bf5240c992209516bb29c31f40f7a7beb8c02952e4926edc6c41b1b7b4f SHA512 844e04517f69ed67d82004dd38b1e30603022bfe968e4ba8319a4e78dab21170fa61660f38f7784bfb108abe5f5f30d64e37228929652a2e76ee7042706c69f7
-EBUILD pipewire-0.3.67.ebuild 17321 BLAKE2B 94fd54f00768dc2837451d2119f04d3166a1059b993909d899061098a8515f73bfaa59245e2add17d0008a6412a77516789ce11d237dfcf72ddb1f1a35feb96c SHA512 af52e3cd694ec8730189ddcfdcceb0a34cb709a4e466566f7e694457ad71ee505a5732e36871374d8294aa3c3252ba712a4d5fd068df8628b9a474ff8d62ad2c
-EBUILD pipewire-9999.ebuild 17321 BLAKE2B 94fd54f00768dc2837451d2119f04d3166a1059b993909d899061098a8515f73bfaa59245e2add17d0008a6412a77516789ce11d237dfcf72ddb1f1a35feb96c SHA512 af52e3cd694ec8730189ddcfdcceb0a34cb709a4e466566f7e694457ad71ee505a5732e36871374d8294aa3c3252ba712a4d5fd068df8628b9a474ff8d62ad2c
+EBUILD pipewire-0.3.66-r1.ebuild 17332 BLAKE2B f76ffa0b69a784d5e28e26f0c9d2a0a120fad635d2a484eed0e4c6b0fb7fd3c844f2c16e1b5afb49ca7eb08e433912a10ff2ca9c3f35ceee6edb27aae6fed7da SHA512 de0135a5334a6f6b14b20aaa298974e0ccca009cb5551d8b7cf3d6a7254b2e2afb3d363ad7bad6d3968fd4f2e2f3b5b1355ea883ca6e0d637b3d4cc740ac4f91
+EBUILD pipewire-0.3.67.ebuild 17321 BLAKE2B 415d9e21933f678c07bf35c6e4e9d5b29606cb9f8a06046617f890522e3f06c1431969d179c6bc9defb288a96086f1e595cad10f0faa3ca3122b24c884a2ff32 SHA512 bd0cfab12b691ca53dc8379681eb0c2aac551fa2352860b2ab42d5672796f0921aac9fa08d78e2fe47a658bcf007437838fdba28d90e1f8402f21f329557baad
+EBUILD pipewire-9999.ebuild 17321 BLAKE2B 415d9e21933f678c07bf35c6e4e9d5b29606cb9f8a06046617f890522e3f06c1431969d179c6bc9defb288a96086f1e595cad10f0faa3ca3122b24c884a2ff32 SHA512 bd0cfab12b691ca53dc8379681eb0c2aac551fa2352860b2ab42d5672796f0921aac9fa08d78e2fe47a658bcf007437838fdba28d90e1f8402f21f329557baad
MISC metadata.xml 1860 BLAKE2B 8f537f36217aa1c5869e48a1af71cae96b56e60f5cd9b811739be159dd3aeeabe3c31dccc3d7f695f7361f7d262f8c68230fb410e389465b9264d8e6af232aa5 SHA512 d2ae3129e67b7527bbd3481ac77e27de4e26f6ff77601a7538d5e888c7737b7b39d981be4dcf245ea8d676823f1b1fbf8d854feefa62b74962710af17248d731
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
deleted file mode 100644
index e24b8153ef6d..000000000000
--- a/media-video/pipewire/files/0.3.64/0001-spa-Fix-audioconvert-overflow-when-scaling.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/1d9640af5a7906620f214aa0a39c63128c8506a6.
-
-From 1d9640af5a7906620f214aa0a39c63128c8506a6 Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans@redhat.com>
-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(&state->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(&b,
---
-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
deleted file mode 100644
index f33a83ab7a10..000000000000
--- a/media-video/pipewire/files/0.3.64/0002-filter-chain-fix-AVX-dsp_sum-index-increment.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/ccedf1722ae44c97ec0d058b349494c67a0b56dc
-
-From ccedf1722ae44c97ec0d058b349494c67a0b56dc Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Tue, 17 Jan 2023 09:24:00 +0100
-Subject: [PATCH] filter-chain: fix AVX dsp_sum index increment
-
-Fixes #2965
---- a/src/modules/module-filter-chain/dsp-ops-avx.c
-+++ b/src/modules/module-filter-chain/dsp-ops-avx.c
-@@ -59,7 +59,7 @@ void dsp_sum_avx(struct dsp_ops *ops, float *r, const float *a, const float *b,
- _mm256_store_ps(&r[n+24], in[3]);
- }
- } else {
-- for (n = 0; n < unrolled; n += 16) {
-+ for (n = 0; n < unrolled; n += 32) {
- in[0] = _mm256_loadu_ps(&a[n+ 0]);
- in[1] = _mm256_loadu_ps(&a[n+ 8]);
- in[2] = _mm256_loadu_ps(&a[n+16]);
---
-2.39.1
-
diff --git a/media-video/pipewire/files/0.3.64/0003-keys-don-t-remove-deprecated-symbols-by-default.patch b/media-video/pipewire/files/0.3.64/0003-keys-don-t-remove-deprecated-symbols-by-default.patch
deleted file mode 100644
index fe022959a913..000000000000
--- a/media-video/pipewire/files/0.3.64/0003-keys-don-t-remove-deprecated-symbols-by-default.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/a979c0f43078cbfefa2ba614ee078579042d2de2
-
-From a979c0f43078cbfefa2ba614ee078579042d2de2 Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Tue, 17 Jan 2023 11:58:04 +0100
-Subject: [PATCH] keys: don't remove deprecated symbols by default
-
-Add a new macro to mark deprecated keys. The macro will emit a warning
-about the symbol being deprecated.
-PW_ENABLE_DEPRECATED will suppress the deprecation warning.
-Add PW_REMOVE_DEPRECATED to completely remove the deprecated symbols.
-
-Fixes #2952
---- a/src/pipewire/keys.h
-+++ b/src/pipewire/keys.h
-@@ -29,6 +29,7 @@
- extern "C" {
- #endif
-
-+#include <pipewire/utils.h>
- /**
- * \defgroup pw_keys Key Names
- *
-@@ -337,14 +338,14 @@ extern "C" {
- #define PW_KEY_VIDEO_FORMAT "video.format" /**< a video format */
- #define PW_KEY_VIDEO_SIZE "video.size" /**< a video size as "<width>x<height" */
-
--#ifdef PW_ENABLE_DEPRECATED
--#define PW_KEY_PRIORITY_MASTER "priority.master" /**< deprecated */
--#define PW_KEY_NODE_TARGET "node.target" /**< deprecated since 0.3.64, use target.object. */
--#endif /* PW_ENABLE_DEPRECATED */
--
- #define PW_KEY_TARGET_OBJECT "target.object" /**< a target object to link to. This can be
- * and object name or object.serial */
-
-+#ifndef PW_REMOVE_DEPRECATED
-+#define PW_KEY_PRIORITY_MASTER PW_DEPRECATED("priority.master") /**< deprecated, use priority.driver */
-+#define PW_KEY_NODE_TARGET PW_DEPRECATED("node.target") /**< deprecated since 0.3.64, use target.object. */
-+#endif /* PW_REMOVE_DEPRECATED */
-+
- /** \}
- */
-
---- a/src/pipewire/utils.h
-+++ b/src/pipewire/utils.h
-@@ -94,6 +94,12 @@ ssize_t pw_getrandom(void *buf, size_t buflen, unsigned int flags);
-
- void* pw_reallocarray(void *ptr, size_t nmemb, size_t size);
-
-+#ifdef PW_ENABLE_DEPRECATED
-+#define PW_DEPRECATED(v) (v)
-+#else
-+#define PW_DEPRECATED(v) ({ __typeof__(v) _v SPA_DEPRECATED = (v); (void)_v; (v); })
-+#endif /* PW_ENABLE_DEPRECATED */
-+
- /**
- * \}
- */
---
-2.39.1
-
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
deleted file mode 100644
index 8a4169b57af5..000000000000
--- a/media-video/pipewire/files/pipewire-0.3.63-alsa-node-target.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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 <wtaymans@redhat.com>
-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-bluetooth-typo.patch b/media-video/pipewire/files/pipewire-0.3.63-bluetooth-typo.patch
deleted file mode 100644
index 78993a57831e..000000000000
--- a/media-video/pipewire/files/pipewire-0.3.63-bluetooth-typo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/c7b3ef0d9ff16a1e69a299870860bebcb628e298
-
-From c7b3ef0d9ff16a1e69a299870860bebcb628e298 Mon Sep 17 00:00:00 2001
-From: Pauli Virtanen <pav@iki.fi>
-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/files/pipewire-0.3.63-bluez-ldac_abr.patch b/media-video/pipewire/files/pipewire-0.3.63-bluez-ldac_abr.patch
deleted file mode 100644
index a6e237ddd7c7..000000000000
--- a/media-video/pipewire/files/pipewire-0.3.63-bluez-ldac_abr.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/7758240c79a3ed15459da5d150a0b1c3612e3f79
-
-From 7758240c79a3ed15459da5d150a0b1c3612e3f79 Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Thu, 15 Dec 2022 12:20:40 +0100
-Subject: [PATCH] bluez: fix compilation without ldac_abr
-
-The define for this constant was removed but it was LDACBT_EQMID_MQ
-before.
---- a/spa/plugins/bluez5/a2dp-codec-ldac.c
-+++ b/spa/plugins/bluez5/a2dp-codec-ldac.c
-@@ -243,7 +243,7 @@ static int codec_reduce_bitpool(void *data)
- #else
- struct impl *this = data;
- int res;
-- if (this->eqmid == LDACBT_EQMID_BITRATE_330000 || !this->enable_abr)
-+ if (this->eqmid == LDACBT_EQMID_MQ || !this->enable_abr)
- return this->eqmid;
- res = ldacBT_alter_eqmid_priority(this->ldac, LDACBT_EQMID_INC_CONNECTION);
- return res;
---
-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
deleted file mode 100644
index 91487def58e2..000000000000
--- a/media-video/pipewire/files/pipewire-0.3.63-rate-update.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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 <wtaymans@redhat.com>
-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(&sess->ring,
---
-GitLab
-
-
diff --git a/media-video/pipewire/pipewire-0.3.63-r3.ebuild b/media-video/pipewire/pipewire-0.3.63-r3.ebuild
deleted file mode 100644
index 7d5e71a8dcc3..000000000000
--- a/media-video/pipewire/pipewire-0.3.63-r3.ebuild
+++ /dev/null
@@ -1,454 +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=( python3_{9..11} )
-
-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 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}
- $(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-libs/ncurses:=[unicode(+)]
- virtual/libintl[${MULTILIB_USEDEP}]
- bluetooth? (
- 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
- )
- 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
- )
- jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
- jack-sdk? (
- !media-sound/jack-audio-connection-kit
- !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}]
- )
- sound-server? (
- !media-sound/pulseaudio[daemon(+)]
- !media-sound/pulseaudio-daemon
- )
- readline? ( sys-libs/readline:= )
- ssl? ( dev-libs/openssl:= )
- systemd? ( sys-apps/systemd )
- system-service? (
- acct-user/pipewire
- acct-group/pipewire
- )
- udev? ( virtual/libudev[${MULTILIB_USEDEP}] )
- 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-video/ffmpeg:=
-# 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
- "${FILESDIR}"/${P}-alsa-node-target.patch
- "${FILESDIR}"/${P}-bluez-ldac_abr.patch
- "${FILESDIR}"/${P}-bluetooth-typo.patch
- "${FILESDIR}"/${P}-rate-update.patch
-)
-
-# limitsdfile related code taken from =sys-auth/realtime-base-0.1
-# with changes as necessary.
-limitsdfile=40-${PN}.conf
-
-python_check_deps() {
- python_has_version "dev-python/docutils[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
- default
-
- einfo "Generating ${limitsdfile}"
- cat > ${limitsdfile} <<- EOF || die
- # Start of ${limitsdfile} from ${P}
-
- @audio - memlock 256
-
- $(use system-service && {
- echo @pipewire - rtprio 95
- echo @pipewire - nice -19
- echo @pipewire - memlock 4194304
- })
-
- # End of ${limitsdfile} from ${P}
- EOF
-}
-
-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_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)
- -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 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
- # Not yet packaged.
- -Dbluez5-codec-lc3=disabled
- -Dbluez5-codec-lc3plus=disabled
- -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 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
- $(meson_native_use_feature lv2)
- $(meson_native_use_feature v4l v4l2)
- -Dlibcamera=disabled # libcamera is not in Portage tree
- $(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)
- $(meson_feature udev)
- -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
- -Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
- $(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
-
- # 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
-
- insinto /etc/security/limits.d
- doins ${limitsdfile}
-
- 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-r1 pipewire.desktop
-
- exeinto /usr/bin
- newexe "${FILESDIR}"/gentoo-pipewire-launcher.in gentoo-pipewire-launcher
-
- # 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() {
- use udev && udev_reload
-}
-
-pkg_postinst() {
- use udev && udev_reload
- use system-service && tmpfiles_process pipewire.conf
-
- elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
- elog "using PipeWire. Do it either manually or add yourself"
- elog "to the 'audio' group:"
- elog
- elog " usermod -aG audio <youruser>"
- elog
-
- local ver
- for ver in ${REPLACING_VERSIONS} ; do
- if ver_test ${ver} -le 0.3.53-r1 && ! use sound-server ; then
- 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."
-
- break
- fi
- done
-
- if ! use jack-sdk; then
- 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
- 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."
- else
- 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
-
- if use sound-server && ( has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon' ) ; then
- 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
- elog "NOTE:"
- elog "Starting with PipeWire-0.3.30, this package is no longer installing its config"
- elog "into ${EROOT}/etc/pipewire by default. In case you need to change"
- elog "its config, please start by copying default config from ${EROOT}/usr/share/pipewire"
- elog "and just override the sections you want to change."
- fi
- elog
-
- 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
-
- 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
- ewarn
- fi
-
- if use system-service; then
- ewarn
- ewarn "WARNING: 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"
- ewarn "box, and you are on your own with configuration."
- ewarn
- fi
-}
diff --git a/media-video/pipewire/pipewire-0.3.64-r2.ebuild b/media-video/pipewire/pipewire-0.3.64-r2.ebuild
deleted file mode 100644
index f3ff9f1a1a72..000000000000
--- a/media-video/pipewire/pipewire-0.3.64-r2.ebuild
+++ /dev/null
@@ -1,449 +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=( python3_{9..11} )
-
-inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd 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 flatpak gstreamer gsettings jack-client jack-sdk lv2
-modemmanager pipewire-alsa readline 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.
-REQUIRED_USE="
- bluetooth? ( dbus )
- 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}
- $(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
- doc? (
- app-doc/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
- media-libs/alsa-lib
- 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/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
- )
- 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
- )
- jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
- jack-sdk? (
- !media-sound/jack-audio-connection-kit
- !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}]
- )
- sound-server? (
- !media-sound/pulseaudio[daemon(+)]
- !media-sound/pulseaudio-daemon
- )
- readline? ( sys-libs/readline:= )
- ssl? ( dev-libs/openssl:= )
- systemd? ( sys-apps/systemd )
- system-service? (
- acct-user/pipewire
- acct-group/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-video/ffmpeg:=
-# 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
-)
-
-# limitsdfile related code taken from =sys-auth/realtime-base-0.1
-# with changes as necessary.
-limitsdfile=40-${PN}.conf
-
-python_check_deps() {
- python_has_version "dev-python/docutils[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
- default
-
- # Used for upstream backports
- [[ -d "${FILESDIR}"/${PV} ]] && eapply "${FILESDIR}"/${PV}
-
- einfo "Generating ${limitsdfile}"
- cat > ${limitsdfile} <<- EOF || die
- # Start of ${limitsdfile} from ${P}
-
- @audio - memlock 256
-
- $(use system-service && {
- echo @pipewire - rtprio 95
- echo @pipewire - nice -19
- echo @pipewire - memlock 4194304
- })
-
- # End of ${limitsdfile} from ${P}
- EOF
-}
-
-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_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)
- -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 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
- # Not yet packaged.
- -Dbluez5-codec-lc3=disabled
- -Dbluez5-codec-lc3plus=disabled
- -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 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
- $(meson_native_use_feature lv2)
- $(meson_native_use_feature v4l v4l2)
- -Dlibcamera=disabled # libcamera is not in Portage tree
- $(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)
- $(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
-
- # 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
-
- insinto /etc/security/limits.d
- doins ${limitsdfile}
-
- 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 systemd; then
- insinto /etc/xdg/autostart
- newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop
-
- exeinto /usr/bin
- newexe "${FILESDIR}"/gentoo-pipewire-launcher.in gentoo-pipewire-launcher
-
- # 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_postinst() {
- udev_reload
-
- elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
- elog "using PipeWire. Do it either manually or add yourself"
- elog "to the 'audio' group:"
- elog
- elog " usermod -aG audio <youruser>"
- elog
-
- local ver
- for ver in ${REPLACING_VERSIONS} ; do
- if ver_test ${ver} -le 0.3.53-r1 && ! use sound-server ; then
- 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."
-
- break
- fi
- done
-
- if ! use jack-sdk; then
- 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
- 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."
- else
- 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
-
- if use sound-server && ( has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon' ) ; then
- 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
- elog "NOTE:"
- elog "Starting with PipeWire-0.3.30, this package is no longer installing its config"
- elog "into ${EROOT}/etc/pipewire by default. In case you need to change"
- elog "its config, please start by copying default config from ${EROOT}/usr/share/pipewire"
- elog "and just override the sections you want to change."
- fi
- elog
-
- 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
-
- 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
- ewarn
- fi
-
- if use system-service; then
- ewarn
- ewarn "WARNING: 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"
- ewarn "box, and you are on your own with configuration."
- ewarn
- fi
-}
diff --git a/media-video/pipewire/pipewire-0.3.66-r1.ebuild b/media-video/pipewire/pipewire-0.3.66-r1.ebuild
index 432609f8ed6e..1599227cee48 100644
--- a/media-video/pipewire/pipewire-0.3.66-r1.ebuild
+++ b/media-video/pipewire/pipewire-0.3.66-r1.ebuild
@@ -328,7 +328,7 @@ pkg_preinst() {
HAD_SYSTEM_SERVICE=0
if has_version "media-video/pipewire[sound-server(-)]" ; then
- HAD_SOUND_SERVER=0
+ HAD_SOUND_SERVER=1
fi
if has_version "media-video/pipewire[system-service(-)]" ; then
diff --git a/media-video/pipewire/pipewire-0.3.67.ebuild b/media-video/pipewire/pipewire-0.3.67.ebuild
index d12baf8e313a..788ca944040a 100644
--- a/media-video/pipewire/pipewire-0.3.67.ebuild
+++ b/media-video/pipewire/pipewire-0.3.67.ebuild
@@ -328,7 +328,7 @@ pkg_preinst() {
HAD_SYSTEM_SERVICE=0
if has_version "media-video/pipewire[sound-server(-)]" ; then
- HAD_SOUND_SERVER=0
+ HAD_SOUND_SERVER=1
fi
if has_version "media-video/pipewire[system-service(-)]" ; then
diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild
index d12baf8e313a..788ca944040a 100644
--- a/media-video/pipewire/pipewire-9999.ebuild
+++ b/media-video/pipewire/pipewire-9999.ebuild
@@ -328,7 +328,7 @@ pkg_preinst() {
HAD_SYSTEM_SERVICE=0
if has_version "media-video/pipewire[sound-server(-)]" ; then
- HAD_SOUND_SERVER=0
+ HAD_SOUND_SERVER=1
fi
if has_version "media-video/pipewire[system-service(-)]" ; then
--
cgit v1.2.3