diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-12-16 09:35:57 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-12-16 09:35:57 +0000 |
commit | b982051e7c8e12c3810a0d21d30d687b406b3ae5 (patch) | |
tree | 1f40c63a302b92f633c075f289851ab62633babe /media-video/pipewire | |
parent | b62381b18b4bf2e919cbfbae11ebcad391e38e77 (diff) |
gentoo auto-resync : 16:12:2022 - 09:35:57
Diffstat (limited to 'media-video/pipewire')
-rw-r--r-- | media-video/pipewire/Manifest | 13 | ||||
-rw-r--r-- | media-video/pipewire/files/pipewire-0.3.60-profile-switch-crash.patch | 28 | ||||
-rw-r--r-- | media-video/pipewire/files/pipewire-0.3.60-pulse-server-also-advance-read-pointer-in-underrun.patch | 29 | ||||
-rw-r--r-- | media-video/pipewire/files/pipewire-0.3.60-qemu.patch | 22 | ||||
-rw-r--r-- | media-video/pipewire/files/pipewire-0.3.62-distorted-avx2.patch | 41 | ||||
-rw-r--r-- | media-video/pipewire/files/pipewire-0.3.62-use-after-free.patch | 185 | ||||
-rw-r--r-- | media-video/pipewire/files/pipewire-0.3.63-bluez-ldac_abr.patch | 22 | ||||
-rw-r--r-- | media-video/pipewire/pipewire-0.3.60-r1.ebuild | 438 | ||||
-rw-r--r-- | media-video/pipewire/pipewire-0.3.62-r1.ebuild | 442 | ||||
-rw-r--r-- | media-video/pipewire/pipewire-0.3.63.ebuild (renamed from media-video/pipewire/pipewire-0.3.62.ebuild) | 1 |
10 files changed, 26 insertions, 1195 deletions
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest index 64fad8aca278..991e1da628f7 100644 --- a/media-video/pipewire/Manifest +++ b/media-video/pipewire/Manifest @@ -2,21 +2,14 @@ AUX 99-pipewire-default-hook.conf 540 BLAKE2B cec76e78db9db290054bf766774c284d7a 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.59-filter-chain-alloc-port-data-handle.patch 2771 BLAKE2B a6248de6ca263fa275938f61e504b442e06e41ef5cb650fe03c0c8a91d28567fc3e20b02626f2293a3ca1c0014c8f6692498178be38017445e167efcdf2d6e7e SHA512 46534f3fc267170090c0abdc076a1486fe4c3b964790bba19156349814b26b14b0dd637ff4aeaa0b5a3775ddebcf021e93cc4e1f85f7aa7cfda3bb4a66af6fc7 -AUX pipewire-0.3.60-profile-switch-crash.patch 1137 BLAKE2B 7788032fbb6f4ff1641c607700c73932c743ab2d1a0187bbeff845a1877cc152e26c7568a53ea34647a09a5f0f2b176b58459e733abab931837306ffac759523 SHA512 2e841b76be0eb0b481913aabee41d62dcc0fbb190adae1624f6a20719e62b292324f0687cde659685403ae9ce29ff3ee2831d826ff5cd447c5e729bc74dea619 -AUX pipewire-0.3.60-pulse-server-also-advance-read-pointer-in-underrun.patch 994 BLAKE2B e33d9d2c1b77264f3e14e6d0c6b04e2674758567b2604b37c25d6d08507742446478a22b84a2ae4316d2128f363b59f96493ce1a470c2cbce8f974afe9da7161 SHA512 c20e3d46b0f89077e39998617dace62147c0f3e6c6da8bf800cfeb817545ef68b8f1d9bd78c16204d1d47c0c5ac097dbf986a728262c7f4ef0a6090774d615eb -AUX pipewire-0.3.60-qemu.patch 697 BLAKE2B debafa8889db0f9724c7e6ffdfdfd1c71e4722b042fca1dba1bc2ef1378d32950689ce8e85ea7fc179867d9f937d8f69eb795132fc8d14278268ca521dcecd80 SHA512 c32edc0164c61d758efc525307c65e8cb823645b32f8eb8fff8dda8be3517b254e7a578ab2b4cb42e6e0b4d66ae2f4ff985ddcabf1cc30efe13a380ebed51466 -AUX pipewire-0.3.62-distorted-avx2.patch 1891 BLAKE2B efd3cf35930a03e1c7df5bb3c50e995e0ffb0a5b5a2c59140619057c3d6bff31fe2d567364f3c15039a56725b92e41afb3c7eb31ca85c77d2360782d79794f4c SHA512 336e23772eb535d17aa48c5477bf1d6472e8836539382c0509a6050b6d0d26f9145eef3d62a278cb3a9c3e3f3a779855ed36be090feec14e27b0d9a4056c341d -AUX pipewire-0.3.62-use-after-free.patch 6777 BLAKE2B 688881bd245177b93d5b36c867eb762be5ea76a845da31b0854fb7854a450829a9a4456878a4449a40464042cc63b0ff26d1ebbc491dab102fb732fe2c20c724 SHA512 50db5e67fcf4835884fbd4f75ead595e77f9990a2cecab717a0b0e7f3a291e1ca32093961a1b1ae699bea504675bf4e512603e84ca22fc87bfa962f69365a27b +AUX pipewire-0.3.63-bluez-ldac_abr.patch 835 BLAKE2B 9ba6316674c70fd9a92d81ef8bc78eb3600744de8f34819388e92d5a04814a76cd297cfd9802aa15129753de7e9fef22d68a5154a56f0aefd2729fcfc3c196fd SHA512 6ddc794787d4cc5d56d2a025dd8a59f59c50e1d05506d68d08fd2107826adee17bb74c74bc87efc281c0e1c7e46b79b0ebf1ff1c2d919d2b9ef2cb53a26ab0f0 AUX pipewire.desktop 322 BLAKE2B 0299b9054cf881a5cbbdb128a5e8a51308cf0b5a98260dca756e704504ef057e403b2fb4aa2d58f52dde4be59e416c95d8fce21bc3ca6b6447ecab58263a3f21 SHA512 c13ea531cfdd3798f8d6cd20f5fa8c0a5040c27a6ef3850fdd41102a3bf0bcb73176e3300845af77804a98842fb736841223bc9ac1c92eb2034e9d46e41fc344 AUX pipewire.desktop-r1 325 BLAKE2B 7d823a264e5147bf8669127df22f468518fd54375ed57910f0143821894b33cfee8925b1cf8b9c5b1d219453a5c62fffa50d111b78bc5e151e23aed84d0a577e SHA512 e51ba049484daba3e4cdc5890748267f0c23ea6e57f31f3bb8a49c011e1a61b47b68eea742e5e7bcd58bfeddb96dd4064079fd9787cb66c78bd5eff10799a7bf DIST pipewire-0.3.59.tar.bz2 1443372 BLAKE2B 5e2d82c0bfdb7c030d8be525152c38115438caeb990afd7757424efcf2a7391a6a4891b0f58347ab0b7446707e8ad88baffa0c11c5acc42e086f23c9de3cb354 SHA512 f42bfab6e1bb227431119b44887af818a25eb0cdbcca917433162af87c942eb105a2b6e100de877d188941a24f1c8e2e9ae79f499fc20f0a32e2f7cc5de54162 -DIST pipewire-0.3.60.tar.bz2 1478952 BLAKE2B a7cda37a35ea58079b5297949239fd05b895b59d397f36a68c75c9392c65ad060926caf2e61c5511ab27f02da6c1c2044e4e86009f9c5f18d2744cad63585900 SHA512 8a1c022a283f3cbe7488658563440ff6b426f0b894f519ccd5c7d73bdb5437902fbd4d7d572d5840d48bd7a2f037f0f14dd244fe36b8be891a2d2843f4a99b5c DIST pipewire-0.3.61.tar.bz2 1480364 BLAKE2B df940896189b986e1d63ce6d5ec6cb554ae030ef2ed217a5310f06d959b8c28bff12bc48d847ce5bc6ff007b3652f9ae6e35fd15ef39283348c010cd341bcea6 SHA512 8fe5b6ce0fd1ef2a20b1253436fb97aab9da168ce243400b0291051e97809d75793d9446fd4aafc835f82fd257009ec6df9e181d375b492ee72d7f90275ab917 -DIST pipewire-0.3.62.tar.bz2 1482986 BLAKE2B 008f57e0e01971aa27af7a7c1e4ddcc72326845534fd8c9257b14078acdde1abf44629b93532ba340c5d446ef47b402bfa22ffbfc28cd44a75131b05e06ce3c8 SHA512 3132b18fc3d1269587216301a9e5a87ee74c1583f17da466a82e9446b57a8a9b77e7dfdea84f04320940c637ea6ce5c1c9caca6a449fb1e55e946259820b2084 +DIST pipewire-0.3.63.tar.bz2 1485423 BLAKE2B 8629bce6d11959d4b3930d7db4e0ad201981002d52c6b73b3ee2b0ac141518f553f7b0e47aef4157b3c3ef71c6b544889f60f4be0fadb01b8a35c1d457edb1aa SHA512 0a45e9017bbcd74f21c6a1f388c5b58123deec083bbc9a9e695948ea95e67b6384acfff6e5ab685ea7287b4696e01176e257b73286ecd03c2d2e43d80fd60805 EBUILD pipewire-0.3.59-r2.ebuild 15852 BLAKE2B 21cf0a628f02e323ee25220ac73659813009ec786962a579ed882297315415096ebcbd2db9a0463d892a592d22142cd2eaf39c8abd767a18124bbaf523b057ed SHA512 3294fc701cd4953e40920e9679b57531e29512cdb65f82a9b2f611212497572e388b3a3ced87898a0f262279588ac82d861d7de46f4048976f1508c16663f364 -EBUILD pipewire-0.3.60-r1.ebuild 16248 BLAKE2B 98004ada5eec4a5010b32718e68d388d092e8ecfc7fb8c205eb414ce37f77c7f0b274de9ffaae1d8092985407f0b71ec995a058911ba71f60ea538d4a0e800bb SHA512 cf4ebd534796c61a9cdb1bcf891c524558758956e0d34645f3486c68eda6c4026f9d90e560b64ba5cda8ea5153e17199fe7594c62dacd9b7f49fbe2a9dc692ad EBUILD pipewire-0.3.61.ebuild 16087 BLAKE2B b0691d341f9bbf4ed48dadc6bdb4ccfcb861792f04b3fac7b514d2a5fb134609f813a74ac8618b3ace6a80c69e01c69eec9b2b1a8bdcd2e14bad91cdccaff911 SHA512 9e15b42b38d2fd3bc2fe27aef0e0c3abfaacd2e32b4d648984a1cb1d90c51e2e08857e37f01dd681d3042eb5c5e7e1daf9f284a0a8e095f1e5d5f7be2d5ea1d2 -EBUILD pipewire-0.3.62-r1.ebuild 16270 BLAKE2B a4edc25f01e36a0750547f406534670d1c436537361e3d5de4893580bb0f355944bfa8aea7ac3d26e266ae6120e72b451f7a38f852f08f981cbc0f61de1f724a SHA512 880dbd914fe1a47fd02075e312f90daf3c583c153e9ec1793fb86412e36a13699a28207e847a6ad8e15bfe13fffad7ff9eadc09aab21bdc8c35d8773559545ad -EBUILD pipewire-0.3.62.ebuild 16187 BLAKE2B 2a8a2dd8f18b777ce2d9428aecb74495cdca09e68002ef60fe30595b19fdabf410d6adc1ccf339ceeb0f37347607d546f4091241d20bd410f29c7daac5f66cad SHA512 3b9ef7155317e966dc2c4f7b77b6a7d483d4661c9c4c81e92f87328a814be80d0d05f540b9c7d936628f329284b979d02fe79c9d65a69ee3897e71e699771792 +EBUILD pipewire-0.3.63.ebuild 16228 BLAKE2B deb9ab5c05e60adbfb48706c99fdca9faee12495a542715676ee12e67ab6262b3595dddbc3dd4cb19bef859418c0460c9f5a2681e3b5496acafb19476b006194 SHA512 d8663cd9416dd0d2d40feddd7dee6bc291d96d7292adaa9a969bcdb1fc82565ae844900880e920c84dbca5d35adb760ba38ef87fb3430d5d0ac73a7195d6257d EBUILD pipewire-9999.ebuild 16187 BLAKE2B 2a8a2dd8f18b777ce2d9428aecb74495cdca09e68002ef60fe30595b19fdabf410d6adc1ccf339ceeb0f37347607d546f4091241d20bd410f29c7daac5f66cad SHA512 3b9ef7155317e966dc2c4f7b77b6a7d483d4661c9c4c81e92f87328a814be80d0d05f540b9c7d936628f329284b979d02fe79c9d65a69ee3897e71e699771792 MISC metadata.xml 1860 BLAKE2B 8f537f36217aa1c5869e48a1af71cae96b56e60f5cd9b811739be159dd3aeeabe3c31dccc3d7f695f7361f7d262f8c68230fb410e389465b9264d8e6af232aa5 SHA512 d2ae3129e67b7527bbd3481ac77e27de4e26f6ff77601a7538d5e888c7737b7b39d981be4dcf245ea8d676823f1b1fbf8d854feefa62b74962710af17248d731 diff --git a/media-video/pipewire/files/pipewire-0.3.60-profile-switch-crash.patch b/media-video/pipewire/files/pipewire-0.3.60-profile-switch-crash.patch deleted file mode 100644 index cd126d627d20..000000000000 --- a/media-video/pipewire/files/pipewire-0.3.60-profile-switch-crash.patch +++ /dev/null @@ -1,28 +0,0 @@ -https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/bf3516ba0496b644b3944b114253f23964178897 - -From bf3516ba0496b644b3944b114253f23964178897 Mon Sep 17 00:00:00 2001 -From: Wim Taymans <wtaymans@redhat.com> -Date: Tue, 15 Nov 2022 15:40:47 +0100 -Subject: [PATCH] audioadapter: perform setup again after a PortConfig - -After the ports are reconfigured, we need to perform the setup again so -that buffers and processing can happen with the right settings. - -This fixes an issue when autoswitching between A2DP and HFP with -bluetooth headsets when there is also a stereo capture device available. -The input stream of the browser is quickly reconfigured between stereo -and mono with only a Pause command in between, clearing the setup state -is enough to redo the setup when going back to Playing. - -Fixes #2764 ---- a/spa/plugins/audioconvert/audioconvert.c -+++ b/spa/plugins/audioconvert/audioconvert.c -@@ -979,6 +979,7 @@ static int reconfigure_mode(struct impl *this, enum spa_param_port_config_mode m - } - - this->monitor = monitor; -+ this->setup = false; - dir->control = control; - dir->have_profile = true; - dir->mode = mode; -GitLab diff --git a/media-video/pipewire/files/pipewire-0.3.60-pulse-server-also-advance-read-pointer-in-underrun.patch b/media-video/pipewire/files/pipewire-0.3.60-pulse-server-also-advance-read-pointer-in-underrun.patch deleted file mode 100644 index 99e752391885..000000000000 --- a/media-video/pipewire/files/pipewire-0.3.60-pulse-server-also-advance-read-pointer-in-underrun.patch +++ /dev/null @@ -1,29 +0,0 @@ -https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/b720da771efa950cf380101bed42d5d5ee177908 - -From b720da771efa950cf380101bed42d5d5ee177908 Mon Sep 17 00:00:00 2001 -From: Wim Taymans <wtaymans@redhat.com> -Date: Thu, 10 Nov 2022 16:13:33 +0100 -Subject: [PATCH] pulse-server: also advance read pointer in underrun - -So that we ask for more data from the client. - -Also retested with #2799 that caused this regression. - -Fixes #2821 ---- a/src/modules/module-protocol-pulse/pulse-server.c -+++ b/src/modules/module-protocol-pulse/pulse-server.c -@@ -1433,10 +1433,11 @@ static void stream_process(void *data) - stream->buffer, MAXLENGTH, - index % MAXLENGTH, - p, avail); -- index += avail; -- pd.read_inc = avail; -- spa_ringbuffer_read_update(&stream->ring, index); - } -+ index += size; -+ pd.read_inc = size; -+ spa_ringbuffer_read_update(&stream->ring, index); -+ - pd.playing_for = size; - } - pw_log_debug("%p: [%s] underrun read:%u avail:%d max:%u", diff --git a/media-video/pipewire/files/pipewire-0.3.60-qemu.patch b/media-video/pipewire/files/pipewire-0.3.60-qemu.patch deleted file mode 100644 index 87d34ec609cf..000000000000 --- a/media-video/pipewire/files/pipewire-0.3.60-qemu.patch +++ /dev/null @@ -1,22 +0,0 @@ -From b46d8a8c921a8da6883610ad4b68da95bf59b59e Mon Sep 17 00:00:00 2001 -From: Wim Taymans <wtaymans@redhat.com> -Date: Wed, 16 Nov 2022 20:45:38 +0100 -Subject: [PATCH] alsa: force playback start when buffer is full - -When we try to play data but the ringbuffer is full, we need to start -the device or else we will stay in this situation forever and stay -silent. - -Fixes #2830 ---- a/spa/plugins/alsa/alsa-pcm.c -+++ b/spa/plugins/alsa/alsa-pcm.c -@@ -2128,7 +2128,7 @@ again: - - state->sample_count += total_written; - -- if (SPA_UNLIKELY(!state->alsa_started && total_written > 0)) -+ if (SPA_UNLIKELY(!state->alsa_started && (total_written > 0 || frames == 0))) - do_start(state); - - return 0; -GitLab diff --git a/media-video/pipewire/files/pipewire-0.3.62-distorted-avx2.patch b/media-video/pipewire/files/pipewire-0.3.62-distorted-avx2.patch deleted file mode 100644 index 5b2f0817d048..000000000000 --- a/media-video/pipewire/files/pipewire-0.3.62-distorted-avx2.patch +++ /dev/null @@ -1,41 +0,0 @@ -https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/b927063b89b791c5fc5485ce4d9eac2cd17a4ad6 - -From b927063b89b791c5fc5485ce4d9eac2cd17a4ad6 Mon Sep 17 00:00:00 2001 -From: Sefa Eyeoglu <contact@scrumplex.net> -Date: Sun, 11 Dec 2022 20:14:09 +0100 -Subject: [PATCH] audioconvert: fix distorted audio on AVX2 - -Closes pipewire/pipewire#2885 - -Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net> ---- a/spa/plugins/audioconvert/fmt-ops-avx2.c -+++ b/spa/plugins/audioconvert/fmt-ops-avx2.c -@@ -339,7 +339,7 @@ conv_s32_to_f32d_4s_avx2(void *data, void * SPA_RESTRICT dst[], const void * SPA - __m256i in[4]; - __m256 out[4], factor = _mm256_set1_ps(1.0f / S24_SCALE); - __m256i mask1 = _mm256_setr_epi32(0*n_channels, 1*n_channels, 2*n_channels, 3*n_channels, -- 3*n_channels, 5*n_channels, 6*n_channels, 7*n_channels); -+ 4*n_channels, 5*n_channels, 6*n_channels, 7*n_channels); - - if (SPA_IS_ALIGNED(d0, 32) && - SPA_IS_ALIGNED(d1, 32) && -@@ -405,7 +405,7 @@ conv_s32_to_f32d_2s_avx2(void *data, void * SPA_RESTRICT dst[], const void * SPA - __m256i in[4]; - __m256 out[4], factor = _mm256_set1_ps(1.0f / S24_SCALE); - __m256i mask1 = _mm256_setr_epi32(0*n_channels, 1*n_channels, 2*n_channels, 3*n_channels, -- 3*n_channels, 5*n_channels, 6*n_channels, 7*n_channels); -+ 4*n_channels, 5*n_channels, 6*n_channels, 7*n_channels); - - if (SPA_IS_ALIGNED(d0, 32) && - SPA_IS_ALIGNED(d1, 32)) -@@ -453,7 +453,7 @@ conv_s32_to_f32d_1s_avx2(void *data, void * SPA_RESTRICT dst[], const void * SPA - __m256i in[2]; - __m256 out[2], factor = _mm256_set1_ps(1.0f / S24_SCALE); - __m256i mask1 = _mm256_setr_epi32(0*n_channels, 1*n_channels, 2*n_channels, 3*n_channels, -- 3*n_channels, 5*n_channels, 6*n_channels, 7*n_channels); -+ 4*n_channels, 5*n_channels, 6*n_channels, 7*n_channels); - - if (SPA_IS_ALIGNED(d0, 32)) - unrolled = n_samples & ~15; --- -GitLab diff --git a/media-video/pipewire/files/pipewire-0.3.62-use-after-free.patch b/media-video/pipewire/files/pipewire-0.3.62-use-after-free.patch deleted file mode 100644 index 66d21caf3195..000000000000 --- a/media-video/pipewire/files/pipewire-0.3.62-use-after-free.patch +++ /dev/null @@ -1,185 +0,0 @@ -https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/3bdd2e01c56ec13179340ecdce0b766f72e4339e -https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/8c892443eb5989ea3e660dedc6a506a9bfb42eac - -From 3bdd2e01c56ec13179340ecdce0b766f72e4339e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= <pobrn@protonmail.com> -Date: Sat, 10 Dec 2022 00:40:21 +0100 -Subject: [PATCH] pipewire: store SPA handles in a global list by age - -Operating on the assumption that every SPA handle -can reference any other older SPA handle, the only -safe destruction order is from youngest to oldest. - -To achieve this, store all handles across all plugins -sorted by age (youngest first), and use that as the -order of destruction in `pw_deinit()`. - -This line of thinking does not account for what happens -when a handle that is referenced by others is unloaded, -but it does not make that case worse either. - -See #2881 ---- a/src/pipewire/pipewire.c -+++ b/src/pipewire/pipewire.c -@@ -64,7 +64,6 @@ struct plugin { - char *filename; - void *hnd; - spa_handle_factory_enum_func_t enum_func; -- struct spa_list handles; - int ref; - }; - -@@ -78,6 +77,7 @@ struct handle { - - struct registry { - struct spa_list plugins; -+ struct spa_list handles; /* all handles across all plugins by age (youngest first) */ - }; - - struct support { -@@ -149,7 +149,6 @@ open_plugin(struct registry *registry, - plugin->filename = strdup(filename); - plugin->hnd = hnd; - plugin->enum_func = enum_func; -- spa_list_init(&plugin->handles); - - spa_list_append(®istry->plugins, &plugin->link); - -@@ -290,7 +289,7 @@ static struct spa_handle *load_spa_handle(const char *lib, - handle->ref = 1; - handle->plugin = plugin; - handle->factory_name = strdup(factory_name); -- spa_list_append(&plugin->handles, &handle->link); -+ spa_list_prepend(&sup->registry.handles, &handle->link); - - return &handle->handle; - -@@ -321,15 +320,13 @@ struct spa_handle *pw_load_spa_handle(const char *lib, - static struct handle *find_handle(struct spa_handle *handle) - { - struct registry *registry = &global_support.registry; -- struct plugin *p; - struct handle *h; - -- spa_list_for_each(p, ®istry->plugins, link) { -- spa_list_for_each(h, &p->handles, link) { -- if (&h->handle == handle) -- return h; -- } -+ spa_list_for_each(h, ®istry->handles, link) { -+ if (&h->handle == handle) -+ return h; - } -+ - return NULL; - } - -@@ -611,6 +608,7 @@ void pw_init(int *argc, char **argv[]) - support->support_lib = str; - - spa_list_init(&support->registry.plugins); -+ spa_list_init(&support->registry.handles); - - if (pw_log_is_default()) { - char *patterns = NULL; -@@ -684,7 +682,7 @@ void pw_deinit(void) - { - struct support *support = &global_support; - struct registry *registry = &support->registry; -- struct plugin *p; -+ struct handle *h; - - pthread_mutex_lock(&init_lock); - if (support->init_count == 0) -@@ -694,13 +692,10 @@ void pw_deinit(void) - - pthread_mutex_lock(&support_lock); - pw_log_set(NULL); -- spa_list_consume(p, ®istry->plugins, link) { -- struct handle *h; -- p->ref++; -- spa_list_consume(h, &p->handles, link) -- unref_handle(h); -- unref_plugin(p); -- } -+ -+ spa_list_consume(h, ®istry->handles, link) -+ unref_handle(h); -+ - pw_free_strv(support->categories); - free(support->i18n_domain); - spa_zero(global_support); --- -GitLab - -From 8c892443eb5989ea3e660dedc6a506a9bfb42eac Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= <pobrn@protonmail.com> -Date: Sat, 10 Dec 2022 02:43:13 +0100 -Subject: [PATCH] spa: audioadapter: fix stack-use-after-scope when configuring - format - -It is not enough for `buffer` to be alive in its current -scope because when execution enters that branch, `format` -will be set to `fmt`, which points inside `buffer`. And -since `format` is used outside that scope, `buffer` must -live longer. - -This was detected by ASAN when Audacity was starting up. - - ==25007==ERROR: AddressSanitizer: stack-use-after-scope on address 0x7ffdbcfef560 at pc 0x7fe44ca95db3 bp 0x7ffdbcfeeda0 sp 0x7ffdbcfeed90 - READ of size 4 at 0x7ffdbcfef560 thread T0 - #0 0x7fe44ca95db2 in spa_pod_parser_pod ../spa/include/spa/pod/parser.h:67 - #1 0x7fe44ca9a805 in spa_format_parse ../spa/include/spa/param/format-utils.h:44 - #2 0x7fe44cad293a in port_set_format ../spa/plugins/audioconvert/audioconvert.c:1934 - #3 0x7fe44cadad14 in impl_node_port_set_param ../spa/plugins/audioconvert/audioconvert.c:2038 - #4 0x7fe44ca587e2 in configure_format ../spa/plugins/audioconvert/audioadapter.c:509 - #5 0x7fe44ca60dff in negotiate_format ../spa/plugins/audioconvert/audioadapter.c:822 - #6 0x7fe44ca62bbf in impl_node_send_command ../spa/plugins/audioconvert/audioadapter.c:846 - #7 0x7fe45ea1c2f1 in node_update_state ../src/pipewire/impl-node.c:407 - #8 0x7fe45ea5137e in pw_impl_node_set_state ../src/pipewire/impl-node.c:2251 - #9 0x7fe45eb3355f in pw_work_queue_destroy ../src/pipewire/work-queue.c:142 - #10 0x7fe45b2cd6f4 in source_event_func ../spa/plugins/support/loop.c:615 - #11 0x7fe45b2c634f in loop_iterate ../spa/plugins/support/loop.c:452 - #12 0x7fe45e9ebebc in spa_hook_list_clean ../spa/include/spa/utils/hook.h:395 - #13 0x5561e03dc722 in main ../src/daemon/pipewire.c:131 - #14 0x7fe45da3c28f (/usr/lib/libc.so.6+0x2328f) - #15 0x7fe45da3c349 in __libc_start_main (/usr/lib/libc.so.6+0x23349) - #16 0x5561e03db2a4 in _start ../sysdeps/x86_64/start.S:115 - - Address 0x7ffdbcfef560 is located in stack of thread T0 at offset 160 in frame - #0 0x7fe44ca56fa9 in configure_format ../spa/plugins/audioconvert/audioadapter.c:475 - - This frame has 4 object(s): - [32, 36) 'state' (line 493) - [48, 56) 'fmt' (line 494) - [80, 128) 'b' (line 492) - [160, 4256) 'buffer' (line 491) <== Memory access at offset 160 is inside this variable ---- a/spa/plugins/audioconvert/audioadapter.c -+++ b/spa/plugins/audioconvert/audioadapter.c -@@ -473,6 +473,7 @@ static int negotiate_buffers(struct impl *this) - - static int configure_format(struct impl *this, uint32_t flags, const struct spa_pod *format) - { -+ uint8_t buffer[4096]; - int res; - - if (format == NULL && !this->have_format) -@@ -487,14 +488,13 @@ static int configure_format(struct impl *this, uint32_t flags, const struct spa_ - SPA_PARAM_Format, flags, - format)) < 0) - return res; -+ - if (res > 0) { -- uint8_t buffer[4096]; -- struct spa_pod_builder b = { 0 }; -+ struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer)); - uint32_t state = 0; - struct spa_pod *fmt; - - /* format was changed to nearest compatible format */ -- spa_pod_builder_init(&b, buffer, sizeof(buffer)); - - if ((res = spa_node_port_enum_params_sync(this->follower, - this->direction, 0, --- -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 new file mode 100644 index 000000000000..a6e237ddd7c7 --- /dev/null +++ b/media-video/pipewire/files/pipewire-0.3.63-bluez-ldac_abr.patch @@ -0,0 +1,22 @@ +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/pipewire-0.3.60-r1.ebuild b/media-video/pipewire/pipewire-0.3.60-r1.ebuild deleted file mode 100644 index 0acb65629783..000000000000 --- a/media-video/pipewire/pipewire-0.3.60-r1.ebuild +++ /dev/null @@ -1,438 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# 1. Please regularly check (even at the point of bumping) Fedora's packaging -# for needed backports at https://src.fedoraproject.org/rpms/pipewire/tree/rawhide. -# -# 2. Upstream also sometimes amend release notes for the previous release to mention -# needed patches, e.g. https://gitlab.freedesktop.org/pipewire/pipewire/-/tags/0.3.55#distros -# -# 3. Keep an eye on git master (for both PipeWire and WirePlumber) as things -# continue to move quickly. It's not uncommon for fixes to be made shortly -# after releases. - -PYTHON_COMPAT=( python3_{8..11} ) - -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 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 - ) - 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}-pulse-server-also-advance-read-pointer-in-underrun.patch - "${FILESDIR}"/${P}-profile-switch-crash.patch - "${FILESDIR}"/${P}-qemu.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 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_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() { - use udev && udev_reload -} - -pkg_postinst() { - use udev && 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.62-r1.ebuild b/media-video/pipewire/pipewire-0.3.62-r1.ebuild deleted file mode 100644 index 04cd2cae11af..000000000000 --- a/media-video/pipewire/pipewire-0.3.62-r1.ebuild +++ /dev/null @@ -1,442 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# 1. Please regularly check (even at the point of bumping) Fedora's packaging -# for needed backports at https://src.fedoraproject.org/rpms/pipewire/tree/rawhide. -# -# 2. Upstream also sometimes amend release notes for the previous release to mention -# needed patches, e.g. https://gitlab.freedesktop.org/pipewire/pipewire/-/tags/0.3.55#distros -# -# 3. Keep an eye on git master (for both PipeWire and WirePlumber) as things -# continue to move quickly. It's not uncommon for fixes to be made shortly -# after releases. - -PYTHON_COMPAT=( python3_{8..11} ) - -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 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}-use-after-free.patch - "${FILESDIR}"/${P}-distorted-avx2.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_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() { - use udev && udev_reload -} - -pkg_postinst() { - use udev && 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.62.ebuild b/media-video/pipewire/pipewire-0.3.63.ebuild index cd99389d6ba1..1372ecbeb898 100644 --- a/media-video/pipewire/pipewire-0.3.62.ebuild +++ b/media-video/pipewire/pipewire-0.3.63.ebuild @@ -153,6 +153,7 @@ DOCS=( {README,INSTALL}.md NEWS ) PATCHES=( "${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch + "${FILESDIR}"/${P}-bluez-ldac_abr.patch ) # limitsdfile related code taken from =sys-auth/realtime-base-0.1 |