diff options
Diffstat (limited to 'media-video')
74 files changed, 4796 insertions, 1275 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz Binary files differindex e9bfd83076b7..eff0931b16a5 100644 --- a/media-video/Manifest.gz +++ b/media-video/Manifest.gz diff --git a/media-video/gaupol/Manifest b/media-video/gaupol/Manifest index a7fe0dcbf5bd..49b852ebbe99 100644 --- a/media-video/gaupol/Manifest +++ b/media-video/gaupol/Manifest @@ -1,5 +1,5 @@ DIST gaupol-1.10.1.tar.gz 580890 BLAKE2B eb3f5bc3f9ec371d4169a9517f83bd42371aa41532f99f650b51e4649f813f0a37c0de5a01f69ee0c73f38cf2b57dd3260b5cac88f4c09785e86da2ec82c0cba SHA512 f294ea10c73dcf9941f70988ae58066917d7b321141e3a3ba3e12810e5f20a4711feca45d354dddc0e104a1ee2496fad24e529b129bdeee1cdb92010ec20be1d DIST gaupol-1.11.tar.gz 581799 BLAKE2B d0f4ad7c71086f585138bde79ba49f43e8e71eba7bc5ef5f0ac324ab962049cd1c71030f5a7d6ec859d4ac32dc7a07c8255ab01d98114629055f777f11210a2e SHA512 8c623f6ed8d189a79a994545be3dd96ae7fec399216520bfe89587a9c0b5917e07b6d80fe1f8a7b2d016b9fb1aa544bdabe103428dc97ea78e6d8c05666d0e9c EBUILD gaupol-1.10.1.ebuild 1610 BLAKE2B 913b19290318c821146465b2fcce0f12d13a438d783e0011ac96a096083237735755d35d03813dad973aa20156bf1d414bf700ae3e91303cad9fcb6608355b12 SHA512 92b5fb0ae733f04a39fbd2d72c33d571d44381b26f7a992a105be3479533427ac27b00ec9678def5a119cee99d701f90edd8c9c473433fbddc4e0431454c982b -EBUILD gaupol-1.11-r1.ebuild 1582 BLAKE2B 32f37a7039e02ef682f44c7c9c61e229dd07263185e66c9c643bede09e25ad516550851a9aa06ebc6e0a63eb84e0b11186234efdce5cb0469e8bdedb96200fc8 SHA512 093640609c6ae3f16088ac5d2dc12d8d02fbb2bef1b0de4e55deafdbe72fd624cd5332b57c792bcf320921cd6f792c1717e2d0f605d622e47ccf6fee7b0895d3 +EBUILD gaupol-1.11-r1.ebuild 1579 BLAKE2B 36d862587a2af9201298ddb9157313c416481daf521147bebbe14835cbe73c01889317a5a21ac4ead4ce7dbf7411d37ef3b8916e824258c0d7cbdbeee6567afa SHA512 a9a012eda5723036ff6427c1c4a0dbb85f7c861b78807e715fa8486c05ee4938fea44f54a160b5e3d17912ec433235b0f61c9da760ba633b64b397fea9c11551 MISC metadata.xml 533 BLAKE2B eb6d56dbe104832c594f306fc020b591b04e4f21d7533740ab613ecf105cdfdc4bc9232fe18bbfc4276cc08063a7a570a1c98025e9c74561b4abda0119e3801e SHA512 49859f8f6b75f20c6cf94f60764c1e688ddf907a7657815574b666fcc7873de0a3105cda9acd9f4bbdb7f658bd0003c67ec1ced72e3d84e15b5d86b64ca91abe diff --git a/media-video/gaupol/gaupol-1.11-r1.ebuild b/media-video/gaupol/gaupol-1.11-r1.ebuild index b8c6438c17c7..da58d3581c24 100644 --- a/media-video/gaupol/gaupol-1.11-r1.ebuild +++ b/media-video/gaupol/gaupol-1.11-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/otsaloma/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 arm64 x86" IUSE="spell" RDEPEND=" diff --git a/media-video/libva-utils/Manifest b/media-video/libva-utils/Manifest index b26c32897c88..421e556c36b3 100644 --- a/media-video/libva-utils/Manifest +++ b/media-video/libva-utils/Manifest @@ -1,7 +1,6 @@ -AUX libva-utils-2.10.0_test_in_sandbox.patch 526 BLAKE2B 8275555ee777b8e66852730a084911a44b74ebb3cfe378d5f60d2e1a95f3cf8185506788af2e8606a23bc233623a59eaa7554b68f16555ba35b941b1c59dae3a SHA512 980424fbbd5215da672819963fd5e36a7900955752f42632cf8258efef577f5a511e8a961e273141c4acf83f8c6bb5783561c256b730992a03bd9c914510209e -DIST libva-utils-2.13.0.tar.gz 1230036 BLAKE2B 4e70a13fb9b4362713b6f461a0ee199b8f7e9d9cbac7bc664c11870db92a87873d73306b5777c554830b932a15e726965e1db3591fd1349fb62f068617dd8558 SHA512 81c7c122a4d1bdf8d390a4ea3e0d34499158fb7b7fe0f7aa9d556158895e755139975fd01d73d883897c0a4390612d131b6349febbdf16fa5edcd46a6a82acd2 DIST libva-utils-2.14.0.tar.gz 1241072 BLAKE2B 17f1e0badb05e39f3979bde652dfe6832e8bfb2accd99fd6c5d972090cfce630e2a93ad96e5d17bc7bd9c393b12c2a7b066cb60a715c2dbb128dd263c480bcca SHA512 631e9becf5b2f6d083906962c004c9080d2e2b2d98b6003638a31dde8ad4e2549606301b97e88822471e29007232fc470a2116be09dc0c55d3cc2df6a45a7be1 -EBUILD libva-utils-2.13.0.ebuild 2365 BLAKE2B 9bf8572aabdbf1eecb5d7ee1d4fb66d1193d1082862e5a1e8839c819c57d2f79f242ecc8dfa83571a9e6e461c0d68b4d68763985797c79436bba78f8d064b4d2 SHA512 78e1c3582322968308b135f165296481881d0cc07d34d4defe2388c6a791283fc077c03e66dd68598c60e967b4648fe349fcf94a9c170dba5612be20e0e47e39 +DIST libva-utils-2.15.0.tar.gz 1245559 BLAKE2B 92fe1e7dbd3c953eecb351625213c2b537ad640f61534f3316d3a46070cb3818b4acafbc7a666e24b51d0900cea044074a7a6519f3c4aba6d2a38cf6ed0b2d66 SHA512 90cfa83fb7443fc90558c148c740c9c272796197fba49ff0179af94c40e97c830fc26c534e9a74fa58f597075f9ba68b477aabc784148c14dc09bde07f23cdeb EBUILD libva-utils-2.14.0.ebuild 2008 BLAKE2B a8aac0631df452323aa175609632443c38f76f7d0d1bdb9a818d170a384416ddb51b14d264a83944fa97aee452024f44a387f3992d9fcb5d1275f143e2bd8147 SHA512 52e8fe84be9f693b1297f220fc8498fe7cc6dff6a343a9b515fb99b256d0a2b5fa31f027ee9bcd4b6f3c67283f751dea233e0b971b58e6f0330cc95e2ecc5629 -EBUILD libva-utils-9999.ebuild 2012 BLAKE2B 92feda6a6485ba3ad93f2e29e9d555c93492455bb87c37296ada700311d29b95c45b6504f6ebcfe45cb721cf64a1acd92dd13f7f23386d2b517e4d5b0ce4a382 SHA512 1ec5d41926a58d4d57c7025abcf61c07fde1c211f6a897e314730de8a24eb51ec08458a50b43c86a5e59cc4df38510fa6fe9d691452f32ed9436e1db26414ec3 -MISC metadata.xml 761 BLAKE2B 5aaf0b0be9bf41a00d7df2bfd5975ea0f0e2b257e091b77752db8e29ed358a919fd9c9aaf6296f665a2d5f8864766893044064f8ccff9be7d66c41993d6bd454 SHA512 e5fdc3992abc81021b2ec939ea4ab11a997ae0374e3bc6ba87b49127a7478e023283614a9fc39ec9f33f5221469587196d932bf85da9f0a99f134673d6d5f006 +EBUILD libva-utils-2.15.0.ebuild 1889 BLAKE2B ad1ea2a23c7b442b24a0a60be02f19f67c0e36812d0583cfd3d4254ff91b5b4a6415ae79fcd96702312534dd147b8b6548778d9a1bd39c5c92f331fba5834302 SHA512 034c63820418b13c50e564f61135cc07ef82a4491e6208fdc32c1b9ca0eadc151c7c640a6748ab0ecac8f563f56f7dc672e2442748dae8c9a9dcd872533f2fec +EBUILD libva-utils-9999.ebuild 1889 BLAKE2B ad1ea2a23c7b442b24a0a60be02f19f67c0e36812d0583cfd3d4254ff91b5b4a6415ae79fcd96702312534dd147b8b6548778d9a1bd39c5c92f331fba5834302 SHA512 034c63820418b13c50e564f61135cc07ef82a4491e6208fdc32c1b9ca0eadc151c7c640a6748ab0ecac8f563f56f7dc672e2442748dae8c9a9dcd872533f2fec +MISC metadata.xml 598 BLAKE2B 22e12ade6d6847d659971976ffb272dea97d6a8579cf6b39720a0a4eca5336644dbcf7276892f707e9e4e454f9bc523ff5fe6cab2f2e4602c3f09af3d52168cb SHA512 e6f11bd15f5f666fc22a87070e388f5e9244f15c4ef244ae225f7082da39ebd7a48d2539ca6eb0c2c08ff71e1f7613a72d40e0ff9d2919012a68411166d86765 diff --git a/media-video/libva-utils/files/libva-utils-2.10.0_test_in_sandbox.patch b/media-video/libva-utils/files/libva-utils-2.10.0_test_in_sandbox.patch deleted file mode 100644 index c35e5926796f..000000000000 --- a/media-video/libva-utils/files/libva-utils-2.10.0_test_in_sandbox.patch +++ /dev/null @@ -1,17 +0,0 @@ -There are only two test compatible with portage sandbox. -All other tests require access to install VA driver and -Intel video on the host machine. - -https://bugs.gentoo.org/647746 -https://bugs.gentoo.org/632180 -https://bugs.gentoo.org/714126 -https://bugs.gentoo.org/758620 ---- a/test/Makefile.am -+++ b/test/Makefile.am -@@ -91,4 +91,4 @@ test_va_api_CXXFLAGS = \ - $(NULL) - - check-local: test_va_api -- $(builddir)/test_va_api -+ $(builddir)/test_va_api '--gtest_filter=Internal.*:VAAPIInitTerminate.InitTermWithoutDisplay' - diff --git a/media-video/libva-utils/libva-utils-2.13.0.ebuild b/media-video/libva-utils/libva-utils-2.13.0.ebuild deleted file mode 100644 index 20c064a87332..000000000000 --- a/media-video/libva-utils/libva-utils-2.13.0.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="Collection of utilities and tests for VA-API" -HOMEPAGE="https://01.org/linuxmedia/vaapi" -if [[ ${PV} = *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/intel/libva-utils" -else - # Tarball with pre-built 'configure' not always available, portage use tarballs - # without pre-built 'configure' as they are always available upstream. - # SRC_URI="https://github.com/intel/libva-utils/releases/download/${PV}/${P}.tar.bz2" - SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="+drm examples putsurface test test-va-api +vainfo wayland X" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - || ( drm wayland X ) - putsurface? ( || ( wayland X ) ) - putsurface? ( drm ) - || ( examples putsurface test-va-api vainfo ) -" - -BDEPEND="virtual/pkgconfig" - -if [[ ${PV} = *9999 ]] ; then - DEPEND="~x11-libs/libva-${PV}:=[drm?,wayland?,X?]" -else - DEPEND=">=x11-libs/libva-$(ver_cut 1-2).0:=[drm?,wayland?,X?]" -fi - -DEPEND+=" - wayland? ( >=dev-libs/wayland-1.0.6 ) - X? ( >=x11-libs/libX11-1.6.2 ) -" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/${PN}-2.10.0_test_in_sandbox.patch" ) - -# CONTRIBUTING.md and README.md are avaialbe only in .tar.gz tarballs and in git -DOCS=( NEWS CONTRIBUTING.md README.md ) - -src_prepare() { - default - - sed -e 's/-Werror//' -i test/Makefile.am || die - - if ! use examples ; then - sed -E -e '/^SUBDIRS \+?=/s!( decode\>| encode\>| videoprocess\>| vendor/intel\>| vendor/intel/sfcsample\>)!!g' -i Makefile.am || die - fi - - if ! use putsurface ; then - sed -E -e '/^SUBDIRS \+?=/s! putsurface\>!!g' -i Makefile.am || die - fi - - if ! use vainfo ; then - sed -E -e '/^SUBDIRS \+?=/s! vainfo\>!!g' -i Makefile.am || die - fi - - eautoreconf -} - -src_configure() { - local myeconfargs=( - $(use_enable drm) - $(use_enable test tests) - $(use_enable wayland) - $(use_enable X x11) - ) - - if use test || use test-va-api ; then - myeconfargs+=( --enable-tests ) - else - myeconfargs+=( --disable-tests ) - fi - - econf "${myeconfargs[@]}" -} - -src_install() { - default - - if ! use test-va-api ; then - if [[ -e "${ED}"/usr/bin/test_va_api ]] ; then - rm -f "${ED}"/usr/bin/test_va_api || die - fi - fi -} diff --git a/media-video/libva-utils/libva-utils-2.15.0.ebuild b/media-video/libva-utils/libva-utils-2.15.0.ebuild new file mode 100644 index 000000000000..428cc77cbc2d --- /dev/null +++ b/media-video/libva-utils/libva-utils-2.15.0.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson + +DESCRIPTION="Collection of utilities and tests for VA-API" +HOMEPAGE="https://01.org/linuxmedia/vaapi" +if [[ ${PV} = *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/intel/libva-utils" +else + SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="examples putsurface test +vainfo wayland X" +RESTRICT="test" # Tests must be run manually + +REQUIRED_USE=" + putsurface? ( || ( wayland X ) ) + || ( examples putsurface test vainfo ) +" + +DEPEND=" + x11-libs/libdrm + wayland? ( >=dev-libs/wayland-1.0.6 ) + X? ( >=x11-libs/libX11-1.6.2 ) +" +if [[ ${PV} = *9999 ]] ; then + DEPEND+="~x11-libs/libva-${PV}:=[drm(+),wayland?,X?]" +else + DEPEND+=">=x11-libs/libva-$(ver_cut 1-2).0:=[drm(+),wayland?,X?]" +fi +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + default + + local sed_args=() + + if ! use examples ; then + sed_args+=( + -e "/^subdir('decode')$/d" + -e "/^subdir('encode')$/d" + -e "/^subdir('videoprocess')$/d" + -e "/^subdir('vendor\/intel')$/d" + -e "/^subdir('vendor\/intel\/sfcsample')$/d" + ) + fi + + if ! use putsurface ; then + sed_args+=(-e "/^subdir('putsurface')$/d") + fi + + if ! use vainfo ; then + sed_args+=(-e "/^subdir('vainfo')$/d") + fi + + if [[ ${#sed_args[@]} -gt 0 ]] ; then + sed "${sed_args[@]}" -i meson.build || die + fi +} + +src_configure() { + local emesonargs=( + -Ddrm=true + $(meson_use X x11) + $(meson_use wayland) + $(meson_use test tests) + ) + meson_src_configure +} + +src_install() { + meson_src_install + + if ! use test ; then + rm -f "${ED}"/usr/bin/test_va_api || die + fi +} + +pkg_postinst() { + if use test ; then + elog "Tests must be run manually with the test_va_api binary" + fi +} diff --git a/media-video/libva-utils/libva-utils-9999.ebuild b/media-video/libva-utils/libva-utils-9999.ebuild index 4decf846c639..428cc77cbc2d 100644 --- a/media-video/libva-utils/libva-utils-9999.ebuild +++ b/media-video/libva-utils/libva-utils-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit meson @@ -25,29 +25,24 @@ REQUIRED_USE=" || ( examples putsurface test vainfo ) " -BDEPEND="virtual/pkgconfig" - -if [[ ${PV} = *9999 ]] ; then - DEPEND="~x11-libs/libva-${PV}:=[drm(+),wayland?,X?]" -else - DEPEND=">=x11-libs/libva-$(ver_cut 1-2).0:=[drm(+),wayland?,X?]" -fi - -DEPEND+=" +DEPEND=" + x11-libs/libdrm wayland? ( >=dev-libs/wayland-1.0.6 ) X? ( >=x11-libs/libX11-1.6.2 ) " +if [[ ${PV} = *9999 ]] ; then + DEPEND+="~x11-libs/libva-${PV}:=[drm(+),wayland?,X?]" +else + DEPEND+=">=x11-libs/libva-$(ver_cut 1-2).0:=[drm(+),wayland?,X?]" +fi RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" src_prepare() { default local sed_args=() - # Fix broken dependency check - # https://github.com/intel/libva-utils/pull/260 - sed_args+=(-e "s/dependency('drm'/dependency('libdrm'/") - if ! use examples ; then sed_args+=( -e "/^subdir('decode')$/d" diff --git a/media-video/libva-utils/metadata.xml b/media-video/libva-utils/metadata.xml index 1952a21fa412..16a009c1734f 100644 --- a/media-video/libva-utils/metadata.xml +++ b/media-video/libva-utils/metadata.xml @@ -6,10 +6,8 @@ <name>Alexis Ballier</name> </maintainer> <use> - <flag name="drm">Enables VA/DRM API support.</flag> <flag name="examples">Build and install decode, encode, videoprocess and other VA-API examples.</flag> <flag name="putsurface">Build and install putsurface tool.</flag> - <flag name="test-va-api">Install test_va_api tool for thorough testing of the installed VA-API.</flag> <flag name="vainfo">Build and install vainfo tool.</flag> </use> <upstream> diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest index 2b25fa2373cb..efa980a63bca 100644 --- a/media-video/makemkv/Manifest +++ b/media-video/makemkv/Manifest @@ -1,6 +1,7 @@ -AUX makemkv-flags.patch 481 BLAKE2B 26ea134bddf0c1168944bc76de20cf1b860178a990dab88ee61f3656495ea125d97e929e0626b6626f2fa12e1219e3dcfb80067e9f682311bb75d8750dc7eddb SHA512 c43c28774e9750f79624ff682bbcd8566aadf18bf4c44692d214e80f654eecf63f26bcaa8c7292d4d8e3969350f50f0b720982099e0114866630a8c0828088a7 +AUX makemkv-flags.patch 1014 BLAKE2B 335c3d9bb8f48e2af9b6ee82d9fcebe980ece2b02e5429aa716ebcbdbf42e8ebfb40ebe850957207996a9def153235afd336d620dbe54eb3b8cd240524d97673 SHA512 181a2d551a90dec314e9359b3dad520ddc281e99fccafc2c1c8dd24cb82443402b94398e4fa87116ffc714ceec67bf55fde91ba316e62165a3f01a4acade2111 AUX makemkv-path.patch 1579 BLAKE2B 6ca7ed6c854c0357fea864bedc3f65a1051a466a52db1380bf1904c97bfa2b455beeb7ff9852fe57f6d224ed659df63d02db96a281be7a14f0587bece9aff75b SHA512 9294d3645b953fdb7ca24e83066becfbf07e03cab01d0aaf4527cf2d54fb0990649da1f766836a0f3efea9c363c8f00116b4624c49fd7bcfa197cae2ef17e6ed -DIST makemkv-bin-1.16.7.tar.gz 16130689 BLAKE2B 6535cbeb65d0166c5093920f2064065f4d7a3ea0232878dfeda76f5ea53dad68e2da10894dcbeaab706c93b733f32e9c316a07a9365f43943a1f0710a48af83f SHA512 8233affac002a4ec9b0d37746371d2f582f5ebbb18621bb4801442bab2f8b79616b7f641893b896c350a8a7e8f09368b8b4acae58a6ab32a591926d98b808be1 -DIST makemkv-oss-1.16.7.tar.gz 6541953 BLAKE2B 28273db7300532b1ce2ab63629aa5ceb90059e4e02ea22e6f2764e727946fe6e6dbc45e16c743bf239e3bdfe015e447e662d0c5e838ada8564d0e251721a6bcc SHA512 6e8159b344caa70103369585f5a2f12dcfb6e5d6f65fb19466dab97dbf690cecaa1f08f6501342007966c23a08aa13f625eca078e270c8bb651d9b896a5977ff -EBUILD makemkv-1.16.7.ebuild 3062 BLAKE2B da5bfc8f074694402ad05878fcec5590a64e520a2793a509d28ce91cc5e63be150ab551bf0f9adb9d7bb0a2afd75cd3f72da9a2c68c6bd55ff80ccf080312ede SHA512 f64291ca19f83a2a32401376c93be2129a52146234d4d8185af9b6cae6081a5fb79e23c4be70abd250bd0b1c0a17fb0d4450c20f0aca7530e3f34b7306461405 +AUX makemkvcon.1 6118 BLAKE2B bf8f7665d7b367e4dc5cfb12136cb91271087991d86bb0c2bfe6fe41def407539276114f95548cd867c49bc10bed25cec51ac00dbd6defe5df7fd82f2fe29b25 SHA512 a9334a96fcc90932a109c2d74b1769ab60e652a1e860399d8a486bd36ba02fbdabf55816059e0c51e3e4826824b7798f86b85cb5e22a4d13c2e18a2944522ac4 +DIST makemkv-bin-1.17.0.tar.gz 16332197 BLAKE2B 9a51f7802c54ad7cfba5678ea1caf45d5099f9479fe1c6bdb4be05fe29d738b69d780c747e69147ef0eed85d9bc1174e0a959642039276ede9fe0a693d377b85 SHA512 f60ad2279e738e91dbe9d716a64102212b00bc32819907ebf4da8ea2127d74bb577dee25f3efb16da6393b1e29d3a2a09498dec93fc70940175471f0a4744939 +DIST makemkv-oss-1.17.0.tar.gz 6631571 BLAKE2B fd4c383deb26a948079005671e59d3bc3230612b7b405ee8587684922175a94beee4f4ba2ab7e4d0052ca09f6fdabaca4ef008a5a711d77c7e861dc879df3120 SHA512 895c0edd429e934d72f851a6cbbfe6df183e246e65a2899945e77917c612e7ee04251c4a22f94f2d7df547ce58ddded4fd451497791c56fe473b1d201aaa52e6 +EBUILD makemkv-1.17.0.ebuild 3128 BLAKE2B 6acd4e23e9d48ec8323d50cf7d9fa5a23030a4cff1f9c0f5a4324b94a3270f783d27bca334d5961242d29f4fb0878f9236e02dba6d7099c9fe4683068ca466f4 SHA512 bf532c4351a440cf31445da19288229e8c7c1b29efa6b111d135d5b3834075a69033fa3b28a9ed33269275b062c16a6f46bf8c58a078e342193f2efa40d2e715 MISC metadata.xml 1272 BLAKE2B 7c02bfcb2638d2f33c6fbee2d0e79b6d7d270b8209f7ec82ec51d7cf0e19b94936ee599b618f9a6b9df280fc403b0890b2c8e2323525f6d50b79fc19d26c8756 SHA512 8de92a5802b26a98984be7b5e3c0868b249c14a77a690a186dc4361db1508b79c7ebccd261e7fe9251b2d4abbbe2b93aec8a91efeafc00baada2839020a9207f diff --git a/media-video/makemkv/files/makemkv-flags.patch b/media-video/makemkv/files/makemkv-flags.patch index d7a2f1be16c5..0f05aa7a751b 100644 --- a/media-video/makemkv/files/makemkv-flags.patch +++ b/media-video/makemkv/files/makemkv-flags.patch @@ -1,11 +1,17 @@ ---- a/Makefile.in 2021-03-19 13:06:50.000000000 +0000 -+++ b/Makefile.in 2021-03-30 23:28:42.720480399 +0100 -@@ -112,7 +112,7 @@ - +diff -Naur a/Makefile.in b/Makefile.in +--- a/Makefile.in 2022-06-26 20:14:12.000000000 +0100 ++++ b/Makefile.in 2022-07-07 13:28:27.481730073 +0100 +@@ -113,12 +113,12 @@ + out/mmccextr.full: $(MMCCX_SRC) tmp/gen_buildinfo.h mkdir -p out - $(GCC) $(CFLAGS) $(MMCCEXTR_DEF) -DHAVE_BUILDINFO_H -Itmp -D_GNU_SOURCE -o$@ $(MMCCX_SRC) -lc \ + $(GCC) $(CFLAGS) $(LDFLAGS) $(MMCCEXTR_DEF) -DHAVE_BUILDINFO_H -Itmp -D_GNU_SOURCE -o$@ $(MMCCX_SRC) -lc \ -ffunction-sections -Wl,--gc-sections -Wl,-z,defs - - tmp/gen_buildinfo.h: + + out/mmgplsrv.full: $(MMGPL_SRC) + mkdir -p out +- $(GCC) $(CFLAGS) $(INCF)$(MMGPL_INC) $(INCF)$(DVDNAV_INC) $(INCF)$(DVDREAD_INC) $(INCF)$(MAKEMKVGUI_INC) $(INCF)$(LIBMAKEMKV_INC) \ ++ $(GCC) $(CFLAGS) $(LDFLAGS) $(INCF)$(MMGPL_INC) $(INCF)$(DVDNAV_INC) $(INCF)$(DVDREAD_INC) $(INCF)$(MAKEMKVGUI_INC) $(INCF)$(LIBMAKEMKV_INC) \ + $(INCF)$(LIBDRIVEIO_INC) $(INCF)$(LIBABI_INC) $(MMGPL_DEF) -D_GNU_SOURCE -Dstl=std -o$@ $(MMGPL_SRC) $(MMGPL_SRC_LINUX) -lc -lstdc++ \ + -ffunction-sections -Wl,--gc-sections -Wl,-z,defs diff --git a/media-video/makemkv/files/makemkvcon.1 b/media-video/makemkv/files/makemkvcon.1 new file mode 100644 index 000000000000..0abeaa5387e0 --- /dev/null +++ b/media-video/makemkv/files/makemkvcon.1 @@ -0,0 +1,242 @@ +'\" t +.\" Title: makemkvcon +.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] +.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/> +.\" Date: 05/20/2020 +.\" Manual: \ \& +.\" Source: \ \& +.\" Language: English +.\" +.TH "MAKEMKVCON" "1" "05/20/2020" "\ \&" "\ \&" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +makemkvcon \- MakeMKV console application +.SH "SYNOPSIS" +.sp +\fBmakemkvcon\fR [\fIOPTIONS\fR] <backup|info|mkv> [\fIPARAMETERS\fR] +.SH "DESCRIPTION" +.sp +Command\-line options for MakeMKV\&. +.sp +Configuration options and setup keys are located in ~/\&.MakeMKV/ +.SH "OPTIONS" +.sp +General options: +.PP +\fB\-\-messages=\fR\fIFILE\fR +.RS 4 +Output all messgaes to a file\&. Special file names: stdout, stderr, null\&. Default is to stdout\&. +.RE +.PP +\fB\-\-progress=\fR\fIFILE\fR +.RS 4 +Output all progress messages to a file\&. Special file names: stdout, stderr, null\&. Use +\fB\-same\fR +to use +\fB\-\-messages\fR +argument\&. Default is no output\&. +.RE +.PP +\fB\-\-debug\fR[=\fIFILE\fR] +.RS 4 +Enables debug messages\&. Optionally saves to output file\&. +.RE +.PP +\fB\-\-directio=[true|false]\fR +.RS 4 +Enables or disables direct disc access\&. +.RE +.PP +\fB\-\-noscan\fR +.RS 4 +Don\(cqt access any media during disc scan and do not check for media insertion and removal\&. Helpful when other applications are already accessing discs in other drives\&. +.RE +.PP +\fB\-\-cache=\fR\fISIZE\fR +.RS 4 +Specifies size of read cache in megabytes\&. By default program uses a huge amount of memory\&. About 128 MB is recommended for streaming and backup, 512MB for DVD conversion and 1024MB for Blu\-ray conversion\&. +.RE +.PP +\fB\-r, \-\-robot\fR +.RS 4 +Enables automation mode\&. Program will output more information in a format that is easier to parse\&. All output is line\-based and output is flushed on line end\&. All strings are quoted, all control characters and quotes are backlash\-escaped\&. If you automate this program it is highly recommended to use this option\&. Some options make reference to apdefs\&.h file that can be found in MakeMKV open\-source package, included with version for Linux\&. These values will not change in future versions\&. +.RE +.sp +Backup options: +.PP +\fB\-\-decrypt\fR +.RS 4 +Decrypt stream files during backup\&. Default: no decryption\&. +.RE +.PP +\fB\-\-minlength\fR=\fISECONDS\fR +.RS 4 +Specify minimum title length\&. Default: program preferences\&. +.RE +.SH "COMMANDS" +.sp +\fBbackup\fR Backup disc\&. +.sp +\fBinfo\fR Display information about a disc\&. +.sp +\fBmkv\fR Copy titles from disc\&. +.sp +\fBf\fR Run universal firmware tool\&. +.SH "PARAMETERS" +.PP +\fBsource iso:\fR\fIFILENAME\fR +.RS 4 +Open ISO image\&. +.RE +.PP +\fBsource file:\fR\fIDIRECTORY\fR +.RS 4 +Open files in directory\&. +.RE +.PP +\fBsource disc:\fR\fIDISC ID\fR +.RS 4 +Open disc with ID\&. +.RE +.PP +\fBsource dev:\fR\fIDEVICE\fR +.RS 4 +Open disc with device name\&. +.RE +.SH "EXAMPLES" +.sp +Copy all titles from first disc and save as MKV files into current directory: +.sp +.if n \{\ +.RS 4 +.\} +.nf +makemkvcon mkv disc:0 all \&. +.fi +.if n \{\ +.RE +.\} +.sp +List all available drives: +.sp +.if n \{\ +.RS 4 +.\} +.nf +makemkvcon \-r \-\-cache=1 info disc:9999 +.fi +.if n \{\ +.RE +.\} +.sp +Backup first disc decrypting all video files in automation mode with progress output: +.sp +.if n \{\ +.RS 4 +.\} +.nf +makemkvcon backup \-\-decrypt \-\-cache=16 \-\-noscan \-r \-\-progress=\-same disc:0 \&. +.fi +.if n \{\ +.RE +.\} +.SH "MESSAGE FORMATS" +.sp +\fBMessage output\fR +.sp +MSG:code,flags,count,message,format,param0,param1,\&... +.sp +code \- unique message code, should be used to identify particular string in language\-neutral way\&. +.sp +flags \- message flags, see AP_UIMSG_xxx flags in apdefs\&.h +.sp +count \- number of parameters +.sp +message \- raw message string suitable for output +.sp +format \- format string used for message\&. This string is localized and subject to change, unlike message code\&. +.sp +paramX \- parameter for message +.sp +\fBCurrent and total progress title\fR +.sp +PRGC:code,id,name +.sp +PRGT:code,id,name +.sp +code \- unique message code +.sp +id \- operation sub\-id +.sp +name \- name string +.sp +\fBProgress bar values for current and total progress\fR +.sp +PRGV:current,total,max +.sp +current \- current progress value +.sp +total \- total progress value +.sp +max \- maximum possible value for a progress bar, constant +.sp +\fBDrive scan messages\fR +.sp +DRV:index,visible,enabled,flags,drive name,disc name +.sp +index \- drive index +.sp +visible \- set to 1 if drive is present +.sp +enabled \- set to 1 if drive is accessible +.sp +flags \- media flags, see AP_DskFsFlagXXX in apdefs\&.h +.sp +drive name \- drive name string +.sp +disc name \- disc name string +.sp +\fBDisc information output messages\fR +.sp +TCOUT:count +.sp +count \- titles count +.sp +\fBDisc, title and stream information\fR +.sp +CINFO:id,code,value +.sp +TINFO:id,code,value +.sp +SINFO:id,code,value +.sp +id \- attribute id, see AP_ItemAttributeId in apdefs\&.h +.sp +code \- message code if attribute value is a constant string +.sp +value \- attribute value +.SH "RESOURCES" +.sp +Console usage: https://www\&.makemkv\&.com/developers/usage\&.txt +.sp +MakeMKV for Linux forum: https://www\&.makemkv\&.com/forum/viewforum\&.php?f=3 +.sp +Main web site: https://www\&.makemkv\&.com/ diff --git a/media-video/makemkv/makemkv-1.16.7.ebuild b/media-video/makemkv/makemkv-1.17.0.ebuild index 23a32955e746..7bb22f94b4f1 100644 --- a/media-video/makemkv/makemkv-1.16.7.ebuild +++ b/media-video/makemkv/makemkv-1.17.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -100,6 +100,9 @@ src_install() { # install profiles and locales insinto /usr/share/MakeMKV doins src/share/* + + # install unofficial man page + doman "${FILESDIR}"/makemkvcon.1 } pkg_postinst() { diff --git a/media-video/mjpg-streamer/Manifest b/media-video/mjpg-streamer/Manifest index f36b567df5fe..388c1cfe3df1 100644 --- a/media-video/mjpg-streamer/Manifest +++ b/media-video/mjpg-streamer/Manifest @@ -1,6 +1,6 @@ AUX make-var-instead-of-cmd.patch 3716 BLAKE2B 322c6ada49e976840e949ca781eca29e1008c781c6aa578586bb7ef522b6fe2227a9c6b6f60ac7d4d1c982ddf926e522798aa7ebde74d2a272e57b4d8c2c1cef SHA512 e585b6f2988020087ffd2dd33878e6392baeb94f6020471ade157d1f27df073f363f5fc05107ef1b21fad69aaacf0a53096e48ce5c8eeaf77a6a328780d64e9d AUX mjpg-streamer.confd 347 BLAKE2B f544307fca9e420d5a8edd3b8ea1834dc5d9125d2aba627361ef381329036831ee2d19925dff5f5cc7fb5b1d6623dcb33e74c68966d88749cd9b84325aa78f5c SHA512 15841b10f0caa136b58372e180bfc3a0198d323ef2df22ddd2b334c09d0d376cac78d799c327306105bc97648ee40a3d0c78ef013a421f9468be7f89278baa33 -AUX mjpg-streamer.initd 1265 BLAKE2B e42564a98636a1a5dc059bd418e281ab6da494f88cb64cd56c58401d55c4e02208c5f45289d0ee04ce16fe4118a7cbcd2f5f2d4a289f171be790bbb5e8d81a3e SHA512 4cc90922e9fbd966f9a41719e18672e46a94a7206f18e12e8ac19bd40de3944597f0323c42862731079201367381af9de8cfd4ee8d89f7fc3173640fda9ef5d9 +AUX mjpg-streamer.initd 1291 BLAKE2B a3baa4d0f67a89eee8beff48cbc9c13ba3c9bde7f973668e92ad4901db5b2054b66fd9bf19f7bbfbe291395ad6098032fb8a25a53950c4cdc8823dc93fa1ef43 SHA512 3fbdd4e8d17d5f4e49c3a2620550fddca3733593e6e84ea5907362762e420c68301ecccbcac1e8e64a3ec05d47a43276ba4ca21717425a38bb04d068d46c9cfa AUX to-work-with-kernel-3.18.patch 2832 BLAKE2B 157c3c5c30973cdc64d9bd0a5cadba238dd6e33d72b96b0776065f57bb34e14f47336e509e8dbf1fe6fbb8f715fd99837b42e9ecec6fcc4c5da1101300c1e900 SHA512 c619c788fd09118f309b081eabb7f80835690923e098368f16f26a7b4e6b63e494dd5f91a9fe73d83b3151b77dd6393263ab3756f7d8b3a6286ac3d52f1e89c8 DIST mjpg-streamer-0_pre20120621.tar.bz2 471546 BLAKE2B 3ede2a60062bba7c91ddfa0d7151e32cd8dac11a083cc6a88dc350a523174685b2ff066fa99db13b82a6a4960d370b97b27aa3663ac323fa54908bb0108857d0 SHA512 dfc6077ec03fe4f239d8e25b65b7808bd489a954d8cf3aeed444e68fd9536720c2c888a5fa9f4b8d0152dab5ca0bd166a46f2cb22a357ba816eb5bc79ff11332 DIST mjpg-streamer-0_pre20200524.tar.gz 711183 BLAKE2B 3a40f20f518a53c0c6046cf37728c46c2a843a1dd0ef0086c77940b5133f1337445b1edb2c21edc1bbacc588f7c7b45b1530871c944695c2ae02cf327fde6847 SHA512 d6e910f6693b27c16c33749458affcb4d9336bd15c642156c452fcbc4a8c2ba9f4a6102e6b94f698fc6fb48da9564a09cb0f804a5ac52201e566adf798a70ba2 diff --git a/media-video/mjpg-streamer/files/mjpg-streamer.initd b/media-video/mjpg-streamer/files/mjpg-streamer.initd index e7116dba01d2..3b307e777c94 100644 --- a/media-video/mjpg-streamer/files/mjpg-streamer.initd +++ b/media-video/mjpg-streamer/files/mjpg-streamer.initd @@ -3,7 +3,7 @@ # Distributed under the terms of the GNU General Public License v2 MJPG_STREAMER_PIDFILE="${MJPG_STREAMER_PIDFILE:-/var/run/${SVCNAME}.pid}" -MY_NAME=${SVCNAME//-/_} +MY_NAME=$(printf %s "${SVCNAME}" | tr - _) depend() { use logger @@ -11,17 +11,16 @@ depend() { } checkconfig() { - local vars + set -- - [[ ${INPUT_PLUGIN} ]] || vars+=\ INPUT_PLUGIN - [[ ${OUTPUT_PLUGIN} ]] || vars+=\ OUTPUT_PLUGIN - [[ ${MJPG_STREAMER_USER} ]] || vars+=\ MJPG_STREAMER_USER - [[ ${MJPG_STREAMER_GROUP} ]] || vars+=\ MJPG_STREAMER_GROUP - vars="${vars# }" + [ "${INPUT_PLUGIN}" ] || set -- "$@" INPUT_PLUGIN + [ "${OUTPUT_PLUGIN}" ] || set -- "$@" OUTPUT_PLUGIN + [ "${MJPG_STREAMER_USER}" ] || set -- "$@" MJPG_STREAMER_USER + [ "${MJPG_STREAMER_GROUP}" ] || set -- "$@" MJPG_STREAMER_GROUP - if [[ ${vars} ]]; then + if [ $# -gt 0 ]; then eerror "Required variables in /etc/conf.d/${SVCNAME} are not set:" - eerror " ${vars// /, }" + eerror " $(IFS=,; printf %s "$*")" return 1 fi @@ -31,7 +30,7 @@ checkconfig() { start() { checkconfig || return $? ebegin "Starting ${SVCNAME}" - start-stop-daemon --start --exec /usr/bin/${MY_NAME} \ + start-stop-daemon --start --exec "/usr/bin/${MY_NAME}" \ --user "${MJPG_STREAMER_USER}" \ --group "${MJPG_STREAMER_GROUP}" -w 100 -b -m \ --pidfile "${MJPG_STREAMER_PIDFILE}" \ @@ -42,7 +41,7 @@ start() { stop() { ebegin "Stopping ${SVCNAME}" - start-stop-daemon --stop --exec /usr/bin/${MY_NAME} \ + start-stop-daemon --stop --exec "/usr/bin/${MY_NAME}" \ --pidfile "${MJPG_STREAMER_PIDFILE}" eend $? } diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest index 2f7273525c6d..b796e4c2378a 100644 --- a/media-video/mkvtoolnix/Manifest +++ b/media-video/mkvtoolnix/Manifest @@ -2,15 +2,18 @@ AUX mkvtoolnix-49.0.0-qt5dbus.patch 1442 BLAKE2B 041c33dcb691377b4b50a4c24f1eac5 AUX mkvtoolnix-56.1.0-optlevel.patch 607 BLAKE2B 62c3ef3717a54030b1acc586e9468f4d8d783755f7762ccebe18b0f8b0214268477a5a218b2fc02f3e2f770664507d43119f13046a31c94f865f01d0000a8a68 SHA512 b8eec05844aa8ef4f27416a78f5231496e34a112126e8ef403d18cab26b94756bd60323b51cf0d59a5a44d7b379bbf09f6b7b1b7e29b9282a0a2e82a5b3f325e AUX mkvtoolnix-58.0.0-qt5dbus.patch 1500 BLAKE2B f85f6a50bd4d4f44470ec6f85729cfca22518859b34e2cf6e1dac25a35d58170b626afe3a1f12f41b1f2d34d4763ab3b180139b402675071794a0dcd29503209 SHA512 6c6ffc83f6c4ed482347cc172467189add3662430a029d74e94d1373a1f0e519fced494812691d7b38c054bc010f1c670f1f6be97819fc142c402d5264c3595e AUX mkvtoolnix-67.0.0-no-uic-qtwidgets.patch 2494 BLAKE2B 1d23ca6e908947d80e3ea7567508714cd73461a7571dda88a227bf9d4ca3ec86113ad596ff64dc6bfea641c8b097fffa1b4b359a17f5b24c0305c7e6628103b7 SHA512 982953a7f992def139140298a5a6b2ceeae6afaf5123b8e12c46523ab1f799994aa2f5d435bebb8091ca63e56bb44310a39a6382c313f8e4083cfea67daff41d +AUX mkvtoolnix-68.0.0-fmt-9.patch 11851 BLAKE2B 936383fa62ce4bf2d3a08e62854c3c520a2bff8d56efc59c1ab6e75326f06a6af50e716513ca29e080f4579e2501b64d8a502c1d73c56fe270189676deaaf065 SHA512 7431eea6a3c559a802ce07a19e28588bea0842185748c03be1e9f2e70056465dea07ad7dc77cfbc18d39d046b6cdddd70d0cf24748b3fdae69881bde434cacfb DIST mkvtoolnix-57.0.0.tar.xz 7635780 BLAKE2B e0253dc0f48b0c98ee30590560daecbb7cef19e0f92f5baa4694c829c75f28146f7cde58a85a02575b314c2f94efc048003e51f8f6b29abeff2ca1a8d1f28a18 SHA512 583cd9148a361f0886a3e18f32597a980b5ca56d1bba95b36ca613ee291f2cb3d95a0c749a32e6fa480e8dc8f8375e2bd04a1c4b21fd15d8056d8bb2d6082b99 DIST mkvtoolnix-60.0.0.tar.xz 7657960 BLAKE2B 094c13ac7e73e79f3cc7eae0768625482c4808a4323239a93de34d1406583bfe676d71855dd1f7eae9a8a0ff0a7badf50c04c71f9d2fbb4afd9ff5f05b9353ea SHA512 90bbb95c3a7a91bd47f76aaec9459a1f6f26a381ff03db1047c0fdb41cb87bdd96160c448152357a2b306adbd26f478112ac5d5e8215ee37331a15fc89fa43c3 DIST mkvtoolnix-61.0.0.tar.xz 7662500 BLAKE2B de9d73658fe779b34b21fded8e6676b76fed5ce5ecd598aeff12e8c4f120353f63413f260bacc30c0a102a4eb6d4b907feaabdd84d80d20469a3ae8341bce5f1 SHA512 9f35b5af8784eb4b92b437f41b5df677aa7fc859827eaef4d0e2d8531ad9908331f70a852c7e6e965a5f8cec47b38c6c91b8fbdbcaee0edca54f8cbb000ba582 DIST mkvtoolnix-64.0.0.tar.xz 7700012 BLAKE2B f0c64786fdc3d05915650a08ca398dc7f5356b9a9ce9cb108fb40a4394a7518dd45143717fde7af1dccd3e7e43d343f81d69633c78f1201670924257529baede SHA512 252fdf0a9497d34f2a407ca0d3e584d1cd5a2f566b793a3a6b9af8473855d89e55ce79a8b4aff71d5a25f7a15ca991f84a3c4441168553af9feffdfe75e19844 DIST mkvtoolnix-67.0.0.tar.xz 7791720 BLAKE2B 815172f1e120d90ec33cbc6dac1bb3aad793edc0b629f0bab9400a0732d3b692f983d7eca82c61c453ccd245dea948d0950bcb357e3104d2012554871e09c80c SHA512 eed390cb305b5fcaddf11d68a9021f9ddc22a62d1eb95f4c0a34161a7662dd62495c87193a2d951f0fe30fb9a6b5b93f06ed7fedc24ed674da531f2c2317c997 +DIST mkvtoolnix-68.0.0.tar.xz 10911424 BLAKE2B e4704592212aa919a7cbd62b3906b5af6c4bb88293299e93a4ad65cc8857615b1654ed554c17daf60e1b001d8e5265afda808e81ee51f372be2f738d737fdd4d SHA512 fd078208f5ef0438f06b3bb19c3f3c477f87561997a847c56a731265ee9627b089cc568e1d31a9a2c7e46f63aeeabccf98a27694b6b4b1586ba93f7656d20838 EBUILD mkvtoolnix-57.0.0.ebuild 2969 BLAKE2B 402ed70eb494854ce19cebf3e78809b8f96df652dcdaa385210eb0b7417a342aed1065245ffc06a76b62c05a5be009ff38f562049fc07ad2f7100f32e4fbc8d9 SHA512 2f6ee7dbfb8702dcd1cb9c358906e0fc850f8cd3d209ae21144311f0cef58f5a037cb3d748390206ec65b026ac22797636f1d11b81afc4c7ba75ed4a0fbf4d37 -EBUILD mkvtoolnix-60.0.0.ebuild 2687 BLAKE2B 97fdbe6d11985f608d996dc43954480ea3a007ad753a610836ad62d04977c319a2ebee16af88d4b1072032a54356088705cac8a4acabad1a7a94045710b6b7c3 SHA512 7e80c992f5bab78ba16a4a8540d5f3a54883d3a9ee58d4690964f2d07cf829d4762cc21941bde4ead37528d81c45f73d72996235bc7137bd7f39493be897818f -EBUILD mkvtoolnix-61.0.0.ebuild 2707 BLAKE2B f2a49d0826ba6790ae810dde53e798490312b8ce89257ebcf69f0f1a5e0cebf76a77098920fa2d07d4f6a84ee2eeeeb0546f006423e941332b664707d4177acf SHA512 c78a908c2be0e394ae42100b4196347e79903df925e2c436cc6140bf0d54e4f18ee798bd2f4e6643f202a0106d57f2fadbc2d9724f938126f98c2f960d6f4acc -EBUILD mkvtoolnix-64.0.0.ebuild 2717 BLAKE2B b5711556f9c73bda4a13cdb51e01db8a7c98966cb5579ff6c8cb01169e979a11e516c8e0d3884ffb1b5f2e941b885182c2b7b031deb1742798a06f0339ca1e72 SHA512 b6c8a32ef2c59cdf1a9587ec3d48e1d89f319c8b1c41caa6729f6baf7e5d215bf28c86ce35cfd00ca34908e06245fb400a0f69c3915a8bee5095922fb2a1b2db -EBUILD mkvtoolnix-67.0.0.ebuild 2927 BLAKE2B c2fdc8769179233ce9de4ab683b27c1e73e58af440907817cb08ddbe33598d0ed67f96831b9250dcf510ec659edc6a15be39f3546eae41371137a0bcd96d7b73 SHA512 2856e3ae8d784b23497ac56be624e0830974fe2339ac031f7cda247ad772ab8052972a62964e788ec06d2269efcab5e5cfa74a09f801ff3baee400cca481ce96 -EBUILD mkvtoolnix-9999.ebuild 2931 BLAKE2B baf0ebefaf8adbb46010c76d55f71d1950453d4f4ef32821be0d646cb8428d5bd9884e0ff50fc8ce9baf4362e5cd2f9dc5e3e38bdab72958dcddba19399dedf8 SHA512 8f93889fd7e55f80d55ab4cfbf7b89b7cc683c09b0eb7646d740ecf164d417434ffde452dbfd069a90eccfb1cc8b0ebf79ab6b7ec12cfca6e4146027a319fee3 +EBUILD mkvtoolnix-60.0.0.ebuild 2713 BLAKE2B 8b6c460647fad06911cf9f6f4cbbd1e0122470eea052d9693f76ccffe7500287713aeb8199994d2642ff4081e291e0b686302d10a81fb6197cf1d25705efd084 SHA512 6799f52699577880d685ecb602d5a1788fbb7e7948a37cbd4e712f07705fe172b0288e2ef35f5d542e96991940567d6905113f8d160d0ecad841cf2a7b1e007a +EBUILD mkvtoolnix-61.0.0.ebuild 2733 BLAKE2B 4b3262642f5bf64e60ee3e5537f65881ec6287113f1ba7d160c118454f425a87dc257ee73dbb9d0a7b96f72551c6ae8d337b9d8120f5ec86519122375b9370c5 SHA512 fdddc73a07386bd68d0b85894f384e88405f09285b78210a31fdb2b2a1d1341d04b9329f94872480482a24aa60ad8c261df4c2e6b5d82b570526f0b263df168c +EBUILD mkvtoolnix-64.0.0.ebuild 2743 BLAKE2B 128120db4c38bea554f5a19ceecee021cd9dac3e5b3771a901dbcc2180dad5ead753f53a373323a8b86d6ca18023f441253325174ae9cbd7b014cccb933734e4 SHA512 91fa7c061c2be25ab775156a163c552690d5f91ce797988e9f24689a0ccfc2a612dd1f7eb0dc2b4706cb16060f8f1d2e15c8db36d9ae298fbd94e00f51ff7afd +EBUILD mkvtoolnix-67.0.0.ebuild 2953 BLAKE2B 3c3c1b2ca1234d7bec20a30ad859673be073655a8182021d4b1ae20e2132da41a949d5f9a8203cd466f0fe1008aa0a3778fff243328c9ed1119e84c9a916bbb6 SHA512 c3d1772e7363c6ca4c9760e6a40c87141d3da03e24fddb98255204b1320dbf104525082738a2a3c653acdf857ac6f868b5e6527e199748e9e86f75f68eae2845 +EBUILD mkvtoolnix-68.0.0-r3.ebuild 2980 BLAKE2B a7319bb5c1d79c2aae66e770ca1b47c7b31c8fcc4493464e5858d5b95bc7007cf57d1150d8d86e400d7e346fd410076461450ea605a6487269f37a03d57f0fdc SHA512 ae05fc55bc96b737dbbba190c8290fce78d9a745522fc5ac5c1e766ee80ab4cee2a72894fa236fab2858a50c5819cf9c9120a4cf70defb5b1e671a05ade08dbe +EBUILD mkvtoolnix-9999.ebuild 2948 BLAKE2B fb49d9e001092d07f347ec622247943d8a06b1b31d9b2ecf80bd2009d8e37118c6cc1751d2e5cf6529fa73cb1e73879c431d1329576525636a093fdbee7afe18 SHA512 8d5b9e3d413ce32b352f0dbc35c153f2b5dc765912bbd39597b7bcebdfe99966964c75ffe3f2ceb614d767a4557ddf2e979b702441e5929fb8d2441f8670d42b MISC metadata.xml 256 BLAKE2B ff2b5536809c94dc64867bca73d779a31bd343559cd65520c9b5684091734b3ccf7bf495335890df5533857480794cb3258566e5836e8dce7514b6833ba93f37 SHA512 b7f3d0564d06254ff552beec9594236b84ebc3ad87adab673f68963bcc4dfbf2e29b401e75486ba41b9b526de74b73f65e9d5e901221f810363497aa694c8567 diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-68.0.0-fmt-9.patch b/media-video/mkvtoolnix/files/mkvtoolnix-68.0.0-fmt-9.patch new file mode 100644 index 000000000000..a0e3c1780db9 --- /dev/null +++ b/media-video/mkvtoolnix/files/mkvtoolnix-68.0.0-fmt-9.patch @@ -0,0 +1,293 @@ +https://gitlab.com/mbunkus/mkvtoolnix/-/commit/1e1076e43fe8f38e33246fff3ce8651a93c371d9 +https://bugs.gentoo.org/856700 + +From: Moritz Bunkus <mo@bunkus.online> +Date: Thu, 7 Jul 2022 13:11:34 +0200 +Subject: [PATCH] fix compilation with fmt v9.0.0 + +Prior to v9 all types that were outputtable via `operator<<` to +`std::ostream` could be formatted. v9 changed that to require explicit +tagging of those types that should work this way. This commit adds +those tags for the types that are currently formatted via fmt. + +Fixes #3366. +--- a/src/common/aac.h ++++ b/src/common/aac.h +@@ -221,3 +221,7 @@ protected: + using parser_cptr = std::shared_ptr<parser_c>; + + } // namespace mtx::aac ++ ++#if FMT_VERSION >= 90000 ++template <> struct fmt::formatter<mtx::aac::header_c> : ostream_formatter {}; ++#endif // FMT_VERSION >= 90000 +--- a/src/common/bcp47.h ++++ b/src/common/bcp47.h +@@ -176,3 +176,8 @@ struct hash<mtx::bcp47::language_c> { + }; + + } // namespace mtx::bcp47 ++ ++#if FMT_VERSION >= 90000 ++template <> struct fmt::formatter<mtx::bcp47::language_c::extension_t> : ostream_formatter {}; ++template <> struct fmt::formatter<mtx::bcp47::language_c> : ostream_formatter {}; ++#endif // FMT_VERSION >= 90000 +--- a/src/common/bluray/track_chapter_names.cpp ++++ b/src/common/bluray/track_chapter_names.cpp +@@ -18,6 +18,7 @@ + #include "common/bluray/track_chapter_names.h" + #include "common/bluray/util.h" + #include "common/debugging.h" ++#include "common/path.h" + #include "common/qt.h" + #include "common/xml/xml.h" + +--- a/src/common/error.h ++++ b/src/common/error.h +@@ -45,3 +45,7 @@ operator <<(std::ostream &out, + } + + } ++ ++#if FMT_VERSION >= 90000 ++template <> struct fmt::formatter<mtx::exception> : ostream_formatter {}; ++#endif // FMT_VERSION >= 90000 +--- a/src/common/fourcc.h ++++ b/src/common/fourcc.h +@@ -83,3 +83,7 @@ operator <<(std::ostream &out, + out << fourcc.str(); + return out; + } ++ ++#if FMT_VERSION >= 90000 ++template <> struct fmt::formatter<fourcc_c> : ostream_formatter {}; ++#endif // FMT_VERSION >= 90000 +--- a/src/common/kax_analyzer.h ++++ b/src/common/kax_analyzer.h +@@ -239,3 +239,7 @@ public: + virtual void debug_abort_process(); + }; + using console_kax_analyzer_cptr = std::shared_ptr<console_kax_analyzer_c>; ++ ++#if FMT_VERSION >= 90000 ++template <> struct fmt::formatter<mtx::kax_analyzer_x> : ostream_formatter {}; ++#endif // FMT_VERSION >= 90000 +--- a/src/common/math_fwd.h ++++ b/src/common/math_fwd.h +@@ -18,6 +18,11 @@ + using mtx_mp_rational_t = boost::multiprecision::number<boost::multiprecision::backends::gmp_rational, boost::multiprecision::et_off>; + using mtx_mp_int_t = boost::multiprecision::number<boost::multiprecision::backends::gmp_int, boost::multiprecision::et_off>; + ++#if FMT_VERSION >= 90000 ++template <> struct fmt::formatter<mtx_mp_rational_t> : ostream_formatter {}; ++template <> struct fmt::formatter<mtx_mp_int_t> : ostream_formatter {}; ++#endif // FMT_VERSION >= 90000 ++ + namespace mtx { + + // This conversion function exists to work around incomplete +--- a/src/common/mm_io_x.h ++++ b/src/common/mm_io_x.h +@@ -155,3 +155,16 @@ operator <<(std::ostream &out, + } + + }} ++ ++#if FMT_VERSION >= 90000 ++template <> struct fmt::formatter<mtx::mm_io::exception> : ostream_formatter {}; ++template <> struct fmt::formatter<mtx::mm_io::end_of_file_x> : ostream_formatter {}; ++template <> struct fmt::formatter<mtx::mm_io::seek_x> : ostream_formatter {}; ++template <> struct fmt::formatter<mtx::mm_io::read_write_x> : ostream_formatter {}; ++template <> struct fmt::formatter<mtx::mm_io::open_x> : ostream_formatter {}; ++template <> struct fmt::formatter<mtx::mm_io::wrong_read_write_access_x>: ostream_formatter {}; ++template <> struct fmt::formatter<mtx::mm_io::insufficient_space_x> : ostream_formatter {}; ++template <> struct fmt::formatter<mtx::mm_io::create_directory_x> : ostream_formatter {}; ++template <> struct fmt::formatter<mtx::mm_io::text::exception> : ostream_formatter {}; ++template <> struct fmt::formatter<mtx::mm_io::text::invalid_utf8_char_x>: ostream_formatter {}; ++#endif // FMT_VERSION >= 90000 +--- a/src/common/opus.h ++++ b/src/common/opus.h +@@ -91,3 +91,9 @@ operator <<(std::ostream &out, + } + + } ++ ++#if FMT_VERSION >= 90000 ++template <> struct fmt::formatter<mtx::opus::decode_error> : ostream_formatter {}; ++template <> struct fmt::formatter<mtx::opus::id_header_t> : ostream_formatter {}; ++template <> struct fmt::formatter<mtx::opus::toc_t> : ostream_formatter {}; ++#endif // FMT_VERSION >= 90000 +--- a/src/common/path.h ++++ b/src/common/path.h +@@ -36,3 +36,7 @@ std::filesystem::path absolute(std::filesystem::path const &p); + void create_directories(std::filesystem::path const &path, std::error_code &error_code); + + } // namespace mtx::fs ++ ++#if FMT_VERSION >= 90000 ++template <> struct fmt::formatter<std::filesystem::path> : ostream_formatter {}; ++#endif // FMT_VERSION >= 90000 +--- a/src/common/qt.h ++++ b/src/common/qt.h +@@ -102,3 +102,7 @@ operator <<(std::wostream &out, + out << string.toStdWString(); + return out; + } ++ ++#if FMT_VERSION >= 90000 ++template <> struct fmt::formatter<QString> : ostream_formatter {}; ++#endif // FMT_VERSION >= 90000 +--- a/src/common/strings/formatting.h ++++ b/src/common/strings/formatting.h +@@ -129,3 +129,7 @@ operator <<(std::ostream &out, + out << mtx::string::format_timestamp(timestamp); + return out; + } ++ ++#if FMT_VERSION >= 90000 ++template <> struct fmt::formatter<basic_timestamp_c<int64_t>> : ostream_formatter {}; ++#endif // FMT_VERSION >= 90000 +--- a/src/common/translation.h ++++ b/src/common/translation.h +@@ -80,4 +80,8 @@ operator <<(std::ostream &out, + return out; + } + ++#if FMT_VERSION >= 90000 ++template <> struct fmt::formatter<translatable_string_c> : ostream_formatter {}; ++#endif ++ + void init_locales(std::string locale = ""); +--- a/src/input/r_flac.cpp ++++ b/src/input/r_flac.cpp +@@ -240,7 +240,7 @@ flac_reader_c::handle_picture_metadata(FLAC__StreamMetadata const *metadata) { + mxdebug_if(m_debug, fmt::format("flac_reader: MIME type: {0}\n", attachment->mime_type)); + mxdebug_if(m_debug, fmt::format("flac_reader: data length: {0}\n", picture.data_length)); + mxdebug_if(m_debug, fmt::format("flac_reader: ID: {0}\n", m_attachment_id)); +- mxdebug_if(m_debug, fmt::format("flac_reader: mode: {0}\n", attach_mode)); ++ mxdebug_if(m_debug, fmt::format("flac_reader: mode: {0}\n", static_cast<unsigned int>(attach_mode))); + + if (attachment->mime_type.empty() || attachment->name.empty()) + return; +@@ -276,7 +276,7 @@ flac_reader_c::flac_metadata_cb(const FLAC__StreamMetadata *metadata) { + : metadata->type == FLAC__METADATA_TYPE_VORBIS_COMMENT ? "VORBIS COMMENT" + : metadata->type == FLAC__METADATA_TYPE_CUESHEET ? "CUESHEET" + : "UNDEFINED", +- metadata->type, metadata->length)); ++ static_cast<unsigned int>(metadata->type), metadata->length)); + break; + } + } +--- a/src/input/r_flv.h ++++ b/src/input/r_flv.h +@@ -173,3 +173,8 @@ protected: + + unsigned int add_track(char type); + }; ++ ++#if FMT_VERSION >= 90000 ++template <> struct fmt::formatter<flv_header_t> : ostream_formatter {}; ++template <> struct fmt::formatter<flv_tag_c> : ostream_formatter {}; ++#endif // FMT_VERSION >= 90000 +--- a/src/input/r_mpeg_ps.h ++++ b/src/input/r_mpeg_ps.h +@@ -244,3 +244,8 @@ private: + void sort_tracks(); + void calculate_global_timestamp_offset(); + }; ++ ++#if FMT_VERSION >= 90000 ++template <> struct fmt::formatter<mpeg_ps_id_t> : ostream_formatter {}; ++template <> struct fmt::formatter<mpeg_ps_packet_c> : ostream_formatter {}; ++#endif // FMT_VERSION >= 90000 +--- a/src/input/r_ogm_flac.cpp ++++ b/src/input/r_ogm_flac.cpp +@@ -104,7 +104,7 @@ fhe_metadata_cb(const FLAC__StreamDecoder *, + : metadata->type == FLAC__METADATA_TYPE_VORBIS_COMMENT ? "VORBIS COMMENT" + : metadata->type == FLAC__METADATA_TYPE_CUESHEET ? "CUESHEET" + : "UNDEFINED", +- metadata->type, metadata->length)); ++ static_cast<unsigned int>(metadata->type), metadata->length)); + break; + } + } +--- a/src/input/r_qtmp4.h ++++ b/src/input/r_qtmp4.h +@@ -590,3 +590,7 @@ protected: + + virtual void process_atom(qt_atom_t const &parent, int level, std::function<void(qt_atom_t const &)> const &handler); + }; ++ ++#if FMT_VERSION >= 90000 ++template <> struct fmt::formatter<qt_atom_t> : ostream_formatter {}; ++#endif // FMT_VERSION >= 90000 +--- a/src/merge/item_selector.h ++++ b/src/merge/item_selector.h +@@ -139,3 +139,7 @@ operator <<(std::ostream &out, + + return out; + } ++ ++#if FMT_VERSION >= 90000 ++template <typename T> struct fmt::formatter<item_selector_c<T>> : ostream_formatter {}; ++#endif // FMT_VERSION >= 90000 +--- a/src/propedit/attachment_target.cpp ++++ b/src/propedit/attachment_target.cpp +@@ -83,14 +83,14 @@ attachment_target_c::dump_info() + " selector_num_arg: {6}\n" + " selector_string_arg: {7}\n", + m_file_name, +- m_command, ++ static_cast<unsigned int>(m_command), + ac_add == m_command ? "add" + : ac_delete == m_command ? "delete" + : ac_replace == m_command ? "replace" + : ac_update == m_command ? "update" + : "unknown", + m_options, +- m_selector_type, ++ static_cast<unsigned int>(m_selector_type), + st_id == m_selector_type ? "ID" + : st_uid == m_selector_type ? "UID" + : st_name == m_selector_type ? "name" +--- a/src/propedit/attachment_target.h ++++ b/src/propedit/attachment_target.h +@@ -130,3 +130,7 @@ operator <<(std::ostream &out, + + return out; + } ++ ++#if FMT_VERSION >= 90000 ++template <> struct fmt::formatter<attachment_target_c::options_t> : ostream_formatter {}; ++#endif // FMT_VERSION >= 90000 +--- a/src/propedit/tag_target.cpp ++++ b/src/propedit/tag_target.cpp +@@ -104,10 +104,10 @@ tag_target_c::dump_info() + " selection_track_type: {3}\n" + " track_uid: {4}\n" + " file_name: {5}\n", +- static_cast<int>(m_operation_mode), +- static_cast<int>(m_selection_mode), ++ static_cast<unsigned int>(m_operation_mode), ++ static_cast<unsigned int>(m_selection_mode), + m_selection_param, +- m_selection_track_type, ++ static_cast<unsigned int>(m_selection_track_type), + m_track_uid, + m_file_name)); + +--- a/src/propedit/track_target.cpp ++++ b/src/propedit/track_target.cpp +@@ -78,9 +78,9 @@ track_target_c::dump_info() + " selection_track_type: {2}\n" + " track_uid: {3}\n" + " file_name: {4}\n", +- static_cast<int>(m_selection_mode), ++ static_cast<unsigned int>(m_selection_mode), + m_selection_param, +- m_selection_track_type, ++ static_cast<unsigned int>(m_selection_track_type), + m_track_uid, + m_file_name)); + +GitLab diff --git a/media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild index cd70327db014..d249b81b99d8 100644 --- a/media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild +++ b/media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild @@ -28,6 +28,7 @@ RDEPEND=" >=dev-libs/boost-1.66:= >=dev-libs/libebml-1.4.0:= >=dev-libs/libfmt-6.1.0:= + <dev-libs/libfmt-9.0.0:= dev-libs/libpcre2:= dev-libs/pugixml:= media-libs/flac:= diff --git a/media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild index cd4d49f2c426..94c85413024d 100644 --- a/media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild +++ b/media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild @@ -28,6 +28,7 @@ RDEPEND=" >=dev-libs/boost-1.66:= >=dev-libs/libebml-1.4.0:= >=dev-libs/libfmt-6.1.0:= + <dev-libs/libfmt-9.0.0:= dev-libs/libpcre2:= dev-libs/pugixml:= media-libs/flac:= diff --git a/media-video/mkvtoolnix/mkvtoolnix-64.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-64.0.0.ebuild index 7e1ffe9d6374..5e0ad3ee70e7 100644 --- a/media-video/mkvtoolnix/mkvtoolnix-64.0.0.ebuild +++ b/media-video/mkvtoolnix/mkvtoolnix-64.0.0.ebuild @@ -29,6 +29,7 @@ RDEPEND=" dev-libs/gmp:= >=dev-libs/libebml-1.4.2:= >=dev-libs/libfmt-8.0.1:= + <dev-libs/libfmt-9.0.0:= >=dev-libs/pugixml-1.11:= media-libs/flac:= >=media-libs/libmatroska-1.6.3:= diff --git a/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild index 0b4de7083e3b..664482898d27 100644 --- a/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild +++ b/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild @@ -29,6 +29,7 @@ RDEPEND=" dev-libs/gmp:= >=dev-libs/libebml-1.4.2:= >=dev-libs/libfmt-8.0.1:= + <dev-libs/libfmt-9.0.0:= >=dev-libs/pugixml-1.11:= media-libs/flac:= >=media-libs/libmatroska-1.6.3:= diff --git a/media-video/mkvtoolnix/mkvtoolnix-68.0.0-r3.ebuild b/media-video/mkvtoolnix/mkvtoolnix-68.0.0-r3.ebuild new file mode 100644 index 000000000000..f5a1084acaf8 --- /dev/null +++ b/media-video/mkvtoolnix/mkvtoolnix-68.0.0-r3.ebuild @@ -0,0 +1,133 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic multiprocessing qmake-utils xdg + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git" + EGIT_SUBMODULES=() + inherit git-r3 +else + SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz" + KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +fi + +DESCRIPTION="Tools to create, alter, and inspect Matroska files" +HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix" + +LICENSE="GPL-2" +SLOT="0" +IUSE="dbus debug dvd gui nls pch test" +RESTRICT="!test? ( test )" + +# check NEWS.md for build system changes entries for boost/libebml/libmatroska +# version requirement updates and other packaging info +RDEPEND=" + >=dev-libs/boost-1.66:= + dev-libs/gmp:= + >=dev-libs/libebml-1.4.2:= + >=dev-libs/libfmt-8.0.1:= + >=dev-libs/pugixml-1.11:= + media-libs/flac:= + >=media-libs/libmatroska-1.6.3:= + media-libs/libogg:= + media-libs/libvorbis:= + sys-libs/zlib + dvd? ( media-libs/libdvdread:= ) + dev-qt/qtcore:5 + gui? ( + dev-qt/qtsvg:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + dev-qt/qtconcurrent:5 + dev-qt/qtmultimedia:5 + ) + app-text/cmark:0= + dbus? ( dev-qt/qtdbus:5 ) +" +DEPEND="${RDEPEND} + >=dev-cpp/nlohmann_json-3.9.1 + >=dev-libs/utfcpp-3.1.2 + test? ( dev-cpp/gtest ) +" +BDEPEND=" + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + dev-ruby/rake + virtual/pkgconfig + nls? ( + sys-devel/gettext + app-text/po4a + ) +" + +PATCHES=( + "${FILESDIR}"/mkvtoolnix-58.0.0-qt5dbus.patch + "${FILESDIR}"/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch + "${FILESDIR}"/${P}-fmt-9.patch +) + +src_prepare() { + default + + if [[ ${PV} == *9999 ]]; then + ./autogen.sh || die + fi + + # bug #692018 + sed -i -e 's/pandoc/diSaBlEd/' ac/pandoc.m4 || die + + eautoreconf + + # remove bundled libs + rm -r lib/{fmt,libebml,libmatroska,nlohmann-json,pugixml,utf8-cpp} || die +} + +src_configure() { + # bug #692322, use system dev-libs/utfcpp + append-cppflags -I"${ESYSROOT}"/usr/include/utf8cpp + + local myeconfargs=( + $(use_enable debug) + $(usex pch "" --disable-precompiled-headers) + $(use_enable dbus) + + # Qt (of some version) is always needed, even for non-GUI builds, + # to do e.g. MIME detection. See e.g. bug #844097. + # But most of the Qt deps are conditional on a GUI build. + --disable-qt6 + --enable-qt5 + $(use_enable gui) + --with-qmake="$(qt5_get_bindir)"/qmake + + $(use_with dvd dvdread) + $(use_with nls gettext) + $(usex nls "" --with-po4a-translate=false) + --disable-update-check + --disable-optimization + --with-boost="${ESYSROOT}"/usr + --with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir) + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + rake V=1 -j$(makeopts_jobs) || die +} + +src_test() { + rake V=1 -j$(makeopts_jobs) tests:unit || die + rake V=1 -j$(makeopts_jobs) tests:run_unit || die +} + +src_install() { + DESTDIR="${D}" rake -j$(makeopts_jobs) install || die + + einstalldocs + dodoc NEWS.md + doman doc/man/*.1 +} diff --git a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild index 0939d7201a9b..3b7b072da517 100644 --- a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild +++ b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild @@ -38,6 +38,7 @@ RDEPEND=" dvd? ( media-libs/libdvdread:= ) dev-qt/qtcore:5 gui? ( + dev-qt/qtsvg:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest index d2c6664647a7..0921b11506cf 100644 --- a/media-video/mpv/Manifest +++ b/media-video/mpv/Manifest @@ -1,3 +1,4 @@ +AUX mpv-9999-docdir.patch 536 BLAKE2B eeb4bec0a51a68515c7c321a4419679e4b6d0567db2145ce44f0ff5141b2043ec3de057607dca0798f2d63f7b5f2e8fde3ed87be725e156e0b769ca561598702 SHA512 e8a122dec7adea75681e285378d99a7f94f4f75926cbde65dd5f0c7014b4a49d4567e719d92a9d9d428f8f746ff0cd3495ba59c5e7b3acb43d83329a10b338c5 DIST mpv-0.33.1.tar.gz 3259882 BLAKE2B 97ab101c2013ffb219d36a788020fb9fc4382d09971ac0beee42701a54667a6c766521be7b052193de4505b2117c2d47b3682ebafab46632fc40b637e0d19c04 SHA512 99d6c40d18c5cf83814b44ec6d8eade229800c5b51a734c9bbe831c3aeb95f8931124c94f6ae2360ffff62053c163bc3c55b254df021e005b350ebc3df7e952b DIST mpv-0.34.0.tar.gz 3287976 BLAKE2B 9fc412544d81b249c71eed0d6669121a1942771ecb48d50d3fda16b8f967c8a777529e28a234d7169617981cd909ff03aed0deaf15db900d605b8d8849939218 SHA512 9935a20730dbb8fbf4cd11fe2fc38b1981882fc85c93046837a9b99cae089b3f710e6af7d7ea977c177de5479aa24e413f76cab9b995e8b7e66d6b77c524fdf0 DIST mpv-0.34.1.tar.gz 3288356 BLAKE2B c0e5dc3cd23307449a526bd2cf0df5d870322aa1914a139784fd50d77274d42648a769ee4da3ba74e34a7a080700a5740dae13ed0827df1b3cfef36846f983ab SHA512 77ea349d6999f8cce9b5cce4cebd3506a224fc18ab08d22dd16bd34c34d012bb170879b268ddd62db40d116b4cc0b2d9d651b8097f387ed9115c426834cac77e @@ -6,5 +7,5 @@ DIST waf-2.0.9 103104 BLAKE2B c7e996aa49662da3ff941d076fc7e2dd23e867ade92a3b2ae0 EBUILD mpv-0.33.1-r3.ebuild 9698 BLAKE2B 18a25640c9ba5e3d1b3f06d75d1f9eca75a2eb202a67b6107a9e1704012ef3b20f819ab7e38567068439450b3c9feba916a484ab34e7fca94ec47623965878c0 SHA512 4358a7a120e72cb6cb036aaa30469d534eaecb7596017b3a54ad07443f89732102eb037b9c22fddcd95cbb7660ef0a59fb2f5476b7dbc3e78a804a0d94947a51 EBUILD mpv-0.34.0-r1.ebuild 9701 BLAKE2B fd2f7cbeabd539efa9625d476efdf86bd15de954f100fbdb01ee3549fb92fcf380d9bbcf003dec17d901711007c822b01274a535ff92caa09c978edfbf20db97 SHA512 78ed75d5e4393aacbcba8f223cacc00ea88184c30df9316b7daf4ec2e52b3f65fbd3661468639e9a5ebf52d14e336cf358ccad2659c386ef3052012ce107a572 EBUILD mpv-0.34.1-r1.ebuild 9697 BLAKE2B 91b819898ec285d53675ec92cbc988db16d943f68a5ec54ff1334064a4aeb67033a2375d8398000a1e6d732b2267b9e813ca4a9e6dfde5950a3c4fba51994cbd SHA512 250ed490a9fdc3ab9133f8ddd4195d6820679293bdab104cec9fb3efbc385cfa8e5207321b7bbab20fa16f45e2cee937ac5b74c86dbab0b0a680317d9c724e2c -EBUILD mpv-9999.ebuild 9724 BLAKE2B 4f539d603252eeb344634f958db5d36fe915205a6d38ecd5bef42de866dd99d7a6979bd4554d673b6ede0adcb992d5fadbc59b994c6ea536704fa64e42bda315 SHA512 b6a755f113b588482d0d0f8f8dc4822dbf2fb6c74a5d1d4213b4ad5269a979f3071d717f8a1e498aca5c76dc91df33f55dacb09affb6fd9e61a963d34513bd14 -MISC metadata.xml 2137 BLAKE2B fe78cb8478cac266c72c939fd87043c0a685c12c840e0966d34d58b1c9dd39767197d93762d8150454a5e2f58ecf0c68cde1289bb392cd92b0d199a81d5f4ff6 SHA512 bd37f4f676eaf2507484d28b0b29f861e575a6232bc67413cae1c09fd16481d5a62b2646ee2e9e5b5a0c5bd8a0dfa63d1b4ef80e3f70c1ef8ff040d103fd6beb +EBUILD mpv-9999.ebuild 9205 BLAKE2B 8f66b018de4030aa77cf560b9fd0e37f16acc4f821fa5777550dc52cc468d7c613158e59ed511dd27539bde066a92d1c34846cbd0716f2cd0bc3eaa8187aeae8 SHA512 6ea59a928d078c1e2ecc7bdf774a7f486986e5522546131d1ff49fad0685d46665cd6b964f7dab89ee7e41ea13b8476bd771bed0e269fea29537cfb78218f43e +MISC metadata.xml 2562 BLAKE2B f53ed5de0b371b102412e050901ba3c58f0c1cdd5e5aba6c3f0fd2ac46fffdf3d87022299489cfb6388573edf9ac3a501488939dc4e9d77527efe6fd65102f55 SHA512 fae81e9b21accc130249475ae50e02e48ea1ddf0ea3e6e332d41275ccf4552131a4bf0e7a15856e909572ed0f5c86163b0a7a10d3e13a2015c650e741d63a373 diff --git a/media-video/mpv/files/mpv-9999-docdir.patch b/media-video/mpv/files/mpv-9999-docdir.patch new file mode 100644 index 000000000000..62a57415163b --- /dev/null +++ b/media-video/mpv/files/mpv-9999-docdir.patch @@ -0,0 +1,11 @@ +--- a/meson.build ++++ b/meson.build +@@ -1856,7 +1856,7 @@ if get_option('cplayer') + + conf_files = ['etc/mpv.conf', 'etc/input.conf', + 'etc/mplayer-input.conf', 'etc/restore-old-bindings.conf'] +- install_data(conf_files, install_dir: join_paths(datadir, 'doc', 'mpv')) ++ install_data(conf_files, install_dir: join_paths(datadir, 'mpv')) + + bash_install_dir = join_paths(datadir, 'bash-completion', 'completions') + install_data('etc/mpv.bash-completion', install_dir: bash_install_dir, rename: 'mpv') diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml index 8f8efa409921..656c28187c05 100644 --- a/media-video/mpv/metadata.xml +++ b/media-video/mpv/metadata.xml @@ -17,14 +17,18 @@ <flag name="jpeg">Enable support for saving screenshots in JPEG format</flag> <flag name="libmpv">Build mpv shared library</flag> <flag name="lua">Enable Lua scripting, OSC (On Screen Controller) GUI and <pkg>net-misc/youtube-dl</pkg> hook-script</flag> + <flag name="mmal">Enables Multi-Media Abstraction Layer (MMAL) decoding support: Available e.g. on the Raspberry Pi.</flag> <flag name="opengl" restrict="<media-video/mpv-0.28.0">Enable the recommended 'opengl' video output</flag> <flag name="opengl" restrict=">=media-video/mpv-0.28.0">Enable support for various OpenGL-based video backends</flag> <flag name="raspberry-pi">Enable support for the Raspberry Pi</flag> + <flag name="pipewire">Enable sound support via native PipeWire backend</flag> <flag name="rubberband">Enable high quality pitch correction via <pkg>media-libs/rubberband</pkg></flag> <flag name="sdl">Enable <pkg>media-libs/libsdl2</pkg> based video and audio outputs (Note: these outputs exist for compatibility reasons only, avoid if possible)</flag> + <flag name="sndio">Enable sound support via <pkg>media-sound/sndio</pkg></flag> <flag name="tools">Install extra tools: mpv_identify.sh, mpv_idet.sh, and umpv</flag> <flag name="uchardet">Enable subtitles charset discovery via <pkg>app-i18n/uchardet</pkg></flag> + <flag name="vector">Use function implementations more amenable to vectorization (gives speedup). Made optional in case of bugs.</flag> <flag name="vulkan">Enable support for various Vulkan-based video backends</flag> <flag name="zimg">Enable libzimg support (for vf_fingerprint)</flag> </use> diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild index 647b7976525a..0958d7c9fee9 100644 --- a/media-video/mpv/mpv-9999.ebuild +++ b/media-video/mpv/mpv-9999.ebuild @@ -1,38 +1,40 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 LUA_COMPAT=( lua5-{1..2} luajit ) PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE='threads(+)' -WAF_PV=2.0.22 - -inherit bash-completion-r1 flag-o-matic lua-single optfeature pax-utils python-r1 toolchain-funcs waf-utils xdg-utils +inherit edo flag-o-matic lua-single optfeature meson pax-utils python-single-r1 toolchain-funcs xdg DESCRIPTION="Media player based on MPlayer and mplayer2" HOMEPAGE="https://mpv.io/ https://github.com/mpv-player/mpv" -if [[ ${PV} != *9999* ]]; then +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://github.com/mpv-player/mpv.git" + inherit git-r3 + + DOCS=() +else SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux" + DOCS=( RELEASE_NOTES ) -else - EGIT_REPO_URI="https://github.com/mpv-player/mpv.git" - inherit git-r3 - DOCS=(); SRC_URI="" fi -SRC_URI+=" https://waf.io/waf-${WAF_PV}" + DOCS+=( README.md DOCS/{client-api,interface}-changes.rst ) -# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC. -LICENSE="LGPL-2.1+ GPL-2+ BSD ISC" +# See Copyright in sources and Gentoo bug #506946. libmpv is ISC. +# See https://github.com/mpv-player/mpv/blob/6265724f3331e3dee8d9ec2b6639def5004a5fa2/Copyright which +# says other files may be BSD/MIT/ISC. +LICENSE="LGPL-2.1+ GPL-2+ BSD MIT ISC" SLOT="0" IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins debug doc drm dvb dvd +egl gamepad gbm +iconv jack javascript jpeg lcms libcaca libmpv +lua - nvenc openal +opengl pulseaudio raspberry-pi rubberband sdl - selinux test tools +uchardet vaapi vdpau vulkan wayland +X +xv zlib zimg" + mmal nvenc openal +opengl pipewire pulseaudio raspberry-pi rubberband sdl + selinux sndio test tools +uchardet vaapi vdpau +vector vulkan wayland +X +xv zlib zimg" REQUIRED_USE=" || ( cli libmpv ) @@ -79,17 +81,19 @@ COMMON_DEPEND=" ) jack? ( virtual/jack ) javascript? ( >=dev-lang/mujs-1.0.0 ) - jpeg? ( virtual/jpeg:0 ) + jpeg? ( media-libs/libjpeg-turbo:= ) lcms? ( >=media-libs/lcms-2.6:2 ) >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz(+)] virtual/ttf-fonts libcaca? ( >=media-libs/libcaca-0.99_beta18 ) lua? ( ${LUA_DEPS} ) openal? ( >=media-libs/openal-1.13 ) - pulseaudio? ( media-sound/pulseaudio ) + pulseaudio? ( media-libs/libpulse ) + pipewire? ( media-video/pipewire:= ) raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) rubberband? ( >=media-libs/rubberband-1.8.0 ) sdl? ( media-libs/libsdl2[sound,threads,video] ) + sndio? ( media-sound/sndio ) vaapi? ( x11-libs/libva:=[drm(+)?,X?,wayland?] ) vdpau? ( x11-libs/libvdpau ) vulkan? ( @@ -118,7 +122,6 @@ COMMON_DEPEND=" zimg? ( >=media-libs/zimg-2.9.2 ) " DEPEND="${COMMON_DEPEND} - ${PYTHON_DEPS} dvb? ( virtual/linuxtv-dvb-headers ) nvenc? ( >=media-libs/nv-codec-headers-8.2.15.7 ) " @@ -129,21 +132,18 @@ RDEPEND="${COMMON_DEPEND} " BDEPEND="dev-python/docutils virtual/pkgconfig - test? ( >=dev-util/cmocka-1.0.0 ) " +PATCHES=( + "${FILESDIR}"/${PN}-9999-docdir.patch +) + pkg_setup() { use lua && lua-single_pkg_setup -} - -src_prepare() { - cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die - chmod +x "${S}"/waf || die - default + use tools && python-single-r1_pkg_setup } src_configure() { - python_setup tc-export CC PKG_CONFIG AR if use raspberry-pi; then @@ -151,133 +151,138 @@ src_configure() { append-ldflags -L"${ESYSROOT}/opt/vc/lib" fi - local mywafargs=( - --confdir="${EPREFIX}/etc/${PN}" - - $(usex cli '' '--disable-cplayer') - $(use_enable libmpv libmpv-shared) - - --disable-libmpv-static - --disable-static-build - # See deep down below for build-date. - --disable-optimize # Don't add '-O2' to CFLAGS. - $(usex debug '' '--disable-debug-build') - - $(use_enable doc html-build) - --disable-pdf-build - --enable-manpage-build - $(use_enable cplugins) - $(use_enable test) - - $(use_enable iconv) - $(use_enable lua) - $(use_enable javascript) - $(use_enable zlib) - $(use_enable bluray libbluray) - $(use_enable dvd dvdnav) - $(use_enable cdda) - $(use_enable uchardet) - $(use_enable rubberband) - $(use_enable lcms lcms2) - --disable-vapoursynth # Only available in overlays. - $(use_enable archive libarchive) - - --enable-libavdevice + if use debug && ! use test; then + append-cppflags -DNDEBUG + fi + + local emesonargs=( + -Dbuild-date=false + $(meson_use cli cplayer) + $(meson_use libmpv) + $(meson_use test tests) + + $(meson_feature doc html-build) + -Dmanpage-build=enabled + -Dpdf-build=disabled + + $(meson_feature cplugins) + $(meson_feature iconv) + $(meson_feature javascript) + $(meson_feature zlib) + $(meson_feature bluray libbluray) + $(meson_feature dvd dvdnav) + + $(meson_feature cdda) + + $(meson_feature uchardet) + $(meson_feature rubberband) + $(meson_feature lcms lcms2) + + # Only available in overlays. + -Dvapoursynth=disabled + + $(meson_feature vector) + + $(meson_feature archive libarchive) + + -Dlibavdevice=enabled # Audio outputs: - $(use_enable sdl sdl2) # Listed under audio, but also includes video. - $(use_enable pulseaudio pulse) - $(use_enable jack) - $(use_enable openal) - --disable-opensles - $(use_enable alsa) - $(use_enable coreaudio) + $(meson_feature sdl sdl2-audio) + $(meson_feature pulseaudio pulse) + $(meson_feature jack) + $(meson_feature openal) + $(meson_feature pipewire) + -Dopensles=disabled + $(meson_feature alsa) + $(meson_feature coreaudio) + $(meson_feature sndio) # Video outputs: - $(use_enable aqua cocoa) - $(use_enable drm) - $(use_enable gbm) - $(use_enable wayland wayland-scanner) - $(use_enable wayland wayland-protocols) - $(use_enable wayland) - $(use_enable X x11) - $(use_enable xv) - $(usex opengl "$(use_enable aqua gl-cocoa)" '--disable-gl-cocoa') - $(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11') - $(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11') - $(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm') - $(usex opengl "$(use_enable wayland gl-wayland)" '--disable-gl-wayland') - $(use_enable vdpau) - $(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11') - $(use_enable vaapi) # See below for vaapi-glx, vaapi-x-egl. - $(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11') - $(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland') - $(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm') - $(use_enable libcaca caca) - $(use_enable jpeg) - $(use_enable vulkan shaderc) - $(use_enable vulkan libplacebo) - $(use_enable raspberry-pi rpi) - $(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl') - $(usex opengl '' '--disable-gl') - $(use_enable vulkan) - $(use_enable gamepad sdl2-gamepad) + $(meson_feature sdl sdl2-video) + $(meson_feature aqua cocoa) + $(meson_feature drm) + $(meson_feature gbm) + $(meson_feature wayland) + $(meson_feature X x11) + $(meson_feature xv) + + $(meson_feature opengl gl) + $(usex opengl "$(meson_feature aqua gl-cocoa)" '-Dgl-cocoa=disabled') + $(usex opengl "$(meson_feature X gl-x11)" '-Dgl-x11=disabled') + + $(meson_feature egl) + $(usex egl "$(meson_feature X egl-x11)" "-Degl-x11=disabled") + $(usex egl "$(meson_feature gbm egl-drm)" "-Degl-drm=disabled") + $(usex opengl "$(meson_feature wayland egl-wayland)" '-Degl-wayland=disabled') + + $(meson_feature vdpau) + $(usex vdpau "$(meson_feature opengl vdpau-gl-x11)" '-Dvdpau-gl-x11=disabled') + + $(meson_feature vaapi) # See below for vaapi-glx, vaapi-x-egl. + $(usex vaapi "$(meson_feature X vaapi-x11)" "-Dvaapi-x11=disabled") + $(usex vaapi "$(meson_feature wayland vaapi-wayland)" "-Dvaapi-wayland=disabled") + $(usex vaapi "$(meson_feature gbm vaapi-drm)" "-Dvaapi-drm=disabled") + + $(meson_feature libcaca caca) + $(meson_feature jpeg) + $(meson_feature vulkan shaderc) + $(meson_feature vulkan libplacebo) + $(meson_feature raspberry-pi rpi) + $(meson_feature mmal rpi-mmal) + + -Dsixel=disabled + -Dspirv-cross=disabled + + $(usex libmpv "$(meson_feature opengl plain-gl)" "-Dplain-gl=disabled") + $(meson_feature opengl gl) + $(meson_feature vulkan) + $(meson_feature gamepad sdl2-gamepad) # HWaccels: # Automagic Video Toolbox HW acceleration. See Gentoo bug 577332. - $(use_enable nvenc cuda-hwaccel) - $(use_enable nvenc cuda-interop) + $(meson_feature nvenc cuda-hwaccel) + $(meson_feature nvenc cuda-interop) # TV features: - $(use_enable dvb dvbin) + $(meson_feature dvb dvbin) # Miscellaneous features: - $(use_enable zimg) + $(meson_feature zimg) ) + if use lua; then - if use lua_single_target_luajit; then - mywafargs+=( --lua="luajit" ) - else - # Because it would be too simple to just let the user directly - # specify the package name to check, wouldn't it. - mywafargs+=( --lua="$(ver_rs 1 '' $(ver_cut 1-2 $(lua_get_version)))" ) - fi + emesonargs+=( -Dlua="${ELUA}" ) + else + emesonargs+=( -Dlua=disabled ) fi if use vaapi && use X; then - mywafargs+=( - $(use_enable egl vaapi-x-egl) + emesonargs+=( + $(meson_feature egl vaapi-x-egl) ) fi # Not for us - mywafargs+=( - --disable-android - --disable-egl-android - --disable-uwp - --disable-audiounit - --disable-macos-media-player - --disable-wasapi - --disable-ios-gl - --disable-macos-touchbar - --disable-macos-cocoa-cb - --disable-tvos - --disable-egl-angle-win32 + emesonargs+=( + -Duwp=disabled + -Daudiounit=disabled + -Doss-audio=disabled + -Dwasapi=disabled + + -Dd3d11=disabled + -Ddirect3d=disabled ) - mywafargs+=( - --bashdir="$(get_bashcompdir)" - --zshdir="${EPREFIX}"/usr/share/zsh/site-functions -) - - # Create reproducible non-live builds. - [[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date) + meson_src_configure +} - waf-utils_src_configure "${mywafargs[@]}" +src_test() { + edo "${BUILD_DIR}"/mpv --no-config -v --unittest=all-simple } src_install() { - waf-utils_src_install + meson_src_install if use lua; then insinto /usr/share/${PN} @@ -291,7 +296,7 @@ src_install() { if use tools; then dobin TOOLS/{mpv_identify.sh,umpv} newbin TOOLS/idet.sh mpv_idet.sh - python_replicate_script "${ED}"/usr/bin/umpv + python_fix_shebang "${ED}"/usr/bin/umpv fi } @@ -342,18 +347,3 @@ pkg_postinst() { xdg_icon_cache_update xdg_desktop_database_update } - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update -} - -src_test() { - cd "${S}"/build/test || die - local test - for test in *; do - if [[ -x ${test} ]]; then - ./"${test}" || die "Test suite failed" - fi - done -} diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest index 8a8c9deb0565..2fa5d81a09f5 100644 --- a/media-video/pipewire/Manifest +++ b/media-video/pipewire/Manifest @@ -1,26 +1,23 @@ AUX 99-pipewire-default-hook.conf 540 BLAKE2B cec76e78db9db290054bf766774c284d7a7a1374c453802eb1bdc19db9289856ec7b8643acbab916a39ca859d543deca111e3b0f110d1904343221c1573ffc17 SHA512 ef891e38c6f40fce2904e240307147a58c48d780e8470dac8e28044cfb86ddeb163885a2362687791779379ad814f58ad5649b75ac4e82931c5bdd3f37a6ed01 AUX gentoo-pipewire-launcher.in 1227 BLAKE2B 4316a991978fac653a00d076e9236d0ab6c01a6e4b800c82851e2bd6f9476369605c741aa7ffd47b10853653ef1d4222c449f0b912a0f7694fffd2b1611d7a47 SHA512 edbc03cec765d2307bcf33a14521c6f8beeae52d9fd6a4e181ba66b9f5dd0d64995fdef847453d1a4c682d701814b3afbe70931f55a0e4198fc5c9d87d7a95c5 AUX pipewire-0.3.25-enable-failed-mlock-warning.patch 704 BLAKE2B dc0732b89b57a258ea6dc54941899134259469675f92ae93aebda09a796c73ace8bc4ed0ab2aef4ea1bcaa30c1bea8c3304288168421ce8f9939ec993c8aa438 SHA512 7456a24276b7b766ff5799acf5b80ef5f85ee7a78fc5b52adff3206c0b0aa1985a0bf72634aacf7818c90136c09bcc11cb0fecec291d961c8b3585c897869f65 -AUX pipewire-0.3.25-non-systemd-integration.patch 822 BLAKE2B e80245300313151c01ec56a9be74590d6ee9211a78d9c16180ef1bfb1938a8ad9f8e00f2086d220ca6f8ad2d1c55508cfcc3c240467ed66239808f76029fdcae SHA512 0a7570e0dadd9119ba81b91fc0831ad511ed793f2f10f304547152448e0cf079118c595944e22f31cea94a92a0819524aad26c3fc2d17e73b622b43637cdf06a -AUX pipewire-0.3.29-revert-openaptx-restriction.patch 1228 BLAKE2B a282cd6f678ecd5fd27076cd945b86a8139caf644fae5f6420f45e47cfa1f1ef7edacb6e5c6c0ae860bfaa016de902accb916159f90a85bddb0b26b73658e3ff SHA512 cadfe7c54eec23d2619faf274d2c5c95b4f430525c7fc0b84e667e3f90775d27dbb6682d200d3af5d48475a2b37ab0ff2dd6e8be4f2d69bead68f6f1efb7a7ad -AUX pipewire-0.3.35-non-systemd-integration.patch 820 BLAKE2B bbde90ab174a0101f7c48f682d40b0457a19db23c42c9df9b50d29af9643dcb29d5c03fd5faaa467ef94090c00c9022a01ed699f15bf4b69239ead6a41586880 SHA512 8a545da244ad3cbba35c75c9ea15607ff012bb10143cc349c1feea077ac2db09a28f7e06b3b04095b39b217f4b97af679027aee631d93ea3b281801e799bf60e -AUX pipewire-0.3.36-fix-crash-uaf-media-session.patch 1295 BLAKE2B 7c32a70c48e2cdcaab5cba0315845026ce4feadd2531724e92aa0932f20783253aa00ff4c6f96eeb6124f4ac6011c22afee07fd4cc22488c6ad4619655972155 SHA512 a46341fa86b61f0bf8b80736b411b870d7ac809d556358f4994aaa876a7827811073f99591fb1269ee70dc3b62157d2f1f3d4db63c1cd7729c9f160bf0e621a9 -AUX pipewire-0.3.36-fix-version.patch 716 BLAKE2B c447bd11291f809b7607f4094f2d5e3497996a3834e5d5d468dcc63f0e36c117a31158634c08b8acc724f0ce5b599594b05f79ef3e3128ac28843cc08df03fed SHA512 74c757edf20c911df9299b4322486a34746eec8c4aa212441082f954cebe7c7d9c836a757dd134d71b3c31a97abe1494c13dc470495846ffaf52f943ec397532 -AUX pipewire-0.3.36-missing-limits-include.patch 452 BLAKE2B b498e4ec11ab3d5bc4cebdd0975802b68594678aa928dc85b5a7031276af9ec12edb1423714e3e96c7d658e574c679efa9c18afbee1b47b15f3ce582bc021fff SHA512 decd44a59152e4fdc64b79c2e330a09ca9b8f776e72ef7a0150dfe43d9c25f4e501d41c86a445a979137c412dc85e1ffa38fed91f976596500d2a28010d78407 -AUX pipewire-0.3.49-x86-cast.patch 813 BLAKE2B 11107bb9c5a4c626c2ccc4e4aa62c6370b7e0851a7c788caf51ce33151e7e23e70c7d460f19357c3a3b3fa54ac682637f954737b9445fbb67490c9f823a6280d SHA512 0b8cc44f6da29f3a91dc8a15093dfc6f14e9a2220a02d41ddbccc7ea3cadf62d92d8db12602eab0587f782478a5b2264ae0dd887179645fafda8f3ffd4843089 AUX pipewire-0.3.52-pulse-path.patch 2586 BLAKE2B 2569452967f54ac531f07852fcd78070e61f5972c95eed8d8690461f215330e92aad6eca8c5ac393b0903e6d0c26e8a69fac51b445c39aa428cfd47f0ad4d659 SHA512 0ec2d9ceb5acfdf0ecedb7683db52d0d2ddbee52f318a77720134ec51e920d0f76621b4b44c531b7b1c857d161979351eccb08734e6cb80d0c7a8925399d58b3 +AUX pipewire-0.3.54-audioconvert-samples.patch 736 BLAKE2B fdff5ee71e924d325a0ce652ae1ec9e7ebf99826d7226d21b2578657b7a58ae53461924204c6723fa4dd7da707aa3cb6be4b0a0e3aa963818ddb4fc42952efea SHA512 65ef384a444ab7e07fe14e3b33bdcfa9d651ff1c6400f9b83bb267967a4b21d203c60c59c6ad9051e50d0bf164b2f6048f1956f0bed0752ed05d75184fd383cb AUX pipewire-launcher.sh 149 BLAKE2B 42a9fd174e8216f9941ec72bc50581d539453dd0430ac61712582039f1cfe17cafa050bd87fcb90b9c16ffd891fd9f9c5dfec99b2be8c66eaed0128af180508e SHA512 7f50287565fa44e2296a7b294e8fd3dd64938d2de15c6ff5674d85a6e7bbccbc334c0fb9e28321104aff5335894b3c5a21171f385465e37b422ef53988dbfe4b AUX pipewire.desktop 322 BLAKE2B 0299b9054cf881a5cbbdb128a5e8a51308cf0b5a98260dca756e704504ef057e403b2fb4aa2d58f52dde4be59e416c95d8fce21bc3ca6b6447ecab58263a3f21 SHA512 c13ea531cfdd3798f8d6cd20f5fa8c0a5040c27a6ef3850fdd41102a3bf0bcb73176e3300845af77804a98842fb736841223bc9ac1c92eb2034e9d46e41fc344 AUX pipewire.desktop-r1 325 BLAKE2B 7d823a264e5147bf8669127df22f468518fd54375ed57910f0143821894b33cfee8925b1cf8b9c5b1d219453a5c62fffa50d111b78bc5e151e23aed84d0a577e SHA512 e51ba049484daba3e4cdc5890748267f0c23ea6e57f31f3bb8a49c011e1a61b47b68eea742e5e7bcd58bfeddb96dd4064079fd9787cb66c78bd5eff10799a7bf -DIST pipewire-0.3.30.tar.gz 1540950 BLAKE2B 69b35743e3ad9a8caf68d9bb16cf395203efed6c3046b3f4ea33bbcdd6649f5d425d813042c12396a7cd5ff4e8ed91dbc395a96fe55935ad50f9c3f3918b0407 SHA512 ec525e0fb7e5c5313245fcc745b971fd7d4a1caa7ab9fe1fa38dc20d50f03e5969197e86b60659971676bec0f79aa7b7951c8209bfe9565a3fd1dcac1b8535b3 -DIST pipewire-0.3.36.tar.gz 1708209 BLAKE2B 20fce0d7f88347fe594491d4fae7b6a8edee67ff7749f1a40b807a5d5094d792e61e3efd05dca2221f781c263e34ff0a50ad3c162231911d4b1d87704df6c775 SHA512 f0fc68ea005018b420a4f65a24dc9c85eb6263c24e66852a7ce2b03f966990d62487b388c7d73ff5adfc10c80c439b1200ae876e41d78f91db190036a1799a14 -DIST pipewire-0.3.49.tar.gz 1769037 BLAKE2B 2567bc98933bfbb295358886e8f97db2af2f0a6ee3c2586c1718e39f7eedaed8528a4663753ba56d3295e42576da015ce9278f22aff9bbd9ca43d883bff5a2f6 SHA512 36398872f7d7b31193d7a8885bbdfb415a122bd779874107a0642202dfd8408f39fddf769bfbae4533c2cc99fe9ef67903d50cc721e936aa4802229f1c46d809 DIST pipewire-0.3.51.tar.gz 1789070 BLAKE2B 8538eb9f2178efa26365f30b324b707826e580caa1fd9c09b62c561c140c14186e0d2b04808fa78eb5642ddccf1a347def19934ecd654be06b215a693075b6fc SHA512 a762fd260b4b14ad9ef142be11ab1c22268da6726e2179559ffb254f0ce7daf7a502779e33c64313a9c6a9fc1bd15150b76be04ec81aa27c35dbb4333cecdb4a DIST pipewire-0.3.52.tar.gz 1810238 BLAKE2B bb75eff5fe7700d0a303fbfed7910aebd82346a5a21c4a0d17c06e6991bc90bb6d4f6b9559c25788494cb11faff957523dcd7f0c4c8a40be11b81c63a5a9e5ef SHA512 30e9cf74c92babafe386f02a03bb5c41a8ee5591a02f15845cca1ee44f091ce68eb14d48943d43b680cb525026a19e0290997670f9a82156eaa72e974fe6d01a -EBUILD pipewire-0.3.30-r2.ebuild 9675 BLAKE2B df43c7f1ef0622d96741266e53dc343d9697903571c723c73f5267a8083539fde110ea8f6420f2c86e296d275ab45e4b9abacbd6f0310825a6121336cf11215b SHA512 47cdcbd48311cee24b45c05b3283c4bbe1231c44f6d55136966f887aa43ad69b789bf642e003b17aa6f1a3b59963e68047e4f8c396431cb05f6dd4d3161f8c14 -EBUILD pipewire-0.3.36.ebuild 10263 BLAKE2B 033b26477ad91c843e9307504ce8eddcad7977a386925a1960409767946a88ac539954c7647075bb48ac373b4e36fecf0bbdb5d50351213b51465ea298cad336 SHA512 38d6225ab02d31d1fe33723f7c14a385648853b5f4f84cfd13fcf7f91489dffc2c5fbac5f649bdf80bdd9a4bd1b19977bae59eba83beca9c3d9e34030f6f332b -EBUILD pipewire-0.3.49-r2.ebuild 13074 BLAKE2B bc61ce451afa845425c53de628ddf8eba92ea106dbabd56f995aab078f7112d42cc1649efbeb1ef0c582dd298da74be1df634d6195097ab8787fda761b46c76e SHA512 751dce1df4347d4f1d218d5f147a2c52f23b0f5c5f737d636dc4a89f9fd5c1b8ac44c57a0132f95e0836ba9fa2120832bf5cf7dd01e28d27bb2395939ea8bbe1 -EBUILD pipewire-0.3.51-r2.ebuild 13195 BLAKE2B a4aadc7f5831560ad74b95fba740f5fed50dceb2a9d436c806375782b5376788662fba4afc7172b523a097915c627bd85602ccd5b276851b112d34a3c56b92f3 SHA512 3e4729db31116edb0a6474e48ce90b60cb330320ca594daabed67d99a510d2f2c1de031d41e4c2d95ddd1d39179dbad46cb6a1d3ff0a82a0b7c9c6260cd1d1c8 +DIST pipewire-0.3.53.tar.gz 1783505 BLAKE2B 269466c6ba78cb85516dc714f3aa5d71cdf72a859b6e1a11c60062da6dcd56eefc78958fe026b9fd11d61fd6fbe6f2aac54a2a9fd77d4ee474687f5d54628c38 SHA512 50f23a7b71f3eb20657ff75de54a9f3056270bf05a5472ec9c7dea1c9d0ed391b6b09496d58b065c3cbc40f9be8088b6737cbf0731973498bcd5a8176c42d443 +DIST pipewire-0.3.53_p20220704.tar.bz2 1351516 BLAKE2B 3d4e4859c66e9cbe47adc0f1c0e2e512632793d70853e0105984c06d2e66744b68d1c01dc7a85784ca2007a96aa5fd1c62c7f47ea6360df58ff76b87de4d3ee2 SHA512 87819aa5bdd3caa685c0fc93b0ddcf8212f115cecc130155918876c10883bd98ce923fef3f9716b2562ef5ae2b5465d9e39816f4b6e0c48cf9f28303755584b6 +DIST pipewire-0.3.53_p20220705.tar.bz2 1358645 BLAKE2B 365e81ab114fb9b4abbd5351145d0558c7c00bdbccefc2f7bacb965018c1e7009b7b26b8e95baf35534b74cf9ce49483604841aa7ba949d6a94e720e8ec4233c SHA512 631e737e3517cb4d4c3f84e9540acde2cf94bde472626c61e0223ff4ac5cc2118a35dae79d009558384e24b955cf002d209db1bcf1465056757234725213f152 +DIST pipewire-0.3.54.tar.gz 1789544 BLAKE2B 66b28b36aee0672a1bc8059beb18bf0868d8c01f01823151a732ca8e616860beb1ff4c8eb611f6f17bc99e4201bd1ba8ef44fb8968cedd56be3370e279c75bed SHA512 affb8b4fefd8c1cd3064df0987117931a03e967461d6b8125e3f390b83f6dda1a11d6b30e81590f4780f607b763061dd7a26a7686816dd2801f03d64d43ab8f2 +EBUILD pipewire-0.3.51-r2.ebuild 13194 BLAKE2B 8be112d99c48d5699dc51efe5bb3cff9509d4787f42f97df4ae4c14c254699e13750d2bbf3abf87a4102e763ffec7cd3a49103d29909284d4e94b35a04c0e965 SHA512 3504398ade620b89890c85c18aafa61707068e488ef2c1d1bfda8d9d429cadbf3cfbe333c42b2229201bf778c96e71e333e0d4a08fff59286149ccb1fa7634eb EBUILD pipewire-0.3.52-r1.ebuild 13293 BLAKE2B 17049f576d95cacf15f9e2ba4e0e11c61ecb36cf9cf6cad87b847ffdb5873b3b61607f727af6c3c6c6fd8cbbf3620da6ecb0bf8f77329ae79b34cd7af248dbd2 SHA512 ccaa19700ef8aec87ecb0e1c3a537cf15e7a08a3b603241d3a095e6ba22127d897662ddd3f495b923534f2889714129862c9dec14d3ee59262558d6c7faae9f8 -EBUILD pipewire-9999.ebuild 13256 BLAKE2B 0b486819318ee79b892192e04510a9cdb52465dfcfb9e744b84b0779f56a907d6db64ece5ecddae968696b627f91ea9bf83dcdb090ad47cf878f68752b1bd6c1 SHA512 7193f9ebe1ced1cc1a1b84bd45dde762ed1205df938be724cdaabb76562fc0de960a86e3e90164d46e14a9134bc37ae9e0dbfd84d399cf9f52b93825a0aad71c -MISC metadata.xml 1505 BLAKE2B 415865adf3ecd15444849f69b312a96fb8b59c2a909751b3f8ad868c176fe4c22f76ba0fba78268c75e0847d9c7eb9cc93dbc11d0303d040bb56ded2fc37da9e SHA512 9bd27f8d83889d59bf4fc692e630ab34d2e5fa508bb823c4595b505f95339003c7a81ce1bb37c7294e5a788e9e76297654625d4dfa9aaa3efff05c32e19175b2 +EBUILD pipewire-0.3.53-r1.ebuild 14904 BLAKE2B 26d1fa2c5d616d767b2e333e39e165ce909721692bdcc18d62d15c0249ad00c254aaa25b77a5ca6f60241c2f4b39973db4be77aea9a10548599c5baca97550e6 SHA512 a8f6778d442966547a6ed1314e0f02b8458de2f23d0c154fe543ae0e6be78ad47bd3869f8afd932c9c6908eaf2944d62104a5e1e2a0e6280d3884bedf8274a2a +EBUILD pipewire-0.3.53_p20220704-r1.ebuild 15027 BLAKE2B 04db04cab0edbabc5fd6bb7896592827433501f09a80b2132dc22d33f898e9fe5aab2b8c696de9aca5bb458d2927bd24c2a710354f6b6df6280c1a2819baca5f SHA512 3e4e79486e83e7d191eccb84ab9c04a189c516158662c9f9cc735841989e608a07cdc82765d35a9d1083ff234041e2b183c3ac19e91a810907fdb78d3476fd91 +EBUILD pipewire-0.3.53_p20220705-r1.ebuild 15132 BLAKE2B c384019726ec2652d2032cf09f31bf8b6ef8d1453ceb111921f4a437148f5c66808f6d8a13196d211fb88c7ed7fd46703d89a7341047bb8e1787f3d1661c1fb5 SHA512 184e710cc6d91b4c648f0bbf29bf04523c23936bfb259791a6db47ed61263a4ba135e29c80049553c32e03540fe67f409084919906b09a1b8f2ac1f562263ba3 +EBUILD pipewire-0.3.54-r1.ebuild 15474 BLAKE2B 0cafa483c17190a3d12d049bdf533ea2871795e6efd09bb0842cc6acbb78389f4cf0ff773b6e27c89674078593aec69588c362a47012787f51644f384c33719a SHA512 1725b191017fc944c1386e6e59dee6047ef0084e343e953bec4580efa85d4ec762e684f97a22cc9ba908f7a0189caa3efd5f4f63fff0bf37e69789cd72d1ea1f +EBUILD pipewire-0.3.54.ebuild 15427 BLAKE2B 739879fa7fa51f0ea91cf05a1494594a2b8bf1e8de2f580c6a04ee04c674773025b02b820f390592b493dae25aa163a5b738436a3497be9d5ffc7c10e613f1db SHA512 243c42ef5213eeccc6355670cee87b510c43fbde42408ffcc985a44746ece94af93bb15d80c2a850e7b3925aac90fe67801e1ba5670caf27dfcab9fdd4b1c6aa +EBUILD pipewire-9999.ebuild 15427 BLAKE2B 739879fa7fa51f0ea91cf05a1494594a2b8bf1e8de2f580c6a04ee04c674773025b02b820f390592b493dae25aa163a5b738436a3497be9d5ffc7c10e613f1db SHA512 243c42ef5213eeccc6355670cee87b510c43fbde42408ffcc985a44746ece94af93bb15d80c2a850e7b3925aac90fe67801e1ba5670caf27dfcab9fdd4b1c6aa +MISC metadata.xml 1594 BLAKE2B 5291d3254924bd4710238933a4de6c46af4cd9aee9e688fb09878e310c75e6c6c39a154fd9ee3e85c0b59920590fb590a79882c2efc69551630d291bee69311e SHA512 7d0c3f41df7994338ae7506c8501beae032e6630bf3bed72854a324281ed234d3bbc0bc5100a4687d68256480c965b07e53276157e6366a95d08a4071a2389e5 diff --git a/media-video/pipewire/files/pipewire-0.3.25-non-systemd-integration.patch b/media-video/pipewire/files/pipewire-0.3.25-non-systemd-integration.patch deleted file mode 100644 index 51455a3b84b8..000000000000 --- a/media-video/pipewire/files/pipewire-0.3.25-non-systemd-integration.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in ---- a/src/daemon/pipewire.conf.in -+++ b/src/daemon/pipewire.conf.in -@@ -204,12 +204,12 @@ context.exec = [ - # but it is better to start it as a systemd service. - # Run the session manager with -h for options. - # -- @comment@{ path = "@media_session_path@" args = "" } -+ { path = "@media_session_path@" args = "" } - # - # You can optionally start the pulseaudio-server here as well - # but it is better to start it as a systemd service. - # It can be interesting to start another daemon here that listens - # on another address with the -a option (eg. -a tcp:4713). - # -- @comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" } -+ { path = "@pipewire_path@" args = "-c pipewire-pulse.conf" } - ] diff --git a/media-video/pipewire/files/pipewire-0.3.29-revert-openaptx-restriction.patch b/media-video/pipewire/files/pipewire-0.3.29-revert-openaptx-restriction.patch deleted file mode 100644 index 9da495f12d0d..000000000000 --- a/media-video/pipewire/files/pipewire-0.3.29-revert-openaptx-restriction.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 6d2e45a67cadd9498b24e8e4ea7adc6cf627333d Mon Sep 17 00:00:00 2001 -From: Thomas Deutschmann <whissi@gentoo.org> -Date: Thu, 3 Jun 2021 14:15:44 +0200 -Subject: [PATCH] Revert "openaptx: Blacklist >= 0.2.1 due to license change" - -This reverts commit d08b6fac6bec0d334ee9fc785d551a67832f95fe. - -Doesn't apply to us. - -Bug: https://bugs.gentoo.org/785634 ---- - spa/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/spa/meson.build b/spa/meson.build -index 263af4c2..7671c74b 100644 ---- a/spa/meson.build -+++ b/spa/meson.build -@@ -23,7 +23,7 @@ if not get_option('spa-plugins').disabled() - sbc_dep = dependency('sbc', required: get_option('bluez5')) - ldac_dep = dependency('ldacBT-enc', required : get_option('bluez5-codec-ldac')) - ldac_abr_dep = dependency('ldacBT-abr', required : get_option('bluez5-codec-ldac')) -- aptx_dep = dependency('libopenaptx', version : '< 0.2.1', required : get_option('bluez5-codec-aptx')) -+ aptx_dep = dependency('libopenaptx', required : get_option('bluez5-codec-aptx')) - fdk_aac_dep = dependency('fdk-aac', required : get_option('bluez5-codec-aac')) - endif - avcodec_dep = dependency('libavcodec', required: get_option('ffmpeg')) --- -2.32.0.rc3 - diff --git a/media-video/pipewire/files/pipewire-0.3.35-non-systemd-integration.patch b/media-video/pipewire/files/pipewire-0.3.35-non-systemd-integration.patch deleted file mode 100644 index 3edab5b924c8..000000000000 --- a/media-video/pipewire/files/pipewire-0.3.35-non-systemd-integration.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/src/daemon/pipewire.conf.in -+++ b/src/daemon/pipewire.conf.in -@@ -235,12 +235,12 @@ context.exec = [ - # but it is better to start it as a systemd service. - # Run the session manager with -h for options. - # -- @sm_comment@{ path = "@session_manager_path@" args = "@session_manager_args@" } -+ { path = "@session_manager_path@" args = "@session_manager_args@" } - # - # You can optionally start the pulseaudio-server here as well - # but it is better to start it as a systemd service. - # It can be interesting to start another daemon here that listens - # on another address with the -a option (eg. -a tcp:4713). - # -- @pulse_comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" } -+ { path = "@pipewire_path@" args = "-c pipewire-pulse.conf" } - ] --- -2.33.0 - diff --git a/media-video/pipewire/files/pipewire-0.3.36-fix-crash-uaf-media-session.patch b/media-video/pipewire/files/pipewire-0.3.36-fix-crash-uaf-media-session.patch deleted file mode 100644 index 6080ff4fd7ab..000000000000 --- a/media-video/pipewire/files/pipewire-0.3.36-fix-crash-uaf-media-session.patch +++ /dev/null @@ -1,36 +0,0 @@ -https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/39c8ed4f62172026036281691cd3b67b469a8629 - -From 39c8ed4f62172026036281691cd3b67b469a8629 Mon Sep 17 00:00:00 2001 -From: Pauli Virtanen <pav@iki.fi> -Date: Thu, 16 Sep 2021 19:18:52 +0300 -Subject: [PATCH] media-session: don't use-after-free if linking node removed - -Should fix an ASAN crash. ---- - src/examples/media-session/policy-node.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/examples/media-session/policy-node.c b/src/examples/media-session/policy-node.c -index d83613d0b..e273434fa 100644 ---- a/src/examples/media-session/policy-node.c -+++ b/src/examples/media-session/policy-node.c -@@ -869,6 +869,7 @@ static int link_nodes(struct node *node, struct node *peer) - struct pw_properties *props; - struct node *output, *input; - int res; -+ uint32_t node_id = node->id; - - pw_log_debug(NAME " %p: link nodes %d %d remix:%d", impl, - node->id, peer->id, !node->dont_remix); -@@ -902,7 +903,7 @@ static int link_nodes(struct node *node, struct node *peer) - - if (impl->linking_node_removed) { - impl->linking_node_removed = false; -- pw_log_info("linking node %d was removed", node->id); -+ pw_log_info("linking node %d was removed", node_id); - return -ENOENT; - } - node->linking = false; --- -GitLab - diff --git a/media-video/pipewire/files/pipewire-0.3.36-fix-version.patch b/media-video/pipewire/files/pipewire-0.3.36-fix-version.patch deleted file mode 100644 index ace05b9e4a14..000000000000 --- a/media-video/pipewire/files/pipewire-0.3.36-fix-version.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/10abcd92d76ddd02b690ff06d67c013bfc5fa5c2 - -From 10abcd92d76ddd02b690ff06d67c013bfc5fa5c2 Mon Sep 17 00:00:00 2001 -From: Wim Taymans <wtaymans@redhat.com> -Date: Thu, 16 Sep 2021 17:57:47 +0200 -Subject: [PATCH] update version number as well - ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index c9b98c8ba..ea35ac674 100644 ---- a/meson.build -+++ b/meson.build -@@ -1,5 +1,5 @@ - project('pipewire', ['c' ], -- version : '0.3.35', -+ version : '0.3.36', - license : [ 'MIT', 'LGPL-2.1-or-later', 'GPL-2.0-only' ], - meson_version : '>= 0.54.0', - default_options : [ 'warning_level=3', --- -GitLab - diff --git a/media-video/pipewire/files/pipewire-0.3.36-missing-limits-include.patch b/media-video/pipewire/files/pipewire-0.3.36-missing-limits-include.patch deleted file mode 100644 index c7ed7b973a91..000000000000 --- a/media-video/pipewire/files/pipewire-0.3.36-missing-limits-include.patch +++ /dev/null @@ -1,17 +0,0 @@ -https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/6168067cb2a45ffa3c92aff1135659feaf9c1240 - -From: Leonardo Neumann <leonardo@neumann.dev.br> -Date: Sat, 18 Sep 2021 04:36:20 -0300 -Subject: [PATCH] fix missing limits.h include - ---- a/src/pipewire/impl-module.c -+++ b/src/pipewire/impl-module.c -@@ -28,6 +28,7 @@ - #include <stdio.h> - #include <dlfcn.h> - #include <dirent.h> -+#include <limits.h> - #include <sys/stat.h> - #include <errno.h> - -GitLab diff --git a/media-video/pipewire/files/pipewire-0.3.49-x86-cast.patch b/media-video/pipewire/files/pipewire-0.3.49-x86-cast.patch deleted file mode 100644 index 58b4b331e03e..000000000000 --- a/media-video/pipewire/files/pipewire-0.3.49-x86-cast.patch +++ /dev/null @@ -1,20 +0,0 @@ -https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/5a023c8c84fb053d452983a64a33a41b931fc99b -https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/2271 - -From: Wim Taymans <wtaymans@redhat.com> -Date: Thu, 21 Apr 2022 22:12:38 +0200 -Subject: [PATCH] alsa: fix argument type for Long - -Fixes #2271 ---- a/spa/plugins/alsa/alsa-pcm.c -+++ b/spa/plugins/alsa/alsa-pcm.c -@@ -311,7 +311,7 @@ struct spa_pod *spa_alsa_enum_propinfo(struct state *state, - SPA_PROP_INFO_name, SPA_POD_String("latency.internal.ns"), - SPA_PROP_INFO_description, SPA_POD_String("Internal latency in nanoseconds"), - SPA_PROP_INFO_type, SPA_POD_CHOICE_RANGE_Long(state->process_latency.ns, -- 0, 2 * SPA_NSEC_PER_SEC), -+ 0LL, 2 * SPA_NSEC_PER_SEC), - SPA_PROP_INFO_params, SPA_POD_Bool(true)); - break; - case 15: -GitLab diff --git a/media-video/pipewire/files/pipewire-0.3.54-audioconvert-samples.patch b/media-video/pipewire/files/pipewire-0.3.54-audioconvert-samples.patch new file mode 100644 index 000000000000..9c231a9f28f5 --- /dev/null +++ b/media-video/pipewire/files/pipewire-0.3.54-audioconvert-samples.patch @@ -0,0 +1,23 @@ +https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/7b0106883716cb0fa72a2b3c4715175607ec658a + +From: Wim Taymans <wtaymans@redhat.com> +Date: Fri, 8 Jul 2022 09:23:31 +0200 +Subject: [PATCH] audioconvert: consume right amount of input samples + +When we are not using the resampler, we consume the same amount of +input samples as output samples. + +Fixes #2519 +--- a/spa/plugins/audioconvert/audioconvert.c ++++ b/spa/plugins/audioconvert/audioconvert.c +@@ -2542,8 +2542,8 @@ static int impl_node_process(void *object) + this->in_offset += in_len; + n_samples = out_len; + } else { +- this->in_offset += n_samples; + n_samples = SPA_MIN(n_samples, n_out); ++ this->in_offset += n_samples; + } + this->out_offset += n_samples; + +GitLab diff --git a/media-video/pipewire/metadata.xml b/media-video/pipewire/metadata.xml index b7e4f57f5480..08adc4c25b4f 100644 --- a/media-video/pipewire/metadata.xml +++ b/media-video/pipewire/metadata.xml @@ -28,5 +28,6 @@ <flag name="ssl">Enable raop-sink support (needs <pkg>dev-libs/openssl</pkg>)</flag> <flag name="system-service">Install systemd unit files for running as a system service. Not recommended.</flag> <flag name="X">Enable audible bell for X11</flag> + <flag name="sound-server">Provide sound server using ALSA and bluetooth devices</flag> </use> </pkgmetadata> diff --git a/media-video/pipewire/pipewire-0.3.30-r2.ebuild b/media-video/pipewire/pipewire-0.3.30-r2.ebuild deleted file mode 100644 index c27f6c9196f0..000000000000 --- a/media-video/pipewire/pipewire-0.3.30-r2.ebuild +++ /dev/null @@ -1,274 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_{7..10} ) - -inherit meson-multilib optfeature python-any-r1 udev - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git" - inherit git-r3 -else - SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz" - KEYWORDS="amd64 arm arm64 ppc ppc64 x86" -fi - -DESCRIPTION="Multimedia processing graphs" -HOMEPAGE="https://pipewire.org/" - -LICENSE="MIT LGPL-2.1+ GPL-2" -SLOT="0/0.3" -IUSE="bluetooth doc extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l" - -# 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)! - -REQUIRED_USE="jack-sdk? ( !jack-client )" - -RESTRICT="!test? ( test )" - -BDEPEND=" - app-doc/xmltoman - virtual/pkgconfig - ${PYTHON_DEPS} - doc? ( - app-doc/doxygen - media-gfx/graphviz - ) -" -RDEPEND=" - acct-group/audio - media-libs/alsa-lib - sys-apps/dbus[${MULTILIB_USEDEP}] - sys-libs/ncurses:=[unicode(+)] - virtual/libintl[${MULTILIB_USEDEP}] - virtual/libudev[${MULTILIB_USEDEP}] - bluetooth? ( - media-libs/fdk-aac - media-libs/libldac - media-libs/libopenaptx - media-libs/sbc - >=net-wireless/bluez-4.101:= - ) - extra? ( - >=media-libs/libsndfile-1.0.20 - ) - 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 - ) - pipewire-alsa? ( - >=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}] - || ( - media-plugins/alsa-plugins[-pulseaudio] - !media-plugins/alsa-plugins - ) - ) - !pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] ) - systemd? ( sys-apps/systemd ) - v4l? ( media-libs/libv4l ) -" - -DEPEND="${RDEPEND}" - -# 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}"/${PN}-0.3.29-revert-openaptx-restriction.patch -) - -# limitsdfile related code taken from =sys-auth/realtime-base-0.1 -# with changes as necessary. -limitsdfile=40-${PN}.conf - -src_prepare() { - default - - if ! use systemd; then - # This can be applied non-conditionally but would make for a - # significantly worse user experience on systemd then. - eapply "${FILESDIR}"/${PN}-0.3.25-non-systemd-integration.patch - fi - - einfo "Generating ${limitsdfile}" - cat > ${limitsdfile} <<- EOF || die - # Start of ${limitsdfile} from ${P} - - @audio - memlock 256 - - # End of ${limitsdfile} from ${P} - EOF -} - -multilib_src_configure() { - local emesonargs=( - -Ddocdir="${EPREFIX}"/usr/share/doc/${PF} - $(meson_native_use_feature doc docs) - $(meson_native_enabled examples) # Disabling this implicitly disables -Dmedia-session - $(meson_native_enabled media-session) - $(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) - -Dsystemd-system-service=disabled # Matches upstream - $(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 (-Dmedia-session depends on this) - -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) - $(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) - -Dcontrol=enabled # Matches upstream - -Daudiotestsrc=enabled # Matches upstream - -Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020 - -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_feature 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 v4l v4l2) - -Dlibcamera=disabled # libcamera is not in Portage tree - -Dvideoconvert=enabled # Matches upstream - -Dvideotestsrc=enabled # Matches upstream - -Dvolume=enabled # Matches upstream - -Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream) - $(meson_native_use_feature extra pw-cat) - -Dudev=enabled - -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d" - -Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install) - $(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat) - ) - - meson_src_configure -} - -multilib_src_install() { - # Our customs 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 - # These will break if someone has /etc that is a symbol 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.conf /etc/alsa/conf.d/99-pipewire-default.conf - fi - - if ! use systemd; then - insinto /etc/xdg/autostart - newins "${FILESDIR}"/pipewire.desktop pipewire.desktop - - exeinto /usr/libexec - newexe "${FILESDIR}"/pipewire-launcher.sh pipewire-launcher - fi -} - -pkg_postinst() { - 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 - - 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 "To use PipeWire for audio, the user units must be manually enabled:" - elog - elog " systemctl --user enable pipewire.socket pipewire-pulse.socket" - elog - elog "When switching from PulseAudio, do not forget to disable PulseAudio:" - elog - elog " systemctl --user disable pulseaudio.service pulseaudio.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 pipewire-media-session:" - elog - elog " systemctl --user enable pipewire-media-session.service" - elog - elog "NOTE: This is not required when using PipeWire only for screencasting." - elog - else - elog "This ebuild auto-enables PulseAudio replacement. Because of that, users" - elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable " - elog "autospawn'ing 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}/etc/pipewire/pipewire.conf by commenting out the relevant" - elog "command near the end of the file:" - elog - elog "#\"/usr/bin/pipewire\" = { args = \"-c pipewire-pulse.conf\" }" - elog - elog "NOTE:" - elog "Starting with PipeWire-0.3.30, package is no longer installing config" - elog "into ${EROOT}/etc/pipewire by default. In case you need to change" - elog "config, please start by copying default config from ${EROOT}/usr/share/pipewire" - elog "and just override sections you want to change." - 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 - # Once hsphfpd lands in tree, both it and ofono will need to be checked for presence here! - if use bluetooth; then - optfeature "better BT headset support (daemon startup required)" net-misc/ofono - #optfeature "an oFono alternative (not packaged)" foo-bar/hsphfpd - fi -} diff --git a/media-video/pipewire/pipewire-0.3.36.ebuild b/media-video/pipewire/pipewire-0.3.36.ebuild deleted file mode 100644 index 3225dc16d442..000000000000 --- a/media-video/pipewire/pipewire-0.3.36.ebuild +++ /dev/null @@ -1,284 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_{8..10} ) - -inherit meson-multilib optfeature python-any-r1 udev - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git" - inherit git-r3 -else - SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz" - KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv x86" -fi - -DESCRIPTION="Multimedia processing graphs" -HOMEPAGE="https://pipewire.org/" - -LICENSE="MIT LGPL-2.1+ GPL-2" -SLOT="0/0.3" -IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l" - -# 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)! - -REQUIRED_USE="jack-sdk? ( !jack-client )" - -RESTRICT="!test? ( test )" - -BDEPEND=" - app-doc/xmltoman - >=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-apps/dbus[${MULTILIB_USEDEP}] - sys-libs/ncurses:=[unicode(+)] - virtual/libintl[${MULTILIB_USEDEP}] - virtual/libudev[${MULTILIB_USEDEP}] - bluetooth? ( - media-libs/fdk-aac - media-libs/libldac - media-libs/libfreeaptx - media-libs/sbc - >=net-wireless/bluez-4.101:= - ) - echo-cancel? ( media-libs/webrtc-audio-processing:0 ) - extra? ( - >=media-libs/libsndfile-1.0.20 - ) - 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 - ) - pipewire-alsa? ( - >=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}] - !media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] - ) - !pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] ) - systemd? ( sys-apps/systemd ) - v4l? ( media-libs/libv4l ) -" - -DEPEND="${RDEPEND}" - -# 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}-fix-crash-uaf-media-session.patch - "${FILESDIR}"/${P}-fix-version.patch - "${FILESDIR}"/${P}-missing-limits-include.patch -) - -# limitsdfile related code taken from =sys-auth/realtime-base-0.1 -# with changes as necessary. -limitsdfile=40-${PN}.conf - -python_check_deps() { - has_version -b "dev-python/docutils[${PYTHON_USEDEP}]" -} - -src_prepare() { - default - - if ! use systemd; then - # This can be applied non-conditionally but would make for a - # significantly worse user experience on systemd then. - eapply "${FILESDIR}"/${PN}-0.3.35-non-systemd-integration.patch - fi - - einfo "Generating ${limitsdfile}" - cat > ${limitsdfile} <<- EOF || die - # Start of ${limitsdfile} from ${P} - - @audio - memlock 256 - - # End of ${limitsdfile} from ${P} - EOF -} - -multilib_src_configure() { - local emesonargs=( - -Ddocdir="${EPREFIX}"/usr/share/doc/${PF} - $(meson_native_use_feature doc docs) - $(meson_native_enabled examples) # Disabling this implicitly disables -Dmedia-session - # Replaced upstream by -Dsession-managers=..., needs more work, bug #812809 - # but default is same as before and right now, this is fatal with unreleased Meson. - #$(meson_native_enabled media-session) - $(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) - -Dsystemd-system-service=disabled # Matches upstream - $(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 (-Dmedia-session depends on this) - -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) - $(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 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 - -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 v4l v4l2) - -Dlibcamera=disabled # libcamera is not in Portage tree - -Dvideoconvert=enabled # Matches upstream - -Dvideotestsrc=enabled # Matches upstream - -Dvolume=enabled # Matches upstream - -Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream) - $(meson_native_use_feature extra pw-cat) - -Dudev=enabled - -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d" - -Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install) - $(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat) - ) - - meson_src_configure -} - -multilib_src_install() { - # Our customs 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 - # These will break if someone has /etc that is a symbol 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.conf /etc/alsa/conf.d/99-pipewire-default.conf - fi - - if ! use systemd; then - insinto /etc/xdg/autostart - newins "${FILESDIR}"/pipewire.desktop pipewire.desktop - - exeinto /usr/libexec - newexe "${FILESDIR}"/pipewire-launcher.sh pipewire-launcher - fi -} - -pkg_postinst() { - 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 - - 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 "To use PipeWire for audio, 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 --now pipewire.socket pipewire-pulse.socket" - elog - elog "When switching from PulseAudio, do not forget to disable PulseAudio likewise:" - elog - elog " systemctl --user disable --now pulseaudio.service pulseaudio.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 pipewire-media-session" - elog "for relevant users:" - elog - elog " systemctl --user enable --now pipewire-media-session.service" - elog - else - elog "This ebuild auto-enables PulseAudio replacement. Because of that, users" - elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable" - elog "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}/etc/pipewire/pipewire.conf by commenting out the relevant" - elog "command near the end of the file:" - elog - elog "#\"/usr/bin/pipewire\" = { args = \"-c pipewire-pulse.conf\" }" - elog - 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 "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 - - # Once hsphfpd lands in tree, both it and ofono will need to be checked for presence here! - if use bluetooth; then - optfeature "better BT headset support (daemon startup required)" net-misc/ofono - #optfeature "an oFono alternative (not packaged)" foo-bar/hsphfpd - fi -} diff --git a/media-video/pipewire/pipewire-0.3.51-r2.ebuild b/media-video/pipewire/pipewire-0.3.51-r2.ebuild index 36646e433754..dd429a538658 100644 --- a/media-video/pipewire/pipewire-0.3.51-r2.ebuild +++ b/media-video/pipewire/pipewire-0.3.51-r2.ebuild @@ -19,7 +19,7 @@ else SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz" fi - KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86" + KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86" fi DESCRIPTION="Multimedia processing graphs" diff --git a/media-video/pipewire/pipewire-0.3.49-r2.ebuild b/media-video/pipewire/pipewire-0.3.53-r1.ebuild index b7acb4f37fa8..1c8969b1cff1 100644 --- a/media-video/pipewire/pipewire-0.3.49-r2.ebuild +++ b/media-video/pipewire/pipewire-0.3.53-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{8..11} ) inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev @@ -19,7 +19,7 @@ else SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz" fi - KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" fi DESCRIPTION="Multimedia processing graphs" @@ -28,7 +28,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 doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewire-alsa ssl system-service systemd test udev v4l X zeroconf" +IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewire-alsa +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 @@ -36,9 +37,15 @@ IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewir # 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 ) system-service? ( systemd ) + !sound-server? ( !pipewire-alsa ) " RESTRICT="!test? ( test )" @@ -85,9 +92,12 @@ RDEPEND=" lv2? ( media-libs/lilv ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}] - !media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] ) !pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] ) + sound-server? ( + !media-sound/pulseaudio[daemon(+)] + !media-sound/pulseaudio-daemon + ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( @@ -124,8 +134,6 @@ DOCS=( {README,INSTALL}.md NEWS ) PATCHES=( "${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch - - "${FILESDIR}"/${PN}-0.3.49-x86-cast.patch ) # limitsdfile related code taken from =sys-auth/realtime-base-0.1 @@ -192,6 +200,8 @@ multilib_src_configure() { $(meson_native_use_feature bluetooth bluez5-codec-ldac) $(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-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 @@ -239,10 +249,25 @@ multilib_src_install_all() { 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.conf /etc/alsa/conf.d/99-pipewire-default.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 @@ -251,6 +276,12 @@ multilib_src_install_all() { 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 } @@ -265,6 +296,18 @@ pkg_postinst() { 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." @@ -305,7 +348,8 @@ pkg_postinst() { 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 has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon'; then + + 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" diff --git a/media-video/pipewire/pipewire-0.3.53_p20220704-r1.ebuild b/media-video/pipewire/pipewire-0.3.53_p20220704-r1.ebuild new file mode 100644 index 000000000000..bd99803c14b4 --- /dev/null +++ b/media-video/pipewire/pipewire-0.3.53_p20220704-r1.ebuild @@ -0,0 +1,407 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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="a46d4aedd7934cf1068e360f80e61fa2b68f20ff" + 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.gz" + 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 doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewire-alsa +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 ) + system-service? ( systemd ) + !sound-server? ( !pipewire-alsa ) +" + +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-apps/dbus[${MULTILIB_USEDEP}] + sys-libs/readline:= + sys-libs/ncurses:=[unicode(+)] + virtual/libintl[${MULTILIB_USEDEP}] + bluetooth? ( + media-libs/fdk-aac + media-libs/libldac + media-libs/libfreeaptx + media-libs/sbc + >=net-wireless/bluez-4.101:= + virtual/libusb:1 + ) + echo-cancel? ( media-libs/webrtc-audio-processing:0 ) + extra? ( + >=media-libs/libsndfile-1.0.20 + ) + 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 ) + pipewire-alsa? ( + >=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}] + ) + sound-server? ( + !media-sound/pulseaudio[daemon(+)] + !media-sound/pulseaudio-daemon + ) + 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 +) + +# limitsdfile related code taken from =sys-auth/realtime-base-0.1 +# with changes as necessary. +limitsdfile=40-${PN}.conf + +python_check_deps() { + has_version -b "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_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) + $(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 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-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 + -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 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_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.53_p20220705-r1.ebuild b/media-video/pipewire/pipewire-0.3.53_p20220705-r1.ebuild new file mode 100644 index 000000000000..e8e364be1937 --- /dev/null +++ b/media-video/pipewire/pipewire-0.3.53_p20220705-r1.ebuild @@ -0,0 +1,413 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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="76350cebefe9bdabe24e9d043b83737547c225d8" + 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.gz" + 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 gstreamer jack-client jack-sdk lv2 +pipewire-alsa 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 ) + 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/readline:= + sys-libs/ncurses:=[unicode(+)] + virtual/libintl[${MULTILIB_USEDEP}] + bluetooth? ( + media-libs/fdk-aac + media-libs/libldac + media-libs/libfreeaptx + 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 + ) + 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 ) + pipewire-alsa? ( + >=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}] + ) + sound-server? ( + !media-sound/pulseaudio[daemon(+)] + !media-sound/pulseaudio-daemon + ) + 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 +) + +# limitsdfile related code taken from =sys-auth/realtime-base-0.1 +# with changes as necessary. +limitsdfile=40-${PN}.conf + +python_check_deps() { + has_version -b "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) + $(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 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-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 + -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 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.54-r1.ebuild b/media-video/pipewire/pipewire-0.3.54-r1.ebuild new file mode 100644 index 000000000000..f8b1bc7b1bc0 --- /dev/null +++ b/media-video/pipewire/pipewire-0.3.54-r1.ebuild @@ -0,0 +1,421 @@ +# 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. 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.gz" + 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 gstreamer jack-client jack-sdk lv2 +pipewire-alsa 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 ) + 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/readline:= + sys-libs/ncurses:=[unicode(+)] + virtual/libintl[${MULTILIB_USEDEP}] + bluetooth? ( + media-libs/fdk-aac + media-libs/libldac + media-libs/libfreeaptx + 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 + ) + 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 ) + pipewire-alsa? ( + >=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}] + ) + sound-server? ( + !media-sound/pulseaudio[daemon(+)] + !media-sound/pulseaudio-daemon + ) + 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}-audioconvert-samples.patch +) + +# limitsdfile related code taken from =sys-auth/realtime-base-0.1 +# with changes as necessary. +limitsdfile=40-${PN}.conf + +python_check_deps() { + has_version -b "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) + $(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 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-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 + -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 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.54.ebuild b/media-video/pipewire/pipewire-0.3.54.ebuild new file mode 100644 index 000000000000..449554e6270c --- /dev/null +++ b/media-video/pipewire/pipewire-0.3.54.ebuild @@ -0,0 +1,420 @@ +# 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. 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.gz" + 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 gstreamer jack-client jack-sdk lv2 +pipewire-alsa 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 ) + 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/readline:= + sys-libs/ncurses:=[unicode(+)] + virtual/libintl[${MULTILIB_USEDEP}] + bluetooth? ( + media-libs/fdk-aac + media-libs/libldac + media-libs/libfreeaptx + 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 + ) + 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 ) + pipewire-alsa? ( + >=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}] + ) + sound-server? ( + !media-sound/pulseaudio[daemon(+)] + !media-sound/pulseaudio-daemon + ) + 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 +) + +# limitsdfile related code taken from =sys-auth/realtime-base-0.1 +# with changes as necessary. +limitsdfile=40-${PN}.conf + +python_check_deps() { + has_version -b "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) + $(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 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-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 + -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 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-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild index 9ab78449ccc3..449554e6270c 100644 --- a/media-video/pipewire/pipewire-9999.ebuild +++ b/media-video/pipewire/pipewire-9999.ebuild @@ -3,6 +3,13 @@ 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. 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 @@ -28,7 +35,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 doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewire-alsa ssl system-service systemd test udev v4l X zeroconf" +IUSE="bluetooth dbus doc echo-cancel extra gstreamer jack-client jack-sdk lv2 +pipewire-alsa 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 @@ -36,9 +44,16 @@ IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewir # 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 ) system-service? ( systemd ) + !sound-server? ( !pipewire-alsa ) + jack-client? ( dbus ) " RESTRICT="!test? ( test )" @@ -56,7 +71,6 @@ BDEPEND=" RDEPEND=" acct-group/audio media-libs/alsa-lib - sys-apps/dbus[${MULTILIB_USEDEP}] sys-libs/readline:= sys-libs/ncurses:=[unicode(+)] virtual/libintl[${MULTILIB_USEDEP}] @@ -68,6 +82,7 @@ RDEPEND=" >=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 @@ -86,7 +101,10 @@ RDEPEND=" pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}] ) - !pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] ) + sound-server? ( + !media-sound/pulseaudio[daemon(+)] + !media-sound/pulseaudio-daemon + ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( @@ -159,6 +177,7 @@ multilib_src_configure() { 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 @@ -250,16 +269,35 @@ multilib_src_install_all() { 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 @@ -270,6 +308,18 @@ pkg_postinst() { 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." @@ -310,7 +360,8 @@ pkg_postinst() { 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 has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon'; then + + 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" @@ -342,6 +393,10 @@ pkg_postinst() { 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 diff --git a/media-video/shotcut/Manifest b/media-video/shotcut/Manifest index 090b68583a32..e1d5fbf80c56 100644 --- a/media-video/shotcut/Manifest +++ b/media-video/shotcut/Manifest @@ -1,6 +1,6 @@ -DIST shotcut-21.10.31.tar.gz 4408987 BLAKE2B 88c77503475de21a4989d0e412a214c2d5c2c30d60abf11e06326a599e14c4b1a7d7b678c494d13223cf7e11c6dd12c810e7d112750f4f18308250693316a8cd SHA512 de5d9992a41217323b3d96cc7618ed5adc633e7d0e65b6f8f189405008f6faba011a80f38cda0126b18ab28a359f6784078cb298b2ee29dcdfdc6769963714f3 DIST shotcut-21.12.24.tar.gz 4522616 BLAKE2B 3d6f423e888971f8913b0fa0d21fd0b122f941840b871275cd7c56e747c5637ecef56b2111b0c7be953bb71013aee66361202aea74e9d1ffe4028d07580815c0 SHA512 4173a2772cc5dcb62f113301aca7c3e0d1c32985b235e38f6c0bc17e0fdad88443123efb71d9fd4d97366d95500ce41776d4d8b1e214fc4c421219185fe112f4 -EBUILD shotcut-21.10.31.ebuild 1385 BLAKE2B 28908cfda2e9cfa163cf0dc240c150324265ae344074dea1175d16ee20f2e76ba323e33172f3563de6d7e4d41042d8e862f2f7b548da099b4c81076c27e43200 SHA512 8b8352a3ec366c19910793424b51b1bbd4c5a9709ec97fd737e45f456eeceed6ad0637cfcf2df5431c2a15e93f6461f02e1c64cb4801a34c7e5484ae664ced7d +DIST shotcut-22.04.25.tar.gz 4600941 BLAKE2B 5f8ba47897c3a8ce078a35c06c90454c8c1df9bd9bd3330466a1be869b7b9c9ec45aaf6d3b5aad0587857ff5613ef22f15c4b5142c8247b97c81bb8345b3ff4d SHA512 e5c51868a7f6e2ead3993d8577b5439408e9c54ee20274658c822666e2ca5fceb7d2360d02b8808b464c69005d83b6742a3a750ec244ffe69f82f2abd5ad39fc EBUILD shotcut-21.12.24.ebuild 1382 BLAKE2B 4f8438dcf54e61ff209c4abaef469b47ced010a9eeb8411230db4e65e8cbeb6d3512db62ea62e2fbf7a34a03c9b33b57e479bec0f6cb46fe15876b0f8ae53ed0 SHA512 8ce2d60fec43e55dcd1ecda720d93373203802dcfce5dfc5d910830c61755ea28fb207374ae6be20e049d10a0ab0a2083d1db1e3c2afe9c5648546636a6337e8 -EBUILD shotcut-9999.ebuild 1385 BLAKE2B 28908cfda2e9cfa163cf0dc240c150324265ae344074dea1175d16ee20f2e76ba323e33172f3563de6d7e4d41042d8e862f2f7b548da099b4c81076c27e43200 SHA512 8b8352a3ec366c19910793424b51b1bbd4c5a9709ec97fd737e45f456eeceed6ad0637cfcf2df5431c2a15e93f6461f02e1c64cb4801a34c7e5484ae664ced7d +EBUILD shotcut-22.04.25-r1.ebuild 1382 BLAKE2B a52d4612f5934aa66d0abca7f702798b5f58dd209bea2d0038ace89113366dc91175fb2d716fa71990a9bcd6e59b997096aa8e21e19b31d0a0afc8abafc20f1d SHA512 43926b473f57533214e4ab29d026e5ac737b3751fe01fc9df3b288fa0e9439ca7ebe8848111cc5ca96421263adfa183ee3e65eb8e1ced395106a96e1c21555dc +EBUILD shotcut-9999.ebuild 1382 BLAKE2B a52d4612f5934aa66d0abca7f702798b5f58dd209bea2d0038ace89113366dc91175fb2d716fa71990a9bcd6e59b997096aa8e21e19b31d0a0afc8abafc20f1d SHA512 43926b473f57533214e4ab29d026e5ac737b3751fe01fc9df3b288fa0e9439ca7ebe8848111cc5ca96421263adfa183ee3e65eb8e1ced395106a96e1c21555dc MISC metadata.xml 481 BLAKE2B 183f296894a3deb21038399eec0a637f2080d029fb8ea539a5a165206868704e472ed554bec67325fb54a4d8aeea54c01857635e32abdd229c91f3ba7855d095 SHA512 95af90837128290393f798b1561ebcbad057da1b5dafb583f9f9ba56878ff1d48245438ea3605601fad608e749235619d2195290c04c5c31eb8bbe627b58f4a7 diff --git a/media-video/shotcut/shotcut-21.10.31.ebuild b/media-video/shotcut/shotcut-22.04.25-r1.ebuild index 288a54c92b74..beb71ab8d58c 100644 --- a/media-video/shotcut/shotcut-21.10.31.ebuild +++ b/media-video/shotcut/shotcut-22.04.25-r1.ebuild @@ -36,7 +36,7 @@ COMMON_DEPEND=" dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 - >=media-libs/mlt-7.2.0-r1[ffmpeg,frei0r,fftw(+),jack,opengl,qt5,sdl,xml] + >=media-libs/mlt-7.6.0[ffmpeg,frei0r,fftw(+),jack,opengl,qt5,sdl,xml] media-video/ffmpeg " DEPEND="${COMMON_DEPEND} diff --git a/media-video/shotcut/shotcut-9999.ebuild b/media-video/shotcut/shotcut-9999.ebuild index 288a54c92b74..beb71ab8d58c 100644 --- a/media-video/shotcut/shotcut-9999.ebuild +++ b/media-video/shotcut/shotcut-9999.ebuild @@ -36,7 +36,7 @@ COMMON_DEPEND=" dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 - >=media-libs/mlt-7.2.0-r1[ffmpeg,frei0r,fftw(+),jack,opengl,qt5,sdl,xml] + >=media-libs/mlt-7.6.0[ffmpeg,frei0r,fftw(+),jack,opengl,qt5,sdl,xml] media-video/ffmpeg " DEPEND="${COMMON_DEPEND} diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest index 54ea6f58356e..8d8ea8b14772 100644 --- a/media-video/vdr/Manifest +++ b/media-video/vdr/Manifest @@ -6,11 +6,15 @@ AUX vdr-2.2.0_gentoo.patch 2395 BLAKE2B 72f238b09ae26f915b9de53c357815a757f158da AUX vdr-2.2.0_glibc-2.24.patch 1395 BLAKE2B 83a82c516554c2fce3b47078c494ddbbd0dbdbe148f1e6525532865b6f61a79110da5d55d17e6357887655ba840525f7349b221bb356a180813ae28bdfd7d1de SHA512 73acef83ada40d067b1c7207e527d782de5bc16027571a31f6411a5a075ef6fbdbd3ecd466314aaa08a01b0bf90a35c36306b5533ea4fecc0e024f7df939517a AUX vdr-2.2.0_glibc-2.31.patch 818 BLAKE2B f63347ecac626d06477e7bf3f5d203dc81d988d8f69590b5c1bcbcefc44657a36f3a3edc7b97c4cbb1f5a6019b5109cf4fb12042b62872c176b8b68d3b032e98 SHA512 b800bc04b984b06b5943473d1726ef198558a62f8c633791272a4ed0ce18ac54b85eefe973b18531beaa8626401c7b38687790692182c787c9b04380b2ebecb0 AUX vdr-2.2.0_unsignedtosigned.patch 5237 BLAKE2B 21c3eddc9e5684337be332ae22c97b6068681ebc8c9ff39a8d673f3511c216fd78ff9bbb43f90fd8f60d8e9bef3b4f0ac4b982469887e91a50919c0d786809ed SHA512 eb740bbfa70d205ee5db66b0aa234a09c54a49cfd60027536af86a208097f0a47dc84e7dae4a6af2cd5c34187b41cd0905ad678c7d610159fe09684b645d6a45 +AUX vdr-2.4.1_mainmenuhook-1.0.1.patch 4645 BLAKE2B 3b4bc624f33366da133bb471bb5c3fe0d9058387bdc81e5a38a4979303f25abe3e86317fe68f52a5e07c75b366151f64b007cb257da661d93cbc00a07cc2cff3 SHA512 c13a74a988ab5082898b1e9845724337914909931426639714652960586a81627e5aa67ddd589d0cc0552908eed39ef8dff5e8e2e8d47d66fa0d4b2a8756d61b AUX vdr-2.4.6_clang.patch 527 BLAKE2B 6f74ee8a96657df7280ea51b55199768ed3bd968cd377df12674b29616b3a43703e4cc76c4c4fa43412a564bc51bdcb32ec565832177397200f5bd7aef9b05c6 SHA512 5ad498c5784551fdcde9911e2890b236c75e47f20dabe85b561bdb0e8771d7d6ce6ab160fa8831361799ed9d5da0cfa4f3788b509dd0eadf1cdb1eeeb6aad8a7 AUX vdr-2.4.6_gentoo.patch 2236 BLAKE2B c7372e3bfe04ea14f1bb12459d4385d6001c6acafbf96b4d1d8a69e194e076af656b76bb349ce07a30b131dd9e779d39441a34cc41ff0ae651fd14c8f2791fef SHA512 6ff8d20e4c596e3705ac6814e0ea1562e4b1f2809d585440bd5940b7094127fce21e7f6a738281305d6782c9806336f2d030c864e189d2c85e3b302635f07685 AUX vdr-2.4.6_makefile-variables.patch 1094 BLAKE2B eabc93d2bb383b1146c15c8b0bdff5979e172a5190a9c755071f1be66a662f89ce6f92c230a0df14ec5ca1958ac53326624e16c54457d83296a0b117047ac22a SHA512 5ee06df94028fc7bbd70fae718aab544f562a1a4d2cf380c282a24db33cdef1bea7224608c01e5ecb4a92cf1a709706342314918f36c0b6f65f5861c872fe499 AUX vdr-2.4.7_gcc11.patch 1159 BLAKE2B 789345c32b5658d65736552ca25dd98d0f3047284c0b528ce8443fa8a20cfa01d44425c601800833b9f3cba5f798b5393708165618322475e284d32221932c5a SHA512 4a74e7126619678497d952b1adf1d3aa9989207b69cbdbea0dc6c899a3cd90f88f438200b3fc058d6e9f6fc550c59f48cddeedfbe7cd61936b19b619486f944b AUX vdr-2.4_remove_plugins.patch 876 BLAKE2B 27f36cd30e11ec85f8c91d0b4da77d2a6a94d23d4801dc8dea70dbd617e12a6e0968ad96624688b7ad1463dcc3676ccbccd85e29c7b556b5e989191fb020df2d SHA512 eb5da3977d5a55dfac8871bf638ad320bf03e84c6c667f098f6f39f71beecd861fd5ae8b898ad835b8441ce8bb9dcb82005ba0b0e1b785ac156e478b222515a9 +AUX vdr-2.6.1-patch-for-permashift.patch 18981 BLAKE2B 01da7d33401a7d73b37f30e5359a4db695345e24a4eda9dda0c5d1c1bb70cf43c2954f136cd96d37d619707f2a74dfb8960b3346d644ab89ac9720b1eb0da4c3 SHA512 71eb63ff475723fb75a7b35fbfff43728baee4d2a665dd6516c2c4be0bedb5b1744d0653c79d679a38b376cb80627aa05605e469bfab0e0b4a65644136425ec7 +AUX vdr-2.6.1_naludump.patch 19594 BLAKE2B 012b92b265c0721ae7baf0f193c9b50fe3bee1e0fd8396e79e05deebef05a34acc5c7eb9ecad225f084449799c8e04a8285b41aa6cac5b24d582e4797dc60888 SHA512 3482d7d921c4b73f12426538cab6d7923d5ca3013efa9d16998bb48bd75557ace04af683401fc93b7c77bf4d619f4ded74f7f4568acdceb0406de0472bef074a +AUX vdr-2.6.1_pinplugin.patch 19274 BLAKE2B 19cc70e16f956087ace9a52d646c7003abba0be5894b05314e96880114f07584309756a4102bf8569c6612c21037ae1a4ec45fbcc91b6e2df42d89e4febfc0c7 SHA512 d5e875f8f51c4f946b9f305a36d15b760720b0495c6abaf6c2fbab4d200799741088026e9edb83458cc75cabc390a72173f33620010aedc4eaf22ed1a3d57973 DIST extpng-vdr-2.2.0-gentoo-edition-v1.patch.bz2 34664 BLAKE2B 81b68ebe0ef4588c3676f0b7a2c766d8d4d4f754a987b3be5868f3c6eff9158d4cea8e492ca81df535e637dbdc5baff638d1fafb4163e9d9a2d0125aba17e2e1 SHA512 16d6fbb8201f003dfe653b6a49424b794d7e697e27ad6f2383dbe17b76712ea5a3da88a676900b84d75ff7425bf3eb9084d60a89a4598758f482dc1f013f7b3e DIST vdr-2.1.5-naludump-0.1.diff 21548 BLAKE2B f193d982d072bbba2261d7dabd82e27795b2e4d8d18ae4486d8c559e7325b87f5902def7bb313e98585331144af62597f6f025f44ca142187e724516bc32c175 SHA512 d9188d5bfcf0588c22dc526fc1082253a1b505b322ccfbe676b8b2c12d4471af7b605924bcea85e879c9606d5e2cecdf6a6e8819cd9b8d877e5bb9f62b91251f DIST vdr-2.2.0.tar.bz2 922708 BLAKE2B 975e07d6d4c5bd13ee92be5d6a1826d6404b0c59e20fa2e30689b185a61e02d54782ad528e6a4f15e0d36806b30bcf48aa336d63adb3604e78056ff318e0fd2c SHA512 183f58133915c6c0fe8ec2b88becbcb2a36418210e6dcf7931053d3771d727c3581593f9eb5c9693abf39e22e728f7b41c42079cd704610c3636ec05134ea93d @@ -19,8 +23,11 @@ DIST vdr-2.4.1_mainmenuhook-1.0.1.patch.bz2 1463 BLAKE2B 2be3597a273a92d02be0d07 DIST vdr-2.4.6_pinplugin.patch.bz2 5176 BLAKE2B 142ad6551b8e37d223acf86f8c2f511cf2cb3664b5ff968bac5e44420c56bf5fdb974360df574141c424cd7a4b1e1489c4a504207420af10f722a77e6d2bad2f SHA512 d5c7263b908302ebf88a5e5ddcb658f56ee92656b40797fd48af1ff9852454adc1d1672cc97411e7744cc31a56f4d0f51df5ece102c21b2aa25d87e3c3c8fe12 DIST vdr-2.4.6_ttxtsubs_v2.patch.bz2 51971 BLAKE2B e4915314e8f659df1c3e0ff631fd0c3dcec89053ff727fd28400dc6eecc49c1d4743a9bedaf3b11fce03fc6082309d4b4658d00a5b01aa5cbe8686e05412f882 SHA512 14c7b4397ba65e0ff9a5fb0705872f1cb6f1cdd1752b14f83f260540da25b5957632900232f83904c3d4fd6759e537c85bda2cce61455729eab3050a96441548 DIST vdr-2.4.7.tbz2 919632 BLAKE2B be4e1ec365330855e4b2b26f44b1f35dc323e4783e96ef344a67b3e9fe2c0499760ab0f3d27c5e3bdddf5a65ebb65b0c81a62092301d34370aa19d0dd63bb1ab SHA512 41b8453bc6cdbb0db728b5d7d6624ab3ff9034b58ba443a8196f5fcc9fa78d18698cc91905890244e69d482ffc493374e6da2c97baed95fe742b888bdc63e42b +DIST vdr-2.6.1.tbz2 937103 BLAKE2B d8bbf8cb74f79c328ba7a367cd120d9472be667def851fbdff2f2fda3addbf33ae1f0ab0f20dc0ea6b3a03667e36164a5acf5a17cff8f7934c15f4e61b3a8db2 SHA512 235ffd1654d8f13ba658533bfa5db9c9669e93106a63a770297997f9b8342807f270f26e7a6f5a3c127cd9f760bb94ae77f884dcad42a500615c28e1cf3fd92f +DIST vdr-2.6.1_ttxtsubs_v2.patch 40549 BLAKE2B 525c05b72fa957372cc1ef91428428f664f42d92eebc06fd0b179afbe99e4ecc4919c69cef000cc15c8340c9a2506d38cbf755fd6665cde1708ce17d4320a35f SHA512 590c43e63818de8be9637cb3b32bf3399b82a181ca151d67e2341232669619020ab78ba9934da3a9c58cdb3bac56fc2a332a5838a92ee0851e42c3707726eb49 DIST vdr-menuorg-2.3.x.diff 8852 BLAKE2B 19b98d51a69f52ecda5500f51ef1741a8397953b20c490055eab0393da5f56ff9598c3e1e8ed8b915f5877e08deeb9ba7a9ef8d9356ad3a1fa12e3778869174a SHA512 7b41c3a529858a4953a57f21619ea01864e140cc1755ee0b03caf1c4de41e80c3f805653502bc8d39d02a4dfcddf720acd4a8c8bd91f4871eef31d86e8e915c0 EBUILD vdr-2.2.0-r6.ebuild 8172 BLAKE2B e6823542e56a5ae3bd4cb5d61840522b25ba9c0d1cb600b8a035a5e79f19c530e478751634130199aff157a8d32adc9b154b3d67d863eb54bfc0a8a4dcde8ed6 SHA512 f67d2c299f7e45cb398294735bdaf6fe2c23b06900aad8b9520bd7bab426cffff99d5be2861dfd0a9ac85215324c52b8a4130fd2b4ae6597c3d459f2c179fe3f -EBUILD vdr-2.2.0-r7.ebuild 8214 BLAKE2B 18aa70b506af3bd462850741e34019ba0d1d30b4f5a8b6aca7c286803721108efb658e18be82c2dfdb5a9acf517038672c9df0112a6518c17d8f9c9f9a14e99b SHA512 1baee9761c40be901a2ec4795775c89b44207622822535b13f91db33f4aec6e7a30b6f0dded4f10c000ea775cca2ce986dd10da4f1eb6afc1d55547db8ab7c9d +EBUILD vdr-2.2.0-r7.ebuild 8240 BLAKE2B 4ce894b7b579a3d2d9e6c0d3f30b8aac6600479152f2d0d7377d7ae829b35d98ecf7b269a1889084d1cd2c09ece2dbf6c372607d944978e37e11dc2717c3efd4 SHA512 7bed97818724be9f25ebafe1e1256ec0b683ad908306eaceea32a47efaea6b1d5ac5ca43163587d0de7158691b63d61fc88a23ca3a79bb53356f6255f35c4f4f EBUILD vdr-2.4.7-r1.ebuild 6171 BLAKE2B 4ee4c05630a0a0133def40460d97839fe2c9346b162f7b9415c48e544c476cf4cf94a66e905f6176dc23478567aec2f0bf5a738cb1b5fe4a9e005f168e75e751 SHA512 c2e97f014040c1f0af8c56e1aeec947b3cd9f428bda0d8897f2de4531445593fabd53dca7e33c0be958147f7cdbb31f9fc8a15e91923d6317ddaf4f8a54f2e1a +EBUILD vdr-2.6.1.ebuild 5514 BLAKE2B aa69dce8d2bc25ce00ec6eb8b01c71b5d7a67726d6bb4190f3e9d628750d4739df62592d82c3e3a76f14935e7324d8b7ac03aa14cd7cf7879c19082436a1466b SHA512 84fc30ca547d9e4cc70c91f67eed91b838b059f853eceee7d1ca51b5ca4c088e3db1c58c16676af498f478044ee91df7b96c9cce2b3c1025a48662ff820d6a21 MISC metadata.xml 1780 BLAKE2B 179a1948c96a7b237b500a08861799c25ae084d5b9cd6702921acd04cfbf0111bbb11170e4d14bf31ad7355ef0899f285857350131badc411548a3611593ecb6 SHA512 6c8c2073c55f327d4dfe52cb22ae1622d936c43503caf2964594656e1281b07110187c139216a73ed10abd625b43509ecdfe41edb7439950653e038991abfb31 diff --git a/media-video/vdr/files/vdr-2.4.1_mainmenuhook-1.0.1.patch b/media-video/vdr/files/vdr-2.4.1_mainmenuhook-1.0.1.patch new file mode 100644 index 000000000000..deec2cd7cfdb --- /dev/null +++ b/media-video/vdr/files/vdr-2.4.1_mainmenuhook-1.0.1.patch @@ -0,0 +1,114 @@ +original https://raw.githubusercontent.com/VDR4Arch/vdr4arch/master/vdr/vdr-MainMenuHooks.patch + +rebased for media-video/vdr-2.4.1 + +Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org> ( 2019 Dez 22 ) +diff -Naur vdr-2.4.1.orig/config.h vdr-2.4.1/config.h +--- vdr-2.4.1.orig/config.h 2019-12-22 00:04:59.000000000 +0100 ++++ vdr-2.4.1/config.h 2019-12-22 00:11:25.000000000 +0100 +@@ -36,6 +36,10 @@ + // plugins to work with newer versions of the core VDR as long as no + // VDR header files have changed. + ++// The MainMenuHook Patch's version number: ++#define MAINMENUHOOKSVERSION "1.0.1" ++#define MAINMENUHOOKSVERSNUM 10001 // Version * 10000 + Major * 100 + Minor ++ + #define MAXPRIORITY 99 + #define MINPRIORITY (-MAXPRIORITY) + #define LIVEPRIORITY 0 // priority used when selecting a device for live viewing +diff -Naur vdr-2.4.1.orig/menu.c vdr-2.4.1/menu.c +--- vdr-2.4.1.orig/menu.c 2019-12-22 00:04:59.000000000 +0100 ++++ vdr-2.4.1/menu.c 2019-12-22 00:11:25.000000000 +0100 +@@ -4395,15 +4395,31 @@ + + // Initial submenus: + ++ cOsdObject *menu = NULL; + switch (State) { +- case osSchedule: AddSubMenu(new cMenuSchedule); break; +- case osChannels: AddSubMenu(new cMenuChannels); break; +- case osTimers: AddSubMenu(new cMenuTimers); break; +- case osRecordings: AddSubMenu(new cMenuRecordings(NULL, 0, OpenSubMenus)); break; +- case osSetup: AddSubMenu(new cMenuSetup); break; +- case osCommands: AddSubMenu(new cMenuCommands(tr("Commands"), &Commands)); break; ++ case osSchedule: ++ if (!cPluginManager::CallFirstService("MainMenuHooksPatch-v1.0::osSchedule", &menu)) ++ menu = new cMenuSchedule; ++ break; ++ case osChannels: ++ if (!cPluginManager::CallFirstService("MainMenuHooksPatch-v1.0::osChannels", &menu)) ++ menu = new cMenuChannels; ++ break; ++ case osTimers: ++ if (!cPluginManager::CallFirstService("MainMenuHooksPatch-v1.0::osTimers", &menu)) ++ menu = new cMenuTimers; ++ break; ++ case osRecordings: ++ if (!cPluginManager::CallFirstService("MainMenuHooksPatch-v1.0::osRecordings", &menu)) ++ menu = new cMenuRecordings(NULL, 0, OpenSubMenus); ++ break; ++ case osSetup: menu = new cMenuSetup; break; ++ case osCommands: menu = new cMenuCommands(tr("Commands"), &Commands); break; + default: break; + } ++ if (menu) ++ if (menu->IsMenu()) ++ AddSubMenu((cOsdMenu *) menu); + } + + cOsdObject *cMenuMain::PluginOsdObject(void) +@@ -4511,13 +4527,34 @@ + eOSState state = cOsdMenu::ProcessKey(Key); + HadSubMenu |= HasSubMenu(); + ++ cOsdObject *menu = NULL; + switch (state) { +- case osSchedule: return AddSubMenu(new cMenuSchedule); +- case osChannels: return AddSubMenu(new cMenuChannels); +- case osTimers: return AddSubMenu(new cMenuTimers); +- case osRecordings: return AddSubMenu(new cMenuRecordings); +- case osSetup: return AddSubMenu(new cMenuSetup); +- case osCommands: return AddSubMenu(new cMenuCommands(tr("Commands"), &Commands)); ++ case osSchedule: ++ if (!cPluginManager::CallFirstService("MainMenuHooksPatch-v1.0::osSchedule", &menu)) ++ menu = new cMenuSchedule; ++ else ++ state = osContinue; ++ break; ++ case osChannels: ++ if (!cPluginManager::CallFirstService("MainMenuHooksPatch-v1.0::osChannels", &menu)) ++ menu = new cMenuChannels; ++ else ++ state = osContinue; ++ break; ++ case osTimers: ++ if (!cPluginManager::CallFirstService("MainMenuHooksPatch-v1.0::osTimers", &menu)) ++ menu = new cMenuTimers; ++ else ++ state = osContinue; ++ break; ++ case osRecordings: ++ if (!cPluginManager::CallFirstService("MainMenuHooksPatch-v1.0::osRecordings", &menu)) ++ menu = new cMenuRecordings; ++ else ++ state = osContinue; ++ break; ++ case osSetup: menu = new cMenuSetup; break; ++ case osCommands: menu = new cMenuCommands(tr("Commands"), &Commands); break; + case osStopRecord: if (Interface->Confirm(tr("Stop recording?"))) { + if (cOsdItem *item = Get(Current())) { + cRecordControls::Stop(item->Text() + strlen(tr(STOP_RECORDING))); +@@ -4568,6 +4605,12 @@ + default: break; + } + } ++ if (menu) { ++ if (menu->IsMenu()) ++ return AddSubMenu((cOsdMenu *) menu); ++ pluginOsdObject = menu; ++ return osPlugin; ++ } + if (!HasSubMenu() && Update(HadSubMenu)) + Display(); + if (Key != kNone) { diff --git a/media-video/vdr/files/vdr-2.6.1-patch-for-permashift.patch b/media-video/vdr/files/vdr-2.6.1-patch-for-permashift.patch new file mode 100644 index 000000000000..03b476f986bb --- /dev/null +++ b/media-video/vdr/files/vdr-2.6.1-patch-for-permashift.patch @@ -0,0 +1,517 @@ +Adapted Patch from forum post +https://www.vdr-portal.de/forum/index.php?thread/134171-permashift-1-0-4-f%C3%BCr-vdr-2-4-betaversion/&postID=1341243#post1341243 + +SRC Url https://www.vdr-portal.de/index.php?attachment/45632-vdr-2-5-4-patch-for-permashift-diff-gz/ adapted for vdr-2.6.1 + +Signed-off-by: Martin Dummer <martin.dummer@gmx.net> + +diff -Naur vdr-2.6.1.orig/device.c vdr-2.6.1/device.c +--- vdr-2.6.1.orig/device.c 2022-02-02 10:56:43.000000000 +0100 ++++ vdr-2.6.1/device.c 2022-02-06 18:05:26.452890690 +0100 +@@ -1880,6 +1880,17 @@ + ReleaseCamSlot(); + } + ++cRecorder* cDevice::GetPreRecording(const cChannel *Channel) ++{ ++ cMutexLock MutexLock(&mutexReceiver); ++ for (int i = 0; i < MAXRECEIVERS; i++) { ++ if (receiver[i]) ++ if (receiver[i]->IsPreRecording(Channel)) ++ return (cRecorder*)receiver[i]; ++ } ++ return NULL; ++} ++ + // --- cTSBuffer ------------------------------------------------------------- + + cTSBuffer::cTSBuffer(int File, int Size, int DeviceNumber) +diff -Naur vdr-2.6.1.orig/device.h vdr-2.6.1/device.h +--- vdr-2.6.1.orig/device.h 2022-02-02 10:56:43.000000000 +0100 ++++ vdr-2.6.1/device.h 2022-02-06 18:05:51.541429884 +0100 +@@ -85,6 +85,7 @@ + + class cPlayer; + class cReceiver; ++class cRecorder; + class cLiveSubtitle; + + class cDeviceHook : public cListObject { +@@ -854,6 +855,8 @@ + ///< Returns true if we are currently receiving. The parameter has no meaning (for backwards compatibility only). + bool AttachReceiver(cReceiver *Receiver); + ///< Attaches the given receiver to this device. ++ cRecorder* GetPreRecording(const cChannel *Channel); ++ ///< Get precocious recording for the channel if there is one. + void Detach(cReceiver *Receiver, bool ReleaseCam = true); + ///< Detaches the given receiver from this device. + ///< If ReleaseCam is true, the CAM slot will be released if it +diff -Naur vdr-2.6.1.orig/dvbplayer.c vdr-2.6.1/dvbplayer.c +--- vdr-2.6.1.orig/dvbplayer.c 2022-02-02 10:56:43.000000000 +0100 ++++ vdr-2.6.1/dvbplayer.c 2022-02-06 18:05:26.452890690 +0100 +@@ -249,13 +249,14 @@ + cUnbufferedFile *replayFile; + double framesPerSecond; + bool isPesRecording; +- bool pauseLive; ++ ReplayState replayState; + bool eof; + bool firstPacket; + ePlayModes playMode; + ePlayDirs playDir; + int trickSpeed; + int readIndex; ++ int startIndex; + bool readIndependent; + cFrame *readFrame; + cFrame *playFrame; +@@ -271,6 +272,8 @@ + virtual void Action(void); + public: + cDvbPlayer(const char *FileName, bool PauseLive); ++ cDvbPlayer(const char *FileName, ReplayState newReplayState); ++ void Construct(const char *FileName, ReplayState newReplayState); + virtual ~cDvbPlayer(); + void SetMarks(const cMarks *Marks); + bool Active(void) { return cThread::Running(); } +@@ -297,6 +300,17 @@ + cDvbPlayer::cDvbPlayer(const char *FileName, bool PauseLive) + :cThread("dvbplayer") + { ++ Construct(FileName, PauseLive? restPauseLive : restNormal); ++} ++ ++cDvbPlayer::cDvbPlayer(const char *FileName, ReplayState newReplayState) ++:cThread("dvbplayer") ++{ ++ Construct(FileName, newReplayState); ++} ++ ++void cDvbPlayer::Construct(const char *FileName, ReplayState newReplayState) ++{ + nonBlockingFileReader = NULL; + ringBuffer = NULL; + marks = NULL; +@@ -304,7 +318,8 @@ + cRecording Recording(FileName); + framesPerSecond = Recording.FramesPerSecond(); + isPesRecording = Recording.IsPesRecording(); +- pauseLive = PauseLive; ++ replayState = newReplayState; ++ bool reuse = (replayState == restReusePause || replayState == restReuseRewind); + eof = false; + firstPacket = true; + playMode = pmPlay; +@@ -323,15 +338,21 @@ + return; + ringBuffer = new cRingBufferFrame(PLAYERBUFSIZE); + // Create the index file: +- index = new cIndexFile(FileName, false, isPesRecording, pauseLive); ++ index = new cIndexFile(FileName, false, isPesRecording, replayState == restPauseLive); + if (!index) + esyslog("ERROR: can't allocate index"); + else if (!index->Ok()) { + delete index; + index = NULL; + } +- else if (PauseLive) ++ else if (reuse) + framesPerSecond = cRecording(FileName).FramesPerSecond(); // the fps rate might have changed from the default ++ startIndex = 0; ++ if (replayState == restReuseRewind || replayState == restReusePause) { ++ int Current, Total; ++ GetIndex(Current, Total, false); ++ startIndex = max(Total - 1, 0); ++ } + } + + cDvbPlayer::~cDvbPlayer() +@@ -481,8 +502,21 @@ + bool CutIn = false; + bool AtLastMark = false; + +- if (pauseLive) +- Goto(0, true); ++ if (replayState == restPauseLive) { ++ Goto(0, true); ++ } ++ else if (replayState == restReuseRewind || replayState == restReusePause) { ++ readIndex = startIndex; ++ Goto(readIndex, true); ++ playMode = pmPlay; ++ if (replayState == restReuseRewind) { ++ Backward(); ++ } ++ else if (replayState == restReusePause) { ++ Pause(); ++ } ++ } ++ + while (Running()) { + if (WaitingForData) + WaitingForData = !nonBlockingFileReader->WaitForDataMs(3); // this keeps the CPU load low, but reacts immediately on new data +@@ -985,6 +1019,11 @@ + { + } + ++cDvbPlayerControl::cDvbPlayerControl(const char *FileName, ReplayState replayState) ++:cControl(player = new cDvbPlayer(FileName, replayState)) ++{ ++} ++ + cDvbPlayerControl::~cDvbPlayerControl() + { + Stop(); +diff -Naur vdr-2.6.1.orig/dvbplayer.h vdr-2.6.1/dvbplayer.h +--- vdr-2.6.1.orig/dvbplayer.h 2022-02-02 10:56:43.000000000 +0100 ++++ vdr-2.6.1/dvbplayer.h 2022-02-06 18:05:26.452890690 +0100 +@@ -16,6 +16,14 @@ + + class cDvbPlayer; + ++enum ReplayState ++{ ++ restNormal, ++ restPauseLive, ++ restReusePause, ++ restReuseRewind ++}; ++ + class cDvbPlayerControl : public cControl { + private: + cDvbPlayer *player; +@@ -25,6 +33,8 @@ + // If PauseLive is true, special care is taken to make sure the index + // file of the recording is long enough to allow the player to display + // the first frame in still picture mode. ++ cDvbPlayerControl(const char *FileName, ReplayState replayState); ++ // Sets up a player for the given file. replayState represents the initial state. + virtual ~cDvbPlayerControl(); + void SetMarks(const cMarks *Marks); + bool Active(void); +diff -Naur vdr-2.6.1.orig/menu.c vdr-2.6.1/menu.c +--- vdr-2.6.1.orig/menu.c 2022-02-02 10:56:43.000000000 +0100 ++++ vdr-2.6.1/menu.c 2022-02-06 18:05:26.452890690 +0100 +@@ -5303,6 +5303,16 @@ + + cRecordControl::cRecordControl(cDevice *Device, cTimers *Timers, cTimer *Timer, bool Pause) + { ++ Construct(Device, Timers, Timer, Pause, NULL); ++} ++ ++cRecordControl::cRecordControl(cDevice *Device, cTimers *Timers, cTimer *Timer, bool Pause, bool* reused) ++{ ++ Construct(Device, Timers, Timer, Pause, reused); ++} ++ ++void cRecordControl::Construct(cDevice *Device, cTimers *Timers, cTimer *Timer, bool Pause, bool* reused) ++{ + const char *LastReplayed = cReplayControl::LastReplayed(); // must do this before locking schedules! + // Whatever happens here, the timers will be modified in some way... + Timers->SetModified(); +@@ -5331,6 +5341,7 @@ + timer->SetPending(true); + timer->SetRecording(true); + event = timer->Event(); ++ if (reused != NULL) *reused = false; + + if (event || GetEvent()) + dsyslog("Title: '%s' Subtitle: '%s'", event->Title(), event->ShortText()); +@@ -5360,8 +5371,21 @@ + if (MakeDirs(fileName, true)) { + Recording.WriteInfo(); // we write this *before* attaching the recorder to the device, to make sure the info file is present when the recorder needs to update the fps value! + const cChannel *ch = timer->Channel(); +- recorder = new cRecorder(fileName, ch, timer->Priority()); +- if (device->AttachReceiver(recorder)) { ++ ++ if (!Timer) { ++ recorder = device->GetPreRecording(ch); ++ if (recorder != NULL) { ++ recorder->ActivatePreRecording(fileName, timer->Priority()); ++ if (reused != NULL) *reused = true; ++ } ++ } ++ ++ if (recorder == NULL) { ++ recorder = new cRecorder(fileName, ch, timer->Priority()); ++ if (!device->AttachReceiver(recorder)) DELETENULL(recorder); ++ } ++ ++ if (recorder != NULL) { + cStatus::MsgRecording(device, Recording.Name(), Recording.FileName(), true); + if (!Timer && !LastReplayed) // an instant recording, maybe from cRecordControls::PauseLiveVideo() + cReplayControl::SetRecording(fileName); +@@ -5371,8 +5395,6 @@ + Recordings->AddByName(fileName); + return; + } +- else +- DELETENULL(recorder); + } + else + timer->SetDeferred(DEFERTIMER); +@@ -5452,7 +5474,7 @@ + cRecordControl *cRecordControls::RecordControls[MAXRECORDCONTROLS] = { NULL }; + int cRecordControls::state = 0; + +-bool cRecordControls::Start(cTimers *Timers, cTimer *Timer, bool Pause) ++bool cRecordControls::Start(cTimers *Timers, cTimer *Timer, bool Pause, bool* reused) + { + static time_t LastNoDiskSpaceMessage = 0; + int FreeMB = 0; +@@ -5490,7 +5512,7 @@ + if (!Timer || Timer->Matches()) { + for (int i = 0; i < MAXRECORDCONTROLS; i++) { + if (!RecordControls[i]) { +- RecordControls[i] = new cRecordControl(device, Timers, Timer, Pause); ++ RecordControls[i] = new cRecordControl(device, Timers, Timer, Pause, reused); + return RecordControls[i]->Process(time(NULL)); + } + } +@@ -5514,6 +5536,11 @@ + return Start(Timers, NULL, Pause); + } + ++bool cRecordControls::Start(cTimers *Timers, cTimer *Timer, bool Pause) ++{ ++ return Start(Timers, Timer, Pause, NULL); ++} ++ + void cRecordControls::Stop(const char *InstantId) + { + LOCK_TIMERS_WRITE; +@@ -5549,10 +5576,17 @@ + + bool cRecordControls::PauseLiveVideo(void) + { ++ return PauseLiveVideo(false); ++} ++ ++bool cRecordControls::PauseLiveVideo(bool rewind) ++{ + Skins.Message(mtStatus, tr("Pausing live video...")); ++ bool reused = false; + cReplayControl::SetRecording(NULL); // make sure the new cRecordControl will set cReplayControl::LastReplayed() +- if (Start(true)) { +- cReplayControl *rc = new cReplayControl(true); ++ LOCK_TIMERS_WRITE; ++ if (Start(Timers, NULL, true, &reused)) { ++ cReplayControl *rc = new cReplayControl(rewind? restReuseRewind : reused? restReusePause : restPauseLive); + cControl::Launch(rc); + cControl::Attach(); + Skins.Message(mtStatus, NULL); +@@ -5695,7 +5729,18 @@ + cReplayControl::cReplayControl(bool PauseLive) + :cDvbPlayerControl(fileName, PauseLive) + { +- cDevice::PrimaryDevice()->SetKeepTracks(PauseLive); ++ Construct(PauseLive? restPauseLive : restNormal); ++} ++ ++cReplayControl::cReplayControl(ReplayState replayState) ++:cDvbPlayerControl(fileName, replayState) ++{ ++ Construct(replayState); ++} ++ ++void cReplayControl::Construct(ReplayState replayState) ++{ ++ cDevice::PrimaryDevice()->SetKeepTracks(replayState == restPauseLive); + currentReplayControl = this; + displayReplay = NULL; + marksModified = false; +diff -Naur vdr-2.6.1.orig/menu.h vdr-2.6.1/menu.h +--- vdr-2.6.1.orig/menu.h 2022-02-02 10:56:43.000000000 +0100 ++++ vdr-2.6.1/menu.h 2022-02-06 18:05:26.452890690 +0100 +@@ -246,6 +246,8 @@ + bool GetEvent(void); + public: + cRecordControl(cDevice *Device, cTimers *Timers, cTimer *Timer = NULL, bool Pause = false); ++ cRecordControl(cDevice *Device, cTimers *Timers, cTimer *Timer, bool Pause, bool* reused); ++ void Construct(cDevice *Device, cTimers *Timers, cTimer *Timer, bool Pause, bool* reused); + virtual ~cRecordControl(); + bool Process(time_t t); + cDevice *Device(void) { return device; } +@@ -261,10 +263,12 @@ + static int state; + public: + static bool Start(cTimers *Timers, cTimer *Timer, bool Pause = false); ++ static bool Start(cTimers *Timers, cTimer *Timer, bool Pause, bool* reused); + static bool Start(bool Pause = false); + static void Stop(const char *InstantId); + static void Stop(cTimer *Timer); + static bool PauseLiveVideo(void); ++ static bool PauseLiveVideo(bool rewind); + static const char *GetInstantId(const char *LastInstantId); + static cRecordControl *GetRecordControl(const char *FileName); + static cRecordControl *GetRecordControl(const cTimer *Timer); +@@ -320,6 +324,8 @@ + void EditTest(void); + public: + cReplayControl(bool PauseLive = false); ++ cReplayControl(ReplayState replayState); ++ void Construct(ReplayState replayState); + virtual ~cReplayControl(); + void Stop(void); + virtual cOsdObject *GetInfo(void); +diff -Naur vdr-2.6.1.orig/receiver.h vdr-2.6.1/receiver.h +--- vdr-2.6.1.orig/receiver.h 2022-02-02 10:56:43.000000000 +0100 ++++ vdr-2.6.1/receiver.h 2022-02-06 18:05:26.452890690 +0100 +@@ -85,6 +85,10 @@ + ///< case the device is needed otherwise, so code that uses a cReceiver + ///< should repeatedly check whether it is still attached, and if + ///< it isn't, delete it (or take any other appropriate measures). ++ virtual bool IsPreRecording(const cChannel *Channel) { return false; } ++ ///< prerecords given channel; may be turned into a disc recording. ++ virtual bool ActivatePreRecording(const char* fileName, int Priority) { return false; } ++ ///< turn prerecording into a disc recording + }; + + #endif //__RECEIVER_H +diff -Naur vdr-2.6.1.orig/recorder.c vdr-2.6.1/recorder.c +--- vdr-2.6.1.orig/recorder.c 2022-02-02 10:56:43.000000000 +0100 ++++ vdr-2.6.1/recorder.c 2022-02-06 18:05:26.452890690 +0100 +@@ -164,11 +164,25 @@ + cRecorder::cRecorder(const char *FileName, const cChannel *Channel, int Priority) + :cReceiver(Channel, Priority) + ,cThread("recording") ++,tsChecker(NULL), frameChecker(NULL), recordingInfo(NULL), ringBuffer(NULL), frameDetector(NULL), fileName(NULL), index(NULL), recordFile(NULL), recordingName(NULL) + { +- tsChecker = new cTsChecker; +- frameChecker = new cFrameChecker; ++ if (FileName != NULL) { ++ InitializeFile(FileName, Channel); ++ } ++} ++ ++void cRecorder::InitializeFile(const char *FileName, const cChannel *Channel) ++{ ++ if (tsChecker == NULL) { ++ tsChecker = new cTsChecker; ++ } ++ if (frameChecker == NULL) { ++ frameChecker = new cFrameChecker; ++ } + recordingName = strdup(FileName); +- recordingInfo = new cRecordingInfo(recordingName); ++ if (recordingInfo == NULL) { ++ recordingInfo = new cRecordingInfo(recordingName); ++ } + recordingInfo->Read(); + oldErrors = max(0, recordingInfo->Errors()); // in case this is a re-started recording + errors = oldErrors; +@@ -193,7 +207,9 @@ + Pid = Channel->Dpid(0); + Type = 0x06; + } +- frameDetector = new cFrameDetector(Pid, Type); ++ if (frameDetector == NULL) { ++ frameDetector = new cFrameDetector(Pid, Type); ++ } + index = NULL; + fileSize = 0; + lastDiskSpaceCheck = time(NULL); +diff -Naur vdr-2.6.1.orig/recorder.h vdr-2.6.1/recorder.h +--- vdr-2.6.1.orig/recorder.h 2022-02-02 10:56:43.000000000 +0100 ++++ vdr-2.6.1/recorder.h 2022-02-06 18:05:26.452890690 +0100 +@@ -19,8 +19,8 @@ + class cTsChecker; + class cFrameChecker; + +-class cRecorder : public cReceiver, cThread { +-private: ++class cRecorder : public cReceiver, protected cThread { ++protected: + cTsChecker *tsChecker; + cFrameChecker *frameChecker; + cRingBufferLinear *ringBuffer; +@@ -41,7 +41,6 @@ + bool RunningLowOnDiskSpace(void); + bool NextFile(void); + void HandleErrors(bool Force = false); +-protected: + virtual void Activate(bool On); + ///< If you override Activate() you need to call Detach() (which is a + ///< member of the cReceiver class) from your own destructor in order +@@ -49,6 +48,9 @@ + ///< destroyed. + virtual void Receive(const uchar *Data, int Length); + virtual void Action(void); ++ void InitializeFile(const char *FileName, const cChannel *Channel); ++ ///< Starts recording to file. ++ ///< Called in constructor if file name has been given. + public: + cRecorder(const char *FileName, const cChannel *Channel, int Priority); + ///< Creates a new recorder for the given Channel and +diff -Naur vdr-2.6.1.orig/ringbuffer.c vdr-2.6.1/ringbuffer.c +--- vdr-2.6.1.orig/ringbuffer.c 2022-02-02 10:56:43.000000000 +0100 ++++ vdr-2.6.1/ringbuffer.c 2022-02-06 18:05:26.452890690 +0100 +@@ -368,6 +368,25 @@ + return NULL; + } + ++uchar *cRingBufferLinear::GetRest(int &Count) ++{ ++ int Head = head; ++ if (getThreadTid <= 0) ++ getThreadTid = cThread::ThreadId(); ++ int rest = Size() - tail; ++ int diff = Head - tail; ++ int cont = (diff >= 0) ? diff : Size() + diff - margin; ++ if (cont > rest) ++ cont = rest; ++ uchar *p = buffer + tail; ++ if (cont > 0) { ++ Count = gotten = cont; ++ return p; ++ } ++ WaitForGet(); ++ return NULL; ++} ++ + void cRingBufferLinear::Del(int Count) + { + if (Count > gotten) { +diff -Naur vdr-2.6.1.orig/ringbuffer.h vdr-2.6.1/ringbuffer.h +--- vdr-2.6.1.orig/ringbuffer.h 2022-02-02 10:56:43.000000000 +0100 ++++ vdr-2.6.1/ringbuffer.h 2022-02-06 18:05:26.452890690 +0100 +@@ -98,6 +98,12 @@ + ///< The data will remain in the buffer until a call to Del() deletes it. + ///< Returns a pointer to the data, and stores the number of bytes + ///< actually available in Count. If the returned pointer is NULL, Count has no meaning. ++ uchar *GetRest(int &Count); ++ ///< Gets data from the ring buffer disregarding the margin. ++ ///< Might have to be called several times to get all data. ++ ///< The data will remain in the buffer until a call to Del() deletes it. ++ ///< Returns a pointer to the data, and stores the number of bytes ++ ///< actually available in Count. If the returned pointer is NULL, Count has no meaning. + void Del(int Count); + ///< Deletes at most Count bytes from the ring buffer. + ///< Count must be less or equal to the number that was returned by a previous +diff -Naur vdr-2.6.1.orig/vdr.c vdr-2.6.1/vdr.c +--- vdr-2.6.1.orig/vdr.c 2022-02-02 10:56:43.000000000 +0100 ++++ vdr-2.6.1/vdr.c 2022-02-06 18:05:26.452890690 +0100 +@@ -1352,13 +1352,22 @@ + key = kNone; + break; + // Pausing live video: ++ case kFastRew: ++ { ++ // test if there's a live buffer to rewind into... ++ LOCK_CHANNELS_READ; ++ if (cDevice::ActualDevice()->GetPreRecording(Channels->GetByNumber(cDevice::CurrentChannel())) == NULL) { ++ break; ++ } ++ } ++ // fall through to pause + case kPlayPause: + case kPause: + if (!Control) { + DELETE_MENU; + if (Setup.PauseKeyHandling) { + if (Setup.PauseKeyHandling > 1 || Interface->Confirm(tr("Pause live video?"))) { +- if (!cRecordControls::PauseLiveVideo()) ++ if (!cRecordControls::PauseLiveVideo(int(key) == kFastRew)) + Skins.QueueMessage(mtError, tr("No free DVB device to record!")); + } + } diff --git a/media-video/vdr/files/vdr-2.6.1_naludump.patch b/media-video/vdr/files/vdr-2.6.1_naludump.patch new file mode 100644 index 000000000000..efea3a1d74f7 --- /dev/null +++ b/media-video/vdr/files/vdr-2.6.1_naludump.patch @@ -0,0 +1,598 @@ +diff -a -U 2 -r a/config.c b/config.c +--- a/config.c ++++ b/config.c +@@ -469,4 +469,5 @@ + SplitEditedFiles = 0; + DelTimeshiftRec = 0; ++ DumpNaluFill = 0; + MinEventTimeout = 30; + MinUserInactivity = 300; +@@ -697,4 +698,5 @@ + else if (!strcasecmp(Name, "SplitEditedFiles")) SplitEditedFiles = atoi(Value); + else if (!strcasecmp(Name, "DelTimeshiftRec")) DelTimeshiftRec = atoi(Value); ++ else if (!strcasecmp(Name, "DumpNaluFill")) DumpNaluFill = atoi(Value); + else if (!strcasecmp(Name, "MinEventTimeout")) MinEventTimeout = atoi(Value); + else if (!strcasecmp(Name, "MinUserInactivity")) MinUserInactivity = atoi(Value); +@@ -829,4 +831,5 @@ + Store("SplitEditedFiles", SplitEditedFiles); + Store("DelTimeshiftRec", DelTimeshiftRec); ++ Store("DumpNaluFill", DumpNaluFill); + Store("MinEventTimeout", MinEventTimeout); + Store("MinUserInactivity", MinUserInactivity); +diff -a -U 2 -r a/config.h b/config.h +--- a/config.h ++++ b/config.h +@@ -341,4 +341,5 @@ + int SplitEditedFiles; + int DelTimeshiftRec; ++ int DumpNaluFill; + int MinEventTimeout, MinUserInactivity; + time_t NextWakeupTime; +diff -a -U 2 -r a/menu.c b/menu.c +--- a/menu.c ++++ b/menu.c +@@ -4185,4 +4185,5 @@ + Add(new cMenuEditBoolItem(tr("Setup.Recording$Split edited files"), &data.SplitEditedFiles)); + Add(new cMenuEditStraItem(tr("Setup.Recording$Delete timeshift recording"),&data.DelTimeshiftRec, 3, delTimeshiftRecTexts)); ++ Add(new cMenuEditBoolItem(tr("Setup.Recording$Dump NALU Fill data"), &data.DumpNaluFill)); + } + +diff -a -U 2 -r a/recorder.c b/recorder.c +--- a/recorder.c ++++ b/recorder.c +@@ -195,4 +195,12 @@ + } + frameDetector = new cFrameDetector(Pid, Type); ++ if ( Type == 0x1B // MPEG4 video ++ && (Setup.DumpNaluFill ? (strstr(FileName, "NALUKEEP") == NULL) : (strstr(FileName, "NALUDUMP") != NULL))) { // MPEG4 ++ isyslog("Starting NALU fill dumper"); ++ naluStreamProcessor = new cNaluStreamProcessor(); ++ naluStreamProcessor->SetPid(Pid); ++ } ++ else ++ naluStreamProcessor = NULL; + index = NULL; + fileSize = 0; +@@ -217,4 +225,10 @@ + { + Detach(); ++ if (naluStreamProcessor) { ++ long long int TotalPackets = naluStreamProcessor->GetTotalPackets(); ++ long long int DroppedPackets = naluStreamProcessor->GetDroppedPackets(); ++ isyslog("NALU fill dumper: %lld of %lld packets dropped, %lli%%", DroppedPackets, TotalPackets, TotalPackets ? DroppedPackets*100/TotalPackets : 0); ++ delete naluStreamProcessor; ++ } + delete index; + delete fileName; +@@ -357,10 +371,32 @@ + t.Set(MAXBROKENTIMEOUT); + } +- if (recordFile->Write(b, Count) < 0) { +- LOG_ERROR_STR(fileName->Name()); +- break; ++ if (naluStreamProcessor) { ++ naluStreamProcessor->PutBuffer(b, Count); ++ bool Fail = false; ++ while (true) { ++ int OutLength = 0; ++ uchar *OutData = naluStreamProcessor->GetBuffer(OutLength); ++ if (!OutData || OutLength <= 0) ++ break; ++ if (recordFile->Write(OutData, OutLength) < 0) { ++ LOG_ERROR_STR(fileName->Name()); ++ Fail = true; ++ break; ++ } ++ HandleErrors(); ++ fileSize += OutLength; ++ } ++ if (Fail) ++ break; ++ } ++ else { ++ if (recordFile->Write(b, Count) < 0) { ++ LOG_ERROR_STR(fileName->Name()); ++ break; ++ } ++ HandleErrors(); ++ fileSize += Count; + } +- HandleErrors(); +- fileSize += Count; ++ + } + } +diff -a -U 2 -r a/recorder.h b/recorder.h +--- a/recorder.h ++++ b/recorder.h C2022-01-08 17:51:00.397595525 +0100 +@@ -27,4 +27,5 @@ + cFrameDetector *frameDetector; + cPatPmtGenerator patPmtGenerator; ++ cNaluStreamProcessor *naluStreamProcessor; + cFileName *fileName; + cRecordingInfo *recordingInfo; +diff -a -U 2 -r a/remux.c b/remux.c +--- a/remux.c ++++ b/remux.c +@@ -357,4 +357,40 @@ + } + ++void TsExtendAdaptionField(unsigned char *Packet, int ToLength) ++{ ++ // Hint: ExtenAdaptionField(p, TsPayloadOffset(p) - 4) is a null operation ++ ++ int Offset = TsPayloadOffset(Packet); // First byte after existing adaption field ++ ++ if (ToLength <= 0) ++ { ++ // Remove adaption field ++ Packet[3] = Packet[3] & ~TS_ADAPT_FIELD_EXISTS; ++ return; ++ } ++ ++ // Set adaption field present ++ Packet[3] = Packet[3] | TS_ADAPT_FIELD_EXISTS; ++ ++ // Set new length of adaption field: ++ Packet[4] = ToLength <= TS_SIZE-4 ? ToLength-1 : TS_SIZE-4-1; ++ ++ if (Packet[4] == TS_SIZE-4-1) ++ { ++ // No more payload, remove payload flag ++ Packet[3] = Packet[3] & ~TS_PAYLOAD_EXISTS; ++ } ++ ++ int NewPayload = TsPayloadOffset(Packet); // First byte after new adaption field ++ ++ // Fill new adaption field ++ if (Offset == 4 && Offset < NewPayload) ++ Offset++; // skip adaptation_field_length ++ if (Offset == 5 && Offset < NewPayload) ++ Packet[Offset++] = 0; // various flags set to 0 ++ while (Offset < NewPayload) ++ Packet[Offset++] = 0xff; // stuffing byte ++} ++ + // --- cPatPmtGenerator ------------------------------------------------------ + +@@ -1765,2 +1801,343 @@ + return Processed; + } ++ ++// --- cNaluDumper --------------------------------------------------------- ++ ++cNaluDumper::cNaluDumper() ++{ ++ LastContinuityOutput = -1; ++ reset(); ++} ++ ++void cNaluDumper::reset() ++{ ++ LastContinuityInput = -1; ++ ContinuityOffset = 0; ++ PesId = -1; ++ PesOffset = 0; ++ NaluFillState = NALU_NONE; ++ NaluOffset = 0; ++ History = 0xffffffff; ++ DropAllPayload = false; ++} ++ ++void cNaluDumper::ProcessPayload(unsigned char *Payload, int size, bool PayloadStart, sPayloadInfo &Info) ++{ ++ Info.DropPayloadStartBytes = 0; ++ Info.DropPayloadEndBytes = 0; ++ int LastKeepByte = -1; ++ ++ if (PayloadStart) ++ { ++ History = 0xffffffff; ++ PesId = -1; ++ NaluFillState = NALU_NONE; ++ } ++ ++ for (int i=0; i<size; i++) { ++ History = (History << 8) | Payload[i]; ++ ++ PesOffset++; ++ NaluOffset++; ++ ++ bool DropByte = false; ++ ++ if (History >= 0x00000180 && History <= 0x000001FF) ++ { ++ // Start of PES packet ++ PesId = History & 0xff; ++ PesOffset = 0; ++ NaluFillState = NALU_NONE; ++ } ++ else if (PesId >= 0xe0 && PesId <= 0xef // video stream ++ && History >= 0x00000100 && History <= 0x0000017F) // NALU start code ++ { ++ int NaluId = History & 0xff; ++ NaluOffset = 0; ++ NaluFillState = ((NaluId & 0x1f) == 0x0c) ? NALU_FILL : NALU_NONE; ++ } ++ ++ if (PesId >= 0xe0 && PesId <= 0xef // video stream ++ && PesOffset >= 1 && PesOffset <= 2) ++ { ++ Payload[i] = 0; // Zero out PES length field ++ } ++ ++ if (NaluFillState == NALU_FILL && NaluOffset > 0) // Within NALU fill data ++ { ++ // We expect a series of 0xff bytes terminated by a single 0x80 byte. ++ ++ if (Payload[i] == 0xFF) ++ { ++ DropByte = true; ++ } ++ else if (Payload[i] == 0x80) ++ { ++ NaluFillState = NALU_TERM; // Last byte of NALU fill, next byte sets NaluFillEnd=true ++ DropByte = true; ++ } ++ else // Invalid NALU fill ++ { ++ dsyslog("cNaluDumper: Unexpected NALU fill data: %02x", Payload[i]); ++ NaluFillState = NALU_END; ++ if (LastKeepByte == -1) ++ { ++ // Nalu fill from beginning of packet until last byte ++ // packet start needs to be dropped ++ Info.DropPayloadStartBytes = i; ++ } ++ } ++ } ++ else if (NaluFillState == NALU_TERM) // Within NALU fill data ++ { ++ // We are after the terminating 0x80 byte ++ NaluFillState = NALU_END; ++ if (LastKeepByte == -1) ++ { ++ // Nalu fill from beginning of packet until last byte ++ // packet start needs to be dropped ++ Info.DropPayloadStartBytes = i; ++ } ++ } ++ ++ if (!DropByte) ++ LastKeepByte = i; // Last useful byte ++ } ++ ++ Info.DropAllPayloadBytes = (LastKeepByte == -1); ++ Info.DropPayloadEndBytes = size-1-LastKeepByte; ++} ++ ++bool cNaluDumper::ProcessTSPacket(unsigned char *Packet) ++{ ++ bool HasAdaption = TsHasAdaptationField(Packet); ++ bool HasPayload = TsHasPayload(Packet); ++ ++ // Check continuity: ++ int ContinuityInput = TsContinuityCounter(Packet); ++ if (LastContinuityInput >= 0) ++ { ++ int NewContinuityInput = HasPayload ? (LastContinuityInput + 1) & TS_CONT_CNT_MASK : LastContinuityInput; ++ int Offset = (NewContinuityInput - ContinuityInput) & TS_CONT_CNT_MASK; ++ if (Offset > 0) ++ dsyslog("cNaluDumper: TS continuity offset %i", Offset); ++ if (Offset > ContinuityOffset) ++ ContinuityOffset = Offset; // max if packets get dropped, otherwise always the current one. ++ } ++ LastContinuityInput = ContinuityInput; ++ ++ if (HasPayload) { ++ sPayloadInfo Info; ++ int Offset = TsPayloadOffset(Packet); ++ ProcessPayload(Packet + Offset, TS_SIZE - Offset, TsPayloadStart(Packet), Info); ++ ++ if (DropAllPayload && !Info.DropAllPayloadBytes) ++ { ++ // Return from drop packet mode to normal mode ++ DropAllPayload = false; ++ ++ // Does the packet start with some remaining NALU fill data? ++ if (Info.DropPayloadStartBytes > 0) ++ { ++ // Add these bytes as stuffing to the adaption field. ++ ++ // Sample payload layout: ++ // FF FF FF FF FF 80 00 00 01 xx xx xx xx ++ // ^DropPayloadStartBytes ++ ++ TsExtendAdaptionField(Packet, Offset - 4 + Info.DropPayloadStartBytes); ++ } ++ } ++ ++ bool DropThisPayload = DropAllPayload; ++ ++ if (!DropAllPayload && Info.DropPayloadEndBytes > 0) // Payload ends with 0xff NALU Fill ++ { ++ // Last packet of useful data ++ // Do early termination of NALU fill data ++ Packet[TS_SIZE-1] = 0x80; ++ DropAllPayload = true; ++ // Drop all packets AFTER this one ++ ++ // Since we already wrote the 0x80, we have to make sure that ++ // as soon as we stop dropping packets, any beginning NALU fill of next ++ // packet gets dumped. (see DropPayloadStartBytes above) ++ } ++ ++ if (DropThisPayload && HasAdaption) ++ { ++ // Drop payload data, but keep adaption field data ++ TsExtendAdaptionField(Packet, TS_SIZE-4); ++ DropThisPayload = false; ++ } ++ ++ if (DropThisPayload) ++ { ++ return true; // Drop packet ++ } ++ } ++ ++ // Fix Continuity Counter and reproduce incoming offsets: ++ int NewContinuityOutput = TsHasPayload(Packet) ? (LastContinuityOutput + 1) & TS_CONT_CNT_MASK : LastContinuityOutput; ++ NewContinuityOutput = (NewContinuityOutput + ContinuityOffset) & TS_CONT_CNT_MASK; ++ TsSetContinuityCounter(Packet, NewContinuityOutput); ++ LastContinuityOutput = NewContinuityOutput; ++ ContinuityOffset = 0; ++ ++ return false; // Keep packet ++} ++ ++// --- cNaluStreamProcessor --------------------------------------------------------- ++ ++cNaluStreamProcessor::cNaluStreamProcessor() ++{ ++ pPatPmtParser = NULL; ++ vpid = -1; ++ data = NULL; ++ length = 0; ++ tempLength = 0; ++ tempLengthAtEnd = false; ++ TotalPackets = 0; ++ DroppedPackets = 0; ++} ++ ++void cNaluStreamProcessor::PutBuffer(uchar *Data, int Length) ++{ ++ if (length > 0) ++ esyslog("cNaluStreamProcessor::PutBuffer: New data before old data was processed!"); ++ ++ data = Data; ++ length = Length; ++} ++ ++uchar* cNaluStreamProcessor::GetBuffer(int &OutLength) ++{ ++ if (length <= 0) ++ { ++ // Need more data - quick exit ++ OutLength = 0; ++ return NULL; ++ } ++ if (tempLength > 0) // Data in temp buffer? ++ { ++ if (tempLengthAtEnd) // Data is at end, copy to beginning ++ { ++ // Overlapping src and dst! ++ for (int i=0; i<tempLength; i++) ++ tempBuffer[i] = tempBuffer[TS_SIZE-tempLength+i]; ++ } ++ // Normalize TempBuffer fill ++ if (tempLength < TS_SIZE && length > 0) ++ { ++ int Size = min(TS_SIZE-tempLength, length); ++ memcpy(tempBuffer+tempLength, data, Size); ++ data += Size; ++ length -= Size; ++ tempLength += Size; ++ } ++ if (tempLength < TS_SIZE) ++ { ++ // All incoming data buffered, but need more data ++ tempLengthAtEnd = false; ++ OutLength = 0; ++ return NULL; ++ } ++ // Now: TempLength==TS_SIZE ++ if (tempBuffer[0] != TS_SYNC_BYTE) ++ { ++ // Need to sync on TS within temp buffer ++ int Skipped = 1; ++ while (Skipped < TS_SIZE && (tempBuffer[Skipped] != TS_SYNC_BYTE || (Skipped < length && data[Skipped] != TS_SYNC_BYTE))) ++ Skipped++; ++ esyslog("ERROR: skipped %d bytes to sync on start of TS packet", Skipped); ++ // Pass through skipped bytes ++ tempLengthAtEnd = true; ++ tempLength = TS_SIZE - Skipped; // may be 0, thats ok ++ OutLength = Skipped; ++ return tempBuffer; ++ } ++ // Now: TempBuffer is a TS packet ++ int Pid = TsPid(tempBuffer); ++ if (pPatPmtParser) ++ { ++ if (Pid == 0) ++ pPatPmtParser->ParsePat(tempBuffer, TS_SIZE); ++ else if (pPatPmtParser->IsPmtPid(Pid)) ++ pPatPmtParser->ParsePmt(tempBuffer, TS_SIZE); ++ } ++ ++ TotalPackets++; ++ bool Drop = false; ++ if (Pid == vpid || (pPatPmtParser && Pid == pPatPmtParser->Vpid() && pPatPmtParser->Vtype() == 0x1B)) ++ Drop = NaluDumper.ProcessTSPacket(tempBuffer); ++ if (!Drop) ++ { ++ // Keep this packet, then continue with new data ++ tempLength = 0; ++ OutLength = TS_SIZE; ++ return tempBuffer; ++ } ++ // Drop TempBuffer ++ DroppedPackets++; ++ tempLength = 0; ++ } ++ // Now: TempLength==0, just process data/length ++ ++ // Pointer to processed data / length: ++ uchar *Out = data; ++ uchar *OutEnd = Out; ++ ++ while (length >= TS_SIZE) ++ { ++ if (data[0] != TS_SYNC_BYTE) { ++ int Skipped = 1; ++ while (Skipped < length && (data[Skipped] != TS_SYNC_BYTE || (length - Skipped > TS_SIZE && data[Skipped + TS_SIZE] != TS_SYNC_BYTE))) ++ Skipped++; ++ esyslog("ERROR: skipped %d bytes to sync on start of TS packet", Skipped); ++ ++ // Pass through skipped bytes ++ if (OutEnd != data) ++ memcpy(OutEnd, data, Skipped); ++ OutEnd += Skipped; ++ continue; ++ } ++ // Now: Data starts with complete TS packet ++ ++ int Pid = TsPid(data); ++ if (pPatPmtParser) ++ { ++ if (Pid == 0) ++ pPatPmtParser->ParsePat(data, TS_SIZE); ++ else if (pPatPmtParser->IsPmtPid(Pid)) ++ pPatPmtParser->ParsePmt(data, TS_SIZE); ++ } ++ ++ TotalPackets++; ++ bool Drop = false; ++ if (Pid == vpid || (pPatPmtParser && Pid == pPatPmtParser->Vpid() && pPatPmtParser->Vtype() == 0x1B)) ++ Drop = NaluDumper.ProcessTSPacket(data); ++ if (!Drop) ++ { ++ if (OutEnd != data) ++ memcpy(OutEnd, data, TS_SIZE); ++ OutEnd += TS_SIZE; ++ } ++ else ++ { ++ DroppedPackets++; ++ } ++ data += TS_SIZE; ++ length -= TS_SIZE; ++ } ++ // Now: Less than a packet remains. ++ if (length > 0) ++ { ++ // copy remains into temp buffer ++ memcpy(tempBuffer, data, length); ++ tempLength = length; ++ tempLengthAtEnd = false; ++ length = 0; ++ } ++ OutLength = (OutEnd - Out); ++ return OutLength > 0 ? Out : NULL; ++} +diff -a -U 2 -r a/remux.h b/remux.h +--- a/remux.h ++++ b/remux.h +@@ -65,4 +65,9 @@ + } + ++inline bool TsSetPayload(const uchar *p) ++{ ++ return p[3] & TS_PAYLOAD_EXISTS; ++} ++ + inline bool TsHasAdaptationField(const uchar *p) + { +@@ -156,4 +161,5 @@ + void TsSetPts(uchar *p, int l, int64_t Pts); + void TsSetDts(uchar *p, int l, int64_t Dts); ++void TsExtendAdaptionField(unsigned char *Packet, int ToLength); + + // Some PES handling tools: +@@ -550,3 +556,77 @@ + }; + ++ ++#define PATCH_NALUDUMP 100 ++ ++class cNaluDumper { ++ unsigned int History; ++ ++ int LastContinuityInput; ++ int LastContinuityOutput; ++ int ContinuityOffset; ++ ++ bool DropAllPayload; ++ ++ int PesId; ++ int PesOffset; ++ ++ int NaluOffset; ++ ++ enum eNaluFillState { ++ NALU_NONE=0, // currently not NALU fill stream ++ NALU_FILL, // Within NALU fill stream, 0xff bytes and NALU start code in byte 0 ++ NALU_TERM, // Within NALU fill stream, read 0x80 terminating byte ++ NALU_END // Beyond end of NALU fill stream, expecting 0x00 0x00 0x01 now ++ }; ++ ++ eNaluFillState NaluFillState; ++ ++ struct sPayloadInfo { ++ int DropPayloadStartBytes; ++ int DropPayloadEndBytes; ++ bool DropAllPayloadBytes; ++ }; ++ ++public: ++ cNaluDumper(); ++ ++ void reset(); ++ ++ // Single packet interface: ++ bool ProcessTSPacket(unsigned char *Packet); ++ ++private: ++ void ProcessPayload(unsigned char *Payload, int size, bool PayloadStart, sPayloadInfo &Info); ++}; ++ ++class cNaluStreamProcessor { ++ //Buffer stream interface: ++ int vpid; ++ uchar *data; ++ int length; ++ uchar tempBuffer[TS_SIZE]; ++ int tempLength; ++ bool tempLengthAtEnd; ++ cPatPmtParser *pPatPmtParser; ++ cNaluDumper NaluDumper; ++ ++ long long int TotalPackets; ++ long long int DroppedPackets; ++public: ++ cNaluStreamProcessor(); ++ ++ void SetPid(int VPid) { vpid = VPid; } ++ void SetPatPmtParser(cPatPmtParser *_pPatPmtParser) { pPatPmtParser = _pPatPmtParser; } ++ // Set either a PID or set a pointer to an PatPmtParser that will detect _one_ PID ++ ++ void PutBuffer(uchar *Data, int Length); ++ // Add new data to be processed. Data must be valid until Get() returns NULL. ++ uchar* GetBuffer(int &OutLength); ++ // Returns filtered data, or NULL/0 to indicate that all data from Put() was processed ++ // or buffered. ++ ++ long long int GetTotalPackets() { return TotalPackets; } ++ long long int GetDroppedPackets() { return DroppedPackets; } ++}; ++ + #endif // __REMUX_H diff --git a/media-video/vdr/files/vdr-2.6.1_pinplugin.patch b/media-video/vdr/files/vdr-2.6.1_pinplugin.patch new file mode 100644 index 000000000000..2552f9e7109f --- /dev/null +++ b/media-video/vdr/files/vdr-2.6.1_pinplugin.patch @@ -0,0 +1,447 @@ +original vdr-pinplugin_vdr-2.3.1.diff +rebased for media-video/vdr-2.6.1 + +Signed-off-by: Christian Kunkel <ch.kunkel@gmx.de> ( 2021 Feb 12 ) +Reviewed-by: Martin Dummer <martin.dummer@gmx.net> ( 2022-06-22 ) +diff -Naur a/Makefile b/Makefile +--- a/Makefile 2022-02-02 10:56:43.000000000 +0100 ++++ b/Makefile 2022-06-20 08:08:11.346956148 +0200 +@@ -351,7 +351,7 @@ + clean: + @$(MAKE) --no-print-directory -C $(LSIDIR) clean + @-rm -f $(OBJS) $(DEPFILE) vdr vdr.pc core* *~ +- @-rm -rf $(LOCALEDIR) $(PODIR)/*.mo $(PODIR)/*.pot ++ @-rm -rf $(LOCALEDIR) $(PODIR)/*~ $(PODIR)/*.mo $(PODIR)/*.pot + @-rm -rf include + @-rm -rf srcdoc + CLEAN: clean +diff -Naur a/device.c b/device.c +--- a/device.c 2022-02-02 10:56:43.000000000 +0100 ++++ b/device.c 2022-06-20 08:08:11.346956148 +0200 +@@ -839,6 +839,7 @@ + const cChannel *Channel; + while ((Channel = Channels->GetByNumber(n, Direction)) != NULL) { + // try only channels which are currently available ++ if (!cStatus::MsgChannelProtected(0, Channel)) // PIN PATCH + if (GetDevice(Channel, LIVEPRIORITY, true, true)) + break; + n = Channel->Number() + Direction; +@@ -860,6 +861,12 @@ + + eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView) + { ++ // I hope 'LiveView = false' indicates a channel switch for recording, // PIN PATCH ++ // I really don't know, but it works ... // PIN PATCH ++ ++ if (LiveView && cStatus::MsgChannelProtected(this, Channel)) // PIN PATCH ++ return scrNotAvailable; // PIN PATCH ++ + cMutexLock MutexLock(&mutexChannel); // to avoid a race between SVDRP CHAN and HasProgramme() + cStatus::MsgChannelSwitch(this, 0, LiveView); + +diff -Naur a/menu.c b/menu.c +--- a/menu.c 2022-02-02 10:56:43.000000000 +0100 ++++ b/menu.c 2022-06-20 08:08:11.346956148 +0200 +@@ -1035,6 +1035,18 @@ + Add(new cMenuEditBitItem( tr("VPS"), &data.flags, tfVps)); + Add(new cMenuEditIntItem( tr("Priority"), &data.priority, 0, MAXPRIORITY)); + Add(new cMenuEditIntItem( tr("Lifetime"), &data.lifetime, 0, MAXLIFETIME)); ++ ++ // PIN PATCH ++ if (cOsd::pinValid || !data.fskProtection) Add(new cMenuEditBoolItem(tr("Childlock"),&data.fskProtection)); ++ else { ++ char* buf = 0; ++ int res = 0; ++ res = asprintf(&buf, "%s\t%s", tr("Childlock"), data.fskProtection ? tr("yes") : tr("no")); ++ if (res < 0) ; // memory problems :o ++ Add(new cOsdItem(buf)); ++ free(buf); ++ } ++ + Add(file = new cMenuEditStrItem( tr("File"), data.file, sizeof(data.file))); + SetFirstDayItem(); + SetPatternItem(true); +@@ -3130,7 +3142,8 @@ + } + } + } +- if (*Item->Text() && !LastDir) { ++ if (*Item->Text() && !LastDir ++ && (!cStatus::MsgReplayProtected(Item->Recording(), Item->Name(), base, Item->IsDirectory(), true))) { // PIN PATCH + Add(Item); + LastItem = Item; + if (Item->IsDirectory()) +@@ -3201,6 +3214,9 @@ + { + cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current()); + if (ri) { ++ if (cStatus::MsgReplayProtected(ri->Recording(), ri->Name(), base, ++ ri->IsDirectory()) == true) // PIN PATCH ++ return osContinue; + if (ri->IsDirectory()) + Open(); + else { +@@ -4506,28 +4522,32 @@ + + // Basic menu items: + +- Add(new cOsdItem(hk(tr("Schedule")), osSchedule)); +- Add(new cOsdItem(hk(tr("Channels")), osChannels)); +- Add(new cOsdItem(hk(tr("Timers")), osTimers)); +- Add(new cOsdItem(hk(tr("Recordings")), osRecordings)); ++ // PIN PATCH ++ if (!cStatus::MsgMenuItemProtected("Schedule", true)) Add(new cOsdItem(hk(tr("Schedule")), osSchedule)); ++ if (!cStatus::MsgMenuItemProtected("Channels", true)) Add(new cOsdItem(hk(tr("Channels")), osChannels)); ++ if (!cStatus::MsgMenuItemProtected("Timers", true)) Add(new cOsdItem(hk(tr("Timers")), osTimers)); ++ if (!cStatus::MsgMenuItemProtected("Recordings", true)) Add(new cOsdItem(hk(tr("Recordings")), osRecordings)); + + // Plugins: + + for (int i = 0; ; i++) { + cPlugin *p = cPluginManager::GetPlugin(i); + if (p) { ++ if (!cStatus::MsgPluginProtected(p, true)) { // PIN PATCH + const char *item = p->MainMenuEntry(); + if (item) + Add(new cMenuPluginItem(hk(item), i)); + } ++ } + else + break; + } + + // More basic menu items: + +- Add(new cOsdItem(hk(tr("Setup")), osSetup)); ++ if (!cStatus::MsgMenuItemProtected("Setup", true)) Add(new cOsdItem(hk(tr("Setup")), osSetup)); // PIN PATCH + if (Commands.Count()) ++ if (!cStatus::MsgMenuItemProtected("Commands", true)) // PIN PATCH + Add(new cOsdItem(hk(tr("Commands")), osCommands)); + + Update(true); +@@ -4600,6 +4620,14 @@ + eOSState state = cOsdMenu::ProcessKey(Key); + HadSubMenu |= HasSubMenu(); + ++ // > PIN PATCH ++ cOsdItem* item = Get(Current()); ++ ++ if (item && item->Text() && state != osContinue && state != osUnknown && state != osBack) ++ if (cStatus::MsgMenuItemProtected(item->Text())) ++ return osContinue; ++ // PIN PATCH < ++ + switch (state) { + case osSchedule: return AddSubMenu(new cMenuSchedule); + case osChannels: return AddSubMenu(new cMenuChannels); +@@ -4624,6 +4652,7 @@ + if (item) { + cPlugin *p = cPluginManager::GetPlugin(item->PluginIndex()); + if (p) { ++ if (!cStatus::MsgPluginProtected(p)) { // PIN PATCH + cOsdObject *menu = p->MainMenuAction(); + if (menu) { + if (menu->IsMenu()) +@@ -4635,6 +4664,7 @@ + } + } + } ++ } + state = osEnd; + } + break; +@@ -4814,6 +4844,7 @@ + Channel = Direction > 0 ? Channels->Next(Channel) : Channels->Prev(Channel); + if (!Channel && Setup.ChannelsWrap) + Channel = Direction > 0 ? Channels->First() : Channels->Last(); ++ if (!cStatus::MsgChannelProtected(0, Channel)) // PIN PATCH + if (Channel && !Channel->GroupSep() && cDevice::GetDevice(Channel, LIVEPRIORITY, true, true)) + return Channel; + } +@@ -5491,6 +5522,7 @@ + for (int i = 0; i < MAXRECORDCONTROLS; i++) { + if (!RecordControls[i]) { + RecordControls[i] = new cRecordControl(device, Timers, Timer, Pause); ++ cStatus::MsgRecordingFile(RecordControls[i]->FileName()); // PIN PATCH + return RecordControls[i]->Process(time(NULL)); + } + } +diff -Naur a/osd.c b/osd.c +--- a/osd.c 2022-02-02 10:56:43.000000000 +0100 ++++ b/osd.c 2022-06-20 08:08:11.346956148 +0200 +@@ -1844,6 +1844,7 @@ + cSize cOsd::maxPixmapSize(INT_MAX, INT_MAX); + cVector<cOsd *> cOsd::Osds; + cMutex cOsd::mutex; ++bool cOsd::pinValid = false; // PIN PATCH + + cOsd::cOsd(int Left, int Top, uint Level) + { +diff -Naur a/osd.h b/osd.h +--- a/osd.h 2022-02-02 10:56:43.000000000 +0100 ++++ b/osd.h 2022-06-20 08:08:11.346956148 +0200 +@@ -957,6 +957,7 @@ + ///< + ///< If a plugin uses a derived cPixmap implementation, it needs to use that + ///< type instead of cPixmapMemory. ++ static bool pinValid; // PIN PATCH + }; + + #define MAXOSDIMAGES 64 +diff -Naur a/status.c b/status.c +--- a/status.c 2022-02-02 10:56:43.000000000 +0100 ++++ b/status.c 2022-06-20 08:08:11.346956148 +0200 +@@ -136,3 +136,55 @@ + for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm)) + sm->OsdProgramme(PresentTime, PresentTitle, PresentSubtitle, FollowingTime, FollowingTitle, FollowingSubtitle); + } ++ ++bool cStatus::MsgChannelProtected(const cDevice* Device, const cChannel* Channel) // PIN PATCH ++{ ++ for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm)) ++ if (sm->ChannelProtected(Device, Channel) == true) ++ return true; ++ ++ return false; ++} ++ ++bool cStatus::MsgReplayProtected(const cRecording* Recording, const char* Name, ++ const char* Base, bool isDirectory, int menuView) // PIN PATCH ++{ ++ for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm)) ++ if (sm->ReplayProtected(Recording, Name, Base, isDirectory, menuView) == true) ++ return true; ++ return false; ++} ++ ++void cStatus::MsgRecordingFile(const char* FileName) ++{ ++ for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm)) // PIN PATCH ++ sm->RecordingFile(FileName); ++} ++ ++void cStatus::MsgTimerCreation(cTimer* Timer, const cEvent *Event) ++{ ++ for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm)) // PIN PATCH ++ sm->TimerCreation(Timer, Event); ++} ++ ++bool cStatus::MsgPluginProtected(cPlugin* Plugin, int menuView) // PIN PATCH ++{ ++ for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm)) ++ if (sm->PluginProtected(Plugin, menuView) == true) ++ return true; ++ return false; ++} ++ ++void cStatus::MsgUserAction(const eKeys key) // PIN PATCH ++{ ++ for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm)) ++ sm->UserAction(key); ++} ++ ++bool cStatus::MsgMenuItemProtected(const char* Name, int menuView) // PIN PATCH ++{ ++ for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm)) ++ if (sm->MenuItemProtected(Name, menuView) == true) ++ return true; ++ return false; ++} +diff -Naur a/status.h b/status.h +--- a/status.h 2022-02-02 10:56:43.000000000 +0100 ++++ b/status.h 2022-06-20 08:08:11.350956230 +0200 +@@ -14,6 +14,7 @@ + #include "device.h" + #include "player.h" + #include "tools.h" ++#include "plugin.h" + + // Several member functions of the following classes are called with a pointer to + // an object from a global list (cTimer, cChannel, cRecording or cEvent). In these +@@ -99,6 +100,22 @@ + // The OSD displays the single line Text with the current channel information. + virtual void OsdProgramme(time_t PresentTime, const char *PresentTitle, const char *PresentSubtitle, time_t FollowingTime, const char *FollowingTitle, const char *FollowingSubtitle) {} + // The OSD displays the given programme information. ++ virtual bool ChannelProtected(const cDevice *Device, const cChannel* Channel) { return false; } // PIN PATCH ++ // Checks if a channel is protected. ++ virtual bool ReplayProtected(const cRecording* Recording, const char* Name, ++ const char* Base, bool isDirectory, int menuView = false) { return false; } // PIN PATCH ++ // Checks if a recording is protected. ++ virtual void RecordingFile(const char* FileName) {} // PIN PATCH ++ // The given DVB device has started recording to FileName. FileName is the name of the ++ // recording directory ++ virtual void TimerCreation(cTimer* Timer, const cEvent *Event) {} // PIN PATCH ++ // The given timer is created ++ virtual bool PluginProtected(cPlugin* Plugin, int menuView = false) { return false; } // PIN PATCH ++ // Checks if a plugin is protected. ++ virtual void UserAction(const eKeys key) {} // PIN PATCH ++ // report user action ++ virtual bool MenuItemProtected(const char* Name, int menuView = false) { return false; } // PIN PATCH ++ + public: + cStatus(void); + virtual ~cStatus(); +@@ -122,6 +139,14 @@ + static void MsgOsdTextItem(const char *Text, bool Scroll = false); + static void MsgOsdChannel(const char *Text); + static void MsgOsdProgramme(time_t PresentTime, const char *PresentTitle, const char *PresentSubtitle, time_t FollowingTime, const char *FollowingTitle, const char *FollowingSubtitle); ++ static bool MsgChannelProtected(const cDevice* Device, const cChannel* Channel); // PIN PATCH ++ static bool MsgReplayProtected(const cRecording* Recording, const char* Name, ++ const char* Base, bool isDirectory, int menuView = false); // PIN PATCH ++ static void MsgRecordingFile(const char* FileName); // PIN PATCH ++ static void MsgTimerCreation(cTimer* Timer, const cEvent *Event); // PIN PATCH ++ static bool MsgPluginProtected(cPlugin* Plugin, int menuView = false); // PIN PATCH ++ static void MsgUserAction(const eKeys key); // PIN PATCH ++ static bool MsgMenuItemProtected(const char* Name, int menuView = false); // PIN PATCH + }; + + #endif //__STATUS_H +diff -Naur a/timers.c b/timers.c +--- a/timers.c 2022-02-02 10:56:43.000000000 +0100 ++++ b/timers.c 2022-06-20 08:14:07.898392829 +0200 +@@ -81,6 +81,7 @@ + stop -= 2400; + priority = Pause ? Setup.PausePriority : Setup.DefaultPriority; + lifetime = Pause ? Setup.PauseLifetime : Setup.DefaultLifetime; ++ fskProtection = 0; // PIN PATCH + if (Instant && channel) + snprintf(file, sizeof(file), "%s%s", Setup.MarkInstantRecord ? "@" : "", *Setup.NameInstantRecord ? Setup.NameInstantRecord : channel->Name()); + } +@@ -212,11 +213,13 @@ + stop -= 2400; + priority = PatternTimer ? PatternTimer->Priority() : Setup.DefaultPriority; + lifetime = PatternTimer ? PatternTimer->Lifetime() : Setup.DefaultLifetime; ++ fskProtection = 0; // PIN PATCH + if (!FileName) + FileName = Event->Title(); + if (!isempty(FileName)) + Utf8Strn0Cpy(file, FileName, sizeof(file)); + SetEvent(Event); ++ cStatus::MsgTimerCreation(this, Event); // PIN PATCH + } + + cTimer::cTimer(const cTimer &Timer) +@@ -255,6 +258,7 @@ + stop = Timer.stop; + priority = Timer.priority; + lifetime = Timer.lifetime; ++ fskProtection = Timer.fskProtection; // PIN PATCH + strncpy(pattern, Timer.pattern, sizeof(pattern)); + strncpy(file, Timer.file, sizeof(file)); + free(aux); +@@ -484,6 +488,7 @@ + result = false; + } + } ++ fskProtection = aux && strstr(aux, "<pin-plugin><protected>yes</protected></pin-plugin>"); // PIN PATCH + free(channelbuffer); + free(daybuffer); + free(filebuffer); +@@ -1037,6 +1042,36 @@ + Matches(); // refresh start and end time + } + ++void cTimer::SetFskProtection(int aFlag) // PIN PATCH ++{ ++ char* p; ++ char* tmp = 0; ++ int res = 0; ++ ++ fskProtection = aFlag; ++ ++ if (fskProtection && (!aux || !strstr(aux, "<pin-plugin><protected>yes</protected></pin-plugin>"))) ++ { ++ // add protection info to aux ++ ++ if (aux) { tmp = strdup(aux); free(aux); } ++ res = asprintf(&aux, "%s<pin-plugin><protected>yes</protected></pin-plugin>", tmp ? tmp : ""); ++ } ++ else if (!fskProtection && aux && (p = strstr(aux, "<pin-plugin><protected>yes</protected></pin-plugin>"))) ++ { ++ // remove protection info from aux ++ ++ res = asprintf(&tmp, "%.*s%s", (int)(p-aux), aux, p+strlen("<pin-plugin><protected>yes</protected></pin-plugin>")); ++ free(aux); ++ aux = strdup(tmp); ++ } ++ ++ if (res < 0) ; // memory problems :o ++ ++ if (tmp) ++ free(tmp); ++} ++ + // --- cTimers --------------------------------------------------------------- + + cTimers cTimers::timers; +diff -Naur a/timers.h b/timers.h +--- a/timers.h 2022-02-02 10:56:43.000000000 +0100 ++++ b/timers.h 2022-06-20 08:08:11.350956230 +0200 +@@ -45,6 +45,7 @@ + int start; ///< the start and stop time of this timer as given by the user, + int stop; ///< in the form hhmm, with hh (00..23) and mm (00..59) added as hh*100+mm + int priority; ++ int fskProtection; // PIN PATCH + int lifetime; + mutable char pattern[NAME_MAX * 2 + 1]; // same size as 'file', to be able to initially fill 'pattern' with 'file' in the 'Edit timer' menu + mutable char file[NAME_MAX * 2 + 1]; // *2 to be able to hold 'title' and 'episode', which can each be up to 255 characters long +@@ -70,6 +71,7 @@ + int Start(void) const { return start; } + int Stop(void) const { return stop; } + int Priority(void) const { return priority; } ++ int FskProtection(void) const { return fskProtection; } // PIN PATCH + int Lifetime(void) const { return lifetime; } + const char *Pattern(void) const { return pattern; } + const char *File(void) const { return file; } +@@ -120,6 +122,7 @@ + void SetRemote(const char *Remote); + void SetDeferred(int Seconds); + void SetFlags(uint Flags); ++ void SetFskProtection(int aFlag); // PIN PATCH + void ClrFlags(uint Flags); + void InvFlags(uint Flags); + bool HasFlags(uint Flags) const; +diff -Naur a/vdr.c b/vdr.c +--- a/vdr.c 2022-02-02 10:56:43.000000000 +0100 ++++ b/vdr.c 2022-06-20 08:08:11.350956230 +0200 +@@ -71,6 +71,7 @@ + #include "tools.h" + #include "transfer.h" + #include "videodir.h" ++#include "status.h" // PIN PATCH + + #define MINCHANNELWAIT 10 // seconds to wait between failed channel switchings + #define ACTIVITYTIMEOUT 60 // seconds before starting housekeeping +@@ -1210,6 +1211,7 @@ + if (!Menu) + Interact = Control = cControl::Control(ControlMutexLock); + if (ISREALKEY(key)) { ++ cStatus::MsgUserAction(key); // PIN PATCH + EITScanner.Activity(); + // Cancel shutdown countdown: + if (ShutdownHandler.countdown) +@@ -1282,10 +1284,12 @@ + Control->Hide(); + cPlugin *plugin = cPluginManager::GetPlugin(PluginName); + if (plugin) { ++ if (!cStatus::MsgPluginProtected(plugin)) { // PIN PATCH + Menu = plugin->MainMenuAction(); + if (Menu) + Menu->Show(); + } ++ } + else + esyslog("ERROR: unknown plugin '%s'", PluginName); + } +@@ -1505,9 +1509,11 @@ + case kPlay: + if (cReplayControl::LastReplayed()) { + Control = NULL; ++ if (cStatus::MsgReplayProtected(0, cReplayControl::LastReplayed(), 0, false) == false) { // PIN PATCH + cControl::Shutdown(); + cControl::Launch(new cReplayControl); + } ++ } + else + DirectMainFunction(osRecordings); // no last viewed recording, so enter the Recordings menu + break; diff --git a/media-video/vdr/vdr-2.2.0-r7.ebuild b/media-video/vdr/vdr-2.2.0-r7.ebuild index 63fed2e99446..bba06dbbb477 100644 --- a/media-video/vdr/vdr-2.2.0-r7.ebuild +++ b/media-video/vdr/vdr-2.2.0-r7.ebuild @@ -28,11 +28,11 @@ SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2 LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc x86" IUSE="bidi debug keyboard html systemd vanilla ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}" COMMON_DEPEND=" - virtual/jpeg:* + media-libs/libjpeg-turbo sys-libs/libcap >=media-libs/fontconfig-2.4.2 >=media-libs/freetype-2" @@ -44,7 +44,8 @@ RDEPEND="${COMMON_DEPEND} media-fonts/corefonts bidi? ( dev-libs/fribidi ) systemd? ( sys-apps/systemd )" -BDEPEND="sys-devel/gettext" +BDEPEND="sys-devel/gettext + virtual/pkgconfig" CONF_DIR="/etc/vdr" CAP_FILE="${S}/capabilities.sh" @@ -212,9 +213,9 @@ src_prepare() { eend $? "make depend failed" eapply "${FILESDIR}/${P}_gcc7extpng.patch" - eapply "${FILESDIR}/${P}_gcc11.patch" fi + eapply "${FILESDIR}/${P}_gcc11.patch" eapply "${FILESDIR}/${P}_gentoo.patch" eapply "${FILESDIR}/${P}_unsignedtosigned.patch" eapply "${FILESDIR}/${P}_glibc-2.24.patch" diff --git a/media-video/vdr/vdr-2.6.1.ebuild b/media-video/vdr/vdr-2.6.1.ebuild new file mode 100644 index 000000000000..306bbb8b220f --- /dev/null +++ b/media-video/vdr/vdr-2.6.1.ebuild @@ -0,0 +1,199 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic strip-linguas toolchain-funcs user-info + +DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB" +HOMEPAGE="http://www.tvdr.de/" +SRC_URI="http://git.tvdr.de/?p=vdr.git;a=snapshot;h=refs/tags/${PV};sf=tbz2 -> ${P}.tbz2 + menuorg? ( https://github.com/vdr-projects/vdr-plugin-menuorg/raw/master/vdr-patch/vdr-menuorg-2.3.x.diff ) + ttxtsubs? ( https://md11.it.cx/download/${PN}/${PN}-2.6.1_ttxtsubs_v2.patch )" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" +IUSE="bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump permashift pinplugin systemd ttxtsubs verbose" + +COMMON_DEPEND=" + acct-group/vdr + acct-user/vdr + media-libs/fontconfig + media-libs/freetype + media-libs/libjpeg-turbo + sys-libs/libcap" +DEPEND="${COMMON_DEPEND} + >=virtual/linuxtv-dvb-headers-5.3" +RDEPEND="${COMMON_DEPEND} + dev-lang/perl + media-tv/gentoo-vdr-scripts + media-fonts/corefonts + bidi? ( dev-libs/fribidi ) + systemd? ( sys-apps/systemd )" +BDEPEND=" + sys-devel/gettext + virtual/pkgconfig" + +REQUIRED_USE="permashift? ( !naludump !pinplugin )" + +CONF_DIR="/etc/vdr" +CAP_FILE="${S}/capabilities.sh" +CAPS="# Capabilities of the vdr-executable for use by startscript etc." + +pkg_setup() { + use debug && append-flags -g + + PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins" + VIDEO_DIR="$(egethome vdr)/video" + + tc-export CC CXX AR +} + +add_cap() { + local arg + for arg; do + CAPS="${CAPS}\n${arg}=1" + done +} + +lang_po() { + LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' ) +} + +src_prepare() { + # apply maintenance-patches + ebegin "Changing paths for gentoo" + + local DVBDIR=/usr/include + local i + for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do + [[ -d ${i} ]] || continue + if [[ -f ${i}/linux/dvb/dmx.h ]]; then + einfo "Found DVB header files in ${i}" + DVBDIR=${i} + break + fi + done + + # checking for s2api headers + local api_version + api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h) + api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h) + + if [[ ${api_version:-0} -lt 5*3 ]]; then + eerror "DVB header files do not contain s2api support or too old for ${P}" + eerror "You cannot compile VDR against old dvb-header" + die "DVB headers too old" + fi + + cat > Make.config <<-EOT || die "cannot write to Make.config" + # + # Generated by ebuild ${PF} + # + PREFIX = /usr + DVBDIR = ${DVBDIR} + PLUGINLIBDIR = ${PLUGIN_LIBDIR} + CONFDIR = ${CONF_DIR} + ARGSDIR = \$(CONFDIR)/conf.d + VIDEODIR = ${VIDEO_DIR} + LOCDIR = \$(PREFIX)/share/locale + INCDIR = \$(PREFIX)/include + + DEFINES += -DCONFDIR=\"\$(CONFDIR)\" + INCLUDES += -I\$(DVBDIR) + + # >=vdr-1.7.36-r1; parameter only used for compiletime on vdr + # PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile new) + LIBDIR = ${PLUGIN_LIBDIR} + PCDIR = /usr/$(get_libdir)/pkgconfig + + EOT + eend 0 + + eapply "${FILESDIR}/${PN}-2.4.6_gentoo.patch" + use demoplugins || eapply "${FILESDIR}/vdr-2.4_remove_plugins.patch" + eapply "${FILESDIR}/${PN}-2.4.6_makefile-variables.patch" + + # fix clang/LLVM compile + eapply "${FILESDIR}/${PN}-2.4.6_clang.patch" + + use naludump && eapply "${FILESDIR}/${P}_naludump.patch" + use permashift && eapply "${FILESDIR}/${P}-patch-for-permashift.patch" + use pinplugin && eapply "${FILESDIR}/${P}_pinplugin.patch" + use ttxtsubs && eapply "${DISTDIR}/${P}_ttxtsubs_v2.patch" + use menuorg && eapply "${DISTDIR}/vdr-menuorg-2.3.x.diff" + use mainmenuhooks && eapply "${FILESDIR}/${PN}-2.4.1_mainmenuhook-1.0.1.patch" + + add_cap CAP_UTF8 \ + CAP_IRCTRL_RUNTIME_PARAM \ + CAP_VFAT_RUNTIME_PARAM \ + CAP_CHUID \ + CAP_SHUTDOWN_AUTO_RETRY + + echo -e ${CAPS} > "${CAP_FILE}" || die "cannot write to CAP_FILE" + + # LINGUAS support + einfo "\n \t VDR supports the LINGUAS values" + + lang_po + + einfo "\t Please set one of this values in your sytem make.conf" + einfo "\t LINGUAS=\"${LING_PO}\"\n" + + if [[ -z ${LINGUAS} ]]; then + einfo "\n \t No values in LINGUAS=" + einfo "\t You will get only english text on OSD \n" + fi + + strip-linguas ${LING_PO} en + + default +} + +src_configure() { + # support languages, written from right to left + export "BIDI=$(usex bidi 1 0)" + # systemd notification support + export "SDNOTIFY=$(usex systemd 1 0)" + # with/without keyboard + export "USE_KBD=$(usex keyboard 1 0)" + # detailed compile output for debug + export "VERBOSE=$(usex verbose 1 0)" +} + +src_install() { + # trick the makefile to not create a VIDEODIR by supplying it with an + # existing directory + emake VIDEODIR="/" DESTDIR="${ED}" install + + keepdir "${PLUGIN_LIBDIR}" + + # backup for plugins they don't be able to create this dir + keepdir "${CONF_DIR}/plugins" + + if use html; then + local HTML_DOCS=( *.html ) + fi + local DOCS=( MANUAL INSTALL README* HISTORY CONTRIBUTORS UPDATE-2* ) + einstalldocs + + insinto /usr/share/vdr + doins "${CAP_FILE}" + + fowners vdr:vdr "${CONF_DIR}" -R +} + +pkg_postinst() { + elog "Please read the /usr/share/doc/${PF}/UPDATE-2.4" + elog "for major changes in this version\n" + + elog "It is a good idea to run vdrplugin-rebuild now.\n" + + elog "To get nice symbols in OSD we recommend to install" + elog "\t1. emerge media-fonts/vdrsymbols-ttf" + elog "\t2. select font VDRSymbolsSans in Setup\n" + + elog "To get an idea how to proceed now, have a look at our vdr-guide:" + elog "\thttps://wiki.gentoo.org/wiki/VDR" +} diff --git a/media-video/vidcutter/Manifest b/media-video/vidcutter/Manifest index bcb0f5d5d491..5aa1743f4214 100644 --- a/media-video/vidcutter/Manifest +++ b/media-video/vidcutter/Manifest @@ -1,6 +1,4 @@ DIST vidcutter-6.0.5.1.tar.gz 9909274 BLAKE2B 063c20f6ae0565b0f3a160b5ee298aae05b2ee1876cd4c73d9f37578a9e86a872353c3e2b7b1b6302db3d5a876139bfb19d50bf7cb4dd18e6e1d1a1ca3587fbd SHA512 f2ea2a86d9eaa3c6593e785daad6869c151baa1add529c9edaf2282f7acad762fbb29804790aece5e4fcd89e9e9bc77f61d1f0b68a1b1f3ecf58951ee8f200e9 -DIST vidcutter-6.0.5.tar.gz 9911435 BLAKE2B 2d901768064b7c3b7444289db84e8f8d6e179d915b04f870a6b397f0d905c6b4ecab0768d045a8c1aa43b3bf7bccb2dcd60e9c043595f2aaf857ce657ec997f8 SHA512 b4a0e0cc3132038e9216f05117768695ba30840f04251c60561b7555cde9064efcf12440c801c834c2160d5b5acad011dc31055d9547269a5689361c875bca80 -EBUILD vidcutter-6.0.5.1.ebuild 1017 BLAKE2B 190df679b975619b91bc2aeb9cc597efd0053326a014c2093a2ce37df4e4bf8fc28e497b40d5ad135322796dda5e185ed38e1074f46c26d623b64414f098bda3 SHA512 4330e92f3ff88eeb051594b4a0e3128d1c2d876e36c2f4838a70294246fda959af636506ee52b76eb5612e8828c1ca7e330746c5acb329ad83b585e4e8dbb8f5 -EBUILD vidcutter-6.0.5.ebuild 1017 BLAKE2B 190df679b975619b91bc2aeb9cc597efd0053326a014c2093a2ce37df4e4bf8fc28e497b40d5ad135322796dda5e185ed38e1074f46c26d623b64414f098bda3 SHA512 4330e92f3ff88eeb051594b4a0e3128d1c2d876e36c2f4838a70294246fda959af636506ee52b76eb5612e8828c1ca7e330746c5acb329ad83b585e4e8dbb8f5 -EBUILD vidcutter-9999.ebuild 1017 BLAKE2B 190df679b975619b91bc2aeb9cc597efd0053326a014c2093a2ce37df4e4bf8fc28e497b40d5ad135322796dda5e185ed38e1074f46c26d623b64414f098bda3 SHA512 4330e92f3ff88eeb051594b4a0e3128d1c2d876e36c2f4838a70294246fda959af636506ee52b76eb5612e8828c1ca7e330746c5acb329ad83b585e4e8dbb8f5 +EBUILD vidcutter-6.0.5.1-r1.ebuild 1015 BLAKE2B 0641285f5b5664b13f674a150c13f6de3b5f9f70ddc54acd2d33047744de6bf23086ded1ef518d754196bc50901a362c20a44540fc22697ae82d88afda966fad SHA512 06bc78a0fce27b6723a3b7008ce1fd6fec03bf6f9f926a48937453c2eac16b39a97ca426459e7347c368f01d43ec4794911fa87332dee1ca1a05229635889b30 +EBUILD vidcutter-9999.ebuild 1017 BLAKE2B 39221734a676128dd3e2f7d11e202d9c64108d7d3e47d93c3dd695787d5168a247211d2c92dba369fe7e6c3e87072a157c4d0421123b54042ab6af307d734cd9 SHA512 06d0fdbd049767fd39eb1f6f203a5bc75e2cdecab9bebf18c813237f54891181bb3cd3235481d25fcec5b23eebef5bb7562d1726f42996f6431577d2c2b18ea0 MISC metadata.xml 461 BLAKE2B 0eeb6abbb7914b27cd567263de9001cfe17c9bd3b98a0887b21fd76b908a48c0abb3695039d21803709d47483078d15c5d412be7c408640ece0a433806272640 SHA512 55fd2db2f66d5cbc2410dfc57f235b90554cf3de4aaa88fc5069d499590ec45264499881f049c5469771f063638a65adad89686717c28abb89ef6ea632c88a30 diff --git a/media-video/vidcutter/vidcutter-6.0.5.1.ebuild b/media-video/vidcutter/vidcutter-6.0.5.1-r1.ebuild index 8ec68eb7ef9e..a94a18c5e7bf 100644 --- a/media-video/vidcutter/vidcutter-6.0.5.1.ebuild +++ b/media-video/vidcutter/vidcutter-6.0.5.1-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{7..10} ) inherit distutils-r1 xdg @@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]];then EGIT_REPO_URI="https://github.com/ozmartian/vidcutter" else SRC_URI="https://github.com/ozmartian/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 x86" fi LICENSE="GPL-3" diff --git a/media-video/vidcutter/vidcutter-6.0.5.ebuild b/media-video/vidcutter/vidcutter-6.0.5.ebuild deleted file mode 100644 index 8ec68eb7ef9e..000000000000 --- a/media-video/vidcutter/vidcutter-6.0.5.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) - -inherit distutils-r1 xdg - -DESCRIPTION="FFmpeg-based simple video cutter & joiner with a modern PyQt5 GUI" -HOMEPAGE="http://vidcutter.ozmartians.com https://github.com/ozmartian/vidcutter" - -if [[ ${PV} == 9999 ]];then - inherit git-r3 - EGIT_REPO_URI="https://github.com/ozmartian/vidcutter" -else - SRC_URI="https://github.com/ozmartian/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE="" - -DEPEND=" - >=media-video/mpv-0.25[libmpv] -" -RDEPEND="${DEPEND} - >=dev-python/PyQt5-5.7[dbus,multimedia,widgets,${PYTHON_USEDEP}] - dev-python/pyopengl[${PYTHON_USEDEP}] - media-video/ffmpeg[X,encode] - media-video/mediainfo" -BDEPEND=" - ${PYTHON_DEPS} - dev-python/setuptools[${PYTHON_USEDEP}]" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -src_install() { - distutils-r1_src_install - mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${P}" -} diff --git a/media-video/vidcutter/vidcutter-9999.ebuild b/media-video/vidcutter/vidcutter-9999.ebuild index 8ec68eb7ef9e..383061cd1bcc 100644 --- a/media-video/vidcutter/vidcutter-9999.ebuild +++ b/media-video/vidcutter/vidcutter-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{7..10} ) inherit distutils-r1 xdg diff --git a/media-video/wireplumber/Manifest b/media-video/wireplumber/Manifest index 51dd01897706..d9ed0f7fe30e 100644 --- a/media-video/wireplumber/Manifest +++ b/media-video/wireplumber/Manifest @@ -1,15 +1,15 @@ AUX wireplumber-0.4.10-alsa.lua-fix-device-name-deduplication-when-reserva.patch 3969 BLAKE2B 9d9fcdf2327834329e120e2322f03acb0a541b3095bba194be132b153769120e59d617bf4b64ebeb4cbc73caaf2fcbe2c6345da3aeef43ab88891edb93750f87 SHA512 406159756795c208ff809489dcd88fd0095681d9867a8c193f73e40709a27ce33a22a635bada6b5594f097113a5af47375d8814016554cbd6ad809ae18ad1502 +AUX wireplumber-0.4.10-config-disable-sound-server-parts.patch 1017 BLAKE2B 09ea7233aaeff88bc7fc0bd0d8345ee15c9377c1a5dca4a1937f00c808def449202186be1ed61cebc05e9d241ad1f8e374b1743f93b2766d7adcf26dc1cf4837 SHA512 d3bc1248bf2ea39ebe7346754f386ec2ab7815beded415c58273372c3e9b2c3b3185e591057aba4233b1320605e08b00702db4de4b78eb4cb833176bb0f16ba5 AUX wireplumber-0.4.10-config-fix-enabled-property-to-default-to-true-when.patch 4475 BLAKE2B baa62d342e3a5f753044f4f4f757064792424e05535b540c09ecef4ac70edf32edbae6a4a36ee87d9c041cccdd24d229ba828e50cdc303c50b1f6d4afef7b075 SHA512 4cce604cd7aa754b53d7473f0a12e764449f76932f7ee0fea6e2b5f6b1f11bc2a38a28eedea5f003a112836ecc6a209c3d5e4b29a582749be742d075e51e6518 AUX wireplumber-0.4.10-m-default-nodes-don-t-check-if-all-device-nodes-are.patch 7122 BLAKE2B bd4eee8b49d7bff9bb309c954576340ed336004a91240ebe96ed6e2cf46ffb2cef3c4546847bcd3ae911eea4ad62c65b7154555771524525512ffbee5eae4257 SHA512 cd241cfd3578fff49b9f6be8fbbb291ccdcfc9e65ceb45a3a92410a7914557614ff57959d94fa9954bf5933b61632b430410860887b6d7578182cbd9b7be75e1 AUX wireplumber-0.4.10-m-lua-scripting-allow-converting-GValue-holding-NUL.patch 1256 BLAKE2B 0e3148edf9811b2a090c1127afee5c8c9094e1b80fb2186980b38faf08b3eedc11d394261676a1416b7d22a9f21b45c5b1522a60a1a2383474cd5d7c4bf93da3 SHA512 2e9b94dcb5daa8e85a56222d2570c5085d322c4bfe251edad1792e8fe870686473bb52a4ef43be034bccb68093e01b5c0bf1e035778edb985568d9f01b45afbb AUX wireplumber-0.4.10-m-lua-scripting-fix-object-refcounting.patch 1200 BLAKE2B ee73f3555418dad6a5c20e401e6f77ec22673b7079d04babe517617771c3d3b29e69ec37a933b1993fc5cfaa0200ee0a70178b7383b4086d9a63765a0d986301 SHA512 fa9fb26868b96742c972574eb2e82e91f54a3a3fe3911136b0c4886ff6324fcf35683059801113a0cc409f9a79383155e7cac1f4b18e0566da724c1fd3679d3d -AUX wireplumber-0.4.9-config-document-which-options-need-to-be-turned-off-.patch 3610 BLAKE2B d473e299a6c22de630786ea4e8ff739aae2975614c79b6fc195a908b4431cc0eba57cfd688865f5c9fe91adf105b75fd6bbe8c00872b8640a8a7a36caabcb620 SHA512 f9770ec2afd83908d473d28cb8972212f57e7e12a64490417f5c301872e3c4cec644090480e60ad9085bbea8f0fc86c521e90b8853534acfe6959dfd5ed9a832 -AUX wireplumber-0.4.9-scripts-policy-device-profile-clear-tables-when-devi.patch 1102 BLAKE2B 2a1e2cbe901e6284002f1393621f26d9c7eebee9eb4edc334dc9712095724a32de9f5a3def5121c28f1690b9ed634c9d3fe843c4ae221567e60f6140fe6b9339 SHA512 25a70e02e403cf155a4aaa6bc63a8f3d4cae712814932a5529366ea4ad2ef31d6c14080294ae4b9a1bab7ad433c26dde71df88123815159206d3f3c76481824a +AUX wireplumber-0.4.11-alsa-lua-crash.patch 1256 BLAKE2B ae5787294e405e37f01d0d4ef3f6031e5df9f60b04f02a682ceeaf2311cd2d525cdbb913d4997d63d18513225bd35d5e6375e33f34931e412ef681df134fa514 SHA512 536e39e4863ca2e002b20f8fca6164a60e280f56d7c5c2c96f9684e75b6e8f7138884fca88a214b4830e2a9fb252ead3ba75dc7f6ad491716f3e2fc595ddefed DIST wireplumber-0.4.10.tar.gz 395588 BLAKE2B 6df1af17d1e53ab1449a2f6f9af5a0c4f7b1cd981e07556e5ea3c6b4d5d624e66b97ce4f945f7ccccebbf72b75d35d10990fac11b5228275f27e5320885ff1ec SHA512 342e8bba2cf00faab71ef39bb361b5ada66ff3a68ccf7a756ea1ca402da6e94784eece277ca02992bc7573c51cb8b1bad33aa9c593b3d1bfe0bb0286e2f4506f -DIST wireplumber-0.4.9.tar.gz 376170 BLAKE2B 50f552c730ac543fc2e8b0e054c861bcd22ed281a62f2921fb956f39b917cce6eb53287dfcfc81db240476f82f5cf1d7556fa34be8bf507ff847089536b81f44 SHA512 39b9e9be014489042fe480219b99d7591e0b68dd44b889bd5c6aeee73e771adb807bc21f48d031217f097182827bd2f48b68d52291036d52e95d4fa75e7f9929 -EBUILD wireplumber-0.4.10-r1.ebuild 3654 BLAKE2B 43f15fe7997b85dd0cade5c0393f7088766482914e7767926a2d714dc73b17efee6614984200a694c3ce2bcdd2325a6a63768d958fefc044c513d516b6981129 SHA512 dba2d1bff0f1a90bfce06df57e9464a71a27aad3ffe1720cd39402da76579aafb363e3a0fe450d392dff57d3c12f6a1480141c5cb95f7e510b948b654faa63a4 -EBUILD wireplumber-0.4.10-r3.ebuild 3948 BLAKE2B 19ffa6b1593b745fc0fc29a106e0587f286170513833ba7dd6288afd2cadc16c5ca0e54022958948f4ef6bb557313ffbbe6af808c1fd06c5cd3684b9bab5b8d6 SHA512 7140723b2261c05eefc08edef705af56a2a1631d9124e7f4a489c7bc4aeae1ee1a92ab67afad0d6b701a9f92fd6db5b5c80d252c1142a89e05a376f6b5b7d431 -EBUILD wireplumber-0.4.9-r1.ebuild 3691 BLAKE2B 63ffe1aa2c86a4fe5cccb29e294189341aa9f70264a2026f16475e52fc6c313c8370dce17753206b7be4ce760f374ad38c8ee3621591e77b6eaa9f84bc75922e SHA512 f37f3130a79ea3898e79ca6abfee456c85b4357620b82aa80f8a119e3c12fcbabf5af55527bf0bee9cc40d5b98a6d707579b8f9be95609fe6abc0ce9071616f4 -EBUILD wireplumber-0.4.9.ebuild 3514 BLAKE2B fcd3cc2a795ba63c467fc46c7480553f9472e6c75f3bb54cd7701c0b28af294afeebdbad4b68f63a1c4adcab4a879c80465c00eb280cbf8db91604a67c493959 SHA512 0284553b29d7ac9b1f7df8f7b99207de4314601ded59df7f2bab33c6d8c538516b8041462221386e477217d43615462f28df6a2ecc81c0d3a2923f506fe565ab -EBUILD wireplumber-9999.ebuild 3563 BLAKE2B bbd86c4a9cfaaec2dc039b486b6737fc9770783860c755ae6d0bd9b1d9c803f608627273e95d8df68a6acfe81e5080258549ae08f0890f605eaf9c1a66a03bc7 SHA512 1bb23ba5ceff7f46934d0312040d594ab8a33007a15be3a71f5e16f07b8e70f15a3dee3bafa6553fca0cf53522b035df3ecb0468832ba0655223f8b81ce9f81a -MISC metadata.xml 803 BLAKE2B d05f76db401a8f71c5c1504d17dd8c0a87686f4b0ab2da450a47f71b1a15eeee2aef17107a3a987af70a097c3004c582fdda4c46e37c89466bfb470d032446dd SHA512 cfa42b1862175344b23fe65fb97d86783ded19352988790aefc6a062da212423dd81d8147525e4256025cdcfc6850909ca61d77d6b4243add0a3339b2eb319ee +DIST wireplumber-0.4.11.tar.gz 403931 BLAKE2B 77ef2540081420d4255dcb54165d0aceb08d97c60d19b9eb7606e90cf95e305e690794a1f46234b53b13765452fea0d23ae6acae9deea672db67e21c31d2307d SHA512 73a5120cd0c55b5fe5248cc22497efd23e40bb91961553639d9cf1bbf138d273db65153fa3c1bb0d2794f869e077e011156d323832534f62651d66f8cc87dca4 +EBUILD wireplumber-0.4.10-r4.ebuild 3933 BLAKE2B bccd391fc42848f7f57d5403ae481c554862f4bbc6b11b4f8fc55019044b3b9150ac3704370242a39992c65d88928f2f64d441a19cddd61721c82cd887b9e1ce SHA512 2c5c1977655178717c6ad1158b0af18267cafed7ace937e28dfc08d466efe227c6a4ad7f276a27ded906cf8439ecb0ae7579ebf64b90ccc4bf67fa8eeed08bca +EBUILD wireplumber-0.4.10-r6.ebuild 4062 BLAKE2B 5706c5fe1a0f68900c9b2eb9131de0aa68ed5b1c51923bab01d557283452f6bc8e9d092f3aa0b182e3c9163a18061cd07fd821f61754ffd9c8355dcd5149d688 SHA512 8a74fc5f82c40ae63660c941d2b6d59189f852b7594a3eaf9f7539eae68917297168ebbd5f5a9c32acca6a10d2ab4b0351812dd7c39dac6da752c619bbbc08da +EBUILD wireplumber-0.4.11-r1.ebuild 4071 BLAKE2B 724bb567cf077985bcd0e9d58649c6e6c8c75f04babb56c503c05416fde901bef4330930e735b6b9e3658ea66369cc8829a30be6ec780a41f8eca33b26454a21 SHA512 7e8e40f7f3d727776881004e01a109e7a7711668a3a8738a960cb2326edb55fe854f0932ca07ff31255bbdc200013e6498933443eb115661052122b517e0dcf5 +EBUILD wireplumber-0.4.11.ebuild 4030 BLAKE2B e93cabeffc20578ba0d3c70e02db1d7b1108e76229bad1dfefd48c887d6d60dc704cbb7a323ba04e42f8674d0d48d70926c24adeecc724bc28c647bb9c9e30dc SHA512 c4deb8102d90102f2c66430e178b7cde7bac734243b94e17497ee8b64159879b17a9d59edca0558c9df928f51b52105b8970c1cf6e1f490603b17173342f754e +EBUILD wireplumber-9999.ebuild 3889 BLAKE2B d44e25f12dc2e6b0d8884b2a670b7fd3c7f1d42b67e6899cff3dd709d8b02d9c9497d4b95beca6f3973e76f54809b042ff6e66058c3de41f39332a022909083d SHA512 07ad0521fbd48382287d6d6f3b62906fa8a29fae84a5a0fb94cdcf8e87da01e6af0ba81f61c8675efb69c038a4fdf62fdde9b9e25b17d4a76b0148de32e457ae +MISC metadata.xml 647 BLAKE2B 0370f3c897d7fcab0bd95fe1f97208f911de022e533ac795817289c554cc75d4de686223cbfd255ecb6e930ff0aee6c9419327ab51b3c65b1c4d8ed7597a1f3e SHA512 9708a52cf340caf359c300116b6ec687fba08a3c0fe33895eb10cda08517583ad36b5ff539142d8ba5f625ad34e5b7228f55fc7b85e7a162cf775f8780899f0e diff --git a/media-video/wireplumber/files/wireplumber-0.4.10-config-disable-sound-server-parts.patch b/media-video/wireplumber/files/wireplumber-0.4.10-config-disable-sound-server-parts.patch new file mode 100644 index 000000000000..a8bf6f106129 --- /dev/null +++ b/media-video/wireplumber/files/wireplumber-0.4.10-config-disable-sound-server-parts.patch @@ -0,0 +1,26 @@ +commit 3d86f51d2c43fd76be2450a8c27836fdd8619cfa +Author: Igor V. Kovalenko <igor.v.kovalenko@gmail.com> +Date: Sun May 15 18:19:03 2022 +0300 + + config: Disable alsa and bluez monitors by default + +diff --git a/src/config/bluetooth.lua.d/50-bluez-config.lua b/src/config/bluetooth.lua.d/50-bluez-config.lua +index d5727d3..938eae0 100644 +--- a/src/config/bluetooth.lua.d/50-bluez-config.lua ++++ b/src/config/bluetooth.lua.d/50-bluez-config.lua +@@ -1,4 +1,4 @@ +-bluez_monitor.enabled = true ++bluez_monitor.enabled = false + + bluez_monitor.properties = { + -- These features do not work on all headsets, so they are enabled +diff --git a/src/config/main.lua.d/50-alsa-config.lua b/src/config/main.lua.d/50-alsa-config.lua +index 3468333..d4c065b 100644 +--- a/src/config/main.lua.d/50-alsa-config.lua ++++ b/src/config/main.lua.d/50-alsa-config.lua +@@ -1,4 +1,4 @@ +-alsa_monitor.enabled = true ++alsa_monitor.enabled = false + + alsa_monitor.properties = { + -- Create a JACK device. This is not enabled by default because diff --git a/media-video/wireplumber/files/wireplumber-0.4.11-alsa-lua-crash.patch b/media-video/wireplumber/files/wireplumber-0.4.11-alsa-lua-crash.patch new file mode 100644 index 000000000000..3bc8bbd08bb6 --- /dev/null +++ b/media-video/wireplumber/files/wireplumber-0.4.11-alsa-lua-crash.patch @@ -0,0 +1,33 @@ +https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/c16e637c329bc9dda8544b18f5bd47a8d63ee253 + +From c16e637c329bc9dda8544b18f5bd47a8d63ee253 Mon Sep 17 00:00:00 2001 +From: George Kiagiadakis <george.kiagiadakis@collabora.com> +Date: Thu, 7 Jul 2022 20:58:36 +0300 +Subject: [PATCH] alsa: use "obj_type" as a variable name to avoid shadowing + lua's "type" function + +This causes a crash when running in a VM because the code tries to +execute lua's "type()" and ends up executing the local string variable... + +Fixes: #303 +--- a/src/scripts/monitors/alsa.lua ++++ b/src/scripts/monitors/alsa.lua +@@ -49,7 +49,7 @@ function nonempty(str) + return str ~= "" and str or nil + end + +-function createNode(parent, id, type, factory, properties) ++function createNode(parent, id, obj_type, factory, properties) + local dev_props = parent.properties + + -- set the device id and spa factory name; REQUIRED, do not change +@@ -199,7 +199,7 @@ function createDevice(parent, id, factory, properties) + end + end + +-function prepareDevice(parent, id, type, factory, properties) ++function prepareDevice(parent, id, obj_type, factory, properties) + -- ensure the device has an appropriate name + local name = "alsa_card." .. + (properties["device.name"] or +GitLab diff --git a/media-video/wireplumber/files/wireplumber-0.4.9-config-document-which-options-need-to-be-turned-off-.patch b/media-video/wireplumber/files/wireplumber-0.4.9-config-document-which-options-need-to-be-turned-off-.patch deleted file mode 100644 index 9e664ec56564..000000000000 --- a/media-video/wireplumber/files/wireplumber-0.4.9-config-document-which-options-need-to-be-turned-off-.patch +++ /dev/null @@ -1,87 +0,0 @@ -https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/0da29f38181e391160fa8702623050b8544ec775 - -From 0da29f38181e391160fa8702623050b8544ec775 Mon Sep 17 00:00:00 2001 -From: George Kiagiadakis <george.kiagiadakis@collabora.com> -Date: Mon, 4 Apr 2022 14:38:28 +0300 -Subject: [PATCH] config: document which options need to be turned off to use - wp without D-Bus - -and actually implement an option for the logind module - -Related to: #237 ---- - src/config/bluetooth.lua.d/30-bluez-monitor.lua | 4 +++- - src/config/bluetooth.lua.d/50-bluez-config.lua | 8 ++++++++ - src/config/main.lua.d/50-alsa-config.lua | 4 +++- - src/config/main.lua.d/50-default-access-config.lua | 3 +++ - 4 files changed, 17 insertions(+), 2 deletions(-) - -diff --git a/src/config/bluetooth.lua.d/30-bluez-monitor.lua b/src/config/bluetooth.lua.d/30-bluez-monitor.lua -index 266d3e2f..ba86657f 100644 ---- a/src/config/bluetooth.lua.d/30-bluez-monitor.lua -+++ b/src/config/bluetooth.lua.d/30-bluez-monitor.lua -@@ -8,5 +8,7 @@ function bluez_monitor.enable() - rules = bluez_monitor.rules, - }) - -- load_optional_module("logind") -+ if bluez_monitor.properties["with-logind"] then -+ load_optional_module("logind") -+ end - end -diff --git a/src/config/bluetooth.lua.d/50-bluez-config.lua b/src/config/bluetooth.lua.d/50-bluez-config.lua -index 072504ec..dd8033ff 100644 ---- a/src/config/bluetooth.lua.d/50-bluez-config.lua -+++ b/src/config/bluetooth.lua.d/50-bluez-config.lua -@@ -34,6 +34,14 @@ bluez_monitor.properties = { - -- Register dummy AVRCP player, required for AVRCP volume function. - -- Disable if you are running mpris-proxy or equivalent. - --["bluez5.dummy-avrcp-player"] = true, -+ -+ -- Enable the logind module, which arbitrates which user will be allowed -+ -- to have bluetooth audio enabled at any given time (particularly useful -+ -- if you are using GDM as a display manager, as the gdm user also launches -+ -- pipewire and wireplumber). -+ -- This requires access to the D-Bus user session; disable if you are running -+ -- a system-wide instance of wireplumber. -+ ["with-logind"] = true, - } - - bluez_monitor.rules = { -diff --git a/src/config/main.lua.d/50-alsa-config.lua b/src/config/main.lua.d/50-alsa-config.lua -index 6c97e8ad..d29b0b6f 100644 ---- a/src/config/main.lua.d/50-alsa-config.lua -+++ b/src/config/main.lua.d/50-alsa-config.lua -@@ -7,6 +7,8 @@ alsa_monitor.properties = { - --["alsa.jack-device"] = false, - - -- Reserve devices via org.freedesktop.ReserveDevice1 on D-Bus -+ -- Disable if you are running a system-wide instance, which -+ -- doesn't have access to the D-Bus user session - ["alsa.reserve"] = true, - --["alsa.reserve.priority"] = -20, - --["alsa.reserve.application-name"] = "WirePlumber", -@@ -20,7 +22,7 @@ alsa_monitor.properties = { - - alsa_monitor.rules = { - -- An array of matches/actions to evaluate. -- -- -+ -- - -- If you want to disable some devices or nodes, you can apply properties per device as the following example. - -- The name can be found by running pw-cli ls Device, or pw-cli dump Device - --{ -diff --git a/src/config/main.lua.d/50-default-access-config.lua b/src/config/main.lua.d/50-default-access-config.lua -index 6cf18bed..45cc5b73 100644 ---- a/src/config/main.lua.d/50-default-access-config.lua -+++ b/src/config/main.lua.d/50-default-access-config.lua -@@ -1,4 +1,7 @@ - default_access.properties = { -+ -- Enable the use of the flatpak portal integration. -+ -- Disable if you are running a system-wide instance, which -+ -- doesn't have access to the D-Bus user session - ["enable-flatpak-portal"] = true, - } - --- -GitLab - diff --git a/media-video/wireplumber/files/wireplumber-0.4.9-scripts-policy-device-profile-clear-tables-when-devi.patch b/media-video/wireplumber/files/wireplumber-0.4.9-scripts-policy-device-profile-clear-tables-when-devi.patch deleted file mode 100644 index 4dc8e276fbfa..000000000000 --- a/media-video/wireplumber/files/wireplumber-0.4.9-scripts-policy-device-profile-clear-tables-when-devi.patch +++ /dev/null @@ -1,33 +0,0 @@ -https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/da5d25acbea5ae03336bd2b4ef2b0687b380978e - -From da5d25acbea5ae03336bd2b4ef2b0687b380978e Mon Sep 17 00:00:00 2001 -From: Pauli Virtanen <pav@iki.fi> -Date: Mon, 28 Mar 2022 20:16:52 +0300 -Subject: [PATCH] scripts: policy-device-profile: clear tables when devices - removed - -When device ids are invalidated, clear all local tables about them, -because the id may be reused by different object, or the same object -reappearing. ---- - src/scripts/policy-device-profile.lua | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/scripts/policy-device-profile.lua b/src/scripts/policy-device-profile.lua -index d0aa2696..9daeafaa 100644 ---- a/src/scripts/policy-device-profile.lua -+++ b/src/scripts/policy-device-profile.lua -@@ -229,4 +229,10 @@ self.om:connect("object-added", function (_, device) - handleProfiles (device, true) - end) - -+self.om:connect("object-removed", function (_, device) -+ local dev_id = device["bound-id"] -+ self.active_profiles[dev_id] = nil -+ self.best_profiles[dev_id] = nil -+end) -+ - self.om:activate() --- -GitLab - diff --git a/media-video/wireplumber/metadata.xml b/media-video/wireplumber/metadata.xml index d0319b1689c5..ff32fcdcb659 100644 --- a/media-video/wireplumber/metadata.xml +++ b/media-video/wireplumber/metadata.xml @@ -1,11 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>89q1r14hd@relay.firefox.com</email> - <name>Niklāvs Koļesņikovs</name> - </maintainer> - <maintainer type="person" proxied="proxy"> + <maintainer type="person"> <email>sam@gentoo.org</email> <name>Sam James</name> </maintainer> diff --git a/media-video/wireplumber/wireplumber-0.4.10-r3.ebuild b/media-video/wireplumber/wireplumber-0.4.10-r4.ebuild index ae1bbb1ec14c..820d1ed7d4a3 100644 --- a/media-video/wireplumber/wireplumber-0.4.10-r3.ebuild +++ b/media-video/wireplumber/wireplumber-0.4.10-r4.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 else SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.gz" - KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86" + KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86" fi DESCRIPTION="Replacement for pipewire-media-session" @@ -43,7 +43,6 @@ DEPEND=" ${LUA_DEPS} >=dev-libs/glib-2.62 >=media-video/pipewire-0.3.48:= - virtual/libc virtual/libintl elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd ) diff --git a/media-video/wireplumber/wireplumber-0.4.10-r1.ebuild b/media-video/wireplumber/wireplumber-0.4.10-r6.ebuild index 4c9a4ce04761..5a21755d5858 100644 --- a/media-video/wireplumber/wireplumber-0.4.10-r1.ebuild +++ b/media-video/wireplumber/wireplumber-0.4.10-r6.ebuild @@ -42,8 +42,7 @@ BDEPEND=" DEPEND=" ${LUA_DEPS} >=dev-libs/glib-2.62 - >=media-video/pipewire-0.3.48:= - virtual/libc + >=media-video/pipewire-0.3.53-r1:= virtual/libintl elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd ) @@ -64,6 +63,11 @@ DOCS=( {NEWS,README}.rst ) PATCHES=( "${FILESDIR}"/${P}-config-fix-enabled-property-to-default-to-true-when.patch + "${FILESDIR}"/${P}-m-lua-scripting-allow-converting-GValue-holding-NUL.patch + "${FILESDIR}"/${P}-alsa.lua-fix-device-name-deduplication-when-reserva.patch + "${FILESDIR}"/${P}-m-default-nodes-don-t-check-if-all-device-nodes-are.patch + "${FILESDIR}"/${P}-m-lua-scripting-fix-object-refcounting.patch + "${FILESDIR}"/${P}-config-disable-sound-server-parts.patch # defer enabling sound server parts to media-video/pipewire ) src_configure() { diff --git a/media-video/wireplumber/wireplumber-0.4.9.ebuild b/media-video/wireplumber/wireplumber-0.4.11-r1.ebuild index 0c71a9ba7f9b..9b738b1c7ac8 100644 --- a/media-video/wireplumber/wireplumber-0.4.9.ebuild +++ b/media-video/wireplumber/wireplumber-0.4.11-r1.ebuild @@ -3,6 +3,13 @@ EAPI=8 +# 1. Please regularly check (even at the point of bumping) Fedora's packaging +# for needed backports at https://src.fedoraproject.org/rpms/wireplumber/tree/rawhide +# +# 2. 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. + LUA_COMPAT=( lua5-{3,4} ) inherit lua-single meson systemd @@ -13,7 +20,7 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 else SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.gz" - KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" fi DESCRIPTION="Replacement for pipewire-media-session" @@ -36,13 +43,14 @@ BDEPEND=" dev-libs/glib dev-util/gdbus-codegen dev-util/glib-utils + sys-devel/gettext " DEPEND=" ${LUA_DEPS} >=dev-libs/glib-2.62 - >=media-video/pipewire-0.3.48:= - virtual/libc + >=media-video/pipewire-0.3.53-r1:= + virtual/libintl elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd ) " @@ -60,6 +68,11 @@ RDEPEND="${DEPEND} DOCS=( {NEWS,README}.rst ) +PATCHES=( + "${FILESDIR}"/${PN}-0.4.10-config-disable-sound-server-parts.patch # defer enabling sound server parts to media-video/pipewire + "${FILESDIR}"/${P}-alsa-lua-crash.patch +) + src_configure() { local emesonargs=( -Ddoc=disabled # Ebuild not wired up yet (Sphinx, Doxygen?) diff --git a/media-video/wireplumber/wireplumber-0.4.9-r1.ebuild b/media-video/wireplumber/wireplumber-0.4.11.ebuild index b2cb2a7e4d87..ac3004d7449f 100644 --- a/media-video/wireplumber/wireplumber-0.4.9-r1.ebuild +++ b/media-video/wireplumber/wireplumber-0.4.11.ebuild @@ -3,6 +3,13 @@ EAPI=8 +# 1. Please regularly check (even at the point of bumping) Fedora's packaging +# for needed backports at https://src.fedoraproject.org/rpms/wireplumber/tree/rawhide +# +# 2. 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. + LUA_COMPAT=( lua5-{3,4} ) inherit lua-single meson systemd @@ -13,7 +20,7 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 else SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" fi DESCRIPTION="Replacement for pipewire-media-session" @@ -36,13 +43,14 @@ BDEPEND=" dev-libs/glib dev-util/gdbus-codegen dev-util/glib-utils + sys-devel/gettext " DEPEND=" ${LUA_DEPS} >=dev-libs/glib-2.62 - >=media-video/pipewire-0.3.48:= - virtual/libc + >=media-video/pipewire-0.3.53-r1:= + virtual/libintl elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd ) " @@ -61,8 +69,7 @@ RDEPEND="${DEPEND} DOCS=( {NEWS,README}.rst ) PATCHES=( - "${FILESDIR}"/${P}-scripts-policy-device-profile-clear-tables-when-devi.patch - "${FILESDIR}"/${P}-config-document-which-options-need-to-be-turned-off-.patch + "${FILESDIR}"/${PN}-0.4.10-config-disable-sound-server-parts.patch # defer enabling sound server parts to media-video/pipewire ) src_configure() { diff --git a/media-video/wireplumber/wireplumber-9999.ebuild b/media-video/wireplumber/wireplumber-9999.ebuild index ca50e19600e4..2a10e58f8187 100644 --- a/media-video/wireplumber/wireplumber-9999.ebuild +++ b/media-video/wireplumber/wireplumber-9999.ebuild @@ -3,6 +3,13 @@ EAPI=8 +# 1. Please regularly check (even at the point of bumping) Fedora's packaging +# for needed backports at https://src.fedoraproject.org/rpms/wireplumber/tree/rawhide +# +# 2. 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. + LUA_COMPAT=( lua5-{3,4} ) inherit lua-single meson systemd @@ -42,8 +49,7 @@ BDEPEND=" DEPEND=" ${LUA_DEPS} >=dev-libs/glib-2.62 - >=media-video/pipewire-0.3.48:= - virtual/libc + >=media-video/pipewire-0.3.53-r1:= virtual/libintl elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd ) diff --git a/media-video/yle-dl/Manifest b/media-video/yle-dl/Manifest index 7c4bb97a93bd..5049eea5d0d2 100644 --- a/media-video/yle-dl/Manifest +++ b/media-video/yle-dl/Manifest @@ -1,5 +1,5 @@ -DIST yle-dl-20220531.tar.gz 68985 BLAKE2B 66a011a741089aeb5a1247d9d4571341b0584b859831460c1ed39db8df0c0838e5271b5d5d9004f6c62134235cd881bc6a24752ef1a88ace95158b00803d5c13 SHA512 499929a8411c515259890fd228970718a357a19b221605cd882d9baa0c8ac688241a4cf8eeb2e75dbc26c28536579db1a5c0ae9db29fb4796b2ca1e093a8de36 DIST yle-dl-20220610.tar.gz 69065 BLAKE2B 6b61351b23d1ea3f351a237bcf31aa9f542e15e621f88350f4758a97016631713b0a4e45c3878139e1040ab8dca671a91dff82c7f1c044de5493890ba0894d87 SHA512 87b8b5a63eb68f60a6b0de47c06ab3f6efd018767138f3da33fa51ecc4a8e56017fedfba20a190b451db3e862ce5a3abc7e9c7f485e9042e300913d47e8ed735 -EBUILD yle-dl-20220531.ebuild 1430 BLAKE2B df52215bd90baea2e5d45cb414e2b473dc6ae430d102b0e835d062c1e1d2db0c7d416fc5345b2331f78eba263e39ee34fed5b100db1945b81cbd7f24a528775d SHA512 3b2ff4856e660cb5a56a13fde396ea97644fff320e307d8a5def0149b768933e61be9d3582d868d84c20698cc06cfb5b0c5ff6ba437ece12214623c0980b027e -EBUILD yle-dl-20220610.ebuild 1430 BLAKE2B df52215bd90baea2e5d45cb414e2b473dc6ae430d102b0e835d062c1e1d2db0c7d416fc5345b2331f78eba263e39ee34fed5b100db1945b81cbd7f24a528775d SHA512 3b2ff4856e660cb5a56a13fde396ea97644fff320e307d8a5def0149b768933e61be9d3582d868d84c20698cc06cfb5b0c5ff6ba437ece12214623c0980b027e +DIST yle-dl-20220704.tar.gz 69784 BLAKE2B 4eed09f2531693a45683958f245df7251fe1df6736443b16b4b6079c25b656fcc53d92147456b80e4144766965b5147bf17c5db0b1c73a8d4c3f519c4639d8f2 SHA512 2aba4ef471b487d174d32762d12f8d6da0f40d0709a4f894dbf7f3d0717e347929dee9f620f795b298b8c714f6d433bb8f8321eeba61648a4684eacc0796711f +EBUILD yle-dl-20220610.ebuild 1430 BLAKE2B 3ea51921728f6d674d764f1c583daaebba56c43c28ec21f30e9518fe20b6a93076e19deb0c1dc0c01bae446ff04c6891fb18c4450e79cf11b2fac9517bf286e8 SHA512 e875d3adb2b0a6b859a4700772849c00bc4c9ca0c91a8100a670819b45882ced1f1e9dce8337a665728d3439341d4a93a62d15b86c0c4f5c71dcbdc8c525fb99 +EBUILD yle-dl-20220704.ebuild 1432 BLAKE2B 0108eea95f68afee12a48e0e9644de6a840069184b8b1d00564f05ced6e42ba59bfabc63c9ec6bb311345b9060e1cfceca8e8ce0aec08961f182ecac4bc42e5d SHA512 13e3f229b260ac87cc9936d18a67b938ab2efad80d62cf7cfcc1617cdab7910947435f5abe3bd6e23204b9a18429a175ef71b07ca9ff6da9fe465a206059baa4 MISC metadata.xml 280 BLAKE2B 30756c19f90277ebe700cf4641848ae376453c6031a019f348f04ee8d4c30146947ec383fa4bf12b669df790417eec9285df363210138e39f611d345d127ed27 SHA512 cf301b82fada2d4ca02e1dd9ba7b5234c42b7c63f87b96d81cb06ebc7853934533b75d0fc77eff0dc39f3c0a9e2d468b6bc03ac98fcb3834da67a11b254a0b77 diff --git a/media-video/yle-dl/yle-dl-20220610.ebuild b/media-video/yle-dl/yle-dl-20220610.ebuild index b715582199de..ae354c51465e 100644 --- a/media-video/yle-dl/yle-dl-20220610.ebuild +++ b/media-video/yle-dl/yle-dl-20220610.ebuild @@ -25,7 +25,7 @@ RESTRICT="test" RDEPEND="media-video/ffmpeg net-misc/wget >=dev-python/attrs-18.1.0[${PYTHON_USEDEP}] - >=dev-python/configargparse-0.13.0[${PYTHON_USEDEP}] + >=dev-python/ConfigArgParse-0.13.0[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}] dev-python/progress[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}]" diff --git a/media-video/yle-dl/yle-dl-20220531.ebuild b/media-video/yle-dl/yle-dl-20220704.ebuild index b715582199de..df6369dae4bf 100644 --- a/media-video/yle-dl/yle-dl-20220531.ebuild +++ b/media-video/yle-dl/yle-dl-20220704.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/aajanki/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" IUSE="test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -25,7 +25,7 @@ RESTRICT="test" RDEPEND="media-video/ffmpeg net-misc/wget >=dev-python/attrs-18.1.0[${PYTHON_USEDEP}] - >=dev-python/configargparse-0.13.0[${PYTHON_USEDEP}] + >=dev-python/ConfigArgParse-0.13.0[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}] dev-python/progress[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}]" |