diff options
Diffstat (limited to 'media-video')
-rw-r--r-- | media-video/Manifest.gz | bin | 25367 -> 25369 bytes | |||
-rw-r--r-- | media-video/motion/Manifest | 5 | ||||
-rw-r--r-- | media-video/motion/files/motion-4.5.1-fix-gettext-0.22-format-specifier.patch | 34 | ||||
-rw-r--r-- | media-video/motion/motion-4.3.2-r3.ebuild | 89 | ||||
-rw-r--r-- | media-video/motion/motion-4.5.1-r2.ebuild | 6 | ||||
-rw-r--r-- | media-video/pipewire/Manifest | 8 | ||||
-rw-r--r-- | media-video/pipewire/files/0.3.72/001-opus-meson.patch | 95 | ||||
-rw-r--r-- | media-video/pipewire/files/0.3.72/002-context-segfault-no-fallback.patch | 32 | ||||
-rw-r--r-- | media-video/pipewire/metadata.xml | 1 | ||||
-rw-r--r-- | media-video/pipewire/pipewire-0.3.72.ebuild | 465 | ||||
-rw-r--r-- | media-video/pipewire/pipewire-9999.ebuild | 14 |
11 files changed, 646 insertions, 103 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz Binary files differindex 5f4540711810..44f56dbb3f77 100644 --- a/media-video/Manifest.gz +++ b/media-video/Manifest.gz diff --git a/media-video/motion/Manifest b/media-video/motion/Manifest index 9b1f58d3abc9..d4b04430bc80 100644 --- a/media-video/motion/Manifest +++ b/media-video/motion/Manifest @@ -1,8 +1,7 @@ +AUX motion-4.5.1-fix-gettext-0.22-format-specifier.patch 956 BLAKE2B 4fb34190389d9373d7597bdaf0eea817c50a10d97f7e9782042eaf60c98f6c9dcaf64f8098c2a842973a6b0cd7749690b80084be1e7f208053269810a9373b46 SHA512 de2965174af33ce2a2254b8a4f784212869d2eb6ed8dafb1dfaa95f03e1d79d83878c4ad3ff0411f959a758a8a8cf58d516bdd0d1bed669e8357640c840f3919 AUX motion.confd-r5 884 BLAKE2B 63c497e942ae499271504d308f826f23d718ac968f7735e340ef2fa8a7b1a64d63365686cc00137141bd4b788975c00b4ea3eaf38c1dd9bd219d3d50ff0da8e0 SHA512 998dcfe4160c90adf2683f0194fcf867f0062f1e54355c1158ecb9965a5ed2c30f362147ac9a915b42ba681184d91e78c3a1d397c4b92ee48440d00f3ac0df99 AUX motion.initd-r5 1392 BLAKE2B 87ac71a1e75ace73ac28c52ff0b1d6bbce364e6d43ef8604f3b90c08646fcf4a66abb4d7b16170eb63e7f7f65e5155382c9bf12ff074feffd2c6f3f16479518c SHA512 0060c062e7ce7f3b9c6ae70d0d6830a1676d9a173072bb3464b42fc2bd595d6237524a1ea916f60268533087647e81eef3b39a1b086cf8e8970837d96e48146c AUX motion.service-r4 497 BLAKE2B 8941424317635d214e74d5d558a443212129c38fed9921b101bd3689d743ed6bd68e30748075ae8c5d26aa10732fc6ce1f08707c9ed559eb89a27322e57e0995 SHA512 44e0fa13e4d93af517a06bac5191d16d528648c6b3eb9d56f80e447db7ef46b311acf6fd1d2159a24fa22200be41bdc62eeef8670ddba918bdd28f6d710f90c0 -DIST motion-release-4.3.2.tar.gz 849378 BLAKE2B 2ff49f44bb1d57123760860ae17cc241ecabf3d045ac0c45e1ca08ce3ac8be2fec308492472c37c0d869bc21a7c04658c923c763f9b8f6b547403fc094b03196 SHA512 df54297eebc44b3bc50fd40890c69a9cbbfc5936224bf7027065364e794d7201ceadd99ac99bf43113ec3368f2b5ca435d2956258b9c774e03a6750b41346a7c DIST motion-release-4.5.1.tar.gz 856665 BLAKE2B 59ae638113c7f08ced4b18d7c4f19e3b3f1850ba0cd4c224b300be5ac65ae3b45aa391f26f506a91bb4c38a47b552c71db846d2b3217ccf0b2f5799873ab7ddb SHA512 3b8b60ad4f41c37cc215aa575b0295ee99b15f2d32cbf3393c0f7cdd8d87616cca1c00e11cb7bf74e4afa285caa094f08df3ba62ab21dcb28a48336e3ff5803e -EBUILD motion-4.3.2-r3.ebuild 2243 BLAKE2B b1fde23db8979ee80015afdfcde2b71f5a6e6ef6b53ffbbf75ca6a968c7a366e4c2a426acae41419e8b5395c63af556d0f12973272a75bde9ddc8b8eca030b1c SHA512 c75db500acadfe4fcfc9bb01d68e6add38335b24fb61c0864101f1115622023e60ce684e39d0b3368a2935c00eec42c6e51a3ba63f732221abe45c46f2d783da -EBUILD motion-4.5.1-r2.ebuild 2231 BLAKE2B cc49a918e4aeca262ace318774271fd222bc5f41019af79ef526cd97186c0a28cf10eb5eeb265b324c5f57f55ea9a16cb971414c7b6cb84520f49569dcaf1b3b SHA512 bb74f854d446943c14201b142846ca0f0bfc4ee95e1abcf93aa4ae68ae4d3ddafc26580ab9b0c28322d9d570bdaa8fbcfc551a38dc83a1a8caba568eb50da684 +EBUILD motion-4.5.1-r2.ebuild 2303 BLAKE2B 8a3100940820e1bf29711c1cbd7f09b6ca3408936757df1f55d3050dba33b1471ed853e0653f29e97a73f81194909f09820ce2ef728b08bf4f479c76138ec415 SHA512 84855758570248de10c989e035652bbe526edaa899a6af236ea17ab86ce04f46ae354314f309c565c5639d53332e43521a1fd73a9881f3997a5a55d0edf284c3 MISC metadata.xml 766 BLAKE2B 1385dc89a2d67fc06b0c430b7cb6a606ce22af15c633edc78382e48bc14e423a2a4ff1553531e0e373151e48d2fed1ab78f9da67680fda3eea6b3d717b077d22 SHA512 8c944d3b1bb54b25597bae085b3fdc3da3ff3677eb97fee314558597917355a2fa4db4216720dc51aa171bb032eb426ae8b1d3c9bc5efed3662af75d8d49cc54 diff --git a/media-video/motion/files/motion-4.5.1-fix-gettext-0.22-format-specifier.patch b/media-video/motion/files/motion-4.5.1-fix-gettext-0.22-format-specifier.patch new file mode 100644 index 000000000000..531fd3cf235a --- /dev/null +++ b/media-video/motion/files/motion-4.5.1-fix-gettext-0.22-format-specifier.patch @@ -0,0 +1,34 @@ +https://github.com/Motion-Project/motion/pull/1681 + +From 6c00ca93d87229ee28b052af4a4b4aefad14499b Mon Sep 17 00:00:00 2001 +From: David Seifert <soap@gentoo.org> +Date: Mon, 26 Jun 2023 19:56:18 +0200 +Subject: [PATCH 1/2] po: fix gettext 0.22 format specifier + +Bug: https://bugs.gentoo.org/908965 +Bug: https://savannah.gnu.org/bugs/index.php?64334#comment1 +--- a/po/de.po ++++ b/po/de.po +@@ -3458,7 +3458,7 @@ msgstr "Sprache: Deutsch" + #: src/util.c + #, c-format + msgid "Could not allocate %llu bytes of memory!" +-msgstr "%Llu Bytes Speicher konnten nicht zugeordnet werden!" ++msgstr "%llu Bytes Speicher konnten nicht zugeordnet werden!" + + #: src/util.c + #, c-format +--- a/po/fi.po ++++ b/po/fi.po +@@ -3432,7 +3432,7 @@ msgstr "Kieli: englanti" + #: src/util.c + #, c-format + msgid "Could not allocate %llu bytes of memory!" +-msgstr "%Llu-tavua muistia ei voitu varata!" ++msgstr "%llu-tavua muistia ei voitu varata!" + + #: src/util.c + #, c-format +-- +2.41.0 + diff --git a/media-video/motion/motion-4.3.2-r3.ebuild b/media-video/motion/motion-4.3.2-r3.ebuild deleted file mode 100644 index 68f6f12d35cc..000000000000 --- a/media-video/motion/motion-4.3.2-r3.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools readme.gentoo-r1 systemd - -DESCRIPTION="A software motion detector" -HOMEPAGE="https://motion-project.github.io" -SRC_URI="https://github.com/Motion-Project/${PN}/archive/release-${PV}.tar.gz -> ${PN}-release-${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86" -IUSE="ffmpeg mariadb mmal mysql postgres sqlite v4l webp" - -RDEPEND=" - acct-group/motion - acct-user/motion - net-libs/libmicrohttpd:= - virtual/jpeg:= - ffmpeg? ( media-video/ffmpeg:0= ) - mariadb? ( dev-db/mariadb-connector-c ) - mmal? ( media-libs/raspberrypi-userland ) - mysql? ( dev-db/mysql-connector-c ) - postgres? ( dev-db/postgresql:= ) - sqlite? ( dev-db/sqlite:3 ) - webp? ( media-libs/libwebp:= ) -" -DEPEND="${RDEPEND} - v4l? ( - media-libs/libv4l - virtual/os-headers - ) -" - -# Breaks src_install(), #727056 -RESTRICT="test" - -DISABLE_AUTOFORMATTING="yes" -DOC_CONTENTS=" -You need to setup a configuraton file (/etc/motion/motion.conf) before -running motion for the first time. - -If motion is built with the mysql or mariadb use flags then please make -sure to configure a matching database_type in the config file. - -Motion runs by default under user motion and group motion: -- change this if needed in /etc/conf.d/motion -- or add users who need access to the output files to the motion group - -To install motion as a service, use: -- rc-update add motion default # with OpenRC -- systemctl enable motion.service # with systemd -" - -S="${WORKDIR}"/${PN}-release-${PV} - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - $(use_with ffmpeg) \ - $(use_with mariadb) \ - $(use_with mmal) \ - $(use_with mysql) \ - $(use_with postgres pgsql) \ - $(use_with sqlite sqlite3) \ - $(use_with v4l v4l2) \ - $(use_with webp) \ - --without-optimizecpu -} - -src_install() { - emake \ - DESTDIR="${D}" \ - docdir=/usr/share/doc/${PF} \ - examplesdir=/usr/share/doc/${PF}/examples \ - install - - newinitd "${FILESDIR}/motion.initd-r5" ${PN} - newconfd "${FILESDIR}/motion.confd-r5" ${PN} - systemd_newunit "${FILESDIR}/${PN}.service-r4" "${PN}.service" - readme.gentoo_create_doc - readme.gentoo_print_elog -} diff --git a/media-video/motion/motion-4.5.1-r2.ebuild b/media-video/motion/motion-4.5.1-r2.ebuild index 55cb4df6acd2..8e786bb8fe9e 100644 --- a/media-video/motion/motion-4.5.1-r2.ebuild +++ b/media-video/motion/motion-4.5.1-r2.ebuild @@ -8,6 +8,7 @@ inherit autotools readme.gentoo-r1 systemd DESCRIPTION="A software motion detector" HOMEPAGE="https://motion-project.github.io" SRC_URI="https://github.com/Motion-Project/${PN}/archive/release-${PV}.tar.gz -> ${PN}-release-${PV}.tar.gz" +S="${WORKDIR}/${PN}-release-${PV}" LICENSE="GPL-2" SLOT="0" @@ -34,6 +35,9 @@ DEPEND="${RDEPEND} virtual/os-headers ) " + +PATCHES=( "${FILESDIR}"/${P}-fix-gettext-0.22-format-specifier.patch ) + DISABLE_AUTOFORMATTING="yes" DOC_CONTENTS=" You need to setup a configuraton file (/etc/motion/motion.conf) before @@ -51,8 +55,6 @@ To install motion as a service, use: - systemctl enable motion.service # with systemd " -S="${WORKDIR}"/${PN}-release-${PV} - src_prepare() { default eautoreconf diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest index 71ba81dc83a1..6fcbf5262e4d 100644 --- a/media-video/pipewire/Manifest +++ b/media-video/pipewire/Manifest @@ -1,5 +1,7 @@ AUX 0.3.70/parser-check-pointer.patch 731 BLAKE2B de916ae5e8f39759e7e2216cd47e96b254e924851836a594b5922739e4b11f0dd809969defba10fadc99306700497d06957084b4edd04f22c2e1a7d37e988509 SHA512 77225841a84cdec4163297a6094365b537775d6824b7ecf6dfca0b71785ec36358c24ed6e51aec6d6d68968dd6d5b7707745b76ef86d1a76e686320b76b4e3ca AUX 0.3.71/jack-update-bufsize-samplerate.patch 1577 BLAKE2B 1bb11301fa7c04482fc8684c1ab07134da52891dba2c357bafd261b829ca255c7bbeab0fb70988813d1c895dab6108498b3ef8c479fdec60c843eb1e6b00f3f5 SHA512 13b8d44bf0ebd4a3d913eff083fbaeed96cff67315f04d9e44e1c92bfe83a04757a11291bcb1c30ef26f698248396212d1f3480290b84573159ffedf51c5fd00 +AUX 0.3.72/001-opus-meson.patch 3622 BLAKE2B 3470eb21de06019dba38747896bcfa0703bc8213658f9e90fc4f4bd687a5a7dcc7c6818c8a4cd14f0ba840981e6e91d88a31def645573b246f9baf02e1d2ca4c SHA512 19d54bbd11bac426882ae69f81d880cc59d950a64fa88914bac00b16d62d29b99e629a92cae2b49b7dfcb5228c088274b6ee30378b8efa8a3f29190d806c377c +AUX 0.3.72/002-context-segfault-no-fallback.patch 991 BLAKE2B 33c3dbac479ba829a9c60161705ee584be1cefb02139d5cd01d56017b982421a2b4607b11bbf9345c13f630f36d9d4eb17a7dbceb31de7787051f1cc2fb08d20 SHA512 ad97cc99faa87842d607ab06cc3308ee2539663270b8901d8bc827e8b85f2b2c1461ef7d070447e824a83680bdeaa632ee05e9f66e263be8c6245fbf8558e55e AUX 99-pipewire-default-hook.conf 540 BLAKE2B cec76e78db9db290054bf766774c284d7a7a1374c453802eb1bdc19db9289856ec7b8643acbab916a39ca859d543deca111e3b0f110d1904343221c1573ffc17 SHA512 ef891e38c6f40fce2904e240307147a58c48d780e8470dac8e28044cfb86ddeb163885a2362687791779379ad814f58ad5649b75ac4e82931c5bdd3f37a6ed01 AUX gentoo-pipewire-launcher.1 1400 BLAKE2B a469d6eb75e5362d44c2cad66169f89fdb93cdf511e3019f669531812b9fce007032388ef2b3927dce8977ab69bfdb51af357b0648c661c079175d5f62cc2ea9 SHA512 de1b4621b59f6505950324746090de21d5fdaced7cb45cae5b9bd6f312aba031590fd71e1c54ca4b8558649556fbab304c9b88ee1e3831ce29530ddb040d3abe AUX gentoo-pipewire-launcher.in 1227 BLAKE2B 4316a991978fac653a00d076e9236d0ab6c01a6e4b800c82851e2bd6f9476369605c741aa7ffd47b10853653ef1d4222c449f0b912a0f7694fffd2b1611d7a47 SHA512 edbc03cec765d2307bcf33a14521c6f8beeae52d9fd6a4e181ba66b9f5dd0d64995fdef847453d1a4c682d701814b3afbe70931f55a0e4198fc5c9d87d7a95c5 @@ -11,8 +13,10 @@ AUX pipewire.desktop-r1 325 BLAKE2B 7d823a264e5147bf8669127df22f468518fd54375ed5 AUX pipewire.desktop-r2 333 BLAKE2B 6a8805bb4ea3f23af535867c0551b8f742543de1fa8d99d2b451575066c3394b01977587078356dab65a640899bf336252b7f81b83072c676110fce9b0732eff SHA512 292fbc7283b30454025be50c657803dcb0592c9a6f0757eebe4de5a98166c3bcfeb5563da3d72489762073fe782b5e1f913c01184fbd2e926d872fc7ade73eb7 DIST pipewire-0.3.70.tar.bz2 1573378 BLAKE2B 3824106cba9c1b0a82c6d8889b2b1473f4bfc5d0994ee9dd8b46a454c287bbd4e0ad5dc508df5d4a9b7c5f683898ed756947788e561f2bf51a3116b12e46d075 SHA512 8b25d90232d07d5b1e210bd8f24240438a7dcece23a5be59a4e49fc3daf51ebf659f2cc343a0d913310a4659792590ef981ab7a59890506557f9510d902a0cff DIST pipewire-0.3.71.tar.bz2 1592332 BLAKE2B ff6483a040285cd7a7cc10878cc88b61a0e01c0376ab64ef84f753b300b61da23211bc1b50208da7f1054d6ddf08092e81cbf29df508aad3bc93f20742a2f735 SHA512 465388faaf0f7fcce21fdbcd7a1705ef524c35e267c3f123b1025c34133fc418194abb9e22d89e60c9acc1417b25d655112fd9ef342e26ca9b8bc26013b09cb3 +DIST pipewire-0.3.72.tar.bz2 1622951 BLAKE2B e3334410b551ba155dc79baecdd85fa5f214483ab53d11cc9b59ec2a0549957b67048d621ff1881ea927ba315d41c32ba3df97435453ff68173e2c450bf216aa SHA512 f105a2afdc00a81cb8c95c57645257109fd3ac1bd0608eb59969473fd94600c8ecf1d3f51abebcf7f9d70307568b2f5f66c7480a014b3955bcb992d92ca3ff43 EBUILD pipewire-0.3.70-r2.ebuild 17540 BLAKE2B c72f6bd813b69016c7e76dceee8d1a599fe0cfcc9cbba69e475df97609b29367c5a59e1be6052362985f145f676cda9e5621bfa2360674b8e31dba7bc2f80626 SHA512 ea444201b17236bb193e87d20b84c71ab4ffcd9638530707120c25e4f662a450e57e2ea1317b810482a0d124a3208320107991bc2bfea881085ad249b7560e02 EBUILD pipewire-0.3.71-r2.ebuild 17641 BLAKE2B f25bbbac377b63de4b9d73e2431a939a29af67025ec736d5f63b24d219ef76b1b58c73bea8f4107e117385a66ab9e639cef78af5f2fc3c357a7b1b9579dd1681 SHA512 0dcc22b48fc7aaab765286b87fe87dee46148fd41d33ab5a3b75f6495f1acd5f01a6b8c2d552db9540ef0254981d2405d1f7ceba9a7ddbf623401d636b92dcac EBUILD pipewire-0.3.71-r3.ebuild 17696 BLAKE2B 6123a1a6d7664aaf5c6488b74267c92ba76f9a8cf96375f3f81d00fef0cd5005415bf7a8addb80200fd2ba8138d1c9c06bfc3daea11730a6baa9f6455e20a367 SHA512 1b812f71c1bc78b1364013996c9191429aac8811024bef1b12cbb0a24935f05f5d8177c796a9b83f102f25d22f4520456e03fdeafb2d2cfe74b2ac57752419d8 -EBUILD pipewire-9999.ebuild 17696 BLAKE2B 6123a1a6d7664aaf5c6488b74267c92ba76f9a8cf96375f3f81d00fef0cd5005415bf7a8addb80200fd2ba8138d1c9c06bfc3daea11730a6baa9f6455e20a367 SHA512 1b812f71c1bc78b1364013996c9191429aac8811024bef1b12cbb0a24935f05f5d8177c796a9b83f102f25d22f4520456e03fdeafb2d2cfe74b2ac57752419d8 -MISC metadata.xml 1860 BLAKE2B 8f537f36217aa1c5869e48a1af71cae96b56e60f5cd9b811739be159dd3aeeabe3c31dccc3d7f695f7361f7d262f8c68230fb410e389465b9264d8e6af232aa5 SHA512 d2ae3129e67b7527bbd3481ac77e27de4e26f6ff77601a7538d5e888c7737b7b39d981be4dcf245ea8d676823f1b1fbf8d854feefa62b74962710af17248d731 +EBUILD pipewire-0.3.72.ebuild 17708 BLAKE2B c371388e0d2fff6d9a6b06dcb7032b6c0bfbd3c9d3b77f2d244cd334dfdd02609bdcaa23de79bfc9af42aef8257a9b75050fe485d3f87ee52973c994787e4bb5 SHA512 b256957d33e160e5419ed03ee6cd4b9e81b1687e9e8c637c4812fafaee81b3910faab535ebce2608e0800527f4188988be85eca6026c26abf2fea370aaae1008 +EBUILD pipewire-9999.ebuild 17708 BLAKE2B c371388e0d2fff6d9a6b06dcb7032b6c0bfbd3c9d3b77f2d244cd334dfdd02609bdcaa23de79bfc9af42aef8257a9b75050fe485d3f87ee52973c994787e4bb5 SHA512 b256957d33e160e5419ed03ee6cd4b9e81b1687e9e8c637c4812fafaee81b3910faab535ebce2608e0800527f4188988be85eca6026c26abf2fea370aaae1008 +MISC metadata.xml 1949 BLAKE2B 8163c9569efec70ed5792f7c82773492da7d888a781b599a48ef851e73c31944a5b437f1a03892300ccd88a386b4f405f847b2708818621b0c2d257940979508 SHA512 3f8037b2f0f06a39186f15bccc1972ec1f65df93ec0484fba2dd186ae529ac63c50047afcf26abbc208e30641181a87e2d98927696c59e624b6465718d083e59 diff --git a/media-video/pipewire/files/0.3.72/001-opus-meson.patch b/media-video/pipewire/files/0.3.72/001-opus-meson.patch new file mode 100644 index 000000000000..a505336e0a31 --- /dev/null +++ b/media-video/pipewire/files/0.3.72/001-opus-meson.patch @@ -0,0 +1,95 @@ +From 14ebb9a568f3d8e1351181300dda93099b52742c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Nikl=C4=81vs=20Ko=C4=BCes=C5=86ikovs?= + <89q1r14hd@relay.firefox.com> +Date: Mon, 26 Jun 2023 17:07:04 +0300 +Subject: [PATCH 1/2] spa/plugins/bluez5/meson: removed some unneeded redefines +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +As far as I can tell, the code in question was not doing anything there +and was also breaking the new code elsewhere, so it was put on the +chopping block. Don't mind the squirming tentacles. + +Signed-off-by: NiklÄvs Koļesņikovs <89q1r14hd@relay.firefox.com> +--- + spa/plugins/bluez5/meson.build | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/spa/plugins/bluez5/meson.build b/spa/plugins/bluez5/meson.build +index e6c52ccc57..80493cfe61 100644 +--- a/spa/plugins/bluez5/meson.build ++++ b/spa/plugins/bluez5/meson.build +@@ -118,16 +118,14 @@ endif + + if ldac_dep.found() + ldac_args = codec_args +- ldac_dep = [ ldac_dep ] + if ldac_abr_dep.found() + ldac_args += [ '-DENABLE_LDAC_ABR' ] +- ldac_dep += ldac_abr_dep + endif + bluez_codec_ldac = shared_library('spa-codec-bluez5-ldac', + [ 'a2dp-codec-ldac.c', 'media-codecs.c' ], + include_directories : [ configinc ], + c_args : ldac_args, +- dependencies : [ spa_dep, ldac_dep ], ++ dependencies : [ spa_dep, ldac_dep, ldac_abr_dep ], + install : true, + install_dir : spa_plugindir / 'bluez5') + endif +@@ -144,7 +142,6 @@ endif + + if get_option('bluez5-codec-opus').allowed() and opus_dep.found() + opus_args = codec_args +- opus_dep = [ opus_dep ] + bluez_codec_opus = shared_library('spa-codec-bluez5-opus', + [ 'a2dp-codec-opus.c', 'media-codecs.c' ], + include_directories : [ configinc ], +-- +GitLab + + +From 23a10a8abb324809d1ebc5d33e36cdfa570390ed Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Nikl=C4=81vs=20Ko=C4=BCes=C5=86ikovs?= + <89q1r14hd@relay.firefox.com> +Date: Mon, 26 Jun 2023 16:35:01 +0300 +Subject: [PATCH 2/2] src/modules/meson: ensure Opus libs were actually found, + too +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The old way fails, if a distro has the header but not the library, +which can happen on at least Gentoo with multilib deployments, +where the shared header is present but non-native libraries might not. + +This could still fail, if a distro had some but not all libraries for +some architectures but hopefully no one did that. In that case, a compile +test would likely be required via cc.check_header() instead but let's try +the faster fix first. + +Reported-by: Sam James <sam@gentoo.org> +Thanks-to: Barnabás PÅ‘cze <pobrn@protonmail.com> +Thanks-to: Xavier Claessens <xavier.claessens@collabora.com> +Signed-off-by: NiklÄvs Koļesņikovs <89q1r14hd@relay.firefox.com> +--- + src/modules/meson.build | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/modules/meson.build b/src/modules/meson.build +index 342bd697b1..970e04db98 100644 +--- a/src/modules/meson.build ++++ b/src/modules/meson.build +@@ -203,7 +203,8 @@ endif + summary({'ffado-driver': build_module_ffado_driver}, bool_yn: true, section: 'Optional Modules') + + opus_custom_h = cc.has_header('opus/opus_custom.h', dependencies: opus_dep) +-if opus_custom_h ++# One would imagine that opus_dep is a requirement but for some reason it's not, so we need to manually check that ++if opus_dep.found() and opus_custom_h + opus_custom_dep = declare_dependency(compile_args: ['-DHAVE_OPUS_CUSTOM'], dependencies: opus_dep) + else + opus_custom_dep = dependency('', required: false) +-- +GitLab diff --git a/media-video/pipewire/files/0.3.72/002-context-segfault-no-fallback.patch b/media-video/pipewire/files/0.3.72/002-context-segfault-no-fallback.patch new file mode 100644 index 000000000000..41998db7ec58 --- /dev/null +++ b/media-video/pipewire/files/0.3.72/002-context-segfault-no-fallback.patch @@ -0,0 +1,32 @@ +https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/4df753d0d7af7e68ab16ee90b94c4ddd44506074 + +From 4df753d0d7af7e68ab16ee90b94c4ddd44506074 Mon Sep 17 00:00:00 2001 +From: Wim Taymans <wtaymans@redhat.com> +Date: Mon, 26 Jun 2023 16:11:33 +0200 +Subject: [PATCH] context: avoid segfault when no fallback driver + +In some cases, there might not be a fallback driver. Handle this without +segfaulting. +--- + src/pipewire/context.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/pipewire/context.c b/src/pipewire/context.c +index daf13c16b..5fd0cdec9 100644 +--- a/src/pipewire/context.c ++++ b/src/pipewire/context.c +@@ -1327,11 +1327,11 @@ again: + if ((t->want_driver && t->active && t->runnable) || + t->always_process) { + driver = target; +- driver->runnable = true; + break; + } + } + if (driver != NULL) { ++ driver->runnable = true; + /* driver needed for this group */ + move_to_driver(context, &collect, driver); + } else { +-- +GitLab diff --git a/media-video/pipewire/metadata.xml b/media-video/pipewire/metadata.xml index 4401131936e1..9e057760e21a 100644 --- a/media-video/pipewire/metadata.xml +++ b/media-video/pipewire/metadata.xml @@ -22,6 +22,7 @@ <flag name="gsettings">Use gsettings (<pkg>dev-libs/glib</pkg>) to read/save used modules (useful for e.g. <pkg>media-sound/paprefs</pkg></flag> <flag name="jack-client">Install a plugin for running PipeWire as a JACK client</flag> <flag name="jack-sdk">Use PipeWire as JACK replacement</flag> + <flag name="liblc3">Allow loading LC3 plugins via <pkg>media-sound/liblc3</pkg></flag> <flag name="lv2">Allow loading LV2 plugins via <pkg>media-libs/lv2</pkg></flag> <flag name="modemmanager">Combined with USE=bluetooth, allows PipeWire to perform telephony on mobile devices.</flag> <flag name="pipewire-alsa">Replace PulseAudio's ALSA plugin with PipeWire's plugin</flag> diff --git a/media-video/pipewire/pipewire-0.3.72.ebuild b/media-video/pipewire/pipewire-0.3.72.ebuild new file mode 100644 index 000000000000..250c3b80d608 --- /dev/null +++ b/media-video/pipewire/pipewire-0.3.72.ebuild @@ -0,0 +1,465 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# 1. Please regularly check (even at the point of bumping) Fedora's packaging +# for needed backports at https://src.fedoraproject.org/rpms/pipewire/tree/rawhide. +# +# 2. Upstream also sometimes amend release notes for the previous release to mention +# needed patches, e.g. https://gitlab.freedesktop.org/pipewire/pipewire/-/tags/0.3.55#distros +# +# 3. Keep an eye on git master (for both PipeWire and WirePlumber) as things +# continue to move quickly. It's not uncommon for fixes to be made shortly +# after releases. + +PYTHON_COMPAT=( python3_{10..11} ) + +inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd tmpfiles udev + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git" + inherit git-r3 +else + if [[ ${PV} == *_p* ]] ; then + MY_COMMIT="" + SRC_URI="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${MY_COMMIT}/pipewire-${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2" + S="${WORKDIR}"/${PN}-${MY_COMMIT} + else + SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2" + fi + + KEYWORDS="~amd64" +fi + +DESCRIPTION="Multimedia processing graphs" +HOMEPAGE="https://pipewire.org/" + +LICENSE="MIT LGPL-2.1+ GPL-2" +# ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49 +SLOT="0/0.4" +IUSE="bluetooth dbus doc echo-cancel extra ffmpeg flatpak gstreamer gsettings ieee1394 jack-client jack-sdk liblc3 lv2" +IUSE+=" modemmanager pipewire-alsa readline sound-server ssl system-service systemd test v4l X zeroconf" + +# Once replacing system JACK libraries is possible, it's likely that +# jack-client IUSE will need blocking to avoid users accidentally +# configuring their systems to send PW sink output to the emulated +# JACK's sink - doing so is likely to yield no audio, cause a CPU +# cycles consuming loop (and may even cause GUI crashes)! + +# - TODO: There should be "sound-server? ( || ( alsa bluetooth ) )" here, but ALSA is always enabled +# - TODO: Pulseaudio alsa plugin performs runtime check that pulseaudio server connection will work +# which provides adequate guarantee that alsa-lib will be able to provide audio services. +# If that works, pulseaudio defaults are loaded into alsa-lib runtime replacing default PCM and CTL. +# When pipewire-alsa will be able to perform similar check, pipewire-alsa can be enabled unconditionally. +# - ffmpeg is only used for pw-cat. We don't build the spa plugin which receives barely any activity. +REQUIRED_USE=" + ffmpeg? ( extra ) + bluetooth? ( dbus ) + jack-sdk? ( !jack-client ) + modemmanager? ( bluetooth ) + system-service? ( systemd ) + !sound-server? ( !pipewire-alsa ) + jack-client? ( dbus ) +" + +RESTRICT="!test? ( test )" + +BDEPEND=" + >=dev-util/meson-0.59 + virtual/pkgconfig + ${PYTHON_DEPS} + $(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]') + dbus? ( dev-util/gdbus-codegen ) + doc? ( + app-doc/doxygen + media-gfx/graphviz + ) +" +# While udev could technically be optional, it's needed for a numebr of options, +# and not really worth it, bug #877769. +RDEPEND=" + acct-group/audio + acct-group/pipewire + media-libs/alsa-lib + sys-libs/ncurses:=[unicode(+)] + virtual/libintl[${MULTILIB_USEDEP}] + virtual/libudev[${MULTILIB_USEDEP}] + bluetooth? ( + dev-libs/glib + media-libs/fdk-aac + media-libs/libldac + media-libs/libfreeaptx + media-libs/opus + media-libs/sbc + >=net-wireless/bluez-4.101:= + virtual/libusb:1 + ) + dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) + echo-cancel? ( media-libs/webrtc-audio-processing:0 ) + extra? ( >=media-libs/libsndfile-1.0.20 ) + ffmpeg? ( media-video/ffmpeg:= ) + flatpak? ( dev-libs/glib ) + gstreamer? ( + >=dev-libs/glib-2.32.0:2 + >=media-libs/gstreamer-1.10.0:1.0 + media-libs/gst-plugins-base:1.0 + ) + gsettings? ( >=dev-libs/glib-2.26.0:2 ) + ieee1394? ( media-libs/libffado[${MULTILIB_USEDEP}] ) + jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) + jack-sdk? ( + !media-sound/jack-audio-connection-kit + !media-sound/jack2 + ) + liblc3? ( media-sound/liblc3 ) + lv2? ( media-libs/lilv ) + modemmanager? ( >=net-misc/modemmanager-1.10.0 ) + pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}] ) + sound-server? ( !media-sound/pulseaudio-daemon ) + readline? ( sys-libs/readline:= ) + ssl? ( dev-libs/openssl:= ) + systemd? ( sys-apps/systemd ) + system-service? ( acct-user/pipewire ) + v4l? ( media-libs/libv4l ) + X? ( + media-libs/libcanberra + x11-libs/libX11 + x11-libs/libXfixes + ) + zeroconf? ( net-dns/avahi ) +" + +DEPEND="${RDEPEND}" + +# TODO: Consider use cases where pipewire is not used for driving audio +# Doing so with WirePlumber currently involves editing Lua scripts +PDEPEND=">=media-video/wireplumber-0.4.8-r3" + +# Present RDEPEND that are currently always disabled due to the PW +# code using them being required to be disabled by Gentoo guidelines +# (i.e. developer binaries not meant for users) and unready code +# media-libs/libsdl2 +# >=media-libs/vulkan-loader-1.1.69 +# +# Ditto for DEPEND +# >=dev-util/vulkan-headers-1.1.69 + +DOCS=( {README,INSTALL}.md NEWS ) + +PATCHES=( + "${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch +) + +python_check_deps() { + python_has_version "dev-python/docutils[${PYTHON_USEDEP}]" +} + +src_prepare() { + default + + # Used for upstream backports + [[ -d "${FILESDIR}"/${PV} ]] && eapply "${FILESDIR}"/${PV} +} + +multilib_src_configure() { + # https://bugs.gentoo.org/838301 + filter-flags -fno-semantic-interposition + + local emesonargs=( + -Ddocdir="${EPREFIX}"/usr/share/doc/${PF} + + $(meson_feature dbus) + $(meson_native_use_feature zeroconf avahi) + $(meson_native_use_feature doc docs) + $(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone + $(meson_native_enabled man) + $(meson_feature test tests) + -Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests + $(meson_feature ieee1394 libffado) + $(meson_native_use_feature gstreamer) + $(meson_native_use_feature gstreamer gstreamer-device-provider) + $(meson_native_use_feature gsettings) + $(meson_native_use_feature systemd) + + $(meson_native_use_feature system-service systemd-system-service) + -Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)" + -Dsystemd-user-unit-dir="$(systemd_get_userunitdir)" + + $(meson_native_use_feature systemd systemd-user-service) + $(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph + -Dspa-plugins=enabled + -Dalsa=enabled # Allows using kernel ALSA for sound I/O (NOTE: media-session is gone so IUSE=alsa/spa_alsa/alsa-backend might be possible) + -Dcompress-offload=disabled # TODO: tinycompress unpackaged + -Daudiomixer=enabled # Matches upstream + -Daudioconvert=enabled # Matches upstream + $(meson_native_use_feature bluetooth bluez5) + $(meson_native_use_feature bluetooth bluez5-backend-hsp-native) + $(meson_native_use_feature bluetooth bluez5-backend-hfp-native) + # https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1379 + $(meson_native_use_feature modemmanager bluez5-backend-native-mm) + $(meson_native_use_feature bluetooth bluez5-backend-ofono) + $(meson_native_use_feature bluetooth bluez5-backend-hsphfpd) + $(meson_native_use_feature bluetooth bluez5-codec-aac) + $(meson_native_use_feature bluetooth bluez5-codec-aptx) + $(meson_native_use_feature bluetooth bluez5-codec-ldac) + $(meson_native_use_feature bluetooth opus) + $(meson_native_use_feature bluetooth bluez5-codec-opus) + $(meson_native_use_feature bluetooth libusb) # At least for now only used by bluez5 native (quirk detection of adapters) + $(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889 + -Dcontrol=enabled # Matches upstream + -Daudiotestsrc=enabled # Matches upstream + -Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020 + $(meson_native_use_feature ffmpeg pw-cat-ffmpeg) + $(meson_native_use_feature flatpak) + -Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph + $(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client + $(meson_use jack-sdk jack-devel) + $(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '') + -Dsupport=enabled # Miscellaneous/common plugins, such as null sink + -Devl=disabled # Matches upstream + -Dtest=disabled # fakesink and fakesource plugins + $(meson_native_use_feature liblc3 bluez5-codec-lc3) + $(meson_native_use_feature lv2) + $(meson_native_use_feature v4l v4l2) + -Dlibcamera=disabled # libcamera is not in Portage tree + $(meson_native_use_feature readline) + $(meson_native_use_feature ssl raop) + -Dvideoconvert=enabled # Matches upstream + -Dvideotestsrc=enabled # Matches upstream + -Dvolume=enabled # Matches upstream + -Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream) + $(meson_native_use_feature extra pw-cat) + -Dudev=enabled + -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d" + -Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install) + -Dlibmysofa=disabled # libmysofa is unpackaged + $(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat) + -Dsession-managers="[]" # All available session managers are now their own projects, so there's nothing to build + + # We still have <5.16 kernels packaged in Gentoo and 6.1 (LTS) only + # just became stable, with 5.15 being the previous LTS. Many people + # are still on it. + -Dpam-defaults-install=true + + # Just for bell sounds in X11 right now. + $(meson_native_use_feature X x11) + $(meson_native_use_feature X x11-xfixes) + $(meson_native_use_feature X libcanberra) + ) + + meson_src_configure +} + +multilib_src_test() { + meson_src_test --timeout-multiplier 10 +} + +multilib_src_install() { + # Our custom DOCS do not exist in multilib source directory + DOCS= meson_src_install +} + +multilib_src_install_all() { + einstalldocs + + if use pipewire-alsa; then + dodir /etc/alsa/conf.d + + # Install pipewire conf loader hook + insinto /usr/share/alsa/alsa.conf.d + doins "${FILESDIR}"/99-pipewire-default-hook.conf + eprefixify "${ED}"/usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf + + # These will break if someone has /etc that is a symbolic link to a subfolder! See #724222 + # And the current dosym8 -r implementation is likely affected by the same issue, too. + dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf + dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf /etc/alsa/conf.d/99-pipewire-default-hook.conf + fi + + # Enable required wireplumber alsa and bluez monitors + if use sound-server; then + dodir /etc/wireplumber/main.lua.d + echo "alsa_monitor.enabled = true" > "${ED}"/etc/wireplumber/main.lua.d/89-gentoo-sound-server-enable-alsa-monitor.lua || die + + dodir /etc/wireplumber/bluetooth.lua.d + echo "bluez_monitor.enabled = true" > "${ED}"/etc/wireplumber/bluetooth.lua.d/89-gentoo-sound-server-enable-bluez-monitor.lua || die + fi + + if use system-service; then + newtmpfiles - pipewire.conf <<-EOF || die + d /run/pipewire 0755 pipewire pipewire - - + EOF + fi + + if ! use systemd; then + insinto /etc/xdg/autostart + newins "${FILESDIR}"/pipewire.desktop-r2 pipewire.desktop + + exeinto /usr/bin + newexe "${FILESDIR}"/gentoo-pipewire-launcher.in-r2 gentoo-pipewire-launcher + + doman "${FILESDIR}"/gentoo-pipewire-launcher.1 + + # Disable pipewire-pulse if sound-server is disabled. + if ! use sound-server ; then + sed -i -s '/pipewire -c pipewire-pulse.conf/s/^/#/' "${ED}"/usr/bin/gentoo-pipewire-launcher || die + fi + + eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher + fi +} + +pkg_postrm() { + udev_reload +} + +pkg_preinst() { + HAD_SOUND_SERVER=0 + HAD_SYSTEM_SERVICE=0 + + if has_version "media-video/pipewire[sound-server(-)]" ; then + HAD_SOUND_SERVER=1 + fi + + if has_version "media-video/pipewire[system-service(-)]" ; then + HAD_SYSTEM_SERVICE=1 + fi +} + +pkg_postinst() { + udev_reload + + use system-service && tmpfiles_process pipewire.conf + + local ver + for ver in ${REPLACING_VERSIONS} ; do + if ver_test ${ver} -le 0.3.66-r1 ; then + elog ">=pipewire-0.3.66 uses the 'pipewire' group to manage permissions" + elog "and limits needed to function smoothly:" + elog + elog "1. Please make sure your user is in the 'pipewire' group for" + elog "the best experience with realtime scheduling (PAM limits behavior)!" + elog "You can add your account with:" + elog " usermod -aG pipewire <youruser>" + elog + elog "2. For the best experience with fast user switching, it is recommended" + elog "that you remove your user from the 'audio' group unless you rely on the" + elog "audio group for device access control or ACLs.:" + elog " usermod -rG audio <youruser>" + elog + + if ! use jack-sdk ; then + elog + elog "JACK emulation is incomplete and not all programs will work. PipeWire's" + elog "alternative libraries have been installed to a non-default location." + elog "To use them, put pw-jack <application> before every JACK application." + elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack" + elog "provider is still needed to compile the JACK applications themselves." + elog + fi + + if use systemd ; then + ewarn + ewarn "PipeWire daemon startup has been moved to a launcher script!" + ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no" + ewarn "longer is set to start a session manager or PulseAudio compatibility daemon (all" + ewarn "lines similar to '{ path = /usr/bin/pipewire*' should be commented out)" + ewarn + ewarn "Those manually starting /usr/bin/pipewire via .xinitrc or similar _must_ from" + ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher instead! It is highly" + ewarn "advised that a D-Bus user session is set up before starting the script." + ewarn + fi + + if use sound-server && ( has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon' ) ; then + elog + elog "This ebuild auto-enables PulseAudio replacement. Because of that, users" + elog "are recommended to edit pulseaudio client configuration files:" + elog "${EROOT}/etc/pulse/client.conf and ${EROOT}/etc/pulse/client.conf.d/enable-autospawn.conf" + elog "if it exists, and disable autospawning of the original daemon by setting:" + elog + elog " autospawn = no" + elog + elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!" + elog + elog "Alternatively, if replacing PulseAudio daemon is not desired, edit" + elog "${EROOT}/usr/bin/gentoo-pipewire-launcher by commenting out the relevant" + elog "command:" + elog + elog "#${EROOT}/usr/bin/pipewire -c pipewire-pulse.conf &" + elog + fi + + if has_version 'net-misc/ofono' ; then + ewarn "Native backend has become default. Please disable oFono via:" + if systemd_is_booted ; then + ewarn "systemctl disable ofono" + else + ewarn "rc-update delete ofono" + fi + fi + fi + done + + if [[ ${HAD_SOUND_SERVER} -eq 0 || -z ${REPLACING_VERSIONS} ]] ; then + # TODO: We could drop most of this if we set up systemd presets? + # They're worth looking into because right now, the out-of-the-box experience + # is automatic on OpenRC, while it needs manual intervention on systemd. + if use sound-server && use systemd ; then + elog + elog "When switching from PulseAudio, you may need to disable PulseAudio:" + elog + elog " systemctl --user disable pulseaudio.service pulseaudio.socket" + elog + elog "To use PipeWire, the user units must be manually enabled" + elog "by running this command as each user you use for desktop activities:" + elog + elog " systemctl --user enable pipewire.socket pipewire-pulse.socket" + elog + elog "A reboot is recommended to avoid interferences from still running" + elog "PulseAudio daemon." + elog + elog "Both new users and those upgrading need to enable WirePlumber" + elog "for relevant users:" + elog + elog " systemctl --user disable pipewire-media-session.service" + elog " systemctl --user --force enable wireplumber.service" + elog + elog "Root user may replace --user with --global to change system default" + elog "configuration for all of the above commands." + elog + fi + + if ! use sound-server ; then + ewarn + ewarn "USE=sound-server is disabled! If you want PipeWire to provide" + ewarn "your sound, please enable it. See the wiki at" + ewarn "https://wiki.gentoo.org/wiki/PipeWire#Replacing_PulseAudio" + ewarn "for more details." + ewarn + fi + fi + + if use system-service && [[ ${HAD_SYSTEM_SERVICE} -eq 0 || -z ${REPLACING_VERSIONS} ]] ; then + ewarn + ewarn "You have enabled the system-service USE flag, which installs" + ewarn "the system-wide systemd units that enable PipeWire to run as a system" + ewarn "service. This is more than likely NOT what you want. You are strongly" + ewarn "advised not to enable this mode and instead stick with systemd user" + ewarn "units. The default configuration files will likely not work out of the" + ewarn "box, and you are on your own with configuration." + ewarn + fi + + elog "For latest tips and tricks, troubleshooting information, and documentation" + elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire" + elog + + optfeature_header "The following can be installed for optional runtime features:" + optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit + + if use sound-server && ! use pipewire-alsa; then + optfeature "ALSA plugin to use PulseAudio interface for output" "media-plugins/alsa-plugins[pulseaudio]" + fi +} diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild index 33887a9e61c1..250c3b80d608 100644 --- a/media-video/pipewire/pipewire-9999.ebuild +++ b/media-video/pipewire/pipewire-9999.ebuild @@ -29,7 +29,7 @@ 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" + KEYWORDS="~amd64" fi DESCRIPTION="Multimedia processing graphs" @@ -38,8 +38,8 @@ HOMEPAGE="https://pipewire.org/" LICENSE="MIT LGPL-2.1+ GPL-2" # ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49 SLOT="0/0.4" -IUSE="bluetooth dbus doc echo-cancel extra ffmpeg flatpak gstreamer gsettings jack-client jack-sdk lv2 -modemmanager pipewire-alsa readline sound-server ssl system-service systemd test v4l X zeroconf" +IUSE="bluetooth dbus doc echo-cancel extra ffmpeg flatpak gstreamer gsettings ieee1394 jack-client jack-sdk liblc3 lv2" +IUSE+=" modemmanager pipewire-alsa readline sound-server ssl system-service systemd test v4l X zeroconf" # Once replacing system JACK libraries is possible, it's likely that # jack-client IUSE will need blocking to avoid users accidentally @@ -106,11 +106,13 @@ RDEPEND=" media-libs/gst-plugins-base:1.0 ) gsettings? ( >=dev-libs/glib-2.26.0:2 ) + ieee1394? ( media-libs/libffado[${MULTILIB_USEDEP}] ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) + liblc3? ( media-sound/liblc3 ) lv2? ( media-libs/lilv ) modemmanager? ( >=net-misc/modemmanager-1.10.0 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}] ) @@ -174,6 +176,7 @@ multilib_src_configure() { $(meson_native_enabled man) $(meson_feature test tests) -Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests + $(meson_feature ieee1394 libffado) $(meson_native_use_feature gstreamer) $(meson_native_use_feature gstreamer gstreamer-device-provider) $(meson_native_use_feature gsettings) @@ -204,10 +207,6 @@ multilib_src_configure() { $(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. - # http://www.bluez.org/le-audio-support-in-pipewire/ - -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 @@ -220,6 +219,7 @@ multilib_src_configure() { -Dsupport=enabled # Miscellaneous/common plugins, such as null sink -Devl=disabled # Matches upstream -Dtest=disabled # fakesink and fakesource plugins + $(meson_native_use_feature liblc3 bluez5-codec-lc3) $(meson_native_use_feature lv2) $(meson_native_use_feature v4l v4l2) -Dlibcamera=disabled # libcamera is not in Portage tree |