diff options
Diffstat (limited to 'media-video/pipewire')
13 files changed, 694 insertions, 46 deletions
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest index ce03bf496e28..547200296440 100644 --- a/media-video/pipewire/Manifest +++ b/media-video/pipewire/Manifest @@ -1,16 +1,25 @@ +AUX 1.2.0/0001-impl-node-fix-required-state-for-async-driver-nodes.patch 3030 BLAKE2B 372d33b155cd8b798265b6dd04296179adcfcddeefd7253a9979f4722b343f68a7cbe128f1f4b24acda9c099d6fc12e75d14c1ec184b5f25a5f3667c5fc85383 SHA512 19803d71e99cc6b79e96b1e8d96c7d279fe345d67df8242dd8589cc8a2eb8549ed879cb8c3a00d9c7d780329dfc3821dca13fb19dea366b5f86f733413586b30 +AUX 1.2.0/0002-module-raop-only-set-softVolume-when-valid.patch 1048 BLAKE2B 326704effb2a904079c33d07c6557c854ef6842a9f3ade996d1a8a4f1e5d073246426d7c94f5e44f9bf195877326972368cecd9cad6883a6c7a33973a4447284 SHA512 a125dd8d7ac121c7fb66211bcac9a9202f654ba5550b237a55588b8153ac6523b350038305df930b3eb5ac640c53387c56b7b8cc3d29a124180425355f32416b +AUX 1.2.0/0003-context-Fix-node-collect-with-groups-and-sync-enable.patch 5206 BLAKE2B 5d4d6ded0a8cf79c7181c40707329d11a00b4d543b46e0e3bf37985299ca0cdd2782a1c9843469f160332d8bd4a987e10165dc25c99405defc2e02119f665d0b SHA512 37b972529cd4f702863a7e19d1980439daab26ee5feed548a204d969c8af9dcaae29a58ea3b87429c0da0b1220ad4e8b719f294103feebc500ed872d5215c565 +AUX 1.2.0/0004-impl-node-disable-async-for-driver-nodes.patch 4717 BLAKE2B 92ddbc78ff24a385bc54a88c46f3654456c8db27229715a4923790cd0e271b32fe245295b37eda6023e2827c3791dc5bf29411edcdad9a7b91c4e593dbe7c34a SHA512 1fb1b85ee717952b8551dc943c72aa158279aacae5666649b8a2b0c1f63ad9d681817be9d5d1b85f4e51aee6b43febda07d01c85e6ba72c1a31323adc4098a02 +AUX 1.2.0/0005-impl-node-set-INACTIVE-state-on-server.patch 1188 BLAKE2B e54b9973f7529b0a6facdc632a2e9c8fd2080171882e5dc081da6ac7e241266eca5186d11d09670281ae772b3054190d64220d2cf0b3e7ca8853d6a9667f8add SHA512 49261c21e7d41d7e1017a8ab5c2f72056a68b10d4d5ac5ab1fe66418cad727fc0ba915dc8f551640ee1b6a54285981dd19fdc999784dbbac7facdee30c7271f3 AUX 99-pipewire-default-hook.conf 540 BLAKE2B cec76e78db9db290054bf766774c284d7a7a1374c453802eb1bdc19db9289856ec7b8643acbab916a39ca859d543deca111e3b0f110d1904343221c1573ffc17 SHA512 ef891e38c6f40fce2904e240307147a58c48d780e8470dac8e28044cfb86ddeb163885a2362687791779379ad814f58ad5649b75ac4e82931c5bdd3f37a6ed01 AUX gentoo-pipewire-launcher.1 1633 BLAKE2B 36c8888693bd0389dc9b1e49d0501d2679956d88f6b7ac42f0347c3fe2259775dd7082cb0bbdeb54a232fcc8902faa8086203e0fe2437c0eea5f1927ba2d0de4 SHA512 8085c9a989f21ee7f2528d56d5b104c0d14024df06f5cb6cd2aa8168b58469c71b91c788706b11021d9dbddb647a2203175603f4f8aa7b33a63a7b7cf8b59d1f AUX gentoo-pipewire-launcher.in-r3 2848 BLAKE2B 5e6b8ca2df88cef240ca1ff4de28cc8ed3590fabd29b903b37880baf9cf52c35ca01be25b031898d4ee06f4600a5f0c61025a244778577a562f4a4bfa14e2aca SHA512 43cf3e07058e86bf6651106f7f192022c05c5640ba8e101b88e98a83efcc5614f9474107b6d0daf3d5234a51ebcc0a3a7ae5b359d9ba36b648c125813f4e1334 AUX gentoo-sound-server-enable-audio-bluetooth.conf 106 BLAKE2B 79945d2dac9671d9b85f6334afb43ff3f35db555d460e82bccee0f1f8ec4a8bf5e6de3b340698a4e9db80a5dc181c4824b9265bf0fce43bef61afd50177ef70a SHA512 fede2c9dc6256894aa29cf72ede8ba42874cf0706d81031d724ca5b43fa424d09009ec6eb685737623f3c5eadb9b095060b0ce48b7325d68d4b07225b07aa2fe AUX pipewire-0.3.25-enable-failed-mlock-warning.patch 704 BLAKE2B dc0732b89b57a258ea6dc54941899134259469675f92ae93aebda09a796c73ace8bc4ed0ab2aef4ea1bcaa30c1bea8c3304288168421ce8f9939ec993c8aa438 SHA512 7456a24276b7b766ff5799acf5b80ef5f85ee7a78fc5b52adff3206c0b0aa1985a0bf72634aacf7818c90136c09bcc11cb0fecec291d961c8b3585c897869f65 +AUX pipewire-1.0.7-automagic-gsettings.patch 3429 BLAKE2B b6184a1edc18396c3fde3b020d2c0222df1086a261d2da18a2d8345f7ef7f813144df0948e8863180afbd5b56b797e5eed2fdf324e9cf2b2b637a4685641a932 SHA512 7a9d71bf631974d88fdc5adb9f4d7ea7d46c589812c3d9b0a4767ed5d9e117ed88db456f723176acc7abe73a59591a57bcffd0384d2d5822e94656a5d9efc293 +AUX pipewire-1.0.7-automagic-webrtc-audio-processing.patch 3745 BLAKE2B 65978f89fb1dd9e4aa56d7e116fd650efb36d9730d9eae2ead02c77f6b9e567c8b881314ed1ca71af45f7ba0f23b482f14036eefdb87d298e0c90eacfecf3ce3 SHA512 d8dcb1eb0234dff76a9a48b54c57e73505d81f29b043d5ef7ad6974fbe976b7ab8480f622c0664e112375875e2b9dc7d78dde5e481376b7cfa488e54119c5bf2 AUX pipewire.desktop-r2 333 BLAKE2B 6a8805bb4ea3f23af535867c0551b8f742543de1fa8d99d2b451575066c3394b01977587078356dab65a640899bf336252b7f81b83072c676110fce9b0732eff SHA512 292fbc7283b30454025be50c657803dcb0592c9a6f0757eebe4de5a98166c3bcfeb5563da3d72489762073fe782b5e1f913c01184fbd2e926d872fc7ade73eb7 DIST pipewire-1.0.0-docs.tar.xz 33632 BLAKE2B be06aa7242f7d2f8627b3bf2a2ae491dbda456a24811a767218eb89b1fd5961a461697e5d8ae2782323fdb927985fa4fd5dd40c21268b1c7939f4cd3c9e1a9ab SHA512 14f794c4152d7d9a4a7d9d4d5c2ff381c2a8262deaff034f993c4d28629fca8cc3d71d3a7c02982703e449fae5f58257fea0c20db02bf95b5aed88a4d99d2c58 -DIST pipewire-1.0.4.tar.bz2 1698660 BLAKE2B 0842a5fca65c8a91eadd9f0594864ae0f0d428b3c03d2c5fecc3b7f62ff6f5d24fc1190eb351279c002e26596148b23b4b576551502be21beb2eeaa0d2ad4dac SHA512 42e8e28b1fd497f5329b5966abd5cfb7d7976fb0ca9f8f39bccf44195dd11f227cdec2448ba7db4559e866ea2dccf64b8172a2ae069c5204cd8f66c0f8a9e2d9 -DIST pipewire-1.0.5.tar.bz2 1698291 BLAKE2B 0f919a01b5f84060fb2ce560a7790a0d59374671f52a941492930fe21ac39178688f27f00cad649d239901f88b392e16895648efae2ec2785c394c1f6d186ddf SHA512 18fbbe36c8752eb0f1df5ee3f3fffee279addcec9825281bd165ad8316f17af7e91bb5759f63c16139c074b03e5a77ef9d596a87f584d1580bbb754101b70a0f -DIST pipewire-1.0.6.tar.bz2 1698889 BLAKE2B f782efa2aa8fa0976fd3025f58041f450505c63acd9028c3d79368d0c41465a51b4472059a1c13092aa72dc6110fc12589b03de653d7eac3c93bc5498cc17154 SHA512 09e5c951c835dcc2654ec284aaaad6be4254744e943f95556c494cd22a4fc67bdc481982856f2aa439e33ec84e7fbdb6df45a1d4b9ced261b01cd91b0ee4d2ed -EBUILD pipewire-1.0.4.ebuild 19988 BLAKE2B 49df8fcf2e136537401ebab8673c0815a275c2deb29a2779306a77536d2db0688c81e69bbf768061a2ee3e94888da5e77e12055594bf84b14951fd28f12e248c SHA512 5d6506afa393f6286ba33a88cdf17f739a265e2f09baf1b7f9ff5fb239a7b4d87b32ce553d366bfaf6ba36f4384982cf73a521488118d2e5f33d87b4cc9467e3 -EBUILD pipewire-1.0.5-r1.ebuild 19283 BLAKE2B c873436b2f3cad35aa2d6797085823cc215d621b275634c25c3b79e00a56121a97824f3092df74b13809a9ea7639b669710fb9ae7476441209c9f7aff1496827 SHA512 f290058849e339a64bb897e831618b9f886b9c6b7754a0f3b4301fc94be929c0531ffd6c98754228c30bc308371e508021fa907252028d6a5a57d14314d4b5b6 -EBUILD pipewire-1.0.5.ebuild 19988 BLAKE2B 49df8fcf2e136537401ebab8673c0815a275c2deb29a2779306a77536d2db0688c81e69bbf768061a2ee3e94888da5e77e12055594bf84b14951fd28f12e248c SHA512 5d6506afa393f6286ba33a88cdf17f739a265e2f09baf1b7f9ff5fb239a7b4d87b32ce553d366bfaf6ba36f4384982cf73a521488118d2e5f33d87b4cc9467e3 -EBUILD pipewire-1.0.6.ebuild 19283 BLAKE2B c873436b2f3cad35aa2d6797085823cc215d621b275634c25c3b79e00a56121a97824f3092df74b13809a9ea7639b669710fb9ae7476441209c9f7aff1496827 SHA512 f290058849e339a64bb897e831618b9f886b9c6b7754a0f3b4301fc94be929c0531ffd6c98754228c30bc308371e508021fa907252028d6a5a57d14314d4b5b6 -EBUILD pipewire-9999.ebuild 19274 BLAKE2B 86ec3c9efdaa0fd53839c261ae7e23a570d534df6670fd78cab1f0c31b5065017b4c483f9249407a32a928df9b127586fa523fe27e1dabe359c1e247c7bbcc94 SHA512 bdc4d9a357dd5839614aca7b2fbe52ea27a818bc660db55b08e1d696b648e2801ab2f2b1078123e4bf084479918eaf6ec39a9e7f4a6dfe89b54188989956070d +DIST pipewire-1.0.7.tar.bz2 1698775 BLAKE2B be075eb82fe516116de0a6a4d390dd99d7ea3b41e53c9079219978649845df4e9c16cb8e2dcfe594c2ace65fe63976ec432e9ce97eb048df5103d17f3e8ff353 SHA512 3fb46376cdf061b3ea7be55249399d0036c2728bb4deeb6f5c6d708141234e75f563e6a3dc749fbd40dadba72ad2db5fda358b368a480479157731cc67f3303d +DIST pipewire-1.2.0-docs.tar.xz 58528 BLAKE2B b7abdfecd46239050ab80695c8f3d1a4e6a2aded3f9d64c435c64c7dc54a4e6ae32c3526da0fb4f6e2a22a6dbc8c768450ac2c0824b685022284eb1e1990c038 SHA512 25792090f258acc6cd52231be3918f0edaefeeb6c757acc748710a2e6f40ff7861a44e376dc9651742173c40153d3f848c9532257036ab874940270559d9c7f3 +DIST pipewire-1.2.3.tar.bz2 1813639 BLAKE2B 42bd8a08125e79a67a4adec30541ae7fef3c1e8279d8f84365636f8691a237fc7d6b392ed2576b681a9b9418804978e5a8493d7062567ed89035286fb49977f5 SHA512 8a06ef3a9079b334b0d3248431fe6a09f330ad8078dc378ac465e253d3601c3e4552e2e07f7cf492ff6fbc218e686b30941ea153ccaaf826b5f0ff231f6b214e +DIST pipewire-1.2.4.tar.bz2 1813941 BLAKE2B 07819879ccd4122ea543fa7dffb45701741520577f09dd6a6fff9931fc571e0a2f1b3d1a023effd57e13148b6d1fb988fbd6444519b5e7c30b2c10fe30aa1cae SHA512 844c3c95b61aa78c21e5e471648f9c4c03839a64ca365ef39cfba6e4b9cc86a72dbfd725cdbbf00db22d3b82ae6faa20911b2bfcb0bc06a87984bfcb73fc4481 +DIST pipewire-1.2.5.tar.bz2 1814091 BLAKE2B 734fc6e70eab6d7c145a6d6614d6a0a49941b00b51d072f8ba318264d8cb0ec9937da63cf0c1725e90c8a2e6730ae0d590d530cd171aba325611cd916170d902 SHA512 c6b3c59882fe9261c14fb28d3ac3887566c56aeb98b3ec3ad965a007a51519c9597ca88ef76432872220bdd8c802fa1abe1dc043523410f4186321bbd353dc67 +EBUILD pipewire-1.0.7-r1.ebuild 19565 BLAKE2B c0250fdcf5157412d74ef4c020d64b571f84cf75296fe900a4fa964352782f440bc05b413df6475e227c42b526b9e423f23aafa19debc65d18018a43a85452cf SHA512 77f9b34964a14f34a855a8061860b4ce5a6de0ad75f99bc1d599c9c0ad318b6e4604b449e7a0c0483cc4439ce39d4233d2a2cedc1f92ad2b7c3e12ba317841bc +EBUILD pipewire-1.2.3.ebuild 19596 BLAKE2B bada9a63a09f8ca26fbadeebdc0efba1acd88d15b50a81bbc2ba0ed25273543439c0441d1fdb6596c1a5c30f6efacbf7c14b181c09a329fff674753256e10d33 SHA512 db0183a5bffe627e947684f6414fbdb14986a4f05a9722ff3bf63988bcf95e13bd55817881d19f695737b2882f4145beb107d2c5fac37084989ef9f4c18d9219 +EBUILD pipewire-1.2.4.ebuild 19602 BLAKE2B 0594a1082c02d88befd9d3cdf4eaea883bb905e3a16223e1646be00d6281c1446d4c56b07db6c5873c73a38a80f4219106ac0f5d77a3490ad8f4c88d293ace14 SHA512 f14db8d84c6081b6ea4d59d6b67a83f82cf795794d73c8b4917a67ca037b22a3c041bf2f58020f7d7b342fbbbaaa44cea1e17b9e43847ba388e27a8bcdabf9e5 +EBUILD pipewire-1.2.5.ebuild 19871 BLAKE2B dfae536c24cf9a489a08b33b08298027cbb31e90b0e06d59d1045e2b2406c6a23152a36de5abc0d90f0f9bb76d5e9f2f38e05e21dea751b6c3cb925cd347b628 SHA512 696652eee3c8ab6227f44160f29e163250368c883843c9e62188f88d1843c189ffa09efe573af3f96c046a3b089077756e4b89ce08e7588d005f10e9d586a362 +EBUILD pipewire-9999.ebuild 19866 BLAKE2B e178f8dc8254d7d77191e71b7a13d2d6225586c65f25fd969dfff45a40d7ed1f2c8b0139a13b3e4691c2acaa24e07f89d152cf5061e64c4b3c8ba356ff3da36f SHA512 ccdf5dfbafedac96b7c248a186249cbd0e19dc85d16431f54d98894f890b05d9bfdc4cf5cf7dd27911898fefbe94e39e3943ac3d842689724024c7e9ec196d43 MISC metadata.xml 2156 BLAKE2B 974459115e0f3cf4e4c3ac15159740b42e01a093da37d8a27f80e122c9ab2a3fe9194443eaf08f9b66d613db90a14465abbe1b76816bce90e11a46c8409c7513 SHA512 cfe0fdb86c993f167507e22635878d6d7d5dcd48f4c23323231263551ceff986fc454700428ecb7d2ee2abe82093c35d8e7bd491020fd6dd3f3889c09e9020bb diff --git a/media-video/pipewire/files/1.2.0/0001-impl-node-fix-required-state-for-async-driver-nodes.patch b/media-video/pipewire/files/1.2.0/0001-impl-node-fix-required-state-for-async-driver-nodes.patch new file mode 100644 index 000000000000..105c8dd1676a --- /dev/null +++ b/media-video/pipewire/files/1.2.0/0001-impl-node-fix-required-state-for-async-driver-nodes.patch @@ -0,0 +1,82 @@ +From b8d07e40d66f12ac28aab710cfeb181bf25bc59a Mon Sep 17 00:00:00 2001 +From: Wim Taymans <wtaymans@redhat.com> +Date: Mon, 1 Jul 2024 10:36:09 +0200 +Subject: [PATCH 1/5] impl-node: fix required state for async driver nodes + +When the node activation.required was incremented because it was a +driver, only decrement it in that case, regardless of the current driver +state of the node. + +This fixes the case of KODI where the required field gets out of sync +and things become unschedulable. + +Fixes #4087 +--- + src/pipewire/impl-node.c | 22 ++++++++++++++-------- + src/pipewire/private.h | 1 + + 2 files changed, 15 insertions(+), 8 deletions(-) + +diff --git a/src/pipewire/impl-node.c b/src/pipewire/impl-node.c +index 12629ee64..4def52897 100644 +--- a/src/pipewire/impl-node.c ++++ b/src/pipewire/impl-node.c +@@ -112,13 +112,17 @@ static inline void activate_target(struct pw_impl_node *node, struct pw_node_tar + { + struct pw_node_activation_state *state = &t->activation->state[0]; + if (!t->active) { +- if ((!node->async || node->driving) && !node->exported) { +- SPA_ATOMIC_INC(state->required); +- SPA_ATOMIC_INC(state->pending); ++ if (!node->async || node->driving) { ++ if (!node->exported) { ++ SPA_ATOMIC_INC(state->required); ++ SPA_ATOMIC_INC(state->pending); ++ } + } ++ t->active_driving = node->driving; + t->active = true; +- pw_log_debug("%p: target state:%p id:%d pending:%d/%d", +- node, state, t->id, state->pending, state->required); ++ pw_log_debug("%p: target state:%p id:%d pending:%d/%d %d:%d:%d", ++ node, state, t->id, state->pending, state->required, ++ node->async, node->driving, node->exported); + } + } + +@@ -126,7 +130,7 @@ static inline void deactivate_target(struct pw_impl_node *node, struct pw_node_t + { + if (t->active) { + struct pw_node_activation_state *state = &t->activation->state[0]; +- if (!node->async || node->driving) { ++ if (!node->async || t->active_driving) { + /* the driver copies the required to the pending state + * so first try to resume the node and then decrement the + * required state. This way we either resume with the old value +@@ -137,8 +141,10 @@ static inline void deactivate_target(struct pw_impl_node *node, struct pw_node_t + SPA_ATOMIC_DEC(state->required); + } + t->active = false; +- pw_log_debug("%p: target state:%p id:%d pending:%d/%d trigger:%"PRIu64, +- node, state, t->id, state->pending, state->required, trigger); ++ t->active_driving = false; ++ pw_log_debug("%p: target state:%p id:%d pending:%d/%d %d:%d:%d trigger:%"PRIu64, ++ node, state, t->id, state->pending, state->required, ++ node->async, node->driving, node->exported, trigger); + } + } + +diff --git a/src/pipewire/private.h b/src/pipewire/private.h +index 8c01fe8d5..25af677ac 100644 +--- a/src/pipewire/private.h ++++ b/src/pipewire/private.h +@@ -541,6 +541,7 @@ struct pw_node_target { + int fd; + void (*trigger)(struct pw_node_target *t, uint64_t nsec); + unsigned int active:1; ++ unsigned int active_driving:1; + unsigned int added:1; + }; + +-- +2.45.2 + diff --git a/media-video/pipewire/files/1.2.0/0002-module-raop-only-set-softVolume-when-valid.patch b/media-video/pipewire/files/1.2.0/0002-module-raop-only-set-softVolume-when-valid.patch new file mode 100644 index 000000000000..343b42dfdc8a --- /dev/null +++ b/media-video/pipewire/files/1.2.0/0002-module-raop-only-set-softVolume-when-valid.patch @@ -0,0 +1,30 @@ +From 82b9fa118f2fa009b5eb2891378fe003e2573bbe Mon Sep 17 00:00:00 2001 +From: Wim Taymans <wtaymans@redhat.com> +Date: Mon, 1 Jul 2024 11:27:17 +0200 +Subject: [PATCH 2/5] module-raop: only set softVolume when valid + +--- + src/modules/module-raop-sink.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/modules/module-raop-sink.c b/src/modules/module-raop-sink.c +index 05e467d24..8ad28693f 100644 +--- a/src/modules/module-raop-sink.c ++++ b/src/modules/module-raop-sink.c +@@ -1643,10 +1643,10 @@ static void stream_props_changed(struct impl *impl, uint32_t id, const struct sp + impl->volume = volume; + + rtsp_send_volume(impl); ++ spa_pod_builder_prop(&b, SPA_PROP_softVolumes, 0); ++ spa_pod_builder_array(&b, sizeof(float), SPA_TYPE_Float, ++ n_vols, soft_vols); + } +- spa_pod_builder_prop(&b, SPA_PROP_softVolumes, 0); +- spa_pod_builder_array(&b, sizeof(float), SPA_TYPE_Float, +- n_vols, soft_vols); + spa_pod_builder_raw_padded(&b, prop, SPA_POD_PROP_SIZE(prop)); + break; + } +-- +2.45.2 + diff --git a/media-video/pipewire/files/1.2.0/0003-context-Fix-node-collect-with-groups-and-sync-enable.patch b/media-video/pipewire/files/1.2.0/0003-context-Fix-node-collect-with-groups-and-sync-enable.patch new file mode 100644 index 000000000000..5e18550bf193 --- /dev/null +++ b/media-video/pipewire/files/1.2.0/0003-context-Fix-node-collect-with-groups-and-sync-enable.patch @@ -0,0 +1,149 @@ +From e6c0014f94e995e49b72bea7ae56b960416e6b29 Mon Sep 17 00:00:00 2001 +From: Wim Taymans <wtaymans@redhat.com> +Date: Mon, 1 Jul 2024 14:50:34 +0200 +Subject: [PATCH 3/5] context: Fix node collect with groups and sync enabled + +Keep track of the sync nodes we added to a driver and bring in the other +nodes from the same sync group, group or link groups. This makes it +possible to have disjoint sync groups each with their own driver. + +Fixes export in ardour8 + +Fixes #4083 +--- + src/pipewire/context.c | 49 +++++++++++++++++++++--------------------- + 1 file changed, 25 insertions(+), 24 deletions(-) + +diff --git a/src/pipewire/context.c b/src/pipewire/context.c +index 686dd5eee..f3e1b4d76 100644 +--- a/src/pipewire/context.c ++++ b/src/pipewire/context.c +@@ -1163,13 +1163,14 @@ static inline int run_nodes(struct pw_context *context, struct pw_impl_node *nod + * This ensures that we only activate the paths from the runnable nodes to the + * driver nodes and leave the other nodes idle. + */ +-static int collect_nodes(struct pw_context *context, struct pw_impl_node *node, struct spa_list *collect, +- char **sync) ++static int collect_nodes(struct pw_context *context, struct pw_impl_node *node, struct spa_list *collect) + { + struct spa_list queue; + struct pw_impl_node *n, *t; + struct pw_impl_port *p; + struct pw_impl_link *l; ++ uint32_t n_sync; ++ char *sync[MAX_SYNC+1]; + + pw_log_debug("node %p: '%s'", node, node->name); + +@@ -1178,20 +1179,30 @@ static int collect_nodes(struct pw_context *context, struct pw_impl_node *node, + spa_list_append(&queue, &node->sort_link); + node->visited = true; + ++ n_sync = 0; ++ sync[0] = NULL; ++ + /* now follow all the links from the nodes in the queue + * and add the peers to the queue. */ + spa_list_consume(n, &queue, sort_link) { + spa_list_remove(&n->sort_link); + spa_list_append(collect, &n->sort_link); + +- pw_log_debug(" next node %p: '%s' runnable:%u", n, n->name, n->runnable); ++ pw_log_debug(" next node %p: '%s' runnable:%u active:%d", ++ n, n->name, n->runnable, n->active); + + if (!n->active) + continue; + +- if (sync[0] != NULL) { +- if (pw_strv_find_common(n->sync_groups, sync) < 0) +- continue; ++ if (n->sync) { ++ for (uint32_t i = 0; n->sync_groups[i]; i++) { ++ if (n_sync >= MAX_SYNC) ++ break; ++ if (pw_strv_find(sync, n->sync_groups[i]) >= 0) ++ continue; ++ sync[n_sync++] = n->sync_groups[i]; ++ sync[n_sync] = NULL; ++ } + } + + spa_list_for_each(p, &n->input_ports, link) { +@@ -1242,6 +1253,8 @@ static int collect_nodes(struct pw_context *context, struct pw_impl_node *node, + spa_list_for_each(t, &context->node_list, link) { + if (t->exported || !t->active || t->visited) + continue; ++ /* the other node will be scheduled with this one if it's in ++ * the same group or link group */ + if (pw_strv_find_common(t->groups, n->groups) < 0 && + pw_strv_find_common(t->link_groups, n->link_groups) < 0 && + pw_strv_find_common(t->sync_groups, sync) < 0) +@@ -1253,7 +1266,8 @@ static int collect_nodes(struct pw_context *context, struct pw_impl_node *node, + spa_list_append(&queue, &t->sort_link); + } + } +- pw_log_debug(" next node %p: '%s' runnable:%u", n, n->name, n->runnable); ++ pw_log_debug(" next node %p: '%s' runnable:%u %p %p %p", n, n->name, n->runnable, ++ n->groups, n->link_groups, sync); + } + spa_list_for_each(n, collect, sort_link) + if (!n->driving && n->runnable) { +@@ -1497,10 +1511,9 @@ int pw_context_recalc_graph(struct pw_context *context, const char *reason) + struct pw_impl_node *n, *s, *target, *fallback; + const uint32_t *rates; + uint32_t max_quantum, min_quantum, def_quantum, rate_quantum, floor_quantum, ceil_quantum; +- uint32_t n_rates, def_rate, n_sync; ++ uint32_t n_rates, def_rate; + bool freewheel, global_force_rate, global_force_quantum, transport_start; + struct spa_list collect; +- char *sync[MAX_SYNC+1]; + + pw_log_info("%p: busy:%d reason:%s", context, impl->recalc, reason); + +@@ -1514,23 +1527,11 @@ again: + freewheel = false; + transport_start = false; + +- /* clean up the flags first and collect sync */ +- n_sync = 0; +- sync[0] = NULL; ++ /* clean up the flags first */ + spa_list_for_each(n, &context->node_list, link) { + n->visited = false; + n->checked = 0; + n->runnable = n->always_process && n->active; +- if (n->sync) { +- for (uint32_t i = 0; n->sync_groups[i]; i++) { +- if (n_sync >= MAX_SYNC) +- break; +- if (pw_strv_find(sync, n->sync_groups[i]) >= 0) +- continue; +- sync[n_sync++] = n->sync_groups[i]; +- sync[n_sync] = NULL; +- } +- } + } + + get_quantums(context, &def_quantum, &min_quantum, &max_quantum, &rate_quantum, +@@ -1551,7 +1552,7 @@ again: + + if (!n->visited) { + spa_list_init(&collect); +- collect_nodes(context, n, &collect, sync); ++ collect_nodes(context, n, &collect); + move_to_driver(context, &collect, n); + } + /* from now on we are only interested in active driving nodes +@@ -1605,7 +1606,7 @@ again: + + /* collect all nodes in this group */ + spa_list_init(&collect); +- collect_nodes(context, n, &collect, sync); ++ collect_nodes(context, n, &collect); + + driver = NULL; + spa_list_for_each(t, &collect, sort_link) { +-- +2.45.2 + diff --git a/media-video/pipewire/files/1.2.0/0004-impl-node-disable-async-for-driver-nodes.patch b/media-video/pipewire/files/1.2.0/0004-impl-node-disable-async-for-driver-nodes.patch new file mode 100644 index 000000000000..a7528249f1e3 --- /dev/null +++ b/media-video/pipewire/files/1.2.0/0004-impl-node-disable-async-for-driver-nodes.patch @@ -0,0 +1,112 @@ +From 525360d70ab1698afaaaf20f7e58002b8756353f Mon Sep 17 00:00:00 2001 +From: Wim Taymans <wtaymans@redhat.com> +Date: Wed, 3 Jul 2024 13:31:24 +0200 +Subject: [PATCH 4/5] impl-node: disable async for driver nodes + +Make it so that a driver node can never be scheduled async. It could +possibly make sense when the driver node is not currently driving the +graph but when it drives the graph it always needs to be sync. This +also simplifies the target activation because we can simply check the +async state and ignore if the node is driving or not. + +Also make sure that we never make an async link with a driver output port. +This does not make sense because the driver node will always be +triggered sync first and before the async node so we can simply make +a sync link. + +This fixes the modified (only generate 1 buffer) video-src -> video-play +case where the buffer never arrives in video-play because of the +useless async link. + +Fixes #4092 +--- + src/pipewire/impl-link.c | 8 +++++--- + src/pipewire/impl-node.c | 7 +++---- + src/pipewire/private.h | 1 - + 3 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/src/pipewire/impl-link.c b/src/pipewire/impl-link.c +index 39e9bd17d..6dc2e1a59 100644 +--- a/src/pipewire/impl-link.c ++++ b/src/pipewire/impl-link.c +@@ -1321,7 +1321,8 @@ struct pw_impl_link *pw_context_create_link(struct pw_context *context, + if (this->passive && str == NULL) + pw_properties_set(properties, PW_KEY_LINK_PASSIVE, "true"); + +- impl->async = (output_node->async || input_node->async) && ++ impl->async = !output_node->driver && ++ (output_node->async || input_node->async) && + SPA_FLAG_IS_SET(output->flags, PW_IMPL_PORT_FLAG_ASYNC) && + SPA_FLAG_IS_SET(input->flags, PW_IMPL_PORT_FLAG_ASYNC); + +@@ -1375,8 +1376,9 @@ struct pw_impl_link *pw_context_create_link(struct pw_context *context, + this->name = spa_aprintf("%d.%d.%d -> %d.%d.%d", + output_node->info.id, output->port_id, this->rt.out_mix.port.port_id, + input_node->info.id, input->port_id, this->rt.in_mix.port.port_id); +- pw_log_info("(%s) (%s) -> (%s) async:%04x:%04x:%d", this->name, output_node->name, +- input_node->name, output->flags, input->flags, impl->async); ++ pw_log_info("(%s) (%s) -> (%s) async:%d:%04x:%04x:%d", this->name, output_node->name, ++ input_node->name, output_node->driving, ++ output->flags, input->flags, impl->async); + + pw_impl_port_emit_link_added(output, this); + pw_impl_port_emit_link_added(input, this); +diff --git a/src/pipewire/impl-node.c b/src/pipewire/impl-node.c +index 4def52897..c75e5793e 100644 +--- a/src/pipewire/impl-node.c ++++ b/src/pipewire/impl-node.c +@@ -112,13 +112,12 @@ static inline void activate_target(struct pw_impl_node *node, struct pw_node_tar + { + struct pw_node_activation_state *state = &t->activation->state[0]; + if (!t->active) { +- if (!node->async || node->driving) { ++ if (!node->async) { + if (!node->exported) { + SPA_ATOMIC_INC(state->required); + SPA_ATOMIC_INC(state->pending); + } + } +- t->active_driving = node->driving; + t->active = true; + pw_log_debug("%p: target state:%p id:%d pending:%d/%d %d:%d:%d", + node, state, t->id, state->pending, state->required, +@@ -130,7 +129,7 @@ static inline void deactivate_target(struct pw_impl_node *node, struct pw_node_t + { + if (t->active) { + struct pw_node_activation_state *state = &t->activation->state[0]; +- if (!node->async || t->active_driving) { ++ if (!node->async) { + /* the driver copies the required to the pending state + * so first try to resume the node and then decrement the + * required state. This way we either resume with the old value +@@ -141,7 +140,6 @@ static inline void deactivate_target(struct pw_impl_node *node, struct pw_node_t + SPA_ATOMIC_DEC(state->required); + } + t->active = false; +- t->active_driving = false; + pw_log_debug("%p: target state:%p id:%d pending:%d/%d %d:%d:%d trigger:%"PRIu64, + node, state, t->id, state->pending, state->required, + node->async, node->driving, node->exported, trigger); +@@ -1202,6 +1200,7 @@ static void check_properties(struct pw_impl_node *node) + recalc_reason = "transport changed"; + } + async = pw_properties_get_bool(node->properties, PW_KEY_NODE_ASYNC, false); ++ async &= !node->driver; + if (async != node->async) { + pw_log_info("%p: async %d -> %d", node, node->async, async); + node->async = async; +diff --git a/src/pipewire/private.h b/src/pipewire/private.h +index 25af677ac..8c01fe8d5 100644 +--- a/src/pipewire/private.h ++++ b/src/pipewire/private.h +@@ -541,7 +541,6 @@ struct pw_node_target { + int fd; + void (*trigger)(struct pw_node_target *t, uint64_t nsec); + unsigned int active:1; +- unsigned int active_driving:1; + unsigned int added:1; + }; + +-- +2.45.2 + diff --git a/media-video/pipewire/files/1.2.0/0005-impl-node-set-INACTIVE-state-on-server.patch b/media-video/pipewire/files/1.2.0/0005-impl-node-set-INACTIVE-state-on-server.patch new file mode 100644 index 000000000000..9821c151c97b --- /dev/null +++ b/media-video/pipewire/files/1.2.0/0005-impl-node-set-INACTIVE-state-on-server.patch @@ -0,0 +1,30 @@ +From d08df293a95ce976df1cc8c3ec367a8d5d84db35 Mon Sep 17 00:00:00 2001 +From: Wim Taymans <wtaymans@redhat.com> +Date: Wed, 3 Jul 2024 17:42:39 +0200 +Subject: [PATCH 5/5] impl-node: set INACTIVE state on server + +Don't wait for the client to set the INACTIVE state, do it on the +server. We already decremented the target required so we don't want to +schedule the node anymore. + +Fixes some xruns when removing nodes in a stress test. +--- + src/pipewire/impl-node.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/pipewire/impl-node.c b/src/pipewire/impl-node.c +index c75e5793e..be25aa83e 100644 +--- a/src/pipewire/impl-node.c ++++ b/src/pipewire/impl-node.c +@@ -221,7 +221,7 @@ do_node_unprepare(struct spa_loop *loop, bool async, uint32_t seq, + if (!this->rt.prepared) + return 0; + +- if (!this->remote || this->rt.target.activation->client_version < 1) { ++ if (!this->exported) { + /* We mark ourself as finished now, this will avoid going further into the process loop + * in case our fd was ready (removing ourselfs from the loop should avoid that as well). + * If we were supposed to be scheduled make sure we continue the graph for the peers we +-- +2.45.2 + diff --git a/media-video/pipewire/files/pipewire-1.0.7-automagic-gsettings.patch b/media-video/pipewire/files/pipewire-1.0.7-automagic-gsettings.patch new file mode 100644 index 000000000000..bde229b80b24 --- /dev/null +++ b/media-video/pipewire/files/pipewire-1.0.7-automagic-gsettings.patch @@ -0,0 +1,80 @@ +From acc75b21f653873ec1da68bfa08f2945a8dd09d2 Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwartz93@gmail.com> +Date: Sun, 30 Jun 2024 13:44:06 -0400 +Subject: [PATCH] meson: fix conflicting use of feature-based dependency + lookups + +When spa-plugins is enabled, the gio-2.0 global dependency is +overwritten. + +When bluez support is enabled, OR when gsettings is enabled, the gio-2.0 +dependency is then detected as found. This means that +pipewire-module-protocol-pulse can end up enabling gsettings support +even if it has been forcibly turned off. + +Rename the meson variables to ensure they are looked up separately. + +(cherry picked from commit b5f031bc15524bbfde577290ad9bbadeab77ae8b) +Signed-off-by: Eli Schwartz <eschwartz93@gmail.com> +--- + meson.build | 4 ++-- + spa/meson.build | 6 +++--- + src/modules/meson.build | 4 ++-- + 3 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/meson.build b/meson.build +index 0ea256e9b..3353a2aec 100644 +--- a/meson.build ++++ b/meson.build +@@ -343,8 +343,8 @@ summary({'GLib-2.0 (Flatpak support)': glib2_dep.found()}, bool_yn: true, sectio + flatpak_support = glib2_dep.found() + cdata.set('HAVE_GLIB2', flatpak_support) + +-gio_dep = dependency('gio-2.0', version : '>= 2.26.0', required : get_option('gsettings')) +-summary({'GIO (GSettings)': gio_dep.found()}, bool_yn: true, section: 'Misc dependencies') ++gsettings_gio_dep = dependency('gio-2.0', version : '>= 2.26.0', required : get_option('gsettings')) ++summary({'GIO (GSettings)': gsettings_gio_dep.found()}, bool_yn: true, section: 'Misc dependencies') + + gst_option = get_option('gstreamer') + gst_deps_def = { +diff --git a/spa/meson.build b/spa/meson.build +index db0a84425..e37744b08 100644 +--- a/spa/meson.build ++++ b/spa/meson.build +@@ -43,12 +43,12 @@ if get_option('spa-plugins').allowed() + summary({'ALSA': alsa_dep.found()}, bool_yn: true, section: 'Backend') + + bluez_dep = dependency('bluez', version : '>= 4.101', required: get_option('bluez5')) +- gio_dep = dependency('gio-2.0', required : get_option('bluez5')) +- gio_unix_dep = dependency('gio-unix-2.0', required : get_option('bluez5')) ++ bluez_gio_dep = dependency('gio-2.0', required : get_option('bluez5')) ++ bluez_gio_unix_dep = dependency('gio-unix-2.0', required : get_option('bluez5')) + bluez_glib2_dep = dependency('glib-2.0', required : get_option('bluez5')) + sbc_dep = dependency('sbc', required: get_option('bluez5')) + summary({'SBC': sbc_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs') +- bluez5_deps = [ mathlib, dbus_dep, sbc_dep, bluez_dep, bluez_glib2_dep, gio_dep, gio_unix_dep ] ++ bluez5_deps = [ mathlib, dbus_dep, sbc_dep, bluez_dep, bluez_glib2_dep, bluez_gio_dep, bluez_gio_unix_dep ] + bluez_deps_found = get_option('bluez5').allowed() + foreach dep: bluez5_deps + if get_option('bluez5').enabled() and not dep.found() +diff --git a/src/modules/meson.build b/src/modules/meson.build +index 1b434b7f6..52660253e 100644 +--- a/src/modules/meson.build ++++ b/src/modules/meson.build +@@ -409,11 +409,11 @@ if avahi_dep.found() + cdata.set('HAVE_AVAHI', true) + endif + +-if gio_dep.found() ++if gsettings_gio_dep.found() + pipewire_module_protocol_pulse_sources += [ + 'module-protocol-pulse/modules/module-gsettings.c', + ] +- pipewire_module_protocol_pulse_deps += gio_dep ++ pipewire_module_protocol_pulse_deps += gsettings_gio_dep + cdata.set('HAVE_GIO', true) + endif + +-- +2.44.2 + diff --git a/media-video/pipewire/files/pipewire-1.0.7-automagic-webrtc-audio-processing.patch b/media-video/pipewire/files/pipewire-1.0.7-automagic-webrtc-audio-processing.patch new file mode 100644 index 000000000000..ac245dd7cc15 --- /dev/null +++ b/media-video/pipewire/files/pipewire-1.0.7-automagic-webrtc-audio-processing.patch @@ -0,0 +1,95 @@ +From acd5bf60b9d4a35d00c90bfdca7f89e4ff4a4ff7 Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwartz93@gmail.com> +Date: Thu, 30 May 2024 19:44:38 -0400 +Subject: [PATCH] meson: fix webrtc-audio-processing dependency ignoring + configure args + +Most dependencies use meson "feature" options for optional +functionality. This allows people to disable them, if they don't want +them, through the power of tristate decision-making. + +This particular dependency does something a bit more complicated than +can be described by simply passing feature options to the required +kwarg. It: + +- tries to look for two different names of the dependency +- selects different version ranges, depending on the dependency name +- has a hole in the middle of the versions + +Unfortunately, `required: false` for the first dependency isn't +equivalent to a tristate decision-making process. We have to manually +code the logic ourselves. + +The problem is that when we look up the first name, we cannot pass the +feature option in because if the option is force enabled, then the +dependency lookup fails and configuration never tries to find the older +version instead. + +But also, we can't just say it *isn't* required, because if the option +is force *disabled* but it is installed on the system, we still find it +and build against it. + +One solution would be using meson 0.60's support for multiple dependency +names: + +``` +dependency('webrtc-audio-processing-1', 'webrtc-audio-processing', + version : ['>= 0.2'], + required: get_option('echo-cancel-webrtc'), +) +``` + +Unfortunately, this too doesn't work since we could end up detecting 1.1 +(the hole in the middle) which is invalid. + +Instead, we do a bit of checking for tristate values before deciding to +invoke `dependency()`. This lets us guarantee that disabled dependencies +are well and truly disabled. + +Bug: https://bugs.gentoo.org/933218 +Fixes: #3678 +--- + meson.build | 25 +++++++++++++++---------- + 1 file changed, 15 insertions(+), 10 deletions(-) + +diff --git a/meson.build b/meson.build +index cda60112f..72d275086 100644 +--- a/meson.build ++++ b/meson.build +@@ -393,18 +393,23 @@ cdata.set('HAVE_GSTREAMER_DEVICE_PROVIDER', get_option('gstreamer-device-provide + summary({'gstreamer DMA_DRM support': gst_dma_drm_found}, bool_yn: true, section: 'Backend') + cdata.set('HAVE_GSTREAMER_DMA_DRM', gst_dma_drm_found) + +-webrtc_dep = dependency('webrtc-audio-processing-1', +- version : ['>= 1.2' ], +- required : false) +-cdata.set('HAVE_WEBRTC1', webrtc_dep.found()) +-if webrtc_dep.found() ++if get_option('echo-cancel-webrtc').disabled() ++ webrtc_dep = dependency('', required: false) + summary({'WebRTC Echo Canceling >= 1.2': webrtc_dep.found()}, bool_yn: true, section: 'Misc dependencies') + else +- webrtc_dep = dependency('webrtc-audio-processing', +- version : ['>= 0.2', '< 1.0'], +- required : get_option('echo-cancel-webrtc')) +- cdata.set('HAVE_WEBRTC', webrtc_dep.found()) +- summary({'WebRTC Echo Canceling < 1.0': webrtc_dep.found()}, bool_yn: true, section: 'Misc dependencies') ++ webrtc_dep = dependency('webrtc-audio-processing-1', ++ version : ['>= 1.2' ], ++ required : false) ++ cdata.set('HAVE_WEBRTC1', webrtc_dep.found()) ++ if webrtc_dep.found() ++ summary({'WebRTC Echo Canceling >= 1.2': webrtc_dep.found()}, bool_yn: true, section: 'Misc dependencies') ++ else ++ webrtc_dep = dependency('webrtc-audio-processing', ++ version : ['>= 0.2', '< 1.0'], ++ required : get_option('echo-cancel-webrtc')) ++ cdata.set('HAVE_WEBRTC', webrtc_dep.found()) ++ summary({'WebRTC Echo Canceling < 1.0': webrtc_dep.found()}, bool_yn: true, section: 'Misc dependencies') ++ endif + endif + + # On FreeBSD and MidnightBSD, epoll-shim library is required for eventfd() and timerfd() +-- +GitLab + diff --git a/media-video/pipewire/pipewire-1.0.5-r1.ebuild b/media-video/pipewire/pipewire-1.0.7-r1.ebuild index 1373789d2b11..fa900f161e78 100644 --- a/media-video/pipewire/pipewire-1.0.5-r1.ebuild +++ b/media-video/pipewire/pipewire-1.0.7-r1.ebuild @@ -47,7 +47,7 @@ else PIPEWIRE_DOCS_USEFLAG="man" fi - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86" fi DESCRIPTION="Multimedia processing graphs" @@ -175,6 +175,11 @@ PDEPEND=">=media-video/wireplumber-0.5.2" PATCHES=( "${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch + # https://bugs.gentoo.org/933218 + # https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/2028 + "${FILESDIR}"/${P}-automagic-webrtc-audio-processing.patch + # https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/2061 + "${FILESDIR}"/${P}-automagic-gsettings.patch ) pkg_setup() { diff --git a/media-video/pipewire/pipewire-1.0.4.ebuild b/media-video/pipewire/pipewire-1.2.3.ebuild index 0115d177525b..2f8576568666 100644 --- a/media-video/pipewire/pipewire-1.0.4.ebuild +++ b/media-video/pipewire/pipewire-1.2.3.ebuild @@ -23,7 +23,7 @@ EAPI=8 : ${PIPEWIRE_DOCS_PREBUILT:=1} PIPEWIRE_DOCS_PREBUILT_DEV=sam -PIPEWIRE_DOCS_VERSION=$(ver_cut 1-2).0 +PIPEWIRE_DOCS_VERSION="$(ver_cut 1-2).0" # Default to generating docs (inc. man pages) if no prebuilt; overridden later PIPEWIRE_DOCS_USEFLAG="+man" PYTHON_COMPAT=( python3_{10..12} ) @@ -124,7 +124,7 @@ RDEPEND=" virtual/libusb:1 ) dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) - echo-cancel? ( media-libs/webrtc-audio-processing:1 ) + echo-cancel? ( >=media-libs/webrtc-audio-processing-1.2:1 ) extra? ( >=media-libs/libsndfile-1.0.20 ) ffmpeg? ( media-video/ffmpeg:= ) flatpak? ( dev-libs/glib ) @@ -162,9 +162,7 @@ RDEPEND=" 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" +PDEPEND=">=media-video/wireplumber-0.5.2" # Present RDEPEND that are currently always disabled due to the PW # code using them being required to be disabled by Gentoo guidelines @@ -276,8 +274,21 @@ multilib_src_configure() { $(meson_native_use_feature X x11) $(meson_native_use_feature X x11-xfixes) $(meson_native_use_feature X libcanberra) + + # TODO + -Dsnap=disabled ) + # This installs the schema file for pulseaudio-daemon, iff we are replacing + # the official sound-server + if use !sound-server; then + emesonargs+=( '-Dgsettings-pulse-schema=disabled' ) + else + emesonargs+=( + $(meson_native_use_feature gsettings gsettings-pulse-schema) + ) + fi + meson_src_configure } @@ -313,16 +324,8 @@ multilib_src_install_all() { # Enable required wireplumber alsa and bluez monitors if use sound-server; then - # Install sound-server enabler, alsa part, wireplumber 0.4.15 syntax, clean this up with wireplumber dep bump - 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 - - # Install sound-server enabler, bluetooth part, wireplumber 0.4.15 syntax, clean this up with wireplumber dep bump - 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 - - # Install sound-server enabler for wireplumber 0.4.81+ conf syntax - insinto /etc/pipewire/wireplumber.conf.d + # Install sound-server enabler for wireplumber 0.5.0+ conf syntax + insinto /etc/wireplumber/wireplumber.conf.d doins "${FILESDIR}"/gentoo-sound-server-enable-audio-bluetooth.conf fi diff --git a/media-video/pipewire/pipewire-1.0.6.ebuild b/media-video/pipewire/pipewire-1.2.4.ebuild index 1373789d2b11..408bee308b53 100644 --- a/media-video/pipewire/pipewire-1.0.6.ebuild +++ b/media-video/pipewire/pipewire-1.2.4.ebuild @@ -23,7 +23,7 @@ EAPI=8 : ${PIPEWIRE_DOCS_PREBUILT:=1} PIPEWIRE_DOCS_PREBUILT_DEV=sam -PIPEWIRE_DOCS_VERSION=$(ver_cut 1-2).0 +PIPEWIRE_DOCS_VERSION="$(ver_cut 1-2).0" # Default to generating docs (inc. man pages) if no prebuilt; overridden later PIPEWIRE_DOCS_USEFLAG="+man" PYTHON_COMPAT=( python3_{10..12} ) @@ -124,7 +124,7 @@ RDEPEND=" virtual/libusb:1 ) dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) - echo-cancel? ( media-libs/webrtc-audio-processing:1 ) + echo-cancel? ( >=media-libs/webrtc-audio-processing-1.2:1 ) extra? ( >=media-libs/libsndfile-1.0.20 ) ffmpeg? ( media-video/ffmpeg:= ) flatpak? ( dev-libs/glib ) @@ -274,8 +274,21 @@ multilib_src_configure() { $(meson_native_use_feature X x11) $(meson_native_use_feature X x11-xfixes) $(meson_native_use_feature X libcanberra) + + # TODO + -Dsnap=disabled ) + # This installs the schema file for pulseaudio-daemon, iff we are replacing + # the official sound-server + if use !sound-server; then + emesonargs+=( '-Dgsettings-pulse-schema=disabled' ) + else + emesonargs+=( + $(meson_native_use_feature gsettings gsettings-pulse-schema) + ) + fi + meson_src_configure } diff --git a/media-video/pipewire/pipewire-1.0.5.ebuild b/media-video/pipewire/pipewire-1.2.5.ebuild index 0115d177525b..bad144148611 100644 --- a/media-video/pipewire/pipewire-1.0.5.ebuild +++ b/media-video/pipewire/pipewire-1.2.5.ebuild @@ -23,10 +23,10 @@ EAPI=8 : ${PIPEWIRE_DOCS_PREBUILT:=1} PIPEWIRE_DOCS_PREBUILT_DEV=sam -PIPEWIRE_DOCS_VERSION=$(ver_cut 1-2).0 +PIPEWIRE_DOCS_VERSION="$(ver_cut 1-2).0" # Default to generating docs (inc. man pages) if no prebuilt; overridden later PIPEWIRE_DOCS_USEFLAG="+man" -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit meson-multilib optfeature prefix python-any-r1 systemd tmpfiles udev if [[ ${PV} == 9999 ]]; then @@ -56,7 +56,7 @@ 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="${PIPEWIRE_DOCS_USEFLAG} bluetooth dbus doc echo-cancel extra ffmpeg flatpak gstreamer gsettings ieee1394 jack-client jack-sdk liblc3 lv2" +IUSE="${PIPEWIRE_DOCS_USEFLAG} bluetooth elogind dbus doc echo-cancel extra ffmpeg flatpak gstreamer gsettings ieee1394 jack-client jack-sdk liblc3 lv2" IUSE+=" modemmanager pipewire-alsa readline roc selinux sound-server ssl system-service systemd test v4l X zeroconf" # Once replacing system JACK libraries is possible, it's likely that @@ -123,8 +123,9 @@ RDEPEND=" >=net-wireless/bluez-4.101:= virtual/libusb:1 ) + elogind? ( sys-auth/elogind ) dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) - echo-cancel? ( media-libs/webrtc-audio-processing:1 ) + echo-cancel? ( >=media-libs/webrtc-audio-processing-1.2:1 ) extra? ( >=media-libs/libsndfile-1.0.20 ) ffmpeg? ( media-video/ffmpeg:= ) flatpak? ( dev-libs/glib ) @@ -162,9 +163,7 @@ RDEPEND=" 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" +PDEPEND=">=media-video/wireplumber-0.5.2" # Present RDEPEND that are currently always disabled due to the PW # code using them being required to be disabled by Gentoo guidelines @@ -193,6 +192,15 @@ src_prepare() { } multilib_src_configure() { + local logind=disabled + if multilib_is_native_abi ; then + if use systemd ; then + logind=enabled + elif use elogind ; then + logind=enabled + fi + fi + local emesonargs=( -Ddocdir="${EPREFIX}"/usr/share/doc/${PF} @@ -208,6 +216,8 @@ multilib_src_configure() { $(meson_native_use_feature gstreamer gstreamer-device-provider) $(meson_native_use_feature gsettings) $(meson_native_use_feature systemd) + -Dlogind=${logind} + -Dlogind-provider=$(usex systemd 'libsystemd' 'libelogind') $(meson_native_use_feature system-service systemd-system-service) -Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)" @@ -276,8 +286,21 @@ multilib_src_configure() { $(meson_native_use_feature X x11) $(meson_native_use_feature X x11-xfixes) $(meson_native_use_feature X libcanberra) + + # TODO + -Dsnap=disabled ) + # This installs the schema file for pulseaudio-daemon, iff we are replacing + # the official sound-server + if use !sound-server; then + emesonargs+=( '-Dgsettings-pulse-schema=disabled' ) + else + emesonargs+=( + $(meson_native_use_feature gsettings gsettings-pulse-schema) + ) + fi + meson_src_configure } @@ -313,16 +336,8 @@ multilib_src_install_all() { # Enable required wireplumber alsa and bluez monitors if use sound-server; then - # Install sound-server enabler, alsa part, wireplumber 0.4.15 syntax, clean this up with wireplumber dep bump - 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 - - # Install sound-server enabler, bluetooth part, wireplumber 0.4.15 syntax, clean this up with wireplumber dep bump - 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 - - # Install sound-server enabler for wireplumber 0.4.81+ conf syntax - insinto /etc/pipewire/wireplumber.conf.d + # Install sound-server enabler for wireplumber 0.5.0+ conf syntax + insinto /etc/wireplumber/wireplumber.conf.d doins "${FILESDIR}"/gentoo-sound-server-enable-audio-bluetooth.conf fi diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild index 0e1cb10820aa..1593763ba9c5 100644 --- a/media-video/pipewire/pipewire-9999.ebuild +++ b/media-video/pipewire/pipewire-9999.ebuild @@ -26,7 +26,7 @@ PIPEWIRE_DOCS_PREBUILT_DEV=sam PIPEWIRE_DOCS_VERSION="${PV}" # Default to generating docs (inc. man pages) if no prebuilt; overridden later PIPEWIRE_DOCS_USEFLAG="+man" -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit meson-multilib optfeature prefix python-any-r1 systemd tmpfiles udev if [[ ${PV} == 9999 ]]; then @@ -56,7 +56,7 @@ 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="${PIPEWIRE_DOCS_USEFLAG} bluetooth dbus doc echo-cancel extra ffmpeg flatpak gstreamer gsettings ieee1394 jack-client jack-sdk liblc3 lv2" +IUSE="${PIPEWIRE_DOCS_USEFLAG} bluetooth elogind dbus doc echo-cancel extra ffmpeg flatpak gstreamer gsettings ieee1394 jack-client jack-sdk liblc3 lv2" IUSE+=" modemmanager pipewire-alsa readline roc selinux sound-server ssl system-service systemd test v4l X zeroconf" # Once replacing system JACK libraries is possible, it's likely that @@ -123,8 +123,9 @@ RDEPEND=" >=net-wireless/bluez-4.101:= virtual/libusb:1 ) + elogind? ( sys-auth/elogind ) dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) - echo-cancel? ( media-libs/webrtc-audio-processing:1 ) + echo-cancel? ( >=media-libs/webrtc-audio-processing-1.2:1 ) extra? ( >=media-libs/libsndfile-1.0.20 ) ffmpeg? ( media-video/ffmpeg:= ) flatpak? ( dev-libs/glib ) @@ -191,6 +192,15 @@ src_prepare() { } multilib_src_configure() { + local logind=disabled + if multilib_is_native_abi ; then + if use systemd ; then + logind=enabled + elif use elogind ; then + logind=enabled + fi + fi + local emesonargs=( -Ddocdir="${EPREFIX}"/usr/share/doc/${PF} @@ -206,6 +216,8 @@ multilib_src_configure() { $(meson_native_use_feature gstreamer gstreamer-device-provider) $(meson_native_use_feature gsettings) $(meson_native_use_feature systemd) + -Dlogind=${logind} + -Dlogind-provider=$(usex systemd 'libsystemd' 'libelogind') $(meson_native_use_feature system-service systemd-system-service) -Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)" @@ -274,8 +286,21 @@ multilib_src_configure() { $(meson_native_use_feature X x11) $(meson_native_use_feature X x11-xfixes) $(meson_native_use_feature X libcanberra) + + # TODO + -Dsnap=disabled ) + # This installs the schema file for pulseaudio-daemon, iff we are replacing + # the official sound-server + if use !sound-server; then + emesonargs+=( '-Dgsettings-pulse-schema=disabled' ) + else + emesonargs+=( + $(meson_native_use_feature gsettings gsettings-pulse-schema) + ) + fi + meson_src_configure } |