diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-10-28 22:00:05 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-10-28 22:00:05 +0100 |
commit | 9c602d90d61cea9fe83c596c68a99e383ee15f73 (patch) | |
tree | bca80b41af9c142cee7e07f14622dff065e60932 /media-video | |
parent | cf7630078a53ff74b245b148bd722994068e28f9 (diff) |
gentoo auto-resync : 28:10:2022 - 22:00:04
Diffstat (limited to 'media-video')
30 files changed, 37 insertions, 2469 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz Binary files differindex a4ac77384c6b..69b26b9dd85a 100644 --- a/media-video/Manifest.gz +++ b/media-video/Manifest.gz diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest index ec476617e676..73a7f701db2d 100644 --- a/media-video/mkvtoolnix/Manifest +++ b/media-video/mkvtoolnix/Manifest @@ -1,22 +1,8 @@ -AUX mkvtoolnix-49.0.0-qt5dbus.patch 1442 BLAKE2B 041c33dcb691377b4b50a4c24f1eac528dda0227ccf2baf3732239b481ff6007bf5a8ddd9304dd7c2faff149f1cfbdbfb194eb30a3b19eea0803f10734572421 SHA512 d9a72bb0b8fc7c9915e4efa1e9758d4f9d6b68f1ad6ef9898dd0b5e693c8e1236b37fc97a9786c233f8909417309ea6bb9c1fb71054818f31eeb4c43faa46a06 -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 DIST mkvtoolnix-69.0.0.tar.xz 10946800 BLAKE2B aed865e723d315aaddbfe6351c98bdafaee8b75968a2c03256e37e96d5ee7324d92ef8a5bb12c559c46264ebdcefd7a802884ac33db59fa5935621769ec9bfd1 SHA512 c7ce69e9a921103da4745c75cd6fa41a49dbb8637f48097233388e5d8be121714d3fde10f745b78e84a8ef70e46f0168f36f069331f04623805c0bda8a90060c DIST mkvtoolnix-71.1.0.tar.xz 10989788 BLAKE2B 6b90ac9e103a75f5db76fa06def3593c7dc3c77d1179400aecda7217692fbe7f3866d838a541895d704ab9ddfb9972855c3cdad928356552136f9481cd65cf41 SHA512 f0565813ee4a303f0710b2d8019b6275e5ce7542174475e8ef9d4828c3e5ff5cf8a7940eb0e878b419e0b22a9fd55e2fc41e8e26c1b0777b95caac30d82fad5b -EBUILD mkvtoolnix-57.0.0.ebuild 2962 BLAKE2B f3a339ece4e0cb98fb0533478cfbe888021ff56f831a3faedbcb67205313df4af7727a6b5f5bb2103234710cec224e55d1421b5d5c423f6b103d27b1fdd60236 SHA512 2aa6f5ffe2fc3fe20ad0bc8b1ffd839c468484f36c8e36821e2a3b1689d2d935d80b9c45f4b1612b39c5b9342fc017b9cb373bf4998a506694e9086d8c76c600 -EBUILD mkvtoolnix-60.0.0.ebuild 2706 BLAKE2B dd751ea20eab19a91848f07ebeeedc411849a409c78d19695b77d1ea45dfd94d19651e7cd6824d8d2e9b061cf82b56a7207e05b2b1dd489ceff02b400c253231 SHA512 ab3106fb27a970c0873717fa402c937af4288ae100d26b1f361e7f0382cda413b1a2159812b1be2b738b241a2e0ddcb621e67e51a4c0b32e034c944dc35ba68b -EBUILD mkvtoolnix-61.0.0.ebuild 2726 BLAKE2B 2279b0cb4059b76a66af001589060a3206e05c4c90a9e1b313701ceac45d431cb0535824be25a7882c0ae990dfee9384be2dcc60bc36f3cb183c74cab5081341 SHA512 037d0c1c978eb03634f16c39a8c5c09b1a9f0694c8f226ed3335763dd542133902d13f389e1778f6e4ab0ceb5193a02d960deb2d700f01e0c54dcc161a608763 -EBUILD mkvtoolnix-64.0.0.ebuild 2736 BLAKE2B 2f4fcd86ff3a7fc61adbebd1689e7123e4cd36d8c83baa34145ab35c8aab655feae8724392f062e50519199570a1a7fe6ad82df206f24029b8de1f63106646b8 SHA512 8139a1290507588d94e33bd3ce985c5f68912bb5ffd8b0e542a76e54966aedaba4754c70f0a984c9880df7a93f295ab0ae1a916555f01f2a4a006a10b47de39d -EBUILD mkvtoolnix-67.0.0.ebuild 2946 BLAKE2B 6b4beb782bf52c52314af7b9df19c1920c6c1e54451ebc2cb3d7b56a2eb2628bf3cb3a62b52eb6a3720384858158fce3be596f946c69dc139324a7cd423139b3 SHA512 6103ec8d155a14015e3c01f49618daee3fddc487816e130157ea8f144531cfffa1a4e94012c8028700201dce34a78a254e75f53029f1d06ff1644caf13ad2f9e -EBUILD mkvtoolnix-68.0.0-r3.ebuild 2973 BLAKE2B 2a3b8f0d5f61ccb1d2cbc69cabd9466fde5c1ef1e36689aac4e5433c66c05f1cc72a3afbb536af5604e0748aeb264f54c1c2193170e64b8f34e304f879c6f32c SHA512 69d1bab3c7e6329468930c5a716dfbecfea61b7360e11e333ce047dc4c082ebee2d15044adcd8c6c3a6700cd53a0e69042d9d665997074f461a6ff2a562d943f EBUILD mkvtoolnix-69.0.0.ebuild 2939 BLAKE2B b626b90bd71651f79431cc1cd803f57904c48dacc906a7e220474b602adaf5a8108febe262a08bf56e0c960817e6322413fdc70537a7ae77241c32ca07b85059 SHA512 cafe20ffdc9de60647a63dd4a7cb0806a012582f4d864423650603c6fa3b33658936e2c81ce8d3d4a076e55aefe55f1baaab912701e5d9175971d8492a4a20bc EBUILD mkvtoolnix-71.1.0.ebuild 2941 BLAKE2B 30aca40ae6f0cc410f9cb9d102f14b5efe0a1becbb529762b9dac566087882ac2f2b04db91c62b96825d9c4cccffebb6c7b29d3ead34558004922585f3d0b1c3 SHA512 09a813e5ae9df385fce514fd0f721f49184e4365f43b04952701e11db170889f1933b2a464f021ef804196384f63c96d0f0081e074c7d12081a5c37e99fbb92a EBUILD mkvtoolnix-9999.ebuild 2941 BLAKE2B 30aca40ae6f0cc410f9cb9d102f14b5efe0a1becbb529762b9dac566087882ac2f2b04db91c62b96825d9c4cccffebb6c7b29d3ead34558004922585f3d0b1c3 SHA512 09a813e5ae9df385fce514fd0f721f49184e4365f43b04952701e11db170889f1933b2a464f021ef804196384f63c96d0f0081e074c7d12081a5c37e99fbb92a diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-49.0.0-qt5dbus.patch b/media-video/mkvtoolnix/files/mkvtoolnix-49.0.0-qt5dbus.patch deleted file mode 100644 index 1c59b2c3827a..000000000000 --- a/media-video/mkvtoolnix/files/mkvtoolnix-49.0.0-qt5dbus.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/ac/qt5.m4 2020-07-31 11:25:31.371508129 -0500 -+++ b/ac/qt5.m4 2020-07-31 11:30:14.967322450 -0500 -@@ -14,6 +14,11 @@ - AC_ARG_WITH([qt_pkg_config], - AC_HELP_STRING([--without-qt-pkg-config], [do not use pkg-config for detecting Qt; instead rely on QT_CFLAGS/QT_LIBS being set correctly already]), - [ with_qt_pkg_config=${withval} ], [ with_qt_pkg_config=yes ]) -+AC_ARG_ENABLE([dbus], -+ AC_HELP_STRING([--enable-dbus],[enable/disable qtdbus/dbus from being included in build (yes)]), -+ [],[enable_dbus=yes]) -+ -+ - - if test x"$enable_qt" = "xyes" -a \ - '(' x"$enable_gui" = x"yes" -o x"$enable_gui" = "x" ')'; then -@@ -169,11 +174,13 @@ - AC_MSG_RESULT(no: not found by pkg-config) - fi - -- if test x"$MINGW" != x1 && ! echo "$host" | grep -q -i apple ; then -- PKG_CHECK_EXISTS([Qt5DBus],[dbus_found=yes],[dbus_found=no]) -- if test x"$dbus_found" = xyes; then -- with_qt_pkg_config_modules="$with_qt_pkg_config_modules,Qt5DBus" -- AC_DEFINE(HAVE_QTDBUS, 1, [Define if QtDBus is present]) -+ if test x"$enable_dbus" = xyes; then -+ if test x"$MINGW" != x1 && ! echo "$host" | grep -q -i apple ; then -+ PKG_CHECK_EXISTS([Qt5DBus],[dbus_found=yes],[dbus_found=no]) -+ if test x"$dbus_found" = xyes; then -+ with_qt_pkg_config_modules="$with_qt_pkg_config_modules,Qt5DBus" -+ AC_DEFINE(HAVE_QTDBUS, 1, [Define if QtDBus is present]) -+ fi - fi - fi diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-56.1.0-optlevel.patch b/media-video/mkvtoolnix/files/mkvtoolnix-56.1.0-optlevel.patch deleted file mode 100644 index c0f91deed696..000000000000 --- a/media-video/mkvtoolnix/files/mkvtoolnix-56.1.0-optlevel.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://gitlab.com/mbunkus/mkvtoolnix/-/commit/ba6db89e24aa84316372d59e6bba4ac88145b32a -https://bugs.gentoo.org/786978#c10 -diff --git a/Rakefile b/Rakefile -index 8c9487436ac627cc503e5f233d3f9c756f67fd86..ce564127eeb136b1c1784568ad68a4d593d0931a 100644 ---- a/Rakefile -+++ b/Rakefile -@@ -355,7 +355,7 @@ cxx_compiler = lambda do |*args| - # Even -O1 causes compilation time & memory usage to skyrocket, - # possibly exponentially, with the number of entries to - # emplace_back() into the vector. -- flags.gsub!(%r{ -O\d+ }, ' -O0 ') -+ flags.gsub!(%r{(^| )-O[^ ]*}, ' -O0') - end - - args = [ diff --git a/media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild deleted file mode 100644 index fff9c5471fbe..000000000000 --- a/media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic toolchain-funcs 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 nls pch qt5 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:= - >=dev-libs/libebml-1.4.0:= - >=dev-libs/libfmt-6.1.0:= - dev-libs/libpcre2:= - dev-libs/pugixml:= - media-libs/flac:= - >=media-libs/libmatroska-1.6.3:= - media-libs/libogg:= - media-libs/libvorbis:= - sys-apps/file - sys-libs/zlib - dvd? ( media-libs/libdvdread:= ) - qt5? ( - dev-qt/qtcore: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 - dev-libs/utfcpp - 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-49.0.0-qt5dbus.patch - "${FILESDIR}"/mkvtoolnix-56.1.0-optlevel.patch ) - -src_prepare() { - xdg_src_prepare - if [[ ${PV} == *9999 ]]; then - ./autogen.sh || die - fi - - # https://bugs.gentoo.org/692018 - sed -e 's/pandoc/diSaBlEd/' -i 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) - $(use_enable qt5 qt) - $(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) - ) - - if use qt5 ; then - # ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600 - myeconfargs+=( - --with-moc=$(qt5_get_bindir)/moc - --with-uic=$(qt5_get_bindir)/uic - --with-rcc=$(qt5_get_bindir)/rcc - --with-qmake=$(qt5_get_bindir)/qmake - ) - fi - - 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-60.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild deleted file mode 100644 index b4be2070e7c0..000000000000 --- a/media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic toolchain-funcs 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 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:= - >=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:= - >=media-libs/libmatroska-1.6.3:= - media-libs/libogg:= - media-libs/libvorbis:= - sys-apps/file - sys-libs/zlib - dvd? ( media-libs/libdvdread:= ) - dev-qt/qtcore: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 - dev-libs/utfcpp - 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 ) - -src_prepare() { - xdg_src_prepare - if [[ ${PV} == *9999 ]]; then - ./autogen.sh || die - fi - - # https://bugs.gentoo.org/692018 - sed -e 's/pandoc/diSaBlEd/' -i 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) - --disable-qt6 - --enable-qt5 - --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-61.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild deleted file mode 100644 index cfd401ed0150..000000000000 --- a/media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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 nls pch test gui" -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:= - >=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:= - >=media-libs/libmatroska-1.6.3:= - media-libs/libogg:= - media-libs/libvorbis:= - sys-apps/file - sys-libs/zlib - dvd? ( media-libs/libdvdread:= ) - dev-qt/qtcore:5 - gui? ( - 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 - dev-libs/utfcpp - 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 ) - -src_prepare() { - xdg_src_prepare - if [[ ${PV} == *9999 ]]; then - ./autogen.sh || die - fi - - # https://bugs.gentoo.org/692018 - sed -e 's/pandoc/diSaBlEd/' -i 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) - $(use_enable gui) - --disable-qt6 - --enable-qt5 - --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-64.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-64.0.0.ebuild deleted file mode 100644 index f827b04ecbae..000000000000 --- a/media-video/mkvtoolnix/mkvtoolnix-64.0.0.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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:= - 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:= - media-libs/libogg:= - media-libs/libvorbis:= - sys-libs/zlib - dvd? ( media-libs/libdvdread:= ) - dev-qt/qtcore:5 - gui? ( - 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 -) - -src_prepare() { - xdg_src_prepare - - if [[ ${PV} == *9999 ]]; then - ./autogen.sh || die - fi - - # https://bugs.gentoo.org/692018 - sed -e 's/pandoc/diSaBlEd/' -i 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) - $(use_enable gui) - --disable-qt6 - --enable-qt5 - --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-67.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild deleted file mode 100644 index a27ee5107f3f..000000000000 --- a/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# 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:= - 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:= - media-libs/libogg:= - media-libs/libvorbis:= - sys-libs/zlib - dvd? ( media-libs/libdvdread:= ) - dev-qt/qtcore:5 - gui? ( - 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 -) - -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-68.0.0-r3.ebuild b/media-video/mkvtoolnix/mkvtoolnix-68.0.0-r3.ebuild deleted file mode 100644 index 07634bd57696..000000000000 --- a/media-video/mkvtoolnix/mkvtoolnix-68.0.0-r3.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# 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:= - 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/pipewire/Manifest b/media-video/pipewire/Manifest index 200cec980864..aa72053dc836 100644 --- a/media-video/pipewire/Manifest +++ b/media-video/pipewire/Manifest @@ -7,12 +7,9 @@ AUX pipewire.desktop 322 BLAKE2B 0299b9054cf881a5cbbdb128a5e8a51308cf0b5a98260dc AUX pipewire.desktop-r1 325 BLAKE2B 7d823a264e5147bf8669127df22f468518fd54375ed57910f0143821894b33cfee8925b1cf8b9c5b1d219453a5c62fffa50d111b78bc5e151e23aed84d0a577e SHA512 e51ba049484daba3e4cdc5890748267f0c23ea6e57f31f3bb8a49c011e1a61b47b68eea742e5e7bcd58bfeddb96dd4064079fd9787cb66c78bd5eff10799a7bf DIST pipewire-0.3.51.tar.gz 1789070 BLAKE2B 8538eb9f2178efa26365f30b324b707826e580caa1fd9c09b62c561c140c14186e0d2b04808fa78eb5642ddccf1a347def19934ecd654be06b215a693075b6fc SHA512 a762fd260b4b14ad9ef142be11ab1c22268da6726e2179559ffb254f0ce7daf7a502779e33c64313a9c6a9fc1bd15150b76be04ec81aa27c35dbb4333cecdb4a DIST pipewire-0.3.56.tar.gz 1856321 BLAKE2B 62fb5d5a83b3cfc0555f09da42c8d4fbe69f34432add57f91a9c001535340a84f54572af4a5ba138251888cba9be0c038317dfe929d2e2ef36ff62f4679c6ea0 SHA512 a1ba598c56130a30e573d3ce3ac5879d800d3005a47075c45353d968c97c12f74d85802cd171b61558c06c474a03bbe4885396ca430a0af6c5672ed00f43d108 -DIST pipewire-0.3.58.tar.gz 1893021 BLAKE2B 65c93b3b5b2594799ceac4e5bd0700a15589dc13f7e8f308731b90f2514888f605f67434ef1d1248c6ce348cdde65839c1e7cf3ed68068f217e769ec78743785 SHA512 06fb308fe6a1573ccb955f6e39aef7e4ab0d1b9f4fdeee11b9d6910940f154fac8ce7f2daae5b3ba7d1eb22771590bd13a38622d316affa2cda71bfd8d91de7b -DIST pipewire-0.3.59.tar.gz 1909977 BLAKE2B 098a75060799013e9a5e5ac4b0c7c62e788318a85df9616f6c441255b5a50acae9da01887ee20c60995878601c22a0eda4fec640bafc941cfa20e0cf751f6189 SHA512 1183dc083553ece1f9157898f437996b88dc7d13ba69aa43886f5339f330130404274ceb08ac8ec05a5ccb84dfca56b524a1d4b3fb07e28a41741c5c3333eda0 +DIST pipewire-0.3.59.tar.bz2 1443372 BLAKE2B 5e2d82c0bfdb7c030d8be525152c38115438caeb990afd7757424efcf2a7391a6a4891b0f58347ab0b7446707e8ad88baffa0c11c5acc42e086f23c9de3cb354 SHA512 f42bfab6e1bb227431119b44887af818a25eb0cdbcca917433162af87c942eb105a2b6e100de877d188941a24f1c8e2e9ae79f499fc20f0a32e2f7cc5de54162 EBUILD pipewire-0.3.51-r2.ebuild 13198 BLAKE2B 367ab8b3f5682ed707f8ad46a4959216c10ade3697661e748c90a4473f993d40f1137cf1364b35b2aa884acbf24b3989a5fd3046fdc78bc90ca4334644a711b1 SHA512 a9b4ce58ae5a13491f019d51863f2de822e642cbecdc1ca4018385a2e3a07e5bfba865df09fec6d2a5af3269a72fbcd8c8c3b13a3db310e83cf0e3cd100380da EBUILD pipewire-0.3.56.ebuild 15643 BLAKE2B 15b146a8ca79173ffa4b93315681fda18d1290711ec8b41715c96dcdfff325ea8ffd1fd9418671cfe966542ba7c81bef6ef08f14c7f17b569bb82abc66c6fa63 SHA512 832ba476d2e4f2bbcb78118152b407f426ed40bf514096a19fcf3f8a00afcbfaf3f17e2d914279055c8afdf526969598d9aaa3acddbc905d62509c43fd6b6917 -EBUILD pipewire-0.3.58.ebuild 15765 BLAKE2B 79fdd8c05c6168d9f433c182b986acc0bb27cc19a1024882a77534c045380a5d64b978b431258d519d7c05a964e1d00a3b622ba830ece87ecc1b4992950e9033 SHA512 567219b52c72061d88e3ed70bc479991114a30e0bc63d9b47b0576b92b32f86fbbfce460e569b727db0e6d2c66a8a5e6c60306ab31ee7b570b681b997854fa29 -EBUILD pipewire-0.3.59-r1.ebuild 15857 BLAKE2B 761e60c6eeef8eb3075b71276092f20e9d38d2a28561896d61417663fb94ac6d5e21fa9319a3375d855ddfba583327b455a57ca979852bb80470836c0628a863 SHA512 29982d776489b585ee4b8a94fbcd78fc6b75d8f753e1eacfd50d48f6b4ebc6969adce58da5154be27422ee824616008db4f02bb1c9b1e259322f9c57fab9ffd0 -EBUILD pipewire-0.3.59.ebuild 15795 BLAKE2B c731accff189f39853293293d1585e57745024027322bf7a3c3119f8e3f09f4fded8a8e13bdc56c883f16a64974b35075b65f087c11c4e52ab2d663e007ed48f SHA512 e30a2dcffd163648267127fcaf5b72418342d6fe5b62886a98c3ec5a52b45bceedf7e4146fbbd7186a991b5c3b9a74a8231e365af2e5682adeb10e21800d4435 -EBUILD pipewire-9999.ebuild 15795 BLAKE2B c731accff189f39853293293d1585e57745024027322bf7a3c3119f8e3f09f4fded8a8e13bdc56c883f16a64974b35075b65f087c11c4e52ab2d663e007ed48f SHA512 e30a2dcffd163648267127fcaf5b72418342d6fe5b62886a98c3ec5a52b45bceedf7e4146fbbd7186a991b5c3b9a74a8231e365af2e5682adeb10e21800d4435 +EBUILD pipewire-0.3.59-r2.ebuild 15858 BLAKE2B 26f0a7bf93dab5acc54bfa7ea2ee9d81dd620b1e89e24b982eb94d9d0007eda4246b426d23943681951fc937f71628bf3f653e280a0477b81433a98fff98ae63 SHA512 db2a7685bdda58c88d7049875480685e3d20a9ba331c902bb6a07739c1e88f84c932489b75e66c6f62999a24aebb7765eb4197d103dd6f64e658eb3316df34b4 +EBUILD pipewire-9999.ebuild 15796 BLAKE2B 2949a6d3fafe2d924352f1d8c932e024529264376241c093bd4bca67866e1dd9ce2c9c2757cfe5c3a092233fac266b158b3f540b4c6a1523aea8632e4a3cfb94 SHA512 43a3d853cea62ccd6c43f5530cac884e8ecf0d37d5519438ca4cfbfb44f6cd3c233bba2d1dbcfc06a9a275c838e7d9a493d1fb501a163966e0db33a24ab7fc3d MISC metadata.xml 1533 BLAKE2B 75e656bea9420a16158649d0909be5833ddd7e8f61664d4e6ef00ecaa179110704777faaa5971c1bb7d818b193474e015649468533a0699c6249c57c27f51293 SHA512 8ba9665ef28168d804c5ef3c3f353b8313dbbb12fc9d3bbdfc09771a13a690ae4af903a73670789a2d17c9d3e0566575140d6f6b104279771fd374fab90338d4 diff --git a/media-video/pipewire/pipewire-0.3.58.ebuild b/media-video/pipewire/pipewire-0.3.58.ebuild deleted file mode 100644 index f8327c0c3219..000000000000 --- a/media-video/pipewire/pipewire-0.3.58.ebuild +++ /dev/null @@ -1,429 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# 1. Please regularly check (even at the point of bumping) Fedora's packaging -# for needed backports at https://src.fedoraproject.org/rpms/pipewire/tree/rawhide. -# -# 2. Upstream also sometimes amend release notes for the previous release to mention -# needed patches, e.g. https://gitlab.freedesktop.org/pipewire/pipewire/-/tags/0.3.55#distros -# -# 3. Keep an eye on git master (for both PipeWire and WirePlumber) as things -# continue to move quickly. It's not uncommon for fixes to be made shortly -# after releases. - -PYTHON_COMPAT=( python3_{8..11} ) - -inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git" - inherit git-r3 -else - if [[ ${PV} == *_p* ]] ; then - MY_COMMIT="" - SRC_URI="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${MY_COMMIT}/pipewire-${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2" - S="${WORKDIR}"/${PN}-${MY_COMMIT} - else - SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.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 flatpak 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/opus - media-libs/sbc - >=net-wireless/bluez-4.101:= - virtual/libusb:1 - ) - dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) - echo-cancel? ( media-libs/webrtc-audio-processing:0 ) - extra? ( - >=media-libs/libsndfile-1.0.20 - ) - flatpak? ( - dev-libs/glib - ) - gstreamer? ( - >=dev-libs/glib-2.32.0:2 - >=media-libs/gstreamer-1.10.0:1.0 - media-libs/gst-plugins-base:1.0 - ) - jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) - jack-sdk? ( - !media-sound/jack-audio-connection-kit - !media-sound/jack2 - ) - lv2? ( media-libs/lilv ) - 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() { - python_has_version "dev-python/docutils[${PYTHON_USEDEP}]" -} - -src_prepare() { - default - - einfo "Generating ${limitsdfile}" - cat > ${limitsdfile} <<- EOF || die - # Start of ${limitsdfile} from ${P} - - @audio - memlock 256 - - $(use system-service && { - echo @pipewire - rtprio 95 - echo @pipewire - nice -19 - echo @pipewire - memlock 4194304 - }) - - # End of ${limitsdfile} from ${P} - EOF -} - -multilib_src_configure() { - # https://bugs.gentoo.org/838301 - filter-flags -fno-semantic-interposition - - local emesonargs=( - -Ddocdir="${EPREFIX}"/usr/share/doc/${PF} - - $(meson_feature dbus) - $(meson_native_use_feature zeroconf avahi) - $(meson_native_use_feature doc docs) - $(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone - $(meson_native_enabled man) - $(meson_feature test tests) - -Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests - $(meson_native_use_feature gstreamer) - $(meson_native_use_feature gstreamer gstreamer-device-provider) - $(meson_native_use_feature systemd) - - $(meson_native_use_feature system-service systemd-system-service) - -Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)" - -Dsystemd-user-unit-dir="$(systemd_get_userunitdir)" - - $(meson_native_use_feature systemd systemd-user-service) - $(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph - -Dspa-plugins=enabled - -Dalsa=enabled # Allows using kernel ALSA for sound I/O (NOTE: media-session is gone so IUSE=alsa/spa_alsa/alsa-backend might be possible) - -Daudiomixer=enabled # Matches upstream - -Daudioconvert=enabled # Matches upstream - $(meson_native_use_feature bluetooth bluez5) - $(meson_native_use_feature bluetooth bluez5-backend-hsp-native) - $(meson_native_use_feature bluetooth bluez5-backend-hfp-native) - $(meson_native_use_feature bluetooth bluez5-backend-ofono) - $(meson_native_use_feature bluetooth bluez5-backend-hsphfpd) - $(meson_native_use_feature bluetooth bluez5-codec-aac) - $(meson_native_use_feature bluetooth bluez5-codec-aptx) - $(meson_native_use_feature bluetooth bluez5-codec-ldac) - $(meson_native_use_feature bluetooth bluez5-codec-opus) - $(meson_native_use_feature bluetooth libusb) # At least for now only used by bluez5 native (quirk detection of adapters) - $(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889 - # Not yet packaged. - -Dbluez5-codec-lc3plus=disabled - -Dcontrol=enabled # Matches upstream - -Daudiotestsrc=enabled # Matches upstream - -Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020 - $(meson_native_use_feature flatpak) - -Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph - $(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client - $(meson_use jack-sdk jack-devel) - $(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '') - -Dsupport=enabled # Miscellaneous/common plugins, such as null sink - -Devl=disabled # Matches upstream - -Dtest=disabled # fakesink and fakesource plugins - $(meson_native_use_feature lv2) - $(meson_native_use_feature v4l v4l2) - -Dlibcamera=disabled # libcamera is not in Portage tree - $(meson_native_use_feature 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.59-r1.ebuild b/media-video/pipewire/pipewire-0.3.59-r2.ebuild index da8ad2640541..b138b5e03595 100644 --- a/media-video/pipewire/pipewire-0.3.59-r1.ebuild +++ b/media-video/pipewire/pipewire-0.3.59-r2.ebuild @@ -26,7 +26,7 @@ else 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" + SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2" fi KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" diff --git a/media-video/pipewire/pipewire-0.3.59.ebuild b/media-video/pipewire/pipewire-0.3.59.ebuild deleted file mode 100644 index 1b29ff8d3bec..000000000000 --- a/media-video/pipewire/pipewire-0.3.59.ebuild +++ /dev/null @@ -1,430 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# 1. Please regularly check (even at the point of bumping) Fedora's packaging -# for needed backports at https://src.fedoraproject.org/rpms/pipewire/tree/rawhide. -# -# 2. Upstream also sometimes amend release notes for the previous release to mention -# needed patches, e.g. https://gitlab.freedesktop.org/pipewire/pipewire/-/tags/0.3.55#distros -# -# 3. Keep an eye on git master (for both PipeWire and WirePlumber) as things -# continue to move quickly. It's not uncommon for fixes to be made shortly -# after releases. - -PYTHON_COMPAT=( python3_{8..11} ) - -inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git" - inherit git-r3 -else - if [[ ${PV} == *_p* ]] ; then - MY_COMMIT="" - SRC_URI="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${MY_COMMIT}/pipewire-${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2" - S="${WORKDIR}"/${PN}-${MY_COMMIT} - else - SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.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 flatpak 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/opus - media-libs/sbc - >=net-wireless/bluez-4.101:= - virtual/libusb:1 - ) - dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) - echo-cancel? ( media-libs/webrtc-audio-processing:0 ) - extra? ( - >=media-libs/libsndfile-1.0.20 - ) - flatpak? ( - dev-libs/glib - ) - gstreamer? ( - >=dev-libs/glib-2.32.0:2 - >=media-libs/gstreamer-1.10.0:1.0 - media-libs/gst-plugins-base:1.0 - ) - jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) - jack-sdk? ( - !media-sound/jack-audio-connection-kit - !media-sound/jack2 - ) - lv2? ( media-libs/lilv ) - 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() { - python_has_version "dev-python/docutils[${PYTHON_USEDEP}]" -} - -src_prepare() { - default - - einfo "Generating ${limitsdfile}" - cat > ${limitsdfile} <<- EOF || die - # Start of ${limitsdfile} from ${P} - - @audio - memlock 256 - - $(use system-service && { - echo @pipewire - rtprio 95 - echo @pipewire - nice -19 - echo @pipewire - memlock 4194304 - }) - - # End of ${limitsdfile} from ${P} - EOF -} - -multilib_src_configure() { - # https://bugs.gentoo.org/838301 - filter-flags -fno-semantic-interposition - - local emesonargs=( - -Ddocdir="${EPREFIX}"/usr/share/doc/${PF} - - $(meson_feature dbus) - $(meson_native_use_feature zeroconf avahi) - $(meson_native_use_feature doc docs) - $(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone - $(meson_native_enabled man) - $(meson_feature test tests) - -Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests - $(meson_native_use_feature gstreamer) - $(meson_native_use_feature gstreamer gstreamer-device-provider) - $(meson_native_use_feature systemd) - - $(meson_native_use_feature system-service systemd-system-service) - -Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)" - -Dsystemd-user-unit-dir="$(systemd_get_userunitdir)" - - $(meson_native_use_feature systemd systemd-user-service) - $(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph - -Dspa-plugins=enabled - -Dalsa=enabled # Allows using kernel ALSA for sound I/O (NOTE: media-session is gone so IUSE=alsa/spa_alsa/alsa-backend might be possible) - -Daudiomixer=enabled # Matches upstream - -Daudioconvert=enabled # Matches upstream - $(meson_native_use_feature bluetooth bluez5) - $(meson_native_use_feature bluetooth bluez5-backend-hsp-native) - $(meson_native_use_feature bluetooth bluez5-backend-hfp-native) - $(meson_native_use_feature bluetooth bluez5-backend-ofono) - $(meson_native_use_feature bluetooth bluez5-backend-hsphfpd) - $(meson_native_use_feature bluetooth bluez5-codec-aac) - $(meson_native_use_feature bluetooth bluez5-codec-aptx) - $(meson_native_use_feature bluetooth bluez5-codec-ldac) - $(meson_native_use_feature bluetooth bluez5-codec-opus) - $(meson_native_use_feature bluetooth libusb) # At least for now only used by bluez5 native (quirk detection of adapters) - $(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889 - # Not yet packaged. - -Dbluez5-codec-lc3=disabled - -Dbluez5-codec-lc3plus=disabled - -Dcontrol=enabled # Matches upstream - -Daudiotestsrc=enabled # Matches upstream - -Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020 - $(meson_native_use_feature flatpak) - -Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph - $(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client - $(meson_use jack-sdk jack-devel) - $(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '') - -Dsupport=enabled # Miscellaneous/common plugins, such as null sink - -Devl=disabled # Matches upstream - -Dtest=disabled # fakesink and fakesource plugins - $(meson_native_use_feature lv2) - $(meson_native_use_feature v4l v4l2) - -Dlibcamera=disabled # libcamera is not in Portage tree - $(meson_native_use_feature 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 1b29ff8d3bec..2b66ac34cdf5 100644 --- a/media-video/pipewire/pipewire-9999.ebuild +++ b/media-video/pipewire/pipewire-9999.ebuild @@ -26,7 +26,7 @@ else 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" + SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2" fi KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index c4b51e81a663..95a43325bbd1 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -4,11 +4,12 @@ AUX vlc-2.2.8-libupnp-slot-1.8.patch 725 BLAKE2B eb217ef57f0709fa1d0bdf164461058 AUX vlc-3.0.11.1-configure_lua_version.patch 1598 BLAKE2B 589c90d0c805ff516b7957e9b9fc6931674bc23a8aac15eb27351e9bae00aa55bffb3e62a87813714d8f0d64effa16c06680f10d00ecbe4207d5b26d37c4e5ac SHA512 0f24f54add360164417e01b2899ead07cc9f37cdc872387c7a9c350890f55c6fbec35f99e1e85a96309d7154359ffb99bc2ab7c8151adb080bb1531f88d987e6 AUX vlc-3.0.14-fix-live-address-api.patch 2233 BLAKE2B 50b40430978996e5302b08bcb8a68e5f106fe43f4fd66ad69dd1e6c1e8097abc32c671cdfc8dc87b7526cabadf847bf359f81927919ff3ab8ea7a80274bc7075 SHA512 d79e03677e404ef853499ac7b72977f1d6368d003720ce663581a5527b5b6327b36d5b240bec0aa2d4c3bff4c1b04ce1c4dc904fc648c98498ba2f88f1acd82a AUX vlc-3.0.17.3-dav1d-1.0.0.patch 3256 BLAKE2B 49403c38c7b05b80d7bc075debb584fd71d58c9368d32e8da7129d2e50c2a4152cd4a7f2e62426f520665e0c973a66061ed2622f275f9111b1c1b4bf3da17716 SHA512 5b5414e3c4bfaf62aaf479957c1e13f2747362cc26e2569036f8cb6be52e7148289a160366f3ba3a70198e1ac6cbad248d0d13b045db81e5e894490fa315ce63 +AUX vlc-3.0.17.4-gcc13.patch 595 BLAKE2B 7a3099c607db5e81ce7517e70222c9b0416b137de4033fbde3d89d12f30847a4f548e6914fbf022c7577b8be9cc69e67696c267dee4cbe9b82157a239dcdf0ca SHA512 9ea0f70fc07357dd67c13edd559509d9b14c3c61b4f877090c92c8cbdc53672a64b88ee5a863c738963bebc8e15e1911f2f6f0b8cb209ba3ba5742bd593e6cde AUX vlc-3.0.6-fdk-aac-2.0.0.patch 3436 BLAKE2B 022201ed10fef189feeb36f44ab4194ab7994e4fdd8bad922070b54688d34d051fac28177a0e648d55670e0b9f0c6b45f9a05650476b0ae12ebfe759dd561e28 SHA512 68964adda04cd88e80b586984f1af0cfdccff5dbf8529070d5ab985b23402dfb7380b5d39eacfea433c1ba03434139e4f394c1c25d6b426489883d3a42cb7b5b AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bcfddee004e4e8469e1526a6a38fb5cc11a24a19888443e5f9062d7145665d594e142c12f3a9693967f195bab3b33ada38 SHA512 dd3375997a1935d3a227231785f35e300e3f992034da6a9c3019e28c68c1f005cbdd67190672264b342abc719e69005f965599f7af975e2bbd4cfccd89e3770d AUX vlc-configure_lua_version.patch 2057 BLAKE2B 995291bab038c912b5d76982da803da34afd4ddce4e21f2aeff8ebe2be760857d169f904a0ce96658b6810e1030031f0a33d0c57f7bc514b1bbdc17e0d67157c SHA512 119f2fff52b334cb073c73979a6bec8710695c67e5ab3ff80d846ede52e922138ac77f8f3f9cccb6f750c74a00baf1529e27c683f0b93a6698436bdcdd930e99 DIST vlc-3.0.17.4.tar.xz 26567148 BLAKE2B 4f36e7a9695d9e839fbebe92ec85c9411fa5b980b18332caf3dacfe51c6fea30cae71ee4cb0dad8b5536dd7d9b8801987f87a3c978eec17e444eaeacda603881 SHA512 dac14c6586603c064294672eb878253e52b3a7bef431fb10303345e5400591b5c1f2d452a2af03f503db0ca186582a84be06fdf05ab011c33f7b0bd5389c51fb -EBUILD vlc-3.0.17.4-r2.ebuild 13574 BLAKE2B c91321192ff76042519bbb12abb2ffd4d046335c15fe208625a257fff6fb509acadfb330900aed579fae2487878c0281f0ff044530a269331b521e25c1ef16cf SHA512 78c2534ef7db1d4493528ea89e83374728a577271175c55096289fb2b049fb9e0d5af2d245a02b497b95251a76003396dffd5c799e0e43d1ae043b28911a4e38 -EBUILD vlc-3.0.9999.ebuild 13436 BLAKE2B 4808a99fe8b12b53b7799e581a844edf7de3538fdd90642b4a4504a3c73d425acadccc43fcc830ba14f8e3688da2d02b8a3260a9b5f1e3fa7fbc650b9068e908 SHA512 d8ca49224e68f7331b0edbfedea272f07d55b54e1eb3ff3612bd5d8d18b2c0bef908ef194d9cbb4741b9bc5f10be6415d6bb531f0422ba57216786c5f7dbd7f0 -EBUILD vlc-9999.ebuild 13486 BLAKE2B 10aa88e4adfee804ca8c6dd2a221298718b0e549db089a3dac85a97505b5088dc9f8c1b97faf1bc5e678d96e327c4e13ae3da25660a93d1d9b1a609603a01f40 SHA512 0def46b73101df3a8525ea7ad2b9f0c392c8330501bfd27345fcfe78622bd910205bd1f45e24420225eb1b9dbc39751eec668e33482c152e20465c4a8ed6b109 +EBUILD vlc-3.0.17.4-r2.ebuild 13629 BLAKE2B 3eb7133d0acea2d9abb614f5fdd72188a603301321e92558312a1850c28ed17a78ad64a13e7cfa7928ac85ef7e12ac478b4089a28f97b0401c944f0f85aba4e8 SHA512 13a7d4d473e14e0e87a7ce17a9db384129ccb53512ac33e326e0b4dc6b262814e68d29e1407c2ea11a28086beedda70a1dc538edb453cf6fe2092095642bbf04 +EBUILD vlc-3.0.9999.ebuild 13443 BLAKE2B 084c205f6514aca8b7b136a4ded87ca6c35e71f38df5a5cbb0158e02bef15c799350356a537fba07d5f56eb61de335de4215b636740d9be804abb12d201d4086 SHA512 ebfd90cdb2278d1a2961f004d2cadb74565b83492fc85eb3e553b379729b03c264c8b7f815256dc32eb5db3374a0d507ef42f31d105c0e2bf51528963e4e62ad +EBUILD vlc-9999.ebuild 13493 BLAKE2B 9bc1c14043ecd9bd7cf24e70005316842550dfc2d0af4cd72ce33174735972b1e6456ddc0d50a23da8e8b2759f835744a7a9ed713637137226ea0cf9ec814ceb SHA512 5e02498f23db46bd8f6645ba10614a0e792721213ebba44a0c925a3443745e34eb2a857b4b3f5a61741cad645991c7b8bd5bf3bd8a5e15258e6e0818222b540a MISC metadata.xml 4923 BLAKE2B b115bd6bc666f1da6a0ba4d5b6237fedfff4baada406e56eff9c0f9574968177490c456e2d8f0ad07cf73b8e52bcc122931ae9f800d6a29e41cbfdd4ed6780fe SHA512 4b953a8662e31a66af1fb710e166316106b393d136fca7c1c5b61e78bd285bc578037fc11b7ae07202a6fae2a4a6e43f7f6560400bab8d92457012a4fa7e3045 diff --git a/media-video/vlc/files/vlc-3.0.17.4-gcc13.patch b/media-video/vlc/files/vlc-3.0.17.4-gcc13.patch new file mode 100644 index 000000000000..374cd5ada0ac --- /dev/null +++ b/media-video/vlc/files/vlc-3.0.17.4-gcc13.patch @@ -0,0 +1,20 @@ +https://code.videolan.org/robUx4/vlc/-/commit/6fca76ebd76bf8fce9b111e31bda64015cdc770f +https://bugs.gentoo.org/875785 + +From 6fca76ebd76bf8fce9b111e31bda64015cdc770f Mon Sep 17 00:00:00 2001 +From: Johannes Kauffmann <johanneskauffmann@hotmail.com> +Date: Mon, 11 Jul 2022 19:35:57 +0000 +Subject: [PATCH] demux: dash: include cstdint, needed for uint64_t + +Fixes #27077. +--- a/modules/demux/dash/mpd/TemplatedUri.hpp ++++ b/modules/demux/dash/mpd/TemplatedUri.hpp +@@ -21,6 +21,7 @@ + #ifndef TEMPLATEDURI_HPP + #define TEMPLATEDURI_HPP + ++#include <cstdint> + #include <string> + + namespace dash +GitLab diff --git a/media-video/vlc/vlc-3.0.17.4-r2.ebuild b/media-video/vlc/vlc-3.0.17.4-r2.ebuild index 2d22452092cf..824a5c251898 100644 --- a/media-video/vlc/vlc-3.0.17.4-r2.ebuild +++ b/media-video/vlc/vlc-3.0.17.4-r2.ebuild @@ -232,6 +232,7 @@ PATCHES=( "${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch "${FILESDIR}"/${PN}-3.0.14-fix-live-address-api.patch # bug 835072 "${FILESDIR}"/${PN}-3.0.17.3-dav1d-1.0.0.patch # bug 835787 + "${FILESDIR}"/${PN}-3.0.17.4-gcc13.patch # bug 875785 ) DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt ) diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild index f0b7f292923b..1bb332e0e8d1 100644 --- a/media-video/vlc/vlc-3.0.9999.ebuild +++ b/media-video/vlc/vlc-3.0.9999.ebuild @@ -20,7 +20,7 @@ else else SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz" fi - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 -sparc ~x86" fi inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index 6761ef800a15..04d660284ef4 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -20,7 +20,7 @@ else else SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz" fi - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 -sparc ~x86" fi inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg diff --git a/media-video/wireplumber/Manifest b/media-video/wireplumber/Manifest index 6ede2b635682..0aec1fcb2e68 100644 --- a/media-video/wireplumber/Manifest +++ b/media-video/wireplumber/Manifest @@ -1,18 +1,10 @@ -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.11-alsa-lua-crash.patch 1256 BLAKE2B ae5787294e405e37f01d0d4ef3f6031e5df9f60b04f02a682ceeaf2311cd2d525cdbb913d4997d63d18513225bd35d5e6375e33f34931e412ef681df134fa514 SHA512 536e39e4863ca2e002b20f8fca6164a60e280f56d7c5c2c96f9684e75b6e8f7138884fca88a214b4830e2a9fb252ead3ba75dc7f6ad491716f3e2fc595ddefed AUX wireplumber-0.4.11-dbus-reconnect-crash.patch 1553 BLAKE2B 1792743e726f22ff26f751196f620905122545bb8921dcb2398e627ef6756d786497e84cb899dcadac5417207cba7f1d5bc7f0a018156c89393712eafba5b54b SHA512 1603f928867f8ccf83132fb3b09b4d43995bd97a62689917274b01eb75526237ab86b1e58292e7f3b5b296e094995d284be31dfdd13d1c26ca5a41f2d121c71d AUX wireplumber-0.4.11-loop.patch 5638 BLAKE2B ebebd5a0c668f9ceb44cedecb9a7c364ed135e78802c619d3c1b328932480b11e2392b7263fb8df472ef1134a451537c82e25e0122bd61f80f33cbb36d538c43 SHA512 4486bb29a0f238b5d3df07bce065be30604fd3ef2d62925b3e3869060c0015d3bcdb45375bf5735e39d48e39e115c8f2029526d1044add8992fe2bc22f45faee -DIST wireplumber-0.4.10.tar.gz 395588 BLAKE2B 6df1af17d1e53ab1449a2f6f9af5a0c4f7b1cd981e07556e5ea3c6b4d5d624e66b97ce4f945f7ccccebbf72b75d35d10990fac11b5228275f27e5320885ff1ec SHA512 342e8bba2cf00faab71ef39bb361b5ada66ff3a68ccf7a756ea1ca402da6e94784eece277ca02992bc7573c51cb8b1bad33aa9c593b3d1bfe0bb0286e2f4506f DIST wireplumber-0.4.11.tar.gz 403931 BLAKE2B 77ef2540081420d4255dcb54165d0aceb08d97c60d19b9eb7606e90cf95e305e690794a1f46234b53b13765452fea0d23ae6acae9deea672db67e21c31d2307d SHA512 73a5120cd0c55b5fe5248cc22497efd23e40bb91961553639d9cf1bbf138d273db65153fa3c1bb0d2794f869e077e011156d323832534f62651d66f8cc87dca4 -DIST wireplumber-0.4.12.tar.gz 407239 BLAKE2B 10c5156c730bffc6542976f2d9cdd9634fdfcf6b1271cfd9df2357feb61ce9fbbd606728444e927ad060934e76be4ff99ba9db6c73823f6295a23977ed89a55a SHA512 0da81b62810d15264a14c3349596801cbf6f6f7ee21a1aef867e52f639dfb9b823c5181514ffa8124c3f387499fefe7f14d8cb589bcd785edd9c0e196e114601 -EBUILD wireplumber-0.4.10-r4.ebuild 3933 BLAKE2B bccd391fc42848f7f57d5403ae481c554862f4bbc6b11b4f8fc55019044b3b9150ac3704370242a39992c65d88928f2f64d441a19cddd61721c82cd887b9e1ce SHA512 2c5c1977655178717c6ad1158b0af18267cafed7ace937e28dfc08d466efe227c6a4ad7f276a27ded906cf8439ecb0ae7579ebf64b90ccc4bf67fa8eeed08bca -EBUILD wireplumber-0.4.11-r2.ebuild 4112 BLAKE2B 2f94d975252cb165d86fe23531fa8ea94a54ba44033e506a6785aea9d7be959e5a0f3f1b7b6872566de62475ab3d2a982294c53f7808348166ae6b6db7e44c15 SHA512 8504018873d34dbeb65c3a1acbc2acf68c7074902875bc1dd4f2f1088933edba51551a293345a5aa4ce8b4443fed8405126a197db65d1948ac2839107b29a430 +DIST wireplumber-0.4.12.tar.bz2 317524 BLAKE2B 5f020759fab459fb3311f8a5cddddef2bf7dc62304b6e95f5d983b86b0e6ddef7bc16c4f2ef6a36264d7ed94e48dbb4c66ff3389bfd7ca58841b4fd6cdfb21bc SHA512 79827ea9f61bacf8df80f9cd0ca4c80192cf85a1b181a51256b3c845d1d04a690ea5c1270d6d5d05d56f799f16980a593e61d003ef78ad7dc8d5e9ea332aa5d4 EBUILD wireplumber-0.4.11-r3.ebuild 4143 BLAKE2B 2198a5fae459a27ba6c03c873d123c6744929ec370a5ad1498bdd2bb5fcbc3bf68e79788536171cbafb79f08e0f543e38807945bc46c99dc89172801034eb924 SHA512 c3821991d447e63015c80b6ec3f127508b9e5575b030c14bcb2c08490e6f9ebe6e680938062b69285592c869629d51be028a840de3f37789fc7c30c827a32589 -EBUILD wireplumber-0.4.12.ebuild 4030 BLAKE2B e93cabeffc20578ba0d3c70e02db1d7b1108e76229bad1dfefd48c887d6d60dc704cbb7a323ba04e42f8674d0d48d70926c24adeecc724bc28c647bb9c9e30dc SHA512 c4deb8102d90102f2c66430e178b7cde7bac734243b94e17497ee8b64159879b17a9d59edca0558c9df928f51b52105b8970c1cf6e1f490603b17173342f754e -EBUILD wireplumber-9999.ebuild 3889 BLAKE2B d44e25f12dc2e6b0d8884b2a670b7fd3c7f1d42b67e6899cff3dd709d8b02d9c9497d4b95beca6f3973e76f54809b042ff6e66058c3de41f39332a022909083d SHA512 07ad0521fbd48382287d6d6f3b62906fa8a29fae84a5a0fb94cdcf8e87da01e6af0ba81f61c8675efb69c038a4fdf62fdde9b9e25b17d4a76b0148de32e457ae +EBUILD wireplumber-0.4.12-r1.ebuild 4031 BLAKE2B 4b4b58f12c67e03bb0d1073872f70087e5f0da2207c6c56c0532c9083457b497887c7d3ea6d65452c1223fe5e77d57989213b0f0329a76fa9fda53ea0aa9b9a4 SHA512 e1b2136d886679d03d997cc3f9dc234b416b17c7954066130daa417836704d7b7aa44701b72269277ffa4c603230067847294704f59fc37df427fb5aeb7be264 +EBUILD wireplumber-9999.ebuild 3890 BLAKE2B 9c7338d6ecbd671285cc294d00eff12480729ed921bd621b722a050d175c4b4d45eb57e73866a71a4c7bbe40c38b2a258a5b00ff39e5416026915e00794fa993 SHA512 a5431c85044ddd96f8e1735206d1cb3d7c516fe27c92b0c249936240fef68f3728ea79b6518eedc236429aca320e4698511059c4db1ff3fb0b9ad667653c02c4 MISC metadata.xml 647 BLAKE2B 0370f3c897d7fcab0bd95fe1f97208f911de022e533ac795817289c554cc75d4de686223cbfd255ecb6e930ff0aee6c9419327ab51b3c65b1c4d8ed7597a1f3e SHA512 9708a52cf340caf359c300116b6ec687fba08a3c0fe33895eb10cda08517583ad36b5ff539142d8ba5f625ad34e5b7228f55fc7b85e7a162cf775f8780899f0e diff --git a/media-video/wireplumber/files/wireplumber-0.4.10-alsa.lua-fix-device-name-deduplication-when-reserva.patch b/media-video/wireplumber/files/wireplumber-0.4.10-alsa.lua-fix-device-name-deduplication-when-reserva.patch deleted file mode 100644 index 610db0e11e89..000000000000 --- a/media-video/wireplumber/files/wireplumber-0.4.10-alsa.lua-fix-device-name-deduplication-when-reserva.patch +++ /dev/null @@ -1,117 +0,0 @@ -https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/c00c5a6675b6640db13111c808eaa3251917c412 - -From c00c5a6675b6640db13111c808eaa3251917c412 Mon Sep 17 00:00:00 2001 -From: Julian Bouzas <julian.bouzas@collabora.com> -Date: Wed, 18 May 2022 10:51:41 -0400 -Subject: [PATCH] alsa.lua: fix device name deduplication when reservation is - enabled - -Fixes #241 ---- - src/scripts/monitors/alsa.lua | 47 +++++++++++++++++++---------------- - 1 file changed, 25 insertions(+), 22 deletions(-) - -diff --git a/src/scripts/monitors/alsa.lua b/src/scripts/monitors/alsa.lua -index 01d241db..7beed3a8 100644 ---- a/src/scripts/monitors/alsa.lua -+++ b/src/scripts/monitors/alsa.lua -@@ -11,6 +11,10 @@ local config = ... or {} - -- ensure config.properties is not nil - config.properties = config.properties or {} - -+-- unique device/node name tables -+device_names_table = nil -+node_names_table = nil -+ - -- preprocess rules and create Interest objects - for _, r in ipairs(config.rules or {}) do - r.interests = {} -@@ -41,16 +45,6 @@ function rulesApplyProperties(properties) - end - end - --function findDuplicate(parent, id, property, value) -- for i = 0, id - 1, 1 do -- local obj = parent:get_managed_object(i) -- if obj and obj.properties[property] == value then -- return true -- end -- end -- return false --end -- - function nonempty(str) - return str ~= "" and str or nil - end -@@ -125,11 +119,11 @@ function createNode(parent, id, type, factory, properties) - - -- deduplicate nodes with the same name - for counter = 2, 99, 1 do -- if findDuplicate(parent, id, "node.name", properties["node.name"]) then -- properties["node.name"] = name .. "." .. counter -- else -+ if node_names_table[properties["node.name"]] ~= true then -+ node_names_table[properties["node.name"]] = true - break - end -+ properties["node.name"] = name .. "." .. counter - end - end - -@@ -186,6 +180,10 @@ function createDevice(parent, id, factory, properties) - local device = SpaDevice(factory, properties) - if device then - device:connect("create-object", createNode) -+ device:connect("object-removed", function (parent, id) -+ local node = parent:get_managed_object(id) -+ node_names_table[node.properties["node.name"]] = nil -+ end) - device:activate(Feature.SpaDevice.ENABLED | Feature.Proxy.BOUND) - parent:store_managed_object(id, device) - else -@@ -205,11 +203,11 @@ function prepareDevice(parent, id, type, factory, properties) - - -- deduplicate devices with the same name - for counter = 2, 99, 1 do -- if findDuplicate(parent, id, "device.name", properties["device.name"]) then -- properties["device.name"] = name .. "." .. counter -- else -+ if device_names_table[properties["device.name"]] ~= true then -+ device_names_table[properties["device.name"]] = true - break - end -+ properties["device.name"] = name .. "." .. counter - end - - -- ensure the device has a description -@@ -337,16 +335,21 @@ function createMonitor () - -- handle create-object to prepare device - m:connect("create-object", prepareDevice) - -- -- if dbus reservation, handle object-removed to destroy device reservations -- if rd_plugin then -- m:connect("object-removed", function (parent, id) -- local device = parent:get_managed_object(id) -+ -- handle object-removed to destroy device reservations and recycle device name -+ m:connect("object-removed", function (parent, id) -+ local device = parent:get_managed_object(id) -+ if rd_plugin then - local rd_name = device.properties["api.dbus.ReserveDevice1"] - if rd_name then - rd_plugin:call("destroy-reservation", rd_name) - end -- end) -- end -+ end -+ device_names_table[device.properties["device.name"]] = nil -+ end) -+ -+ -- reset the name tables to make sure names are recycled -+ device_names_table = {} -+ node_names_table = {} - - -- activate monitor - Log.info("Activating ALSA monitor") --- -GitLab - diff --git a/media-video/wireplumber/files/wireplumber-0.4.10-config-fix-enabled-property-to-default-to-true-when.patch b/media-video/wireplumber/files/wireplumber-0.4.10-config-fix-enabled-property-to-default-to-true-when.patch deleted file mode 100644 index 40a486616580..000000000000 --- a/media-video/wireplumber/files/wireplumber-0.4.10-config-fix-enabled-property-to-default-to-true-when.patch +++ /dev/null @@ -1,129 +0,0 @@ -https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/1f045309208ab5d927883b5adc2b7d1623fae162 - -From 1f045309208ab5d927883b5adc2b7d1623fae162 Mon Sep 17 00:00:00 2001 -From: George Kiagiadakis <george.kiagiadakis@collabora.com> -Date: Thu, 12 May 2022 12:19:38 +0300 -Subject: [PATCH] config: fix enabled property to default to "true" when not - defined - -Fixes backwards compatibility with older config files - -Fixes: #254 ---- - src/config/bluetooth.lua.d/30-bluez-monitor.lua | 2 +- - src/config/main.lua.d/20-default-access.lua | 2 +- - src/config/main.lua.d/30-alsa-monitor.lua | 2 +- - src/config/main.lua.d/30-libcamera-monitor.lua | 2 +- - src/config/main.lua.d/30-v4l2-monitor.lua | 2 +- - src/config/main.lua.d/40-device-defaults.lua | 2 +- - src/config/main.lua.d/40-stream-defaults.lua | 2 +- - src/config/policy.lua.d/10-default-policy.lua | 2 +- - 8 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/src/config/bluetooth.lua.d/30-bluez-monitor.lua b/src/config/bluetooth.lua.d/30-bluez-monitor.lua -index b40026c2..a870aa5d 100644 ---- a/src/config/bluetooth.lua.d/30-bluez-monitor.lua -+++ b/src/config/bluetooth.lua.d/30-bluez-monitor.lua -@@ -3,7 +3,7 @@ bluez_monitor.properties = {} - bluez_monitor.rules = {} - - function bluez_monitor.enable() -- if not bluez_monitor.enabled then -+ if bluez_monitor.enabled == false then - return - end - -diff --git a/src/config/main.lua.d/20-default-access.lua b/src/config/main.lua.d/20-default-access.lua -index a6ffb2ee..0a7eb955 100644 ---- a/src/config/main.lua.d/20-default-access.lua -+++ b/src/config/main.lua.d/20-default-access.lua -@@ -3,7 +3,7 @@ default_access.properties = {} - default_access.rules = {} - - function default_access.enable() -- if not default_access.enabled then -+ if default_access.enabled == false then - return - end - -diff --git a/src/config/main.lua.d/30-alsa-monitor.lua b/src/config/main.lua.d/30-alsa-monitor.lua -index da0b2c70..8e45e434 100644 ---- a/src/config/main.lua.d/30-alsa-monitor.lua -+++ b/src/config/main.lua.d/30-alsa-monitor.lua -@@ -3,7 +3,7 @@ alsa_monitor.properties = {} - alsa_monitor.rules = {} - - function alsa_monitor.enable() -- if not alsa_monitor.enabled then -+ if alsa_monitor.enabled == false then - return - end - -diff --git a/src/config/main.lua.d/30-libcamera-monitor.lua b/src/config/main.lua.d/30-libcamera-monitor.lua -index 4a8257ff..cd820a83 100644 ---- a/src/config/main.lua.d/30-libcamera-monitor.lua -+++ b/src/config/main.lua.d/30-libcamera-monitor.lua -@@ -3,7 +3,7 @@ libcamera_monitor.properties = {} - libcamera_monitor.rules = {} - - function libcamera_monitor.enable() -- if not libcamera_monitor.enabled then -+ if libcamera_monitor.enabled == false then - return - end - -diff --git a/src/config/main.lua.d/30-v4l2-monitor.lua b/src/config/main.lua.d/30-v4l2-monitor.lua -index 7cfd4bcd..3fbdc9e7 100644 ---- a/src/config/main.lua.d/30-v4l2-monitor.lua -+++ b/src/config/main.lua.d/30-v4l2-monitor.lua -@@ -3,7 +3,7 @@ v4l2_monitor.properties = {} - v4l2_monitor.rules = {} - - function v4l2_monitor.enable() -- if not v4l2_monitor.enabled then -+ if v4l2_monitor.enabled == false then - return - end - -diff --git a/src/config/main.lua.d/40-device-defaults.lua b/src/config/main.lua.d/40-device-defaults.lua -index 55aafe85..2204c4ac 100644 ---- a/src/config/main.lua.d/40-device-defaults.lua -+++ b/src/config/main.lua.d/40-device-defaults.lua -@@ -38,7 +38,7 @@ device_defaults.persistent_profiles = { - } - - function device_defaults.enable() -- if not device_defaults.enabled then -+ if device_defaults.enabled == false then - return - end - -diff --git a/src/config/main.lua.d/40-stream-defaults.lua b/src/config/main.lua.d/40-stream-defaults.lua -index 2975f4f6..307d83df 100644 ---- a/src/config/main.lua.d/40-stream-defaults.lua -+++ b/src/config/main.lua.d/40-stream-defaults.lua -@@ -25,7 +25,7 @@ stream_defaults.rules = { - } - - function stream_defaults.enable() -- if not stream_defaults.enabled then -+ if stream_defaults.enabled == false then - return - end - -diff --git a/src/config/policy.lua.d/10-default-policy.lua b/src/config/policy.lua.d/10-default-policy.lua -index 7b00e94e..edfdeb1c 100644 ---- a/src/config/policy.lua.d/10-default-policy.lua -+++ b/src/config/policy.lua.d/10-default-policy.lua -@@ -38,7 +38,7 @@ bluetooth_policy.policy = { - } - - function default_policy.enable() -- if not default_policy.enabled then -+ if default_policy.enabled == false then - return - end - --- -GitLab - diff --git a/media-video/wireplumber/files/wireplumber-0.4.10-m-default-nodes-don-t-check-if-all-device-nodes-are.patch b/media-video/wireplumber/files/wireplumber-0.4.10-m-default-nodes-don-t-check-if-all-device-nodes-are.patch deleted file mode 100644 index d9c51489a893..000000000000 --- a/media-video/wireplumber/files/wireplumber-0.4.10-m-default-nodes-don-t-check-if-all-device-nodes-are.patch +++ /dev/null @@ -1,187 +0,0 @@ -https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/392cce2136e81ac3146078eacbbae85b694c917a - -From 392cce2136e81ac3146078eacbbae85b694c917a Mon Sep 17 00:00:00 2001 -From: Julian Bouzas <julian.bouzas@collabora.com> -Date: Fri, 20 May 2022 07:38:24 -0400 -Subject: [PATCH] m-default-nodes: don't check if all device nodes are ready - when finding default node - -This check was originally added to avoid a small audio glitch when changing -default nodes while also changing the device profile (eg Gnome Sound Settings). -The check is removed because it causes issues when disabling alsa nodes. There -are plans to fix the audio glitch issue in the future with the planned -event-dispatcher architecture. - -Fixes #279 ---- - modules/module-default-nodes.c | 136 --------------------------------- - 1 file changed, 136 deletions(-) - -diff --git a/modules/module-default-nodes.c b/modules/module-default-nodes.c -index 0fdaed5..577f9bb 100644 ---- a/modules/module-default-nodes.c -+++ b/modules/module-default-nodes.c -@@ -345,135 +345,6 @@ reevaluate_default_node (WpDefaultNodes * self, WpMetadata *m, gint node_t) - } - } - --static guint --get_device_total_nodes (WpPipewireObject * proxy) --{ -- g_autoptr (WpIterator) profiles = NULL; -- g_auto (GValue) item = G_VALUE_INIT; -- -- profiles = wp_pipewire_object_enum_params_sync (proxy, "Profile", NULL); -- if (!profiles) -- return 0; -- -- for (; wp_iterator_next (profiles, &item); g_value_unset (&item)) { -- WpSpaPod *pod = g_value_get_boxed (&item); -- gint idx = -1; -- const gchar *name = NULL; -- g_autoptr (WpSpaPod) classes = NULL; -- -- /* Parse */ -- if (!wp_spa_pod_get_object (pod, NULL, -- "index", "i", &idx, -- "name", "s", &name, -- "classes", "?P", &classes, -- NULL)) -- continue; -- if (!classes) -- continue; -- -- /* Parse profile classes */ -- { -- g_autoptr (WpIterator) it = wp_spa_pod_new_iterator (classes); -- g_auto (GValue) v = G_VALUE_INIT; -- gint total_nodes = 0; -- for (; wp_iterator_next (it, &v); g_value_unset (&v)) { -- WpSpaPod *entry = g_value_get_boxed (&v); -- g_autoptr (WpSpaPodParser) pp = NULL; -- const gchar *media_class = NULL; -- gint n_nodes = 0; -- g_return_val_if_fail (entry, 0); -- if (!wp_spa_pod_is_struct (entry)) -- continue; -- pp = wp_spa_pod_parser_new_struct (entry); -- g_return_val_if_fail (pp, 0); -- g_return_val_if_fail (wp_spa_pod_parser_get_string (pp, &media_class), 0); -- g_return_val_if_fail (wp_spa_pod_parser_get_int (pp, &n_nodes), 0); -- wp_spa_pod_parser_end (pp); -- -- total_nodes += n_nodes; -- } -- -- if (total_nodes > 0) -- return total_nodes; -- } -- } -- -- return 0; --} -- --static gboolean --nodes_ready (WpDefaultNodes * self) --{ -- g_autoptr (WpIterator) it = NULL; -- g_auto (GValue) val = G_VALUE_INIT; -- -- /* Get the total number of nodes for each device and make sure they exist -- * and have at least 1 port */ -- it = wp_object_manager_new_filtered_iterator (self->rescan_om, -- WP_TYPE_DEVICE, NULL); -- for (; wp_iterator_next (it, &val); g_value_unset (&val)) { -- WpPipewireObject *device = g_value_get_object (&val); -- guint total_nodes = get_device_total_nodes (device); -- if (total_nodes > 0) { -- guint32 device_id = wp_proxy_get_bound_id (WP_PROXY (device)); -- g_autoptr (WpIterator) node_it = NULL; -- g_auto (GValue) node_val = G_VALUE_INIT; -- guint ready_nodes = 0; -- -- node_it = wp_object_manager_new_filtered_iterator (self->rescan_om, -- WP_TYPE_NODE, WP_CONSTRAINT_TYPE_PW_PROPERTY, -- PW_KEY_DEVICE_ID, "=i", device_id, NULL); -- for (; wp_iterator_next (node_it, &node_val); g_value_unset (&node_val)) { -- WpPipewireObject *node = g_value_get_object (&node_val); -- g_autoptr (WpPort) port = -- wp_object_manager_lookup (self->rescan_om, -- WP_TYPE_PORT, WP_CONSTRAINT_TYPE_PW_PROPERTY, -- PW_KEY_NODE_ID, "=u", wp_proxy_get_bound_id (WP_PROXY (node)), -- NULL); -- if (port) -- ready_nodes++; -- } -- -- if (ready_nodes < total_nodes) { -- const gchar *device_name = wp_pipewire_object_get_property ( -- WP_PIPEWIRE_OBJECT (device), PW_KEY_DEVICE_NAME); -- wp_debug_object (self, "device '%s' is not ready (%d/%d)", device_name, -- ready_nodes, total_nodes); -- return FALSE; -- } -- } -- } -- -- /* Make sure Audio and Video virtual sources have ports */ -- { -- g_autoptr (WpIterator) node_it = NULL; -- g_auto (GValue) node_val = G_VALUE_INIT; -- node_it = wp_object_manager_new_filtered_iterator (self->rescan_om, -- WP_TYPE_NODE, WP_CONSTRAINT_TYPE_PW_PROPERTY, PW_KEY_DEVICE_ID, "-", -- NULL); -- for (; wp_iterator_next (node_it, &node_val); g_value_unset (&node_val)) { -- WpPipewireObject *node = g_value_get_object (&node_val); -- const gchar *media_class = wp_pipewire_object_get_property ( -- WP_PIPEWIRE_OBJECT (node), PW_KEY_MEDIA_CLASS); -- g_autoptr (WpPort) port = -- wp_object_manager_lookup (self->rescan_om, -- WP_TYPE_PORT, WP_CONSTRAINT_TYPE_PW_PROPERTY, -- PW_KEY_NODE_ID, "=u", wp_proxy_get_bound_id (WP_PROXY (node)), -- NULL); -- if (!port && -- (g_strcmp0 ("Audio/Source/Virtual", media_class) == 0 || -- g_strcmp0 ("Video/Source/Virtual", media_class) == 0)) { -- const gchar *node_name = wp_pipewire_object_get_property ( -- WP_PIPEWIRE_OBJECT (node), PW_KEY_NODE_NAME); -- wp_debug_object (self, "virtual node '%s' is not ready", node_name); -- return FALSE; -- } -- } -- } -- -- return TRUE; --} -- - static void - sync_rescan (WpCore * core, GAsyncResult * res, WpDefaultNodes * self) - { -@@ -491,10 +362,6 @@ sync_rescan (WpCore * core, GAsyncResult * res, WpDefaultNodes * self) - if (!metadata) - return; - -- /* Make sure nodes are ready for current profile */ -- if (!nodes_ready (self)) -- return; -- - wp_trace_object (self, "re-evaluating defaults"); - reevaluate_default_node (self, metadata, AUDIO_SINK); - reevaluate_default_node (self, metadata, AUDIO_SOURCE); -@@ -584,13 +451,10 @@ on_metadata_added (WpObjectManager *om, WpMetadata *metadata, gpointer d) - self->rescan_om = wp_object_manager_new (); - wp_object_manager_add_interest (self->rescan_om, WP_TYPE_DEVICE, NULL); - wp_object_manager_add_interest (self->rescan_om, WP_TYPE_NODE, NULL); -- wp_object_manager_add_interest (self->rescan_om, WP_TYPE_PORT, NULL); - wp_object_manager_request_object_features (self->rescan_om, WP_TYPE_DEVICE, - WP_OBJECT_FEATURES_ALL); - wp_object_manager_request_object_features (self->rescan_om, WP_TYPE_NODE, - WP_OBJECT_FEATURES_ALL); -- wp_object_manager_request_object_features (self->rescan_om, WP_TYPE_PORT, -- WP_OBJECT_FEATURES_ALL); - g_signal_connect_object (self->rescan_om, "objects-changed", - G_CALLBACK (schedule_rescan), self, G_CONNECT_SWAPPED); - g_signal_connect_object (self->rescan_om, "object-added", --- -2.35.1 - diff --git a/media-video/wireplumber/files/wireplumber-0.4.10-m-lua-scripting-allow-converting-GValue-holding-NUL.patch b/media-video/wireplumber/files/wireplumber-0.4.10-m-lua-scripting-allow-converting-GValue-holding-NUL.patch deleted file mode 100644 index c319ac4a617b..000000000000 --- a/media-video/wireplumber/files/wireplumber-0.4.10-m-lua-scripting-allow-converting-GValue-holding-NUL.patch +++ /dev/null @@ -1,36 +0,0 @@ -https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/c2f31bb550755acba31da2e9f5bbdf646ed5e805 - -From c2f31bb550755acba31da2e9f5bbdf646ed5e805 Mon Sep 17 00:00:00 2001 -From: Julian Bouzas <julian.bouzas@collabora.com> -Date: Mon, 16 May 2022 15:41:10 -0400 -Subject: [PATCH] m-lua-scripting: allow converting GValue holding NULL objects - to Lua - ---- - modules/module-lua-scripting/wplua/value.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/modules/module-lua-scripting/wplua/value.c b/modules/module-lua-scripting/wplua/value.c -index 133051a4..e31ae4ac 100644 ---- a/modules/module-lua-scripting/wplua/value.c -+++ b/modules/module-lua-scripting/wplua/value.c -@@ -314,9 +314,14 @@ wplua_gvalue_to_lua (lua_State *L, const GValue *v) - wplua_pushboxed (L, G_VALUE_TYPE (v), g_value_dup_boxed (v)); - break; - case G_TYPE_OBJECT: -- case G_TYPE_INTERFACE: -- wplua_pushobject (L, g_value_dup_object (v)); -+ case G_TYPE_INTERFACE: { -+ GObject *object = g_value_dup_object (v); -+ if (object) -+ wplua_pushobject (L, g_value_dup_object (v)); -+ else -+ lua_pushnil (L); - break; -+ } - case G_TYPE_ENUM: - wplua_enum_to_lua (L, g_value_get_enum (v), G_VALUE_TYPE (v)); - break; --- -GitLab - diff --git a/media-video/wireplumber/files/wireplumber-0.4.10-m-lua-scripting-fix-object-refcounting.patch b/media-video/wireplumber/files/wireplumber-0.4.10-m-lua-scripting-fix-object-refcounting.patch deleted file mode 100644 index 0b86979ce732..000000000000 --- a/media-video/wireplumber/files/wireplumber-0.4.10-m-lua-scripting-fix-object-refcounting.patch +++ /dev/null @@ -1,32 +0,0 @@ -https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/7908b8d7be2a2992c57cd549054eda7ce46e4b44 - -From 13b85bd4a25ab374f5e5e90b7288e6987996856e Mon Sep 17 00:00:00 2001 -From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Tue, 24 May 2022 11:35:15 +0200 -Subject: [PATCH] m-lua-scripting: fix object refcounting - -7908b8d7be2a2992c57cd549054eda7ce46e4b44 ("m-lua-scripting: allow -converting GValue holding NULL objects to Lua") accidentally added a second -refcount. As a result, the objects are never freeded. - -Remove the second refcount to fix this. ---- - modules/module-lua-scripting/wplua/value.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/module-lua-scripting/wplua/value.c b/modules/module-lua-scripting/wplua/value.c -index e31ae4a..a7927dc 100644 ---- a/modules/module-lua-scripting/wplua/value.c -+++ b/modules/module-lua-scripting/wplua/value.c -@@ -317,7 +317,7 @@ wplua_gvalue_to_lua (lua_State *L, const GValue *v) - case G_TYPE_INTERFACE: { - GObject *object = g_value_dup_object (v); - if (object) -- wplua_pushobject (L, g_value_dup_object (v)); -+ wplua_pushobject (L, object); - else - lua_pushnil (L); - break; --- -2.35.1 - diff --git a/media-video/wireplumber/wireplumber-0.4.10-r4.ebuild b/media-video/wireplumber/wireplumber-0.4.10-r4.ebuild deleted file mode 100644 index 820d1ed7d4a3..000000000000 --- a/media-video/wireplumber/wireplumber-0.4.10-r4.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-{3,4} ) - -inherit lua-single meson systemd - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/pipewire/${PN}.git" - EGIT_BRANCH="master" - 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" -fi - -DESCRIPTION="Replacement for pipewire-media-session" -HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber" - -LICENSE="MIT" -SLOT="0/0.4" -IUSE="elogind system-service systemd test" - -REQUIRED_USE=" - ${LUA_REQUIRED_USE} - ?? ( elogind systemd ) - system-service? ( systemd ) -" - -RESTRICT="!test? ( test )" - -# introspection? ( dev-libs/gobject-introspection ) is valid but likely only used for doc building -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/libintl - elogind? ( sys-auth/elogind ) - systemd? ( sys-apps/systemd ) -" - -# Any dev-lua/* deps get declared like this inside RDEPEND: -# $(lua_gen_cond_dep ' -# dev-lua/<NAME>[${LUA_USEDEP}] -# ') -RDEPEND="${DEPEND} - system-service? ( - acct-user/pipewire - acct-group/pipewire - ) -" - -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 -) - -src_configure() { - local emesonargs=( - -Ddoc=disabled # Ebuild not wired up yet (Sphinx, Doxygen?) - -Dintrospection=disabled # Only used for Sphinx doc generation - -Dsystem-lua=true # We always unbundle everything we can - -Dsystem-lua-version=$(ver_cut 1-2 $(lua_get_version)) - $(meson_feature elogind) - $(meson_feature systemd) - $(meson_use system-service systemd-system-service) - $(meson_use systemd systemd-user-service) - -Dsystemd-system-unit-dir=$(systemd_get_systemunitdir) - -Dsystemd-user-unit-dir=$(systemd_get_userunitdir) - $(meson_use test tests) - ) - - meson_src_configure -} - -src_install() { - meson_src_install - - # We copy the default config, so that Gentoo tools can pick up on any - # updates and /etc does not end up with stale overrides. - # If a reflinking CoW filesystem is used (e.g. Btrfs), then the files - # will not actually get stored twice until modified. - insinto /etc - doins -r "${ED}"/usr/share/wireplumber -} - -pkg_postinst() { - if systemd_is_booted ; then - ewarn "pipewire-media-session.service is no longer installed. You must switch" - ewarn "to wireplumber.service user unit before your next logout/reboot:" - ewarn "systemctl --user disable pipewire-media-session.service" - ewarn "systemctl --user --force enable wireplumber.service" - else - ewarn "Switch to WirePlumber will happen the next time gentoo-pipewire-launcher" - ewarn "is started (a replacement for directly calling pipewire binary)." - ewarn - ewarn "Please ensure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist" - ewarn "or, if it does exist, that any reference to" - ewarn "${EROOT}/usr/bin/pipewire-media-session is commented out (begins with a #)." - 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 WirePlumber 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/wireplumber/wireplumber-0.4.11-r2.ebuild b/media-video/wireplumber/wireplumber-0.4.11-r2.ebuild deleted file mode 100644 index 8cef1f20f182..000000000000 --- a/media-video/wireplumber/wireplumber-0.4.11-r2.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# 1. Please regularly check (even at the point of bumping) Fedora's packaging -# for needed backports at https://src.fedoraproject.org/rpms/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 - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/pipewire/${PN}.git" - EGIT_BRANCH="master" - 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" -fi - -DESCRIPTION="Replacement for pipewire-media-session" -HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber" - -LICENSE="MIT" -SLOT="0/0.4" -IUSE="elogind system-service systemd test" - -REQUIRED_USE=" - ${LUA_REQUIRED_USE} - ?? ( elogind systemd ) - system-service? ( systemd ) -" - -RESTRICT="!test? ( test )" - -# introspection? ( dev-libs/gobject-introspection ) is valid but likely only used for doc building -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.53-r1:= - virtual/libintl - elogind? ( sys-auth/elogind ) - systemd? ( sys-apps/systemd ) -" - -# Any dev-lua/* deps get declared like this inside RDEPEND: -# $(lua_gen_cond_dep ' -# dev-lua/<NAME>[${LUA_USEDEP}] -# ') -RDEPEND="${DEPEND} - system-service? ( - acct-user/pipewire - acct-group/pipewire - ) -" - -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 - "${FILESDIR}"/${P}-dbus-reconnect-crash.patch -) - -src_configure() { - local emesonargs=( - -Ddoc=disabled # Ebuild not wired up yet (Sphinx, Doxygen?) - -Dintrospection=disabled # Only used for Sphinx doc generation - -Dsystem-lua=true # We always unbundle everything we can - -Dsystem-lua-version=$(ver_cut 1-2 $(lua_get_version)) - $(meson_feature elogind) - $(meson_feature systemd) - $(meson_use system-service systemd-system-service) - $(meson_use systemd systemd-user-service) - -Dsystemd-system-unit-dir=$(systemd_get_systemunitdir) - -Dsystemd-user-unit-dir=$(systemd_get_userunitdir) - $(meson_use test tests) - ) - - meson_src_configure -} - -src_install() { - meson_src_install - - # We copy the default config, so that Gentoo tools can pick up on any - # updates and /etc does not end up with stale overrides. - # If a reflinking CoW filesystem is used (e.g. Btrfs), then the files - # will not actually get stored twice until modified. - insinto /etc - doins -r "${ED}"/usr/share/wireplumber -} - -pkg_postinst() { - if systemd_is_booted ; then - ewarn "pipewire-media-session.service is no longer installed. You must switch" - ewarn "to wireplumber.service user unit before your next logout/reboot:" - ewarn "systemctl --user disable pipewire-media-session.service" - ewarn "systemctl --user --force enable wireplumber.service" - else - ewarn "Switch to WirePlumber will happen the next time gentoo-pipewire-launcher" - ewarn "is started (a replacement for directly calling pipewire binary)." - ewarn - ewarn "Please ensure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist" - ewarn "or, if it does exist, that any reference to" - ewarn "${EROOT}/usr/bin/pipewire-media-session is commented out (begins with a #)." - 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 WirePlumber 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/wireplumber/wireplumber-0.4.12.ebuild b/media-video/wireplumber/wireplumber-0.4.12-r1.ebuild index ac3004d7449f..59742a6f7bad 100644 --- a/media-video/wireplumber/wireplumber-0.4.12.ebuild +++ b/media-video/wireplumber/wireplumber-0.4.12-r1.ebuild @@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_BRANCH="master" inherit git-r3 else - SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.gz" + SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.bz2" KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" fi diff --git a/media-video/wireplumber/wireplumber-9999.ebuild b/media-video/wireplumber/wireplumber-9999.ebuild index 2a10e58f8187..270ba536de33 100644 --- a/media-video/wireplumber/wireplumber-9999.ebuild +++ b/media-video/wireplumber/wireplumber-9999.ebuild @@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_BRANCH="master" inherit git-r3 else - SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.gz" + SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.bz2" KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" fi |