From 93a93e9a3b53c1a73142a305ea1f8136846942ee Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 22 Dec 2021 14:08:05 +0000
Subject: gentoo resync : 22.12.2021
---
media-video/Manifest.gz | Bin 26668 -> 26344 bytes
media-video/cheese/Manifest | 2 +
media-video/cheese/cheese-41.1.ebuild | 96 +++++++
media-video/clive/Manifest | 3 -
media-video/clive/clive-2.3.0.1.ebuild | 59 ----
media-video/clive/metadata.xml | 18 --
media-video/droidcam/Manifest | 7 +-
media-video/droidcam/droidcam-1.8.0-r1.ebuild | 156 -----------
media-video/droidcam/droidcam-1.8.0.ebuild | 144 ----------
media-video/droidcam/droidcam-1.8.1-r1.ebuild | 156 +++++++++++
.../droidcam/files/droidcam-makefile-fixes.patch | 23 +-
media-video/ffmpeg-chromium/Manifest | 2 +-
.../ffmpeg-chromium/ffmpeg-chromium-96.ebuild | 2 +-
media-video/ffmpeg/Manifest | 2 +-
media-video/ffmpeg/ffmpeg-4.4.1-r1.ebuild | 2 +-
media-video/google2srt/Manifest | 5 -
media-video/google2srt/files/build.xml | 85 ------
media-video/google2srt/google2srt-0.5.6-r1.ebuild | 64 -----
media-video/google2srt/metadata.xml | 20 --
media-video/libva-utils/Manifest | 2 +-
media-video/libva-utils/libva-utils-2.13.0.ebuild | 2 +-
media-video/pipewire/Manifest | 13 +-
.../files/pipewire-0.3.38-find-readline.patch | 36 ---
.../files/pipewire-0.3.38-fix-arm-build.patch | 18 --
.../pipewire-0.3.38-libcamera-null-deref.patch | 70 -----
media-video/pipewire/metadata.xml | 4 +
media-video/pipewire/pipewire-0.3.38.ebuild | 290 --------------------
media-video/pipewire/pipewire-0.3.40-r1.ebuild | 297 --------------------
media-video/pipewire/pipewire-0.3.42-r1.ebuild | 298 +++++++++++++++++++++
media-video/pipewire/pipewire-9999.ebuild | 5 +-
media-video/unifi-video/Manifest | 4 +-
.../unifi-video/unifi-video-3.10.13-r2.ebuild | 86 ------
.../unifi-video/unifi-video-3.10.13-r3.ebuild | 86 ------
.../unifi-video/unifi-video-3.10.13-r4.ebuild | 87 ------
.../unifi-video/unifi-video-3.10.13-r5.ebuild | 92 +++++++
media-video/vidify/Manifest | 4 +-
.../vidify/files/vidify-2.2.6-python310.patch | 16 ++
media-video/vidify/files/vidify-2.2.6-yt-dlp.patch | 122 +++++++++
media-video/vidify/vidify-2.2.6-r2.ebuild | 84 ++++++
media-video/vidify/vidify-2.2.6.ebuild | 78 ------
media-video/vlc/Manifest | 4 +-
media-video/vlc/vlc-3.0.9999.ebuild | 5 +-
media-video/vlc/vlc-9999.ebuild | 7 +-
media-video/wireplumber/Manifest | 4 +-
.../wireplumber/wireplumber-0.4.5-r2.ebuild | 101 +++++++
media-video/wireplumber/wireplumber-9999.ebuild | 6 +-
media-video/yle-dl/Manifest | 4 +-
media-video/yle-dl/yle-dl-20211203.ebuild | 54 ----
media-video/yle-dl/yle-dl-20211213.ebuild | 54 ++++
49 files changed, 1079 insertions(+), 1700 deletions(-)
create mode 100644 media-video/cheese/cheese-41.1.ebuild
delete mode 100644 media-video/clive/Manifest
delete mode 100644 media-video/clive/clive-2.3.0.1.ebuild
delete mode 100644 media-video/clive/metadata.xml
delete mode 100644 media-video/droidcam/droidcam-1.8.0-r1.ebuild
delete mode 100644 media-video/droidcam/droidcam-1.8.0.ebuild
create mode 100644 media-video/droidcam/droidcam-1.8.1-r1.ebuild
delete mode 100644 media-video/google2srt/Manifest
delete mode 100644 media-video/google2srt/files/build.xml
delete mode 100644 media-video/google2srt/google2srt-0.5.6-r1.ebuild
delete mode 100644 media-video/google2srt/metadata.xml
delete mode 100644 media-video/pipewire/files/pipewire-0.3.38-find-readline.patch
delete mode 100644 media-video/pipewire/files/pipewire-0.3.38-fix-arm-build.patch
delete mode 100644 media-video/pipewire/files/pipewire-0.3.38-libcamera-null-deref.patch
delete mode 100644 media-video/pipewire/pipewire-0.3.38.ebuild
delete mode 100644 media-video/pipewire/pipewire-0.3.40-r1.ebuild
create mode 100644 media-video/pipewire/pipewire-0.3.42-r1.ebuild
delete mode 100644 media-video/unifi-video/unifi-video-3.10.13-r2.ebuild
delete mode 100644 media-video/unifi-video/unifi-video-3.10.13-r3.ebuild
delete mode 100644 media-video/unifi-video/unifi-video-3.10.13-r4.ebuild
create mode 100644 media-video/unifi-video/unifi-video-3.10.13-r5.ebuild
create mode 100644 media-video/vidify/files/vidify-2.2.6-python310.patch
create mode 100644 media-video/vidify/files/vidify-2.2.6-yt-dlp.patch
create mode 100644 media-video/vidify/vidify-2.2.6-r2.ebuild
delete mode 100644 media-video/vidify/vidify-2.2.6.ebuild
create mode 100644 media-video/wireplumber/wireplumber-0.4.5-r2.ebuild
delete mode 100644 media-video/yle-dl/yle-dl-20211203.ebuild
create mode 100644 media-video/yle-dl/yle-dl-20211213.ebuild
(limited to 'media-video')
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index ca3a9b244fef..4060f7ae2332 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/cheese/Manifest b/media-video/cheese/Manifest
index f03192d569ae..01f9c94dd887 100644
--- a/media-video/cheese/Manifest
+++ b/media-video/cheese/Manifest
@@ -2,6 +2,8 @@ AUX cheese-3.38.0-Fix-infinite-loop-if-thumbnailer-is-not-available.patch 4008 B
AUX cheese-3.38.0-buildfix.patch 736 BLAKE2B 3118378b5b125ae6fe223d3b114e07805eb2b5d300bb78ec6b8ff3888f19a0b68af0091aa33918c885991a86293c5cc530d65a75d433cd7c5d343889e5740fbe SHA512 6633f5ebdb2662d199d3f44f49754c8e2c9cd2d864084bff079f4f4de9f20d15489f84ca3acba46df0c9af36920c57b1eca94748c097cb744f71669a69fada47
AUX cheese-3.38.0-vala-genericarray.patch 6731 BLAKE2B 83f283e629106eba1174197f4b0afc9929fcaaaaa6d29ecaa59cbee97a373589638c2aa0da122db0bd11142ef2790e08b8e3a97e757837f4ce420c0f588609a7 SHA512 de93e2664331a792205c29cf893317719b182bece4185452e705cc349d48dbe46d7320a337e16d923dee4da693c07ba0542b4bc4367162212c7df549313849c2
DIST cheese-3.38.0.tar.xz 1086428 BLAKE2B b26a19a019de0385bdd7adbc55c873ebceca90a8f477d2041ef4a5045654f46ee8f7fdfc64f5fd34e059116528cc790610353791a7cbd13d7927a8c3abf38132 SHA512 210b50fc79a7b3a72c94163fe0dd76f7f29f576c1085c671c2c6c3b7f59ee362aec288f885a590ebfd9530534b6a6bad569c6df57874b9fcecf7e9f1ba9531ae
+DIST cheese-41.1.tar.xz 1092912 BLAKE2B 9bbfbc59868f39b344b1102f819ca647d82e9dee327f1d2a2e6b30fcfd2c59dd5f79236355d7148e01a4b07d80d630406708d2a152535b5732cfb52690f9f402 SHA512 2c0922dda97f4ce701add45977b405eff9ddbc24eb286e9e05a9f9bfbd7998e8e77ef2a8f1bbce9f8349ff522ee3cb6d6566fa5df80d782e6d844bff69a30074
EBUILD cheese-3.38.0-r1.ebuild 2328 BLAKE2B 692671c66e723ef87f83efd05db51d0f3e595170892bf17b8b437458acd0b337610a2a395548b1da96c17c863b5a34c537f4f490b64f1ad43f96eb0f2521dbac SHA512 d54cb3648889ba2a88d889c38704b1e2fc070b1341d411e2e97375a97f621234de74d4585009b20c46989216ae00b70ee6c1e1fcf1bc197b600a42152e4f7339
EBUILD cheese-3.38.0.ebuild 2120 BLAKE2B c28699d5912d6bcf91c9c95b02f00bb1e2c5c88964b67dd46681549eccc0570fe1cd55a3d21bacf5b557ba0bb4c4cd9ac1e4ecea4d13cd067577bca19abda7fa SHA512 5af98575aafab5be072e221cc54d4f317cca56fd1bb60a17c80b5811760d2f63c4140ffeecaa350677491737c2bc4bd66ffc2ca7d7d6be835b978246aad62b4b
+EBUILD cheese-41.1.ebuild 2219 BLAKE2B 68fb5b54457b25b95d5af2f482c0ae62231e1c6ff3af13c3d8b8e1e6087803079d701a4ed130fa6a34745b0ab192b5a6d1b92a524beda40d4143d7077a281374 SHA512 68c554da429ee98577704183a17c28c53b6f58cabe8034be4e375b392edb90e4c8e059a4608fefc2921ca17ac465c0affe8c7ed5b106dcbec4bedae7dc5281f6
MISC metadata.xml 429 BLAKE2B 7874cf680a041c34e7c5f29b164552d311d333853050e5486aa0f8bdae3fce50316cd00038ba8cbbd102912cdb0c8c7fd5d6370af0004c8977e053eb89be9687 SHA512 ea2a94d4981bc40d13235bfa9a544855cdeb638e46293c84bfaf14f13dc255651c0eb01752b5987b42e285765ed2dbd65dbd58eb23c730e4cbd7fc31e0003fc8
diff --git a/media-video/cheese/cheese-41.1.ebuild b/media-video/cheese/cheese-41.1.ebuild
new file mode 100644
index 000000000000..67324c0a5595
--- /dev/null
+++ b/media-video/cheese/cheese-41.1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson vala virtualx xdg
+
+DESCRIPTION="A cheesy program to take pictures and videos from your webcam"
+HOMEPAGE="https://wiki.gnome.org/Apps/Cheese"
+
+LICENSE="GPL-2+"
+SLOT="0/8" # subslot = libcheese soname version
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gtk-doc +introspection test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ >=media-libs/clutter-1.13.2:1.0[introspection?]
+ media-libs/clutter-gst:3.0
+ >=media-libs/clutter-gtk-0.91.8:1.0
+ x11-libs/gdk-pixbuf:2[jpeg,introspection?]
+ >=dev-libs/glib-2.39.90:2
+ >=gnome-base/gnome-desktop-2.91.6:3=
+ >=media-libs/gstreamer-1.4:1.0[introspection?]
+ >=media-libs/gst-plugins-base-1.4:1.0[ogg,pango,theora,vorbis]
+ >=media-libs/gst-plugins-bad-1.4:1.0
+ >=x11-libs/gtk+-3.13.4:3
+ >=media-libs/libcanberra-0.26[gtk3]
+ x11-libs/libX11
+ sys-apps/dbus
+ media-video/gnome-video-effects
+ introspection? ( >=dev-libs/gobject-introspection-1.56:= )
+
+ media-libs/cogl:1.0=[introspection?]
+
+"
+RDEPEND="${DEPEND}
+ >=media-libs/gst-plugins-good-1.4:1.0
+
+ >=media-plugins/gst-plugins-jpeg-1.4:1.0
+ >=media-plugins/gst-plugins-v4l2-1.4:1.0
+ >=media-plugins/gst-plugins-vpx-1.4:1.0
+"
+
+BDEPEND="
+ gtk-doc? ( dev-util/gtk-doc )
+ dev-libs/libxslt
+ app-text/docbook-xml-dtd:4.3
+ dev-util/itstool
+ dev-libs/appstream-glib
+ dev-libs/libxml2:2
+ dev-util/glib-utils
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ x11-base/xorg-proto
+ test? ( x11-libs/libXtst )
+ $(vala_depend)
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.38.0-buildfix.patch
+)
+
+src_prepare() {
+ xdg_src_prepare
+ vala_src_prepare
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use gtk-doc gtk_doc)
+ $(meson_use introspection)
+ $(meson_use test tests)
+ -Dman=true
+ )
+
+ meson_src_configure
+
+ # Hack: version.xml is not generated if gtk-doc is not enabled
+ echo ${PV} > docs/reference/version.xml
+}
+
+src_test() {
+ gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
+ virtx meson_src_test
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/media-video/clive/Manifest b/media-video/clive/Manifest
deleted file mode 100644
index a321c907ae22..000000000000
--- a/media-video/clive/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST clive-2.3.0.1.tar.gz 43551 BLAKE2B eea428fdce2598e01e85a81f90110f2f1e4a7d9e8033d39745817d97886f80ddadfe2ba649e9778ab84f11c2f6fe2360eefda24cf5d0285c1a1a248ee7f6b1b6 SHA512 7426d6e8f19c358b30a7d33257d7ee536802eb35442d3cac68f6742613696ab1b280457a65d980237b53b692c5cf311725e46a5d8c27c7f2200172d050337cfc
-EBUILD clive-2.3.0.1.ebuild 1693 BLAKE2B 4e7901be83753258205d9a1da385bc4682378f40a05e2c530aeb96337964a272893d1c11f74ad8bfa85d0647d70ae18b5a6e274f472e3e9a7ec20f925f9cf72d SHA512 e4290fdced6b331e13a9c7c8f669ff380625f829421a756f63d64a23020e53e13f7f7c42615270b0344ebcd9843d2357dfb368321a231460ee7d17b0493e5180
-MISC metadata.xml 700 BLAKE2B 12fb466452d9bbd30c58da35bce88305ef30114c34f971385a29b18f07805a6b25ca95dd5827129dc8735e2ac54ad2275e42e5b1a45e1d54e500f4ba9267c46c SHA512 6e6d8b2d133ffbe4f21d70541887bc8572f53c887e951f0f716712370b5a5136783e219a09654b34ca2a73ae3b95e054682527c65cafe439f0037e42772112d6
diff --git a/media-video/clive/clive-2.3.0.1.ebuild b/media-video/clive/clive-2.3.0.1.ebuild
deleted file mode 100644
index 60f93ec9b36b..000000000000
--- a/media-video/clive/clive-2.3.0.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GENTOO_DEPEND_ON_PERL_SUBSLOT=no
-inherit perl-module
-
-DESCRIPTION="Command line tool for extracting videos from various websites"
-HOMEPAGE="http://clive.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV:0:3}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="clipboard pager password test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-perl/BerkeleyDB-0.34
- >=dev-perl/Config-Tiny-2.12
- >=virtual/perl-Digest-SHA-5.47
- >=dev-perl/HTML-TokeParser-Simple-2.37
- >=dev-perl/Class-Singleton-1.4
- >=dev-perl/WWW-Curl-4.05
- >=dev-perl/XML-Simple-2.18
- >=dev-perl/Getopt-ArgvFile-1.11
- dev-perl/JSON-XS
- dev-perl/URI
- virtual/perl-Getopt-Long
- virtual/perl-File-Spec
- clipboard? ( >=dev-perl/Clipboard-0.09 )
- pager? ( >=dev-perl/IO-Pager-0.05 )
- password? ( >=dev-perl/Expect-1.21 )
- media-libs/quvi
- || ( net-misc/wget net-misc/curl )"
-DEPEND="test? ( dev-perl/Test-Pod ${RDEPEND} )"
-
-SRC_TEST=do
-mydoc="NEWS"
-
-src_install() {
- perl-module_src_install
- dodir /etc/clive
- cat <<-EOF > "${ED}"/etc/clive/config || die
- --quvi "quvi %u"
- --get-with "if type -P wget >/dev/null 2>&1; then wget -c -O %f %u; else curl -L -C - -o %f %u; fi"
- --filename-format "%t.%s"
- EOF
-}
-
-src_test() {
- if [ -z "${I_WANT_CLIVE_HOSTS_TESTS}" ] ; then
- elog "If you wish to run the full testsuite of ${PN}"
- elog "Please set the variable 'I_WANT_CLIVE_HOSTS_TESTS' variable"
- elog "Note that the tests try to download some videos from various websites"
- elog "and thus may randomly fail depending on the site's status."
- export NO_INTERNET=1
- fi
- perl-module_src_test
-}
diff --git a/media-video/clive/metadata.xml b/media-video/clive/metadata.xml
deleted file mode 100644
index dd82ce744e92..000000000000
--- a/media-video/clive/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>media-video@gentoo.org</email>
- </maintainer>
- <longdescription lang="en">Command line tool for extracting videos from Youtube, Google Video,
- Dailymotion, Guba (free) and Stage6 websites</longdescription>
- <use>
- <flag name="clipboard">Support reading from X clipboard</flag>
- <flag name="pager">Support pager!?</flag>
- <flag name="password">Support password controlled sites</flag>
- </use>
- <upstream>
- <remote-id type="google-code">clive</remote-id>
- <remote-id type="sourceforge">clive</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/media-video/droidcam/Manifest b/media-video/droidcam/Manifest
index 58c71a968ec2..8a5d8ab5c764 100644
--- a/media-video/droidcam/Manifest
+++ b/media-video/droidcam/Manifest
@@ -1,5 +1,4 @@
-AUX droidcam-makefile-fixes.patch 1834 BLAKE2B de9b0ae494e419d89dee767afcc78fc8d5222dcd54706ec94a875c032e835015ef60b8a60285a99974df5dde35becd742432bb81e818574022fd699af021e9ad SHA512 5490ce729f622ae93319a299317c1d394cb7af1f1b71c71c1927ae259a6cce682b705eb26fc0c95c467716c9f79b81688ba2d12e33c1c8af4b454333d8cdbca8
-DIST droidcam-1.8.0.tar.gz 84376 BLAKE2B 581e57e2c80dd9662764e399dd797e5893f617e69ee2501a1063d1c51434baf64d7d2b72779debede6d679127f31fa95a4e67953978da591acbf6a41bd05551d SHA512 b448f686562030b352630c6b677a098ecb5041582dd06e57809b04674cb334d02ddfdf1d09b43e1ecc70897e8073714ad6913ab14d894a7679fc433adb3fda82
-EBUILD droidcam-1.8.0-r1.ebuild 3474 BLAKE2B 9cfbca9e3254ddece5369b932294497c1f27bb8e73904d663eb7e727a82cce1a132221a59cd0de8afb8d12ed1cadcd19c4bd19328c9ef104f7d72c5f82579b43 SHA512 c849bb9cbbc84d987da9bf54a7972016142d562dceb8ae4ce81fd04b3a3c6d2da6073f38dabb240eb429244098d48ced1ecbd0254642e4c2573389f55a3d514c
-EBUILD droidcam-1.8.0.ebuild 3094 BLAKE2B 942b8790090c2edbd1a9f35bf7d34e451f51b903a96c62424433b982959c7fc3ecb55a01c5b069869953b416cc6aa421760ca680da7d36dfdaed2fb0f3b5ea98 SHA512 6dc37f34ca0f9f0c4c8e2d0ceb0c8e778726baddd59c3e9c58177f128e8088bb0c92113093ae05e617f54f9fde1f42163908301420aef730c0105902950cc221
+AUX droidcam-makefile-fixes.patch 2178 BLAKE2B 223344a2138b0a93f7eaffda4814236acf19a7cf6d4ee6daa03be3b7c601b549ce77219d03f53dbb1ac11493ff991c08f8d035fb91dbed22b590c07628318640 SHA512 73082410683b81794589816a3158ea66ce1c6717f65454f4528e1b00298c88131fec3f460915cfb603ccb85be1b54134869444924bf63c69cee89f03a275b556
+DIST droidcam-1.8.1.tar.gz 84566 BLAKE2B ba023c98159003bef39eac2fcff211243aa5fb2cc4369a333c5b78c9708b8c34ff9987d6b84628b32e436bab776e0c8c83f75b7c6a788f85831d3d17dd468833 SHA512 58ce6014004edcbf89b4847ed916f9cd2757865172c61e446a04b2f6d93395db1013f0cb31f0b10161bfd83a1436e684891c3457371a3ad62308509bb85b4cf4
+EBUILD droidcam-1.8.1-r1.ebuild 3474 BLAKE2B 97f8aae82515038bcab4e4a24dd2e1c5e900fadb55368781e91622ff4d08b6d98057c37527e9bea79a95365cb8c3b0cef9a22ade480e7ca11dd2de8d172c9830 SHA512 2007f83f3ee34188b208fc5baceecef410c88f38ed596fd1dadd6c35857753bbe9df2eed37525affeee7ac2f1f16783fb0a6935805f91321801ec93d7bad7c44
MISC metadata.xml 1421 BLAKE2B 6d46f5cbd0a226d749b35d8e90a965d4f12fa609b6e95ea6effe87730bce525c0fadb14aa3eb8b99d60f91c7c46a542df5073a55f018f9c06877758360b91e60 SHA512 9dfe075ab79599ecfa3cb9cbf607e4e9a14dd6d002fb3f84bd2d809d962a8bf52b7a0a7166b6805ce4816a57c08e57ab4b224ae1de4e44130bb52f1674ea1e02
diff --git a/media-video/droidcam/droidcam-1.8.0-r1.ebuild b/media-video/droidcam/droidcam-1.8.0-r1.ebuild
deleted file mode 100644
index d81482560789..000000000000
--- a/media-video/droidcam/droidcam-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop linux-mod xdg
-
-DESCRIPTION="Use your phone or tablet as webcam with a v4l device driver and app"
-HOMEPAGE="https://www.dev47apps.com/droidcam/linux/"
-SRC_URI="https://github.com/dev47apps/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="gtk"
-
-# Requires connection to phone/tablet
-RESTRICT="test"
-
-DEPEND="
- app-pda/libplist
- app-pda/libusbmuxd
- dev-libs/glib
- dev-libs/libappindicator:3
- dev-libs/libxml2
- dev-util/android-tools
- media-libs/alsa-lib
- media-libs/libjpeg-turbo
- >=media-libs/speex-1.2.0-r1
- media-video/ffmpeg
- gtk? (
- dev-cpp/gtkmm:3.0
- x11-libs/gdk-pixbuf
- x11-libs/gtk+:3
- x11-libs/libX11
- x11-libs/pango
- )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-BUILD_TARGETS="all"
-MODULE_NAMES="v4l2loopback-dc(video:${S}/v4l2loopback:${S}/v4l2loopback)"
-MODULESD_V4L2LOOPBACK_DC_ENABLED="yes"
-
-CONFIG_CHECK="~SND_ALOOP VIDEO_DEV MEDIA_SUPPORT MEDIA_CAMERA_SUPPORT"
-ERROR_SND_ALOOP="CONFIG_SND_ALOOP is optionally required for audio support"
-
-PATCHES="${FILESDIR}/${PN}-makefile-fixes.patch"
-
-src_prepare() {
- if ! use gtk; then
- sed -i -e '/cflags gtk+/d' Makefile || die
- default
- else
- # remove path and extension from Icon and Exec entry
- sed -i -e 's/Icon=\/opt\/droidcam-icon.png/Icon=droidcam/g' \
- -e 's/\/usr\/local\/bin\/droidcam/droidcam/g' \
- droidcam.desktop || die
- sed -i -e 's%/opt/droidcam-icon.png%/usr/share/icons/hicolor/96x96/apps/droidcam.png%g' src/droidcam.c || die
- xdg_src_prepare
- fi
-}
-
-src_configure() {
- set_arch_to_kernel
- default
-}
-
-src_compile() {
- if use gtk; then
- emake droidcam
- fi
- emake droidcam-cli
-
- if linux_chkconfig_present CC_IS_CLANG; then
- BUILD_PARAMS+=' CC=${CHOST}-clang'
- if linux_chkconfig_present LD_IS_LLD; then
- BUILD_PARAMS+=' LD=ld.lld'
- if linux_chkconfig_present LTO_CLANG_THIN; then
- # kernel enables cache by default leading to sandbox violations
- BUILD_PARAMS+=' ldflags-y=--thinlto-cache-dir= LDFLAGS_MODULE=--thinlto-cache-dir='
- fi
- fi
- fi
- export KERNEL_DIR || die
- linux-mod_src_compile
-}
-
-src_test() {
- pushd "v4l2loopback" || die
- default
- ./test || die
- popd || die
-}
-
-src_install() {
- if use gtk; then
- dobin droidcam
- newicon -s 32 icon.png droidcam.png
- newicon -s 96 icon2.png droidcam.png
- domenu droidcam.desktop
- fi
- dobin droidcam-cli
-
- # The cli and gui do not auto load the module if unloaded (why not though?)
- # so we just put it in modules-load.d to make sure it always works
- insinto /etc/modules-load.d
- if linux_config_exists; then
- if linux_chkconfig_module SND_ALOOP; then
- newins - "${PN}.conf" <<-EOF
- v4l2loopback-dc
- snd_aloop
- EOF
- else
- newins - "${PN}.conf" <<-EOF
- v4l2loopback-dc
- EOF
- fi
- fi
-
- einstalldocs
- linux-mod_src_install
-}
-
-pkg_preinst() {
- linux-mod_pkg_preinst
- if use gtk; then
- xdg_pkg_preinst
- fi
-}
-
-pkg_postinst() {
- linux-mod_pkg_postinst
- if use gtk; then
- xdg_pkg_postinst
- else
- elog
- elog "Only droidcam-cli has been installed since 'gtk' flag was not set"
- elog
- fi
-
- elog "The default resolution for v4l2loopback-dc (i.e. droidcam) is 640x480."
- elog "You can change this value in /etc/modprobe.d/v4l2loopback-dc.conf"
- elog
- elog "Links to the Android/iPhone/iPad apps can be found at"
- elog "https://www.dev47apps.com/"
-}
-
-pkg_postrm() {
- linux-mod_pkg_postrm
- if use gtk; then
- xdg_pkg_postrm
- fi
-}
diff --git a/media-video/droidcam/droidcam-1.8.0.ebuild b/media-video/droidcam/droidcam-1.8.0.ebuild
deleted file mode 100644
index 60f47eb1847b..000000000000
--- a/media-video/droidcam/droidcam-1.8.0.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop linux-mod xdg
-
-DESCRIPTION="Use your phone or tablet as webcam with a v4l device driver and app"
-HOMEPAGE="https://www.dev47apps.com/droidcam/linux/"
-SRC_URI="https://github.com/dev47apps/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="gtk"
-
-# Requires connection to phone/tablet
-RESTRICT="test"
-
-DEPEND="
- app-pda/libplist
- app-pda/libusbmuxd
- dev-libs/glib
- dev-libs/libappindicator:3
- dev-libs/libxml2
- dev-util/android-tools
- media-libs/alsa-lib
- media-libs/libjpeg-turbo
- >=media-libs/speex-1.2.0-r1
- media-video/ffmpeg
- gtk? (
- dev-cpp/gtkmm:3.0
- x11-libs/gdk-pixbuf
- x11-libs/gtk+:3
- x11-libs/libX11
- x11-libs/pango
- )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-BUILD_TARGETS="all"
-MODULE_NAMES="v4l2loopback-dc(video:${S}/v4l2loopback:${S}/v4l2loopback)"
-MODULESD_V4L2LOOPBACK_DC_ENABLED="yes"
-
-CONFIG_CHECK="~SND_ALOOP VIDEO_DEV MEDIA_SUPPORT MEDIA_CAMERA_SUPPORT"
-ERROR_SND_ALOOP="CONFIG_SND_ALOOP is optionally required for audio support"
-
-PATCHES="${FILESDIR}/${PN}-makefile-fixes.patch"
-
-src_prepare() {
- if ! use gtk; then
- sed -i -e '/cflags gtk+/d' Makefile || die
- default
- else
- # remove path and extension from Icon and Exec entry
- sed -i -e 's/Icon=\/opt\/droidcam-icon.png/Icon=droidcam/g' \
- -e 's/\/usr\/local\/bin\/droidcam/droidcam/g' \
- droidcam.desktop || die
- sed -i -e 's%/opt/droidcam-icon.png%/usr/share/icons/hicolor/96x96/apps/droidcam.png%g' src/droidcam.c || die
- xdg_src_prepare
- fi
-}
-
-src_configure() {
- set_arch_to_kernel
- default
-}
-
-src_compile() {
- if use gtk; then
- emake droidcam
- fi
- emake droidcam-cli
- KERNELRELEASE="${KV_FULL}" linux-mod_src_compile
-}
-
-src_test() {
- pushd "v4l2loopback" || die
- default
- ./test || die
- popd || die
-}
-
-src_install() {
- if use gtk; then
- dobin droidcam
- newicon -s 32 icon.png droidcam.png
- newicon -s 96 icon2.png droidcam.png
- domenu droidcam.desktop
- fi
- dobin droidcam-cli
-
- # The cli and gui do not auto load the module if unloaded (why not though?)
- # so we just put it in modules-load.d to make sure it always works
- insinto /etc/modules-load.d
- if linux_config_exists; then
- if linux_chkconfig_module SND_ALOOP; then
- newins - "${PN}.conf" <<-EOF
- v4l2loopback-dc
- snd_aloop
- EOF
- else
- newins - "${PN}.conf" <<-EOF
- v4l2loopback-dc
- EOF
- fi
- fi
-
- einstalldocs
- linux-mod_src_install
-}
-
-pkg_preinst() {
- if use gtk; then
- xdg_pkg_preinst
- fi
- linux-mod_pkg_preinst
-}
-
-pkg_postinst() {
- linux-mod_pkg_postinst
- if use gtk; then
- xdg_pkg_postinst
- else
- elog
- elog "Only droidcam-cli has been installed since 'gtk' flag was not set"
- elog
- fi
-
- elog "The default resolution for v4l2loopback-dc (i.e. droidcam) is 640x480."
- elog "You can change this value in /etc/modprobe.d/v4l2loopback-dc.conf"
- elog
- elog "Links to the Android/iPhone/iPad apps can be found at"
- elog "https://www.dev47apps.com/"
-}
-
-pkg_postrm() {
- if use gtk; then
- xdg_pkg_postrm
- fi
- linux-mod_pkg_postrm
-}
diff --git a/media-video/droidcam/droidcam-1.8.1-r1.ebuild b/media-video/droidcam/droidcam-1.8.1-r1.ebuild
new file mode 100644
index 000000000000..ffafcc099bd0
--- /dev/null
+++ b/media-video/droidcam/droidcam-1.8.1-r1.ebuild
@@ -0,0 +1,156 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop linux-mod xdg
+
+DESCRIPTION="Use your phone or tablet as webcam with a v4l device driver and app"
+HOMEPAGE="https://www.dev47apps.com/droidcam/linux/"
+SRC_URI="https://github.com/dev47apps/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="gtk"
+
+# Requires connection to phone/tablet
+RESTRICT="test"
+
+DEPEND="
+ app-pda/libplist
+ app-pda/libusbmuxd
+ dev-libs/glib
+ dev-libs/libappindicator:3
+ dev-libs/libxml2
+ dev-util/android-tools
+ media-libs/alsa-lib
+ media-libs/libjpeg-turbo
+ >=media-libs/speex-1.2.0-r1
+ media-video/ffmpeg
+ gtk? (
+ dev-cpp/gtkmm:3.0
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:3
+ x11-libs/libX11
+ x11-libs/pango
+ )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+BUILD_TARGETS="all"
+MODULE_NAMES="v4l2loopback-dc(video:${S}/v4l2loopback:${S}/v4l2loopback)"
+MODULESD_V4L2LOOPBACK_DC_ENABLED="yes"
+
+CONFIG_CHECK="~SND_ALOOP VIDEO_DEV MEDIA_SUPPORT MEDIA_CAMERA_SUPPORT"
+ERROR_SND_ALOOP="CONFIG_SND_ALOOP is optionally required for audio support"
+
+PATCHES="${FILESDIR}/${PN}-makefile-fixes.patch"
+
+src_prepare() {
+ if ! use gtk; then
+ default
+ sed -i -e '/cflags gtk+/d' Makefile || die
+ else
+ xdg_src_prepare
+ # remove path and extension from Icon and Exec entry
+ sed -i -e 's/Icon=\/opt\/droidcam-icon.png/Icon=droidcam/g' \
+ -e 's/\/usr\/local\/bin\/droidcam/droidcam/g' \
+ droidcam.desktop || die
+ sed -i -e 's%/opt/droidcam-icon.png%/usr/share/icons/hicolor/96x96/apps/droidcam.png%g' src/droidcam.c || die
+ fi
+}
+
+src_configure() {
+ set_arch_to_kernel
+ default
+}
+
+src_compile() {
+ if use gtk; then
+ emake droidcam
+ fi
+ emake droidcam-cli
+
+ if linux_chkconfig_present CC_IS_CLANG; then
+ BUILD_PARAMS+=' CC=${CHOST}-clang'
+ if linux_chkconfig_present LD_IS_LLD; then
+ BUILD_PARAMS+=' LD=ld.lld'
+ if linux_chkconfig_present LTO_CLANG_THIN; then
+ # kernel enables cache by default leading to sandbox violations
+ BUILD_PARAMS+=' ldflags-y=--thinlto-cache-dir= LDFLAGS_MODULE=--thinlto-cache-dir='
+ fi
+ fi
+ fi
+ export KERNEL_DIR || die
+ linux-mod_src_compile
+}
+
+src_test() {
+ pushd "v4l2loopback" || die
+ default
+ ./test || die
+ popd || die
+}
+
+src_install() {
+ if use gtk; then
+ dobin droidcam
+ newicon -s 32 icon.png droidcam.png
+ newicon -s 96 icon2.png droidcam.png
+ domenu droidcam.desktop
+ fi
+ dobin droidcam-cli
+
+ # The cli and gui do not auto load the module if unloaded (why not though?)
+ # so we just put it in modules-load.d to make sure it always works
+ insinto /etc/modules-load.d
+ if linux_config_exists; then
+ if linux_chkconfig_module SND_ALOOP; then
+ newins - "${PN}.conf" <<-EOF
+ v4l2loopback-dc
+ snd_aloop
+ EOF
+ else
+ newins - "${PN}.conf" <<-EOF
+ v4l2loopback-dc
+ EOF
+ fi
+ fi
+
+ einstalldocs
+ linux-mod_src_install
+}
+
+pkg_preinst() {
+ linux-mod_pkg_preinst
+ if use gtk; then
+ xdg_pkg_preinst
+ fi
+}
+
+pkg_postinst() {
+ linux-mod_pkg_postinst
+ if use gtk; then
+ xdg_pkg_postinst
+ else
+ elog
+ elog "Only droidcam-cli has been installed since 'gtk' flag was not set"
+ elog
+ fi
+
+ elog "The default resolution for v4l2loopback-dc (i.e. droidcam) is 640x480."
+ elog "You can change this value in /etc/modprobe.d/v4l2loopback-dc.conf"
+ elog
+ elog "Links to the Android/iPhone/iPad apps can be found at"
+ elog "https://www.dev47apps.com/"
+}
+
+pkg_postrm() {
+ linux-mod_pkg_postrm
+ if use gtk; then
+ xdg_pkg_postrm
+ fi
+}
diff --git a/media-video/droidcam/files/droidcam-makefile-fixes.patch b/media-video/droidcam/files/droidcam-makefile-fixes.patch
index 5230c18f0f33..9c6ad4c45c09 100644
--- a/media-video/droidcam/files/droidcam-makefile-fixes.patch
+++ b/media-video/droidcam/files/droidcam-makefile-fixes.patch
@@ -1,8 +1,8 @@
diff --git a/Makefile b/Makefile
-index 7be3c15..099a707 100644
+index 7be3c15..8af0953 100644
--- a/Makefile
+++ b/Makefile
-@@ -6,7 +6,7 @@
+@@ -6,25 +6,23 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# Use at your own risk. See README file for more details.
@@ -11,7 +11,9 @@ index 7be3c15..099a707 100644
JPEG_INCLUDE ?= $(JPEG_DIR)/include
JPEG_LIB ?= $(JPEG_DIR)/lib`getconf LONG_BIT`
-@@ -16,15 +16,15 @@ GTK = `pkg-config --libs --cflags gtk+-3.0` `pkg-config --libs x11`
+-CC = gcc
+-CFLAGS = -Wall -O2
+ GTK = `pkg-config --libs --cflags gtk+-3.0` `pkg-config --libs x11`
GTK += `pkg-config --cflags --libs appindicator3-0.1`
LIBAV = `pkg-config --libs --cflags libswscale libavutil`
LIBS = -lspeex -lasound -lpthread -lm
@@ -31,7 +33,7 @@ index 7be3c15..099a707 100644
package: clean all
zip "droidcam_$(RELEASE).zip" \
LICENSE README* icon2.png \
-@@ -40,11 +40,11 @@ gresource: .gresource.xml icon2.png
+@@ -40,11 +38,11 @@ gresource: .gresource.xml icon2.png
droidcam-cli: LDLIBS += $(JPEG) $(LIBAV) $(LIBS)
droidcam-cli: src/droidcam-cli.c $(SRC)
@@ -45,3 +47,16 @@ index 7be3c15..099a707 100644
clean:
rm -f droidcam
+diff --git a/v4l2loopback/Makefile b/v4l2loopback/Makefile
+index 28c4502..02356e9 100644
+--- a/v4l2loopback/Makefile
++++ b/v4l2loopback/Makefile
+@@ -11,7 +11,7 @@ install:
+ $(MAKE) -C $(KERNEL_DIR) M=$(PWD) modules_install
+
+ test:
+- gcc test.c -o test
++ $(CC) test.c -o test
+
+ clean:
+ $(MAKE) -C $(KERNEL_DIR) M=$(PWD) clean
diff --git a/media-video/ffmpeg-chromium/Manifest b/media-video/ffmpeg-chromium/Manifest
index 138d31fb3d7f..de98277fc635 100644
--- a/media-video/ffmpeg-chromium/Manifest
+++ b/media-video/ffmpeg-chromium/Manifest
@@ -3,5 +3,5 @@ AUX ffmpeg-chromium-94.patch 1617 BLAKE2B 83afc6ae7f6d3b802e7c074545f8e469807510
DIST ffmpeg-chromium-94.tar.gz 14709687 BLAKE2B 06dedbd86befd8caed4c6cb34755b52cf70630f8fbd712f89d42e5b63e498f9d2a77935fbd7c87194f6d56fb0f83ff26beba00357dd51b3ac3e2e4480ff4351e SHA512 a6cf5404c892c878c50e3ba8369456db587e327bc3d77e857b9d34f3665ecfee7d3865b20e9871ccda570b30d9d34c03fd981cdc7f495809ea8f12cb8f15937e
DIST ffmpeg-chromium-96.tar.gz 14782341 BLAKE2B 686f5e0970ab49663e43d54cdb9b0216560dabc676711666c9e51840af64d2c78d47b55bcf36625751676839869e1b1f3b65516499646db00fd29f5ed2ff90d3 SHA512 169a1bf58000be0799b05b1d3f3a63b5a93ec66023d31f1ac6f5d9cd77408a390a9308fb626e94c3f1d4e1170638c1c81ac68b248e06c28d318d731ddda8e4d2
EBUILD ffmpeg-chromium-94.ebuild 6148 BLAKE2B 3dcc0310ab9cf7280f64bddca3dd9bb120e217afacca2eff0cdb31be84cc8398eb35da3937dec968e6b5e1afeab24ebb51f100bb3db44d8d91243e22f1f3fdfb SHA512 ac8e2cd29c98a89881580d5ae4e6cba3a0f1143e36ad553520dd12244caddc02e753b4f775454f09b1ef602765713753e2976c6d3851ae3b1f4d458728e4f5c2
-EBUILD ffmpeg-chromium-96.ebuild 6153 BLAKE2B f24b6866de0a6386e1c47475609da520e49bc578a2bc6a89eef6bccf8440f68cf427b3a62103d76b3d6220bb398f136ae8f5017b754ca108895ed8db5a5b0da9 SHA512 6b44d445e12eeaaec9c8fa06f23c1abc48a0294d09f28df238b32ac3a5e4d046545f5bee9da0507fb3e633bcbeec72ea31c08f8cf3fc37c334256201b5a29e2d
+EBUILD ffmpeg-chromium-96.ebuild 6152 BLAKE2B 1afb8f595b0f1bd5259de827ca614343165b97cd60f4443d23139d5162edd065d13e3c37f59a43b8a3837058cebcb360616f7b33c65df1fa408c3afc789a9166 SHA512 00a82ddb95b0457f5347b680ae6c7bf058052de6aacdd9e15435f84a3f2d70c776149f2e9c0ff7935f19e2fe35dcbf05ab2cea43cf6d97c1882353be35d019f6
MISC metadata.xml 669 BLAKE2B 3e1b3934b51d07a5620026f2d24e027d217380a9ef7819b3ee54e09b12b0d3ed377cef911989d63a6ab65bd7cb92752997fdd90afb0e6f29dc9496a9035daf4c SHA512 556601bbb7357eb7b8be23a93268b8f173bf16b42518f4b931e97d13880b5e0642546c1ead253a625a8938a9c7020cf52f69eaa629e65de47dfa010af6299674
diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-96.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-96.ebuild
index 8dafc5bbbacc..d98240ebe12e 100644
--- a/media-video/ffmpeg-chromium/ffmpeg-chromium-96.ebuild
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-96.ebuild
@@ -16,7 +16,7 @@ LICENSE="
gpl? ( GPL-2 )
"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64"
# Options to use as use_enable in the foo[:bar] form.
# This will feed configure with $(use_enable foo bar)
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 541585a6af94..f17516336573 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -13,6 +13,6 @@ EBUILD ffmpeg-4.2.4-r1.ebuild 17663 BLAKE2B c984c43f5f7d3298b7f9d577a62e9babe900
EBUILD ffmpeg-4.3.1-r1.ebuild 17767 BLAKE2B 633604edd9a395d2fb03c7fa5145e4781a52c65ff53d7f2f7fbe6c2f4ae0e4df9ec5f308cb06fbfa197475e9514e961ff01afd1098881605ae5b1013587c9adc SHA512 17eed1b0ab7ecc1fea5b91e02acf686c4239b7bdb5a94777944d08c35889c22046665f8a0f7e7c40aa7946727f0bbbb4a6c9a9c043302419a83a5fbb8c7b1668
EBUILD ffmpeg-4.3.2-r1.ebuild 17750 BLAKE2B 7d8a0ca3154efebe7192bde4953fc680eb91a2cca4abf771ca4a29ef2b5162504f0e27857d4d54b7ab8148538acbb79131f8d29b6ac775160786981d763dea49 SHA512 f6ec1e3e150f644063c241b52bdd607de12b6f87515f98581ad412ce6ab8b0e1864b6c045887b21702743980b9ac0eded342bb49e81883c22a389127dabbe221
EBUILD ffmpeg-4.4-r1.ebuild 17818 BLAKE2B 87e0944f0e72a80daf75867fad31224bf41af5fd769ef468734cdb5cc1827f077336596b66eee7e9fab0a44d12de65c28a6f03a5180e43312b965826200846fc SHA512 0373d1564a9ddce54022b204bb47c46c219000880607d4e33fae0c7adc02d1e530396eac7d28b794a18c7583c1a668880253856f21c24c926b45dce9237e7164
-EBUILD ffmpeg-4.4.1-r1.ebuild 17867 BLAKE2B b0faaf12087ea83aa0a05bb2e9cc502d2fcc6a05ba26b22a359374df3220159f9c639011fd69496faaa9cba14461beabb2d20c7af2d78c27f75c9739e9ace733 SHA512 2808be9d8e80734edd03039a91954edf74dc98385482c5997fc9663434e2ce684319503e2c45c9b6cefe02592d5930213a2dc10eb52f504813992cf6ca804bc7
+EBUILD ffmpeg-4.4.1-r1.ebuild 17860 BLAKE2B 9e3100a33095eb73b3cd3c5c9143a18a30478dd337911bf9b93fb915fb757cf4e21a19145891a00ebb15fdfe640ec3e80471c83ac029ff2b10f15629ef2996ce SHA512 1c988045156ad3a0dde4c4f66903f89c69617961fe64723dbd4eec3eee449c72fa8c68db9930622577b432c8d10c442b714bc9b72c0e3b4b32e59efebd143726
EBUILD ffmpeg-9999.ebuild 17818 BLAKE2B 7d78e16959db094c7cedbf1a161a8c4858c358aa570bd9a549a945bba076c6498a1ca54bfd9f2e4dd67ff299469c4c3a8c78df9754d40896f15c3ae2ba9b37e3 SHA512 43cb6ff9d4c74ba472345ddda2db9c62e735716ae46c5c245274735072039378f220133140c9780ec636cabbb141317f2b286569c58e861a7aad3d275cecacef
MISC metadata.xml 5956 BLAKE2B bf1e10c3a081c721dbaccc7389d1b35c3fdb844be0d5a9b674b154e7cbcef10c00a21fc38401819dbc0d66d6f1c5755dbf482ecdf43e1a43f2c76217af4d4ee3 SHA512 1fc8eee61c9b2d4108cacf52f64173d72e55797e0d87201f71fd35d873256aa0944361305f4c47e3bea39dde0007319643e60adbc64b984de56f3251b2ffc5a8
diff --git a/media-video/ffmpeg/ffmpeg-4.4.1-r1.ebuild b/media-video/ffmpeg/ffmpeg-4.4.1-r1.ebuild
index 9506a778d11a..d28411d2bd94 100644
--- a/media-video/ffmpeg/ffmpeg-4.4.1-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.4.1-r1.ebuild
@@ -59,7 +59,7 @@ LICENSE="
samba? ( GPL-3 )
"
if [ "${PV#9999}" = "${PV}" ] ; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
fi
# Options to use as use_enable in the foo[:bar] form.
diff --git a/media-video/google2srt/Manifest b/media-video/google2srt/Manifest
deleted file mode 100644
index 8a39dcb99673..000000000000
--- a/media-video/google2srt/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX build.xml 2320 BLAKE2B 48a205bd932f3781be640dab3c03f1a95503326259a7bdba7960abab4ec72d3b7ce13e39798ac7b2bf9ff751a5be1e49cba016e5634abb582a1f56555c1a030e SHA512 057368c9199a41d840b0326647e3a3aef70ddc1c3a286fb53e2d68a9baf3ebd82cc21299af5792d0f0fa0fba4abb399a02c781d83403683a54a895fa04167bf9
-DIST Google2SRT-0.5.6.zip 355167 BLAKE2B bb365ae01db8ca3eba67cfe01840a1e6da6034c86dac45a47c0164a72f9fbd958307ce545423a0c715f7ebefdae31d38686e9103d873d8cf98ecf99da579d143 SHA512 edb7b1ee4440f4962220557c794090edb9b3647a64deb70c19170bb4af3edbb5abc93ddd6061badf458c6cd92c17024b91bbdfa95bb1b366d1092b659db08094
-DIST google2srt-icon.png 1848 BLAKE2B 323ff2128b17ba6584f23869432575eeca87a0195867123193b9734cfb453d8483a79e14ba156e2b8168eb5d03c66795f6ae06d8cdb7c1e1aedcc28fbb593c79 SHA512 051d8ffe8488e2521cdfbfd045d6b5159a18619e12dc1216b1687514cf3f1cebdf2167af372c2ec46d3886412350f5872e8a8c245fee341a30fec51615b5140f
-EBUILD google2srt-0.5.6-r1.ebuild 1422 BLAKE2B 1667d7fc5ea5cd096a75fd471c93a1afe27ae94a0193c73cecbd98561e773700b0e684110be272b4bca97ccb46f64e1f0db8288f3355ab86aeb5ed85a1720c7e SHA512 017014d1a5aca47e2874a6cb63d3b54d4917d9a7c46852f84979cb9229b9a1d4aae9d2bca79cb3b32f52181ccde85143374a8666c4ca492101f47cd3c7707d1d
-MISC metadata.xml 695 BLAKE2B 36e2180cb2535a86fb99f0660d407a0409eadb22a1a0f798ae4025122e27d4f99c9e15620ca8b84114835b55eefeda35646c7cb09945d1cca5c57d302e93dda7 SHA512 715be615a2f329aed3d08a8c4b2df4bec0ab8f825cf879a2929f55a47c3ec18adec4cc79ea88caa7d7f3bb6af2d0260f92f960a54cd3ba0583c8e58f246b8bed
diff --git a/media-video/google2srt/files/build.xml b/media-video/google2srt/files/build.xml
deleted file mode 100644
index b1c7e3c775bb..000000000000
--- a/media-video/google2srt/files/build.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="Google2SRT" default="jar">
- <!-- some properties -->
- <property name="src.dir" value="src" />
- <property name="lib.dir" value="lib" />
- <property name="resources.dir" value="resources" />
- <property name="docs.dir" value="apidocs" />
- <property name="build.dir" value="build" />
- <property name="dist.dir" value="dist" />
- <property name="project.jar" value="${dist.dir}/${ant.project.name}.jar" />
- <property name="mainclass.jar" value="GUI" />
- <property name="source.enc" value="UTF-8" />
- <property name="target.jdk" value="1.6" />
-
- <!-- classpath -->
- <path id="refcp">
- <fileset dir="${lib.dir}">
- <include name="**/*.jar" />
- </fileset>
- </path>
-
- <!-- init -->
- <target name="init">
- <mkdir dir="${dist.dir}" />
- <mkdir dir="${docs.dir}" />
- <mkdir dir="${build.dir}" />
- </target>
-
- <!-- compile everything -->
- <target name="compile" depends="init">
- <javac srcdir="${src.dir}"
- destdir="${build.dir}"
- source="${target.jdk}"
- target="${target.jdk}"
- classpathref="refcp"
- encoding="${source.enc}"/>
- <copy todir="${build.dir}">
- <fileset dir="${resources.dir}" />
- </copy>
- </target>
-
- <!-- build the jar files -->
- <target name="build" depends="compile">
- <jar jarfile="${project.jar}" basedir="${build.dir}">
- <manifest>
- <attribute name="Main-Class" value="${mainclass.jar}" />
- </manifest>
- </jar>
- </target>
-
- <!-- generate javadocs -->
- <target name="javadoc" depends="init">
- <javadoc sourcepath="${src.dir}"
- destdir="${docs.dir}"
- packagenames="*"
- author="true"
- version="true"
- use="true"
- charset="UTF-8"
- encoding="${source.enc}"
- defaultexcludes="yes"
- classpathref="refcp"
- windowtitle="${ant.project.name} API">
- <fileset dir="${src.dir}" defaultexcludes="yes">
- <include name="**/*.java"/>
- </fileset>
- </javadoc>
- </target>
-
- <!-- clean up -->
- <target name="clean">
- <delete dir="${build.dir}" />
- <delete dir="${docs.dir}" />
- <delete dir="${dist.dir}" />
- </target>
-
- <!-- zip the sources -->
- <target name="sourcezip">
- <zip destfile="${dist.dir}/${ant.project.name}-src.zip">
- <zipfileset dir="${src.dir}" />
- </zip>
- </target>
-
-</project>
diff --git a/media-video/google2srt/google2srt-0.5.6-r1.ebuild b/media-video/google2srt/google2srt-0.5.6-r1.ebuild
deleted file mode 100644
index 4e228dc166a4..000000000000
--- a/media-video/google2srt/google2srt-0.5.6-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_PN="Google2SRT"
-MY_P="${MY_PN}-${PV}"
-MAINCLASS="GUI"
-
-DESCRIPTION="Convert subtitles from Google Video and YouTube to SubRip (.srt) format"
-HOMEPAGE="http://google2srt.sourceforge.net/en/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
- http://sbriesen.de/gentoo/distfiles/google2srt-icon.png"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="html"
-
-COMMON_DEP="dev-java/jdom:0"
-
-RDEPEND=">=virtual/jre-1.6
- ${COMMON_DEP}"
-DEPEND="
- app-arch/unzip
- >=virtual/jdk-1.6
- ${COMMON_DEP}"
-
-S="${WORKDIR}/${MY_P}"
-
-java_prepare() {
- # copy build.xml
- cp -f "${FILESDIR}/build.xml" build.xml || die
-
- # move resources
- mkdir -p "resources"
- mv -f src/*.{jpg,properties} "resources/"
-
- # update library packages
- cd lib
- rm -f jdom.jar ../${MY_PN}.jar || die
- java-pkg_jar-from jdom
- java-pkg_ensure-no-bundled-jars
-}
-
-src_compile() {
- eant build $(use_doc)
-}
-
-src_install() {
- java-pkg_dojar dist/${MY_PN}.jar
- java-pkg_dolauncher ${MY_PN} --main ${MAINCLASS} --java_args -Xmx256m
- newicon "${DISTDIR}/${PN}-icon.png" "${MY_PN}.png"
- make_desktop_entry ${MY_PN} ${MY_PN} ${MY_PN}
- use doc && java-pkg_dojavadoc apidocs
- use source && java-pkg_dosrc src
- use html && dohtml -r doc
- newdoc Changelog.txt ChangeLog
- newdoc README.TXT README
-}
diff --git a/media-video/google2srt/metadata.xml b/media-video/google2srt/metadata.xml
deleted file mode 100644
index 4af0071e5e99..000000000000
--- a/media-video/google2srt/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>media-video@gentoo.org</email>
- <name>Gentoo Video project</name>
- </maintainer>
- <longdescription lang="en">
- Google2SRT allows you to convert subtitles from Google Video and YouTube
- to SubRip (.srt) format, which is recognized by most video players. You
- can download XML subtitles or simply type video's URL, Google2SRT will
- do the rest.
- </longdescription>
- <use>
- <flag name="html">Install HTML documentation</flag>
- </use>
- <upstream>
- <remote-id type="sourceforge">google2srt</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/media-video/libva-utils/Manifest b/media-video/libva-utils/Manifest
index 209198a28213..dd217c9a8c23 100644
--- a/media-video/libva-utils/Manifest
+++ b/media-video/libva-utils/Manifest
@@ -10,7 +10,7 @@ DIST libva-utils-2.9.1.tar.gz 1198337 BLAKE2B 58f5a6a537c68eed74aec5dc8f1c4b5a04
EBUILD libva-utils-2.10.0.ebuild 1576 BLAKE2B 6479521cd60b67dcd56420a1f6c905f118e6f5513668bb6bfb0cd51971f0e0ed3558b2646580226a2379e53f45b893d8fa22010105572a3572985afb251d9953 SHA512 c46d4576732e21524a79fc712d3241891f0daac3bc52d9f1bbefcee73447886790842a09064f3027ba33bcf7879187f389ad15625a40c0c42127e79db075a125
EBUILD libva-utils-2.11.1.ebuild 2368 BLAKE2B a95caf61fe2b9f5f70101bdb163cbd0f856e79c79828a313b5120e69405153c6e3a934272f154db246d6d1e57be044ebe0eba3fdd6bfe5ead7acede20ebc7cdc SHA512 46e34b227bccb4bb9a97c1069b4a3def2c7e87eb5119220f50151e7814ab986776e721b9930c3d26756b95b74a615c6a5d58205e0f8eea78d1f7e1c291b03aff
EBUILD libva-utils-2.12.0.ebuild 2365 BLAKE2B 92ec7de337502e258cc2cd4b379389c0afc09f2b9254ce7aa6a8b6a84b885b3c8f85f1f2d76ec62a64e21af0a1c16ed177ec44d346a1dd3f0dae07fb6874c284 SHA512 03471a71432a8dd6717061ecf99d56ee1ec91b84626affcf61d82c73fedadd51e19d0e854d66a1fc75b7f1debe8e94a5da42eee780c2852812d2ef6c649d12e4
-EBUILD libva-utils-2.13.0.ebuild 2366 BLAKE2B e5136a33bb3d33f6f993ffe6dcf1c4e48ac5dccb1e58f26e771bfd9fb590b2889c458e32c994a82730bf20cf1509e36487f0d431549896f37000ffc2d98047c7 SHA512 d103d51518c1216986526667984ed086cefa8563029921d970afedb674d1222d8f01af59f35439ede01e255700fa745ddc9059bba479ed4697a2f1a44d2c5ab3
+EBUILD libva-utils-2.13.0.ebuild 2365 BLAKE2B 9bf8572aabdbf1eecb5d7ee1d4fb66d1193d1082862e5a1e8839c819c57d2f79f242ecc8dfa83571a9e6e461c0d68b4d68763985797c79436bba78f8d064b4d2 SHA512 78e1c3582322968308b135f165296481881d0cc07d34d4defe2388c6a791283fc077c03e66dd68598c60e967b4648fe349fcf94a9c170dba5612be20e0e47e39
EBUILD libva-utils-2.4.0.ebuild 1259 BLAKE2B 228e9161a295447362bed7e34d422e1291c184b426e00741b56990ba3d0a36c69966926a902ce4d1e5c065bde7c79b8a2ae01709e67dd319c02e7a8bbeb7d601 SHA512 6a0b6ad30e76bdeef7a2faaf55bee12eddd4c4f2ce23692d9fa2ed9a27754f4221c8c88c83f4dcc389a55337d00f70daf7fb037569e0176cf396ec99a24cb1ce
EBUILD libva-utils-2.8.0-r1.ebuild 1537 BLAKE2B 2c1f7727f4b9c1bbc3360dd20133a56ce641c1fd53ec56ab5b0f736db0ae343c9efbf5b523de2bb9bb50dac477a45f005256fac98ae25b2ffefe8c07469f5f18 SHA512 5f36c0614e05d5ceb11af1bae4aa698cf2a45f3535eb947088546d0f74bf5a725c74d92b054f6cb3a70fd572742d359ab92f68af45e51cfbf8093540a12d95ff
EBUILD libva-utils-2.8.0-r2.ebuild 1576 BLAKE2B 6479521cd60b67dcd56420a1f6c905f118e6f5513668bb6bfb0cd51971f0e0ed3558b2646580226a2379e53f45b893d8fa22010105572a3572985afb251d9953 SHA512 c46d4576732e21524a79fc712d3241891f0daac3bc52d9f1bbefcee73447886790842a09064f3027ba33bcf7879187f389ad15625a40c0c42127e79db075a125
diff --git a/media-video/libva-utils/libva-utils-2.13.0.ebuild b/media-video/libva-utils/libva-utils-2.13.0.ebuild
index 5f77a232170e..20c064a87332 100644
--- a/media-video/libva-utils/libva-utils-2.13.0.ebuild
+++ b/media-video/libva-utils/libva-utils-2.13.0.ebuild
@@ -15,7 +15,7 @@ else
# without pre-built 'configure' as they are always available upstream.
# SRC_URI="https://github.com/intel/libva-utils/releases/download/${PV}/${P}.tar.bz2"
SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="amd64 arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
fi
LICENSE="MIT"
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 49f3b4773437..579d5f6b651d 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -7,19 +7,14 @@ AUX pipewire-0.3.36-fix-crash-uaf-media-session.patch 1295 BLAKE2B 7c32a70c48e2c
AUX pipewire-0.3.36-fix-version.patch 716 BLAKE2B c447bd11291f809b7607f4094f2d5e3497996a3834e5d5d468dcc63f0e36c117a31158634c08b8acc724f0ce5b599594b05f79ef3e3128ac28843cc08df03fed SHA512 74c757edf20c911df9299b4322486a34746eec8c4aa212441082f954cebe7c7d9c836a757dd134d71b3c31a97abe1494c13dc470495846ffaf52f943ec397532
AUX pipewire-0.3.36-missing-limits-include.patch 452 BLAKE2B b498e4ec11ab3d5bc4cebdd0975802b68594678aa928dc85b5a7031276af9ec12edb1423714e3e96c7d658e574c679efa9c18afbee1b47b15f3ce582bc021fff SHA512 decd44a59152e4fdc64b79c2e330a09ca9b8f776e72ef7a0150dfe43d9c25f4e501d41c86a445a979137c412dc85e1ffa38fed91f976596500d2a28010d78407
AUX pipewire-0.3.36-non-systemd-integration.patch 911 BLAKE2B 6c6df1080821cefa1786da4db762a78011672226836525413d10fed3a18d43457277b6b868dfe0ee8e189143f76c971dd9c53809794864bcc642c804bf962ab8 SHA512 08b4998a3129f824c68310d2fc87245311e1d4b85a09a57f1d9bab76f990aa5d95686f22f3835a1072b7e6c0b6eb0246cc9c81884588f0146d26f9c215d9c565
-AUX pipewire-0.3.38-find-readline.patch 1546 BLAKE2B c8d6a8d53e8f71792c5055dabb0a66d8a2b93641e4ade45542fbcb3269ebabb3319c1225f63433cccf8000f4585607383a903045112e9bd204f95bed4e92546e SHA512 c09d604e09552c1dca29b9709c8571a9bc1393fa885e249d8e71403a5669ef732d0e14b9a7c9f315a55b03c2dd2022bfa9f71f4430ae7f93a8d01b686f6bf246
-AUX pipewire-0.3.38-fix-arm-build.patch 550 BLAKE2B c5c178160841494ffcbf5285939a8d2f5c4ac09ba9fd448b3c77446dc523a07d8ed090f08fec1029357c5cb67ea696f57aa3c22de1df5aa01d789c5c96cfdab5 SHA512 e35d35905da4f35b1db5c1e8a8dada24e83320dc38c4353f7c7dc4cc442c9a73aed02b4df99d66983683f36a004f85bdba9a287ff9e0e8ce71624e1703fced7b
-AUX pipewire-0.3.38-libcamera-null-deref.patch 2031 BLAKE2B a1bc641385bd762da8e0e523d48438eb703230a6c05b5064f49584dea990c5aae449ddd9e8fe29dacb35b41dc70f50c4ab2086b3ce6e3a139ca5b5b14754da1a SHA512 5e19f04613de8a85cf70d75a5c1816ba61c789dc35905428b6f0787f63feb41ffe8cef09b1528e608affb6a27cddc7530dfe4f00a7ca3f45fba9740d4093abf0
AUX pipewire-launcher.sh 149 BLAKE2B 42a9fd174e8216f9941ec72bc50581d539453dd0430ac61712582039f1cfe17cafa050bd87fcb90b9c16ffd891fd9f9c5dfec99b2be8c66eaed0128af180508e SHA512 7f50287565fa44e2296a7b294e8fd3dd64938d2de15c6ff5674d85a6e7bbccbc334c0fb9e28321104aff5335894b3c5a21171f385465e37b422ef53988dbfe4b
AUX pipewire.desktop 322 BLAKE2B 0299b9054cf881a5cbbdb128a5e8a51308cf0b5a98260dca756e704504ef057e403b2fb4aa2d58f52dde4be59e416c95d8fce21bc3ca6b6447ecab58263a3f21 SHA512 c13ea531cfdd3798f8d6cd20f5fa8c0a5040c27a6ef3850fdd41102a3bf0bcb73176e3300845af77804a98842fb736841223bc9ac1c92eb2034e9d46e41fc344
AUX pipewire.desktop-r1 325 BLAKE2B 7d823a264e5147bf8669127df22f468518fd54375ed57910f0143821894b33cfee8925b1cf8b9c5b1d219453a5c62fffa50d111b78bc5e151e23aed84d0a577e SHA512 e51ba049484daba3e4cdc5890748267f0c23ea6e57f31f3bb8a49c011e1a61b47b68eea742e5e7bcd58bfeddb96dd4064079fd9787cb66c78bd5eff10799a7bf
DIST pipewire-0.3.30.tar.gz 1540950 BLAKE2B 69b35743e3ad9a8caf68d9bb16cf395203efed6c3046b3f4ea33bbcdd6649f5d425d813042c12396a7cd5ff4e8ed91dbc395a96fe55935ad50f9c3f3918b0407 SHA512 ec525e0fb7e5c5313245fcc745b971fd7d4a1caa7ab9fe1fa38dc20d50f03e5969197e86b60659971676bec0f79aa7b7951c8209bfe9565a3fd1dcac1b8535b3
DIST pipewire-0.3.36.tar.gz 1708209 BLAKE2B 20fce0d7f88347fe594491d4fae7b6a8edee67ff7749f1a40b807a5d5094d792e61e3efd05dca2221f781c263e34ff0a50ad3c162231911d4b1d87704df6c775 SHA512 f0fc68ea005018b420a4f65a24dc9c85eb6263c24e66852a7ce2b03f966990d62487b388c7d73ff5adfc10c80c439b1200ae876e41d78f91db190036a1799a14
-DIST pipewire-0.3.38.tar.gz 1727371 BLAKE2B dac7f3e1992b9690195df1dbc04575d386d21d06d1727b004b851e300709b3707806b7b20d36c1e74225d91a2df5428c913376903b286592f87083857347e53e SHA512 c3c6c822bf4e5e77fed8d6ef09059d3e43195957692ab7baddc349af3d759d892a9af0e7802d389e2a9a15e5fece4c08ec963ac42df931233eec6057bad67eb6
-DIST pipewire-0.3.40.tar.gz 1675384 BLAKE2B b7df4f1ca363b764a5230099d32dd5ba5dceaadc8ca2d4ce55f42810a91628b4e32891757b22fd5eb7a7f497163936c63b86330ab2d5efa261a82d450660c371 SHA512 63109b87d50be160a6cde632470849564d4743f4cb469f5e3713bb1cbefc08f80416210ddedc09439555b702193c0266a1b9724e366a3b850bdf1a346c5e80cb
+DIST pipewire-0.3.42.tar.gz 1705295 BLAKE2B afd397e75be4f776b9d3042258e8091d6e1722f374e62417274238e5017e268c986ac7624e1b91ec8a97fc9078e8aa6d46a22f30c0834f99e5cd3112a096aded SHA512 bbf00ad5cee8ac872d8c2ef6b9499233100dba04c127b435894cf16c349188ae11edf918479a58039becc1b493c6f53a318d8fb483043dde074dc21ec32984c1
EBUILD pipewire-0.3.30-r2.ebuild 9675 BLAKE2B df43c7f1ef0622d96741266e53dc343d9697903571c723c73f5267a8083539fde110ea8f6420f2c86e296d275ab45e4b9abacbd6f0310825a6121336cf11215b SHA512 47cdcbd48311cee24b45c05b3283c4bbe1231c44f6d55136966f887aa43ad69b789bf642e003b17aa6f1a3b59963e68047e4f8c396431cb05f6dd4d3161f8c14
EBUILD pipewire-0.3.36.ebuild 10263 BLAKE2B 033b26477ad91c843e9307504ce8eddcad7977a386925a1960409767946a88ac539954c7647075bb48ac373b4e36fecf0bbdb5d50351213b51465ea298cad336 SHA512 38d6225ab02d31d1fe33723f7c14a385648853b5f4f84cfd13fcf7f91489dffc2c5fbac5f649bdf80bdd9a4bd1b19977bae59eba83beca9c3d9e34030f6f332b
-EBUILD pipewire-0.3.38.ebuild 10338 BLAKE2B 7861add091c7a01562398c392f512426a71e09f2ea3026aa22f296d9c57074f09807790cdaa6f9dd8f8c6b8ed453e83e40bb6561f8d2277c551b84f0e051914b SHA512 3f0758cc305d9efe5ba1599dd47b24820c0100b1279e607607db0d36779da0e6e0c4803e9861887ed49205dba4fc1a22a33b634ddc5c4b02899a910e61c3cb59
-EBUILD pipewire-0.3.40-r1.ebuild 10959 BLAKE2B 1869effe51d3304a72e2895e5189f4bd7e38098eadd06be89cc9530751c49facf65381fc2ad0567f87fa98611fb467c495ddfb5e94d6a5b2ccad4766e187d0b0 SHA512 50b03556c10ef02a3e2e4edf8d4aeb219936ee8adb696e421e1bee59f11862e329bf622710fa193471e222d05ba4f0054450947f60b934a87e9adfa6ad16a99d
-EBUILD pipewire-9999.ebuild 10959 BLAKE2B 1869effe51d3304a72e2895e5189f4bd7e38098eadd06be89cc9530751c49facf65381fc2ad0567f87fa98611fb467c495ddfb5e94d6a5b2ccad4766e187d0b0 SHA512 50b03556c10ef02a3e2e4edf8d4aeb219936ee8adb696e421e1bee59f11862e329bf622710fa193471e222d05ba4f0054450947f60b934a87e9adfa6ad16a99d
-MISC metadata.xml 1182 BLAKE2B 1f8a03e4957ec550bbdc24352ff138ae42b7aaffd876cef6578b4e7247f91fe1eb6d0c6b47bac01c3b477a7efbd1d89bdeb32c5a1411e7d749c45d5e5c3c70bd SHA512 d38b464b77040206ee7e45fb4f18f01c29db0f5bce087fc8caefa1728d3680c1bc299d7197e3ff7a46e0e08f219ac4b0893c1815d564517365c8996cac5e49bf
+EBUILD pipewire-0.3.42-r1.ebuild 11066 BLAKE2B d61bdc505e7fd86172392d0e1e7f3fe3166883fd0c76260d92c4ef832de67ce9d1e8c12d2a66874153e8c255801d9c852084a297204cbf6939acbe969e9b920a SHA512 878f82b0046e3a92881e313083f2e245f9833c0b1852ed87b54c60b0eb5a1927c3f1f6d534f2d257176ecd685fde7c3c67a4e3caa95810b7ed58cf688f0a94a0
+EBUILD pipewire-9999.ebuild 11059 BLAKE2B 762f2eabf3850198aab2856f1a4b62537899d9e5ecd91e14f464898a4560cb1b9e4e8ab4dc798c8b8bb7c5d30b47b374c9d08190792f96937cc78237716b3daf SHA512 4769bbdd0cbae0d8f1982314cdf568b1795a276e68c2e0b42869cb7f798a4596484a2f4daa2547e6d689d3513ab40a352b1a9773ddb1d35fbbd0ee7c3fc4cf01
+MISC metadata.xml 1282 BLAKE2B efb131feba74931b8be2fa9d9f7cf71660d42f84c820c8a81432d6fd5d10e23069ed0fda0af6d98204a32ad06cb68ba14679cee714abfd5f0f00d750e7a3b622 SHA512 6498b99b8462657971d3d5610e0cba29c06f585dff38829440acf75fd52885e47dfb1641b3e790f8e5605ab12166b4a686370da42e8b63bc09a76c6bcebf850a
diff --git a/media-video/pipewire/files/pipewire-0.3.38-find-readline.patch b/media-video/pipewire/files/pipewire-0.3.38-find-readline.patch
deleted file mode 100644
index 6b56304f5d17..000000000000
--- a/media-video/pipewire/files/pipewire-0.3.38-find-readline.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/ddfbd684e78e2b8b9ad40bedb4612ea0197d231a.patch
-
-From: Joshua Strobl <joshua@streambits.io>
-Date: Thu, 30 Sep 2021 23:11:50 +0300
-Subject: [PATCH] Fix readline detection by allowing fallback to cc
- find_library
-
---- a/meson.build
-+++ b/meson.build
-@@ -326,6 +326,11 @@ dbus_dep = dependency('dbus-1')
- sdl_dep = dependency('sdl2', required : get_option('sdl2'))
- summary({'SDL 2': sdl_dep.found()}, bool_yn: true, section: 'Misc dependencies')
- readline_dep = dependency('readline', required : false)
-+
-+if not readline_dep.found()
-+ readline_dep = cc.find_library('readline', required: false)
-+endif
-+
- summary({'readline (for pw-cli)': readline_dep.found()}, bool_yn: true, section: 'Misc dependencies')
- ncurses_dep = dependency('ncursesw', required : false)
- sndfile_dep = dependency('sndfile', version : '>= 1.0.20', required : get_option('sndfile'))
-@@ -406,7 +411,12 @@ libinotify_dep = (build_machine.system() == 'freebsd'
- : dependency('', required: false))
-
- # On FreeBSD, libintl library is required for gettext
--libintl_dep = cc.find_library('intl', required: false)
-+libintl_dep = dependency('intl', required: false)
-+
-+if not libintl_dep.found()
-+ libintl_dep = cc.find_library('intl', required: false)
-+endif
-+summary({'intl support': libintl_dep.found()}, bool_yn: true)
-
- need_alsa = get_option('pipewire-alsa').enabled() or get_option('session-managers').contains('media-session')
- alsa_dep = dependency('alsa', version : '>=1.1.7', required: need_alsa)
-GitLab
diff --git a/media-video/pipewire/files/pipewire-0.3.38-fix-arm-build.patch b/media-video/pipewire/files/pipewire-0.3.38-fix-arm-build.patch
deleted file mode 100644
index 222aa58cce13..000000000000
--- a/media-video/pipewire/files/pipewire-0.3.38-fix-arm-build.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/f8817b439433798bd7217dc4ae72197887b0fc96.patch
-
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Thu, 30 Sep 2021 11:12:27 +0200
-Subject: [PATCH] cpu: fix compilation on ARM
-
---- a/spa/plugins/support/cpu-arm.c
-+++ b/spa/plugins/support/cpu-arm.c
-@@ -80,7 +80,7 @@ arm_init(struct impl *impl)
- int arch;
-
- if (!(cpuinfo = get_cpuinfo())) {
-- spa_log_warn(impl->log, NAME " %p: Can't read cpuinfo", impl);
-+ spa_log_warn(impl->log, "%p: Can't read cpuinfo", impl);
- return 1;
- }
-
-GitLab
diff --git a/media-video/pipewire/files/pipewire-0.3.38-libcamera-null-deref.patch b/media-video/pipewire/files/pipewire-0.3.38-libcamera-null-deref.patch
deleted file mode 100644
index beabd1a30291..000000000000
--- a/media-video/pipewire/files/pipewire-0.3.38-libcamera-null-deref.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/d71a10b7fa9b5c560485b6bbde409c10d3fdd114.patch
-
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Thu, 30 Sep 2021 12:54:29 +0200
-Subject: [PATCH] libcamera: handle failure gracefully
-
-Don't try to access NULL pointers
---- a/spa/plugins/libcamera/libcamera-client.c
-+++ b/spa/plugins/libcamera/libcamera-client.c
-@@ -210,10 +210,10 @@ impl_init(const struct spa_handle_factory *factory,
- SPA_DEVICE_CHANGE_MASK_PROPS;
- this->info.flags = 0;
-
-- if(this->dev.camera == NULL) {
-+ if(this->dev.camera == NULL)
- this->dev.camera = (LibCamera*)newLibCamera();
-+ if(this->dev.camera != NULL)
- libcamera_set_log(this->dev.camera, this->dev.log);
-- }
-
- return 0;
- }
---- a/spa/plugins/libcamera/libcamera-source.c
-+++ b/spa/plugins/libcamera/libcamera-source.c
-@@ -994,10 +994,10 @@ impl_init(const struct spa_handle_factory *factory,
- port->dev.log = this->log;
- port->dev.fd = -1;
-
-- if(port->dev.camera == NULL) {
-+ if(port->dev.camera == NULL)
- port->dev.camera = (LibCamera*)newLibCamera();
-+ if(port->dev.camera != NULL)
- libcamera_set_log(port->dev.camera, port->dev.log);
-- }
-
- if (info && (str = spa_dict_lookup(info, SPA_KEY_API_LIBCAMERA_PATH))) {
- strncpy(this->props.device, str, 63);
---- a/spa/plugins/libcamera/libcamera_wrapper.cpp
-+++ b/spa/plugins/libcamera/libcamera_wrapper.cpp
-@@ -540,7 +540,8 @@ extern "C" {
- }
-
- void LibCamera::close() {
-- this->cam_->release();
-+ if (this->cam_)
-+ this->cam_->release();
- }
-
- void LibCamera::connect()
-@@ -775,6 +776,9 @@ extern "C" {
- std::unique_ptr<CameraManager> cm = std::make_unique<CameraManager>();
- LibCamera* camera = new LibCamera();
-
-+ pthread_mutexattr_init(&attr);
-+ pthread_mutex_init(&camera->lock, &attr);
-+
- ret = cm->start();
- if (ret) {
- deleteLibCamera(camera);
-@@ -794,9 +798,6 @@ extern "C" {
- return nullptr;
- }
-
-- pthread_mutexattr_init(&attr);
-- pthread_mutex_init(&camera->lock, &attr);
--
- camera->ring_buffer_init();
-
- return camera;
-GitLab
diff --git a/media-video/pipewire/metadata.xml b/media-video/pipewire/metadata.xml
index d6ee6bc2024f..dfdfec054d9e 100644
--- a/media-video/pipewire/metadata.xml
+++ b/media-video/pipewire/metadata.xml
@@ -5,6 +5,10 @@
<email>gnome@gentoo.org</email>
<name>Gentoo GNOME Desktop</name>
</maintainer>
+ <maintainer type="person">
+ <email>sam@gentoo.org</email>
+ <name>Sam James</name>
+ </maintainer>
<maintainer type="person">
<email>asturm@gentoo.org</email>
<name>Andreas Sturmlechner</name>
diff --git a/media-video/pipewire/pipewire-0.3.38.ebuild b/media-video/pipewire/pipewire-0.3.38.ebuild
deleted file mode 100644
index a9e1b729e5b0..000000000000
--- a/media-video/pipewire/pipewire-0.3.38.ebuild
+++ /dev/null
@@ -1,290 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit meson-multilib optfeature python-any-r1 systemd udev
-
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
- inherit git-r3
-else
- SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-DESCRIPTION="Multimedia processing graphs"
-HOMEPAGE="https://pipewire.org/"
-
-LICENSE="MIT LGPL-2.1+ GPL-2"
-SLOT="0/0.3"
-IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l"
-
-# Once replacing system JACK libraries is possible, it's likely that
-# jack-client IUSE will need blocking to avoid users accidentally
-# configuring their systems to send PW sink output to the emulated
-# JACK's sink - doing so is likely to yield no audio, cause a CPU
-# cycles consuming loop (and may even cause GUI crashes)!
-
-REQUIRED_USE="jack-sdk? ( !jack-client )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- app-doc/xmltoman
- >=dev-util/meson-0.59
- virtual/pkgconfig
- ${PYTHON_DEPS}
- $(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
- doc? (
- app-doc/doxygen
- media-gfx/graphviz
- )
-"
-RDEPEND="
- acct-group/audio
- media-libs/alsa-lib
- sys-apps/dbus[${MULTILIB_USEDEP}]
- sys-libs/readline:=
- sys-libs/ncurses:=[unicode(+)]
- virtual/libintl[${MULTILIB_USEDEP}]
- virtual/libudev[${MULTILIB_USEDEP}]
- bluetooth? (
- media-libs/fdk-aac
- media-libs/libldac
- media-libs/libfreeaptx
- media-libs/sbc
- >=net-wireless/bluez-4.101:=
- )
- echo-cancel? ( media-libs/webrtc-audio-processing:0 )
- extra? (
- >=media-libs/libsndfile-1.0.20
- )
- gstreamer? (
- >=dev-libs/glib-2.32.0:2
- >=media-libs/gstreamer-1.10.0:1.0
- media-libs/gst-plugins-base:1.0
- )
- jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
- jack-sdk? (
- !media-sound/jack-audio-connection-kit
- !media-sound/jack2
- )
- pipewire-alsa? (
- >=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
- !media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio]
- )
- !pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
- systemd? ( sys-apps/systemd )
- v4l? ( media-libs/libv4l )
-"
-
-DEPEND="${RDEPEND}"
-
-# Present RDEPEND that are currently always disabled due to the PW
-# code using them being required to be disabled by Gentoo guidelines
-# (i.e. developer binaries not meant for users) and unready code
-# media-video/ffmpeg:=
-# media-libs/libsdl2
-# >=media-libs/vulkan-loader-1.1.69
-#
-# Ditto for DEPEND
-# >=dev-util/vulkan-headers-1.1.69
-
-DOCS=( {README,INSTALL}.md NEWS )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
- # Upstream
- "${FILESDIR}"/${P}-fix-arm-build.patch
- "${FILESDIR}"/${P}-libcamera-null-deref.patch # (we don't have it in ::gentoo but let's be nice)
- "${FILESDIR}"/${P}-find-readline.patch # just in case
-)
-
-# limitsdfile related code taken from =sys-auth/realtime-base-0.1
-# with changes as necessary.
-limitsdfile=40-${PN}.conf
-
-python_check_deps() {
- has_version -b "dev-python/docutils[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
- default
-
- if ! use systemd; then
- # This can be applied non-conditionally but would make for a
- # significantly worse user experience on systemd then.
- eapply "${FILESDIR}"/${PN}-0.3.36-non-systemd-integration.patch
- fi
-
- einfo "Generating ${limitsdfile}"
- cat > ${limitsdfile} <<- EOF || die
- # Start of ${limitsdfile} from ${P}
-
- @audio - memlock 256
-
- # End of ${limitsdfile} from ${P}
- EOF
-}
-
-multilib_src_configure() {
- local emesonargs=(
- -Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
- $(meson_native_use_feature doc docs)
- $(meson_native_enabled examples) # Disabling this implicitly disables -Dmedia-session
- # Replaced upstream by -Dsession-managers=..., needs more work, bug #812809
- # but default is same as before and right now, this is fatal with unreleased Meson.
- #$(meson_native_enabled media-session)
- $(meson_native_enabled man)
- $(meson_feature test tests)
- -Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
- $(meson_native_use_feature gstreamer)
- $(meson_native_use_feature gstreamer gstreamer-device-provider)
- $(meson_native_use_feature systemd)
- -Dsystemd-system-service=disabled # Matches upstream
- $(meson_native_use_feature systemd systemd-user-service)
- $(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
- -Dspa-plugins=enabled
- -Dalsa=enabled # Allows using kernel ALSA for sound I/O (-Dmedia-session depends on this)
- -Daudiomixer=enabled # Matches upstream
- -Daudioconvert=enabled # Matches upstream
- $(meson_native_use_feature bluetooth bluez5)
- $(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
- $(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
- $(meson_native_use_feature bluetooth bluez5-backend-ofono)
- $(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
- $(meson_native_use_feature bluetooth bluez5-codec-aac)
- $(meson_native_use_feature bluetooth bluez5-codec-aptx)
- $(meson_native_use_feature bluetooth bluez5-codec-ldac)
- $(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889
- -Dcontrol=enabled # Matches upstream
- -Daudiotestsrc=enabled # Matches upstream
- -Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
- -Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
- $(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
- $(meson_use jack-sdk jack-devel)
- $(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
- -Dsupport=enabled # Miscellaneous/common plugins, such as null sink
- -Devl=disabled # Matches upstream
- -Dtest=disabled # fakesink and fakesource plugins
- $(meson_native_use_feature v4l v4l2)
- -Dlibcamera=disabled # libcamera is not in Portage tree
- -Dvideoconvert=enabled # Matches upstream
- -Dvideotestsrc=enabled # Matches upstream
- -Dvolume=enabled # Matches upstream
- -Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
- $(meson_native_use_feature extra pw-cat)
- -Dudev=enabled
- -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
- -Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
- $(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
- )
-
- meson_src_configure
-}
-
-multilib_src_install() {
- # Our customs DOCS do not exist in multilib source directory
- DOCS= meson_src_install
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- insinto /etc/security/limits.d
- doins ${limitsdfile}
-
- if use pipewire-alsa; then
- dodir /etc/alsa/conf.d
- # These will break if someone has /etc that is a symbol link to a subfolder! See #724222
- # And the current dosym8 -r implementation is likely affected by the same issue, too.
- dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
- dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
- fi
-
- if ! use systemd; then
- insinto /etc/xdg/autostart
- newins "${FILESDIR}"/pipewire.desktop pipewire.desktop
-
- exeinto /usr/libexec
- newexe "${FILESDIR}"/pipewire-launcher.sh pipewire-launcher
- fi
-}
-
-pkg_postinst() {
- elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
- elog "using PipeWire. Do it either manually or add yourself"
- elog "to the 'audio' group:"
- elog
- elog " usermod -aG audio <youruser>"
- elog
-
- if ! use jack-sdk; then
- elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
- elog "alternative libraries have been installed to a non-default location."
- elog "To use them, put pw-jack <application> before every JACK application."
- elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
- elog "provider is still needed to compile the JACK applications themselves."
- elog
- fi
-
- if use systemd; then
- elog "To use PipeWire for audio, the user units must be manually enabled"
- elog "by running this command as each user you use for desktop activities:"
- elog
- elog " systemctl --user enable --now pipewire.socket pipewire-pulse.socket"
- elog
- elog "When switching from PulseAudio, do not forget to disable PulseAudio likewise:"
- elog
- elog " systemctl --user disable --now pulseaudio.service pulseaudio.socket"
- elog
- elog "A reboot is recommended to avoid interferences from still running"
- elog "PulseAudio daemon."
- elog
- elog "Both, new users and those upgrading, need to enable pipewire-media-session"
- elog "for relevant users:"
- elog
- elog " systemctl --user enable --now pipewire-media-session.service"
- elog
- else
- elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
- elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable"
- elog "autospawning of the original daemon by setting:"
- elog
- elog " autospawn = no"
- elog
- elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
- elog
- elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
- elog "${EROOT}/etc/pipewire/pipewire.conf by commenting out the relevant"
- elog "command near the end of the file:"
- elog
- elog "#\"/usr/bin/pipewire\" = { args = \"-c pipewire-pulse.conf\" }"
- elog
- elog "NOTE:"
- elog "Starting with PipeWire-0.3.30, this package is no longer installing its config"
- elog "into ${EROOT}/etc/pipewire by default. In case you need to change"
- elog "its config, please start by copying default config from ${EROOT}/usr/share/pipewire"
- elog "and just override the sections you want to change."
- fi
-
- elog "For latest tips and tricks, troubleshooting information and documentation"
- elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
- elog
-
- optfeature_header "The following can be installed for optional runtime features:"
- optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
-
- 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 --now ofono"
- else
- ewarn "rc-update delete ofono"
- fi
- ewarn
- fi
-}
diff --git a/media-video/pipewire/pipewire-0.3.40-r1.ebuild b/media-video/pipewire/pipewire-0.3.40-r1.ebuild
deleted file mode 100644
index 93882727fc56..000000000000
--- a/media-video/pipewire/pipewire-0.3.40-r1.ebuild
+++ /dev/null
@@ -1,297 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit meson-multilib optfeature prefix python-any-r1 systemd udev
-
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
- inherit git-r3
-else
- SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="Multimedia processing graphs"
-HOMEPAGE="https://pipewire.org/"
-
-LICENSE="MIT LGPL-2.1+ GPL-2"
-SLOT="0/0.3"
-IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l"
-
-# Once replacing system JACK libraries is possible, it's likely that
-# jack-client IUSE will need blocking to avoid users accidentally
-# configuring their systems to send PW sink output to the emulated
-# JACK's sink - doing so is likely to yield no audio, cause a CPU
-# cycles consuming loop (and may even cause GUI crashes)!
-
-REQUIRED_USE="jack-sdk? ( !jack-client )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- >=dev-util/meson-0.59
- virtual/pkgconfig
- ${PYTHON_DEPS}
- $(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
- doc? (
- app-doc/doxygen
- media-gfx/graphviz
- )
-"
-RDEPEND="
- acct-group/audio
- media-libs/alsa-lib
- sys-apps/dbus[${MULTILIB_USEDEP}]
- sys-libs/readline:=
- sys-libs/ncurses:=[unicode(+)]
- virtual/libintl[${MULTILIB_USEDEP}]
- virtual/libudev[${MULTILIB_USEDEP}]
- bluetooth? (
- media-libs/fdk-aac
- media-libs/libldac
- media-libs/libfreeaptx
- media-libs/sbc
- >=net-wireless/bluez-4.101:=
- )
- echo-cancel? ( media-libs/webrtc-audio-processing:0 )
- extra? (
- >=media-libs/libsndfile-1.0.20
- )
- gstreamer? (
- >=dev-libs/glib-2.32.0:2
- >=media-libs/gstreamer-1.10.0:1.0
- media-libs/gst-plugins-base:1.0
- )
- jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
- jack-sdk? (
- !media-sound/jack-audio-connection-kit
- !media-sound/jack2
- )
- pipewire-alsa? (
- >=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
- !media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio]
- )
- !pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
- systemd? ( sys-apps/systemd )
- v4l? ( media-libs/libv4l )
-"
-
-DEPEND="${RDEPEND}"
-
-# 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"
-
-# Present RDEPEND that are currently always disabled due to the PW
-# code using them being required to be disabled by Gentoo guidelines
-# (i.e. developer binaries not meant for users) and unready code
-# media-video/ffmpeg:=
-# media-libs/libsdl2
-# >=media-libs/vulkan-loader-1.1.69
-#
-# Ditto for DEPEND
-# >=dev-util/vulkan-headers-1.1.69
-
-DOCS=( {README,INSTALL}.md NEWS )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
-)
-
-# limitsdfile related code taken from =sys-auth/realtime-base-0.1
-# with changes as necessary.
-limitsdfile=40-${PN}.conf
-
-python_check_deps() {
- has_version -b "dev-python/docutils[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
- default
-
- einfo "Generating ${limitsdfile}"
- cat > ${limitsdfile} <<- EOF || die
- # Start of ${limitsdfile} from ${P}
-
- @audio - memlock 256
-
- # End of ${limitsdfile} from ${P}
- EOF
-}
-
-multilib_src_configure() {
- local emesonargs=(
- -Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
- $(meson_native_use_feature doc docs)
- $(meson_native_enabled examples) # 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)
- -Dsystemd-system-service=disabled # Matches upstream
- $(meson_native_use_feature systemd systemd-user-service)
- $(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
- -Dspa-plugins=enabled
- -Dalsa=enabled # Allows using kernel ALSA for sound I/O (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 echo-cancel echo-cancel-webrtc) #807889
- -Dcontrol=enabled # Matches upstream
- -Daudiotestsrc=enabled # Matches upstream
- -Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
- -Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
- $(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
- $(meson_use jack-sdk jack-devel)
- $(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
- -Dsupport=enabled # Miscellaneous/common plugins, such as null sink
- -Devl=disabled # Matches upstream
- -Dtest=disabled # fakesink and fakesource plugins
- $(meson_native_use_feature v4l v4l2)
- -Dlibcamera=disabled # libcamera is not in Portage tree
- -Dvideoconvert=enabled # Matches upstream
- -Dvideotestsrc=enabled # Matches upstream
- -Dvolume=enabled # Matches upstream
- -Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
- $(meson_native_use_feature extra pw-cat)
- -Dudev=enabled
- -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
- -Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
- $(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
- -Dsession-managers="[]" # All available session managers are now their own projects, so there's nothing to build
- )
-
- 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
- # These will break if someone has /etc that is a symbolic link to a subfolder! See #724222
- # And the current dosym8 -r implementation is likely affected by the same issue, too.
- dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
- dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
- 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
- eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher
- fi
-}
-
-pkg_postinst() {
- elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
- elog "using PipeWire. Do it either manually or add yourself"
- elog "to the 'audio' group:"
- elog
- elog " usermod -aG audio <youruser>"
- elog
-
- if ! use jack-sdk; then
- elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
- elog "alternative libraries have been installed to a non-default location."
- elog "To use them, put pw-jack <application> before every JACK application."
- elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
- elog "provider is still needed to compile the JACK applications themselves."
- elog
- fi
-
- if use systemd; then
- elog "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 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: ${EROOT}/etc/pulse/client.conf and disable"
- elog "autospawning of the original daemon by setting:"
- elog
- elog " autospawn = no"
- elog
- elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
- elog
- elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
- elog "${EROOT}/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 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
-}
diff --git a/media-video/pipewire/pipewire-0.3.42-r1.ebuild b/media-video/pipewire/pipewire-0.3.42-r1.ebuild
new file mode 100644
index 000000000000..966cc0b8c14b
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.42-r1.ebuild
@@ -0,0 +1,298 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit meson-multilib optfeature prefix python-any-r1 systemd udev
+
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
+ inherit git-r3
+else
+ SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/"
+
+LICENSE="MIT LGPL-2.1+ GPL-2"
+# ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
+SLOT="0/0.4"
+IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l"
+
+# Once replacing system JACK libraries is possible, it's likely that
+# jack-client IUSE will need blocking to avoid users accidentally
+# configuring their systems to send PW sink output to the emulated
+# JACK's sink - doing so is likely to yield no audio, cause a CPU
+# cycles consuming loop (and may even cause GUI crashes)!
+
+REQUIRED_USE="jack-sdk? ( !jack-client )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ >=dev-util/meson-0.59
+ virtual/pkgconfig
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
+ doc? (
+ app-doc/doxygen
+ media-gfx/graphviz
+ )
+"
+RDEPEND="
+ acct-group/audio
+ media-libs/alsa-lib
+ sys-apps/dbus[${MULTILIB_USEDEP}]
+ sys-libs/readline:=
+ sys-libs/ncurses:=[unicode(+)]
+ virtual/libintl[${MULTILIB_USEDEP}]
+ virtual/libudev[${MULTILIB_USEDEP}]
+ bluetooth? (
+ media-libs/fdk-aac
+ media-libs/libldac
+ media-libs/libfreeaptx
+ media-libs/sbc
+ >=net-wireless/bluez-4.101:=
+ )
+ echo-cancel? ( media-libs/webrtc-audio-processing:0 )
+ extra? (
+ >=media-libs/libsndfile-1.0.20
+ )
+ gstreamer? (
+ >=dev-libs/glib-2.32.0:2
+ >=media-libs/gstreamer-1.10.0:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
+ jack-sdk? (
+ !media-sound/jack-audio-connection-kit
+ !media-sound/jack2
+ )
+ pipewire-alsa? (
+ >=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
+ !media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio]
+ )
+ !pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
+ systemd? ( sys-apps/systemd )
+ v4l? ( media-libs/libv4l )
+"
+
+DEPEND="${RDEPEND}"
+
+# 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"
+
+# Present RDEPEND that are currently always disabled due to the PW
+# code using them being required to be disabled by Gentoo guidelines
+# (i.e. developer binaries not meant for users) and unready code
+# media-video/ffmpeg:=
+# media-libs/libsdl2
+# >=media-libs/vulkan-loader-1.1.69
+#
+# Ditto for DEPEND
+# >=dev-util/vulkan-headers-1.1.69
+
+DOCS=( {README,INSTALL}.md NEWS )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+)
+
+# limitsdfile related code taken from =sys-auth/realtime-base-0.1
+# with changes as necessary.
+limitsdfile=40-${PN}.conf
+
+python_check_deps() {
+ has_version -b "dev-python/docutils[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+ default
+
+ einfo "Generating ${limitsdfile}"
+ cat > ${limitsdfile} <<- EOF || die
+ # Start of ${limitsdfile} from ${P}
+
+ @audio - memlock 256
+
+ # End of ${limitsdfile} from ${P}
+ EOF
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ -Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+ $(meson_native_use_feature doc docs)
+ $(meson_native_enabled examples) # 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)
+ -Dsystemd-system-service=disabled # Matches upstream
+ $(meson_native_use_feature systemd systemd-user-service)
+ $(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
+ -Dspa-plugins=enabled
+ -Dalsa=enabled # Allows using kernel ALSA for sound I/O (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 echo-cancel echo-cancel-webrtc) #807889
+ -Dcontrol=enabled # Matches upstream
+ -Daudiotestsrc=enabled # Matches upstream
+ -Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
+ -Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
+ $(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
+ $(meson_use jack-sdk jack-devel)
+ $(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
+ -Dsupport=enabled # Miscellaneous/common plugins, such as null sink
+ -Devl=disabled # Matches upstream
+ -Dtest=disabled # fakesink and fakesource plugins
+ $(meson_native_use_feature v4l v4l2)
+ -Dlibcamera=disabled # libcamera is not in Portage tree
+ -Dvideoconvert=enabled # Matches upstream
+ -Dvideotestsrc=enabled # Matches upstream
+ -Dvolume=enabled # Matches upstream
+ -Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
+ $(meson_native_use_feature extra pw-cat)
+ -Dudev=enabled
+ -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+ -Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
+ $(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
+ -Dsession-managers="[]" # All available session managers are now their own projects, so there's nothing to build
+ )
+
+ 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
+ # These will break if someone has /etc that is a symbolic link to a subfolder! See #724222
+ # And the current dosym8 -r implementation is likely affected by the same issue, too.
+ dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
+ dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
+ 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
+ eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher
+ fi
+}
+
+pkg_postinst() {
+ elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
+ elog "using PipeWire. Do it either manually or add yourself"
+ elog "to the 'audio' group:"
+ elog
+ elog " usermod -aG audio <youruser>"
+ elog
+
+ if ! use jack-sdk; then
+ elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
+ elog "alternative libraries have been installed to a non-default location."
+ elog "To use them, put pw-jack <application> before every JACK application."
+ elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
+ elog "provider is still needed to compile the JACK applications themselves."
+ elog
+ fi
+
+ if use systemd; then
+ elog "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 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: ${EROOT}/etc/pulse/client.conf and disable"
+ elog "autospawning of the original daemon by setting:"
+ elog
+ elog " autospawn = no"
+ elog
+ elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
+ elog
+ elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
+ elog "${EROOT}/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 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
+}
diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild
index 93882727fc56..e74fc97557fb 100644
--- a/media-video/pipewire/pipewire-9999.ebuild
+++ b/media-video/pipewire/pipewire-9999.ebuild
@@ -12,14 +12,15 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
fi
DESCRIPTION="Multimedia processing graphs"
HOMEPAGE="https://pipewire.org/"
LICENSE="MIT LGPL-2.1+ GPL-2"
-SLOT="0/0.3"
+# ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
+SLOT="0/0.4"
IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l"
# Once replacing system JACK libraries is possible, it's likely that
diff --git a/media-video/unifi-video/Manifest b/media-video/unifi-video/Manifest
index 5ceb7076a507..bd394157fc89 100644
--- a/media-video/unifi-video/Manifest
+++ b/media-video/unifi-video/Manifest
@@ -2,7 +2,5 @@ AUX commons-daemon-move.patch 337 BLAKE2B 79e847ce6e1c32c3cfbe192d8dce33175e2c0e
AUX unifi-video.initd 467 BLAKE2B c68d4b1efc3a2583e8624d306d667585022d27aa0ad4f2becd9569c8086b568e5c84508f2cc71c81605cc124bc17cd42c884d477b15181dba73544fc254610c1 SHA512 1cd4345daf09a27dcb8528abd076e920e30b6ff7a505acad74fdc291164c94569946cd493563331c5e52cb95c45e18522520aee47555db438fa87c46d07e35c5
AUX unifi-video.service 209 BLAKE2B fd4d96fbd353c795621ec6ad2cb23d8c27132071ebee2843364283da712e46f8fb1d1fcb9ce7b3f042938a55cf3689c7976095ed2f5e72b71bb915ae8a32763d SHA512 ea6eb21bc15c887f4f5e27669bb72eb31db9d8af48d9efdfc32901f1eeff2fb1626ce161dab2bf636eabd4a49c16966cfc55dcd8e572f01a829f491248f7b474
DIST unifi-video.Ubuntu18.04_amd64.v3.10.13.deb 178800688 BLAKE2B b35f91e77514fcf0165298473be503f6d977cb9f8f53e88f5bb700a2c76a3636e2f475c93c395eab6af4a215074521e47e1dc2d868695c1de83968b64e157cc8 SHA512 58d03b1004ba6da58b52c20720137639167647539c135c71c6abb36b80e37c4f33f0d0ae4092f98858bed8fcb4a3c9f05cc2a0a25e96fee957da176b9b6801d2
-EBUILD unifi-video-3.10.13-r2.ebuild 1965 BLAKE2B 21f735f65e95f3d0f0169a7be009d43b9a1525318faa50d9639264bba9c23a119a3bedc255a1bc7881dc94cad9346decb3acdf473732ab87ffe75caa31d8dcb6 SHA512 5c0d9af2a50cdbf82029e1b6aefad026779592828ca99a1223b1602886b078bcf383197f4a1299d7ebffbbd74b67abcbac93f911a73170cd3ec112ec85e48b32
-EBUILD unifi-video-3.10.13-r3.ebuild 1965 BLAKE2B fc71df9184fea92ec66910f36815bcffffc4869d52eb112ff56806942dc442dedfd1097c5983f669f424ccbec9f0cf3bce44bd67c3f57ba41939fc6e1b7f7d2f SHA512 d174900c49e91eed75d41526d63f36c3a055087ec1b1b042a90ed63c2a7a3b7d651a0a755a9d73489da375db3bff9b95b13d33e7abde29463d42c73bc9a3d23a
-EBUILD unifi-video-3.10.13-r4.ebuild 1986 BLAKE2B 2126101402739eed0c4a90bc27974c958449ecc4d5fe89103405c3bfb2e5a57a3f17a5731d875657ad3cef27aa93de98b6c061ed3472188eee20f2f6127f78ac SHA512 0a1795e1db2122f33567d4dfed247dcc744e101f843c6d4a807bdf7ba6ecc7050330ddfb853d773e41b87f39551caf0da6615da1428a1074012bc0cd405ed38a
+EBUILD unifi-video-3.10.13-r5.ebuild 2167 BLAKE2B f3ac14d9ecad119aad672b07390e0d7783097c30036777efb73b31471fbea952a1b831e14fbf7eabece554868e0f9141159f7f3b7429e13921f7786f53902ae4 SHA512 1d50db8445ddb2fa51b7e3239fe361c8d072c73bdb342f1c548cf42bed1658f2c69ff105500951b565eff17afae39753b0c07be9708cde31590fe6f7232133da
MISC metadata.xml 245 BLAKE2B 4988fa1366a9b8a3769e503545339cdd493a0bdc362ca9237b158b94549de1f061477546b00fd3b21dc9325812423f7207071e22e3234d5c0b88c755197557d2 SHA512 e00be68ab9ad3acfce3d2d48721c47cf50e2c6358c9ceb45a2a23fc5303826ea26b9205ce4f230121c2e40c9c467367f2dc57863680899b21e8005034aa9118c
diff --git a/media-video/unifi-video/unifi-video-3.10.13-r2.ebuild b/media-video/unifi-video/unifi-video-3.10.13-r2.ebuild
deleted file mode 100644
index 683e20a1c53e..000000000000
--- a/media-video/unifi-video/unifi-video-3.10.13-r2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd
-
-MY_PV="${PV/_beta/-beta.}"
-DESCRIPTION="UniFi Video Server"
-HOMEPAGE="https://www.ubnt.com/download/unifi-video/"
-SRC_URI="https://dl.ubnt.com/firmwares/ufv/v${MY_PV}/unifi-video.Ubuntu18.04_amd64.v${MY_PV}.deb"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-RESTRICT="mirror"
-
-DEPEND="acct-group/unifi-video
- acct-user/unifi-video"
-RDEPEND="${DEPEND}
- dev-db/mongodb
- dev-java/commons-daemon
- sys-apps/lsb-release
- sys-apps/util-linux
- sys-libs/libcap
- virtual/jre:1.8"
-
-S=${WORKDIR}
-QA_PREBUILT="usr/lib*/${PN}/lib/*.so usr/lib*/${PN}/bin/*"
-
-src_unpack() {
- default
- unpack "${WORKDIR}"/data.tar.gz
-}
-
-src_prepare() {
- eapply "${FILESDIR}"/commons-daemon-move.patch
- sed -i usr/sbin/${PN} \
- -e '/require_root$/d' \
- -e '/update_limits$/d' \
- -e '/ulimit/d' \
- -e '/coredump_filter/d' || die
- default
-}
-
-src_install() {
- export CODEPATH=/usr/lib/${PN}
- export DATAPATH=/var/lib/${PN}
- LOGPATH=${DATAPATH}/logs
- VARLOGPATH=/var/log/${PN}
-
- insinto /usr/lib
- doins -r .${CODEPATH}
- into /usr
- dosbin usr/sbin/unifi-video
-
- dodir ${LOGPATH}
- fowners -R ${PN}:${PN} ${DATAPATH}
- dosym ${LOGPATH} ${VARLOGPATH}
- dosym ${LOGPATH} ${CODEPATH}/logs
-
- dosym ${DATAPATH} ${CODEPATH}/data
-
- fperms 500 ${CODEPATH}/bin/ubnt.avtool
- fperms 500 ${CODEPATH}/bin/evostreamms
- fperms 500 /usr/sbin/${PN}
- fowners -R ${PN}:${PN} ${CODEPATH}
- fperms -R 0400 ${CODEPATH}/lib/
- fperms 500 ${CODEPATH}/lib/
-
- echo "CONFIG_PROTECT=\"${DATAPATH}/system.properties\"" > "${T}"/99${PN}
- doenvd "${T}"/99${PN}
-
- dosym ../../../bin/mongod ${CODEPATH}/bin/mongod
-
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst() {
- if [[ ! -f ${DATAPATH}/system.properties ]]; then
- cp ${CODEPATH}/etc/system.properties ${DATAPATH}/system.properties
- echo uuid=$(uuidgen) >> ${DATAPATH}/system.properties
- fi
-}
diff --git a/media-video/unifi-video/unifi-video-3.10.13-r3.ebuild b/media-video/unifi-video/unifi-video-3.10.13-r3.ebuild
deleted file mode 100644
index a86ef7450ebd..000000000000
--- a/media-video/unifi-video/unifi-video-3.10.13-r3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd
-
-MY_PV="${PV/_beta/-beta.}"
-DESCRIPTION="UniFi Video Server"
-HOMEPAGE="https://www.ubnt.com/download/unifi-video/"
-SRC_URI="https://dl.ubnt.com/firmwares/ufv/v${MY_PV}/unifi-video.Ubuntu18.04_amd64.v${MY_PV}.deb"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-RESTRICT="mirror"
-
-DEPEND="acct-group/unifi-video
- acct-user/unifi-video"
-RDEPEND="${DEPEND}
- dev-db/mongodb
- dev-java/commons-daemon
- sys-apps/lsb-release
- sys-apps/util-linux
- sys-libs/libcap
- virtual/jre:1.8"
-
-S=${WORKDIR}
-QA_PREBUILT="usr/lib*/${PN}/lib/*.so usr/lib*/${PN}/bin/*"
-
-src_unpack() {
- default
- unpack "${WORKDIR}"/data.tar.gz
-}
-
-src_prepare() {
- eapply "${FILESDIR}"/commons-daemon-move.patch
- sed -i usr/sbin/${PN} \
- -e '/require_root$/d' \
- -e '/update_limits$/d' \
- -e '/ulimit/d' \
- -e '/coredump_filter/d' || die
- default
-}
-
-src_install() {
- export CODEPATH=/usr/lib/${PN}
- export DATAPATH=/var/lib/${PN}
- LOGPATH=${DATAPATH}/logs
- VARLOGPATH=/var/log/${PN}
-
- insinto /usr/lib
- doins -r .${CODEPATH}
- into /usr
- dosbin usr/sbin/unifi-video
-
- dodir ${LOGPATH}
- fowners -R ${PN}:${PN} ${DATAPATH}
- dosym ${LOGPATH} ${VARLOGPATH}
- dosym ${LOGPATH} ${CODEPATH}/logs
-
- dosym ${DATAPATH} ${CODEPATH}/data
-
- fperms 500 ${CODEPATH}/bin/ubnt.avtool
- fperms 500 ${CODEPATH}/bin/evostreamms
- fperms 500 /usr/sbin/${PN}
- fowners -R ${PN}:${PN} ${CODEPATH}
- fperms -R 0400 ${CODEPATH}/lib/
- fperms 500 ${CODEPATH}/lib/
-
- echo "CONFIG_PROTECT=\"${DATAPATH}/system.properties\"" > "${T}"/99${PN}
- doenvd "${T}"/99${PN}
-
- dosym ../../../bin/mongod ${CODEPATH}/bin/mongod
-
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst() {
- if [[ ! -f ${DATAPATH}/system.properties ]]; then
- cp ${CODEPATH}/etc/system.properties ${DATAPATH}/system.properties
- echo uuid=$(uuidgen) >> ${DATAPATH}/system.properties
- fi
-}
diff --git a/media-video/unifi-video/unifi-video-3.10.13-r4.ebuild b/media-video/unifi-video/unifi-video-3.10.13-r4.ebuild
deleted file mode 100644
index 0ca08a362e9c..000000000000
--- a/media-video/unifi-video/unifi-video-3.10.13-r4.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd
-
-MY_PV="${PV/_beta/-beta.}"
-DESCRIPTION="UniFi Video Server"
-HOMEPAGE="https://www.ubnt.com/download/unifi-video/"
-SRC_URI="https://dl.ubnt.com/firmwares/ufv/v${MY_PV}/unifi-video.Ubuntu18.04_amd64.v${MY_PV}.deb"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-RESTRICT="mirror"
-
-DEPEND="acct-group/unifi-video
- acct-user/unifi-video"
-RDEPEND="${DEPEND}
- dev-db/mongodb
- dev-java/commons-daemon
- sys-apps/lsb-release
- sys-apps/util-linux
- sys-libs/libcap
- virtual/jre:1.8"
-
-S=${WORKDIR}
-QA_PREBUILT="usr/lib*/${PN}/lib/*.so usr/lib*/${PN}/bin/*"
-
-src_unpack() {
- default
- unpack "${WORKDIR}"/data.tar.gz
-}
-
-src_prepare() {
- eapply "${FILESDIR}"/commons-daemon-move.patch
- sed -i usr/sbin/${PN} \
- -e '/require_root$/d' \
- -e '/update_limits$/d' \
- -e '/ulimit/d' \
- -e '/coredump_filter/d' || die
- default
-}
-
-src_install() {
- export CODEPATH=/usr/lib/${PN}
- export DATAPATH=/var/lib/${PN}
- LOGPATH=${DATAPATH}/logs
- VARLOGPATH=/var/log/${PN}
-
- insinto /usr/lib
- doins -r .${CODEPATH}
- into /usr
- dosbin usr/sbin/unifi-video
-
- keepdir ${LOGPATH}
- dodir ${DATAPATH}
- fowners -R ${PN}:${PN} ${DATAPATH}
- dosym ${LOGPATH} ${VARLOGPATH}
- dosym ${LOGPATH} ${CODEPATH}/logs
-
- dosym ${DATAPATH} ${CODEPATH}/data
-
- fperms 500 ${CODEPATH}/bin/ubnt.avtool
- fperms 500 ${CODEPATH}/bin/evostreamms
- fperms 500 /usr/sbin/${PN}
- fowners -R ${PN}:${PN} ${CODEPATH}
- fperms -R 0400 ${CODEPATH}/lib/
- fperms 500 ${CODEPATH}/lib/
-
- echo "CONFIG_PROTECT=\"${DATAPATH}/system.properties\"" > "${T}"/99${PN}
- doenvd "${T}"/99${PN}
-
- dosym ../../../bin/mongod ${CODEPATH}/bin/mongod
-
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst() {
- if [[ ! -f ${DATAPATH}/system.properties ]]; then
- cp ${CODEPATH}/etc/system.properties ${DATAPATH}/system.properties
- echo uuid=$(uuidgen) >> ${DATAPATH}/system.properties
- fi
-}
diff --git a/media-video/unifi-video/unifi-video-3.10.13-r5.ebuild b/media-video/unifi-video/unifi-video-3.10.13-r5.ebuild
new file mode 100644
index 000000000000..09f2a37096a3
--- /dev/null
+++ b/media-video/unifi-video/unifi-video-3.10.13-r5.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+MY_PV="${PV/_beta/-beta.}"
+DESCRIPTION="UniFi Video Server"
+HOMEPAGE="https://www.ubnt.com/download/unifi-video/"
+SRC_URI="https://dl.ubnt.com/firmwares/ufv/v${MY_PV}/unifi-video.Ubuntu18.04_amd64.v${MY_PV}.deb"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RESTRICT="mirror"
+
+DEPEND="acct-group/unifi-video
+ acct-user/unifi-video
+ app-arch/zip"
+RDEPEND="${DEPEND}
+ dev-db/mongodb
+ dev-java/commons-daemon
+ sys-apps/lsb-release
+ sys-apps/util-linux
+ sys-libs/libcap
+ virtual/jre:1.8"
+
+S=${WORKDIR}
+QA_PREBUILT="usr/lib*/${PN}/lib/*.so usr/lib*/${PN}/bin/*"
+
+src_unpack() {
+ default
+ unpack "${WORKDIR}"/data.tar.gz
+}
+
+src_prepare() {
+ eapply "${FILESDIR}"/commons-daemon-move.patch
+ sed -i usr/sbin/${PN} \
+ -e '/require_root$/d' \
+ -e '/update_limits$/d' \
+ -e '/ulimit/d' \
+ -e '/coredump_filter/d' || die
+ default
+ #delete problematic class in bundled log4j
+ zip -q -d \
+ usr/lib/unifi-video/lib/log4j-core-2.1.jar \
+ org/apache/logging/log4j/core/lookup/JndiLookup.class || die
+}
+
+src_install() {
+ export CODEPATH=/usr/lib/${PN}
+ export DATAPATH=/var/lib/${PN}
+ LOGPATH=${DATAPATH}/logs
+ VARLOGPATH=/var/log/${PN}
+
+ insinto /usr/lib
+ doins -r .${CODEPATH}
+ into /usr
+ dosbin usr/sbin/unifi-video
+
+ keepdir ${LOGPATH}
+ dodir ${DATAPATH}
+ fowners -R ${PN}:${PN} ${DATAPATH}
+ dosym ${LOGPATH} ${VARLOGPATH}
+ dosym ${LOGPATH} ${CODEPATH}/logs
+
+ dosym ${DATAPATH} ${CODEPATH}/data
+
+ fperms 500 ${CODEPATH}/bin/ubnt.avtool
+ fperms 500 ${CODEPATH}/bin/evostreamms
+ fperms 500 /usr/sbin/${PN}
+ fowners -R ${PN}:${PN} ${CODEPATH}
+ fperms -R 0400 ${CODEPATH}/lib/
+ fperms 500 ${CODEPATH}/lib/
+
+ echo "CONFIG_PROTECT=\"${DATAPATH}/system.properties\"" > "${T}"/99${PN}
+ doenvd "${T}"/99${PN}
+
+ dosym ../../../bin/mongod ${CODEPATH}/bin/mongod
+
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst() {
+ if [[ ! -f ${DATAPATH}/system.properties ]]; then
+ cp ${CODEPATH}/etc/system.properties ${DATAPATH}/system.properties
+ echo uuid=$(uuidgen) >> ${DATAPATH}/system.properties
+ fi
+}
diff --git a/media-video/vidify/Manifest b/media-video/vidify/Manifest
index 8b1ba7975e05..5adbc042437d 100644
--- a/media-video/vidify/Manifest
+++ b/media-video/vidify/Manifest
@@ -1,3 +1,5 @@
+AUX vidify-2.2.6-python310.patch 743 BLAKE2B 143ae6532398038da83cf08fc95f25338cabd35f02213336b3e7e54944c2a49b1fd831a7d8ded957305b2b2a292f5bcfc64fb290888029c4859ce8f002db9809 SHA512 63b24e30e1159455411cf1aeaa8c2d2d88db6fa7c08536fb8cf95401c2f23ad68d2d67efdc8fc92d9decb3e2541154fb083a44aba1ba15f526333ff46a3bdf8a
+AUX vidify-2.2.6-yt-dlp.patch 4669 BLAKE2B 04f1c80702a495f732e617c5a1ad51a70dcaed82e9650c4ab21844d2aadeb58893889c575ed141fd9e8b8e2353f24b234217b1b9fad83d1b1d2b9e5f87e90474 SHA512 4ff0ca2d2c9999dae5b90abdd9554f8808b30b263a74f099d21c1de001736d1040e53e2ab55607fe6b0807ac4fbffb81cf10935f1419055a9ac136188ef90d84
DIST vidify-2.2.6.tar.gz 2906511 BLAKE2B 3df48ca57e102f664852e2fc2abeb3d19427673e1fec5144a8c0afda112a0f3b281b18db43b4326244266d6e9dfbcb2443319ddad3f864098a61bd1e3c966307 SHA512 15487ee9dcbe647b2b287bd2eb3c09962b557320313a9a3885fb3c0d6af945909531111d5297c1a5fb5b451af5df6fd968b3953bbf79af113980ed368a5674b5
-EBUILD vidify-2.2.6.ebuild 2304 BLAKE2B 791c43c4bf1bdd168ceafcc26e3b7646f7a23b87ec5eb61447d81475fae292da5e31b720abd175a90379deed515b5195d36dcd08cb2cc0cef0959c2d656d1021 SHA512 d26e4992414d5dd366b60cc0a79a47e7d0ced8658bacd4e1f76dc122cc64a5fa9a04e459969183ce74d76da6c73dc92cd269a6c427bbb757bd0cd7bb96e4967a
+EBUILD vidify-2.2.6-r2.ebuild 2462 BLAKE2B 7579bb1bbcc9504468b147874a324ac3c366ca68c672b9b4f22173a85c80b0f98e73175ec7cdf2d31c6a21c1481ecd72a6e49738d7ec7f7bf0c3a77a772c025a SHA512 b934e7e5f27b22466fd117caad3ed51a85c16d33f814d93f803f494da4d7206c1e04d165087ce6add7bbf335de1a9a07c519bb3a04c413c911fa4ed8d995f746
MISC metadata.xml 792 BLAKE2B b06fd7f4c01b146b8dc6f45f4451ae592f59a7c917be4a315f4500e8a374670262614e500b7498d731e08ffd471b9da5983b22e79e538f67de914f4d43a7300e SHA512 5192430ceb4221ba5a97bd87d1c149d28dbf3613f3fff337b6fabb2b4452302ddd941765e20a3fc2975d74c5207fab728d59bbb7a80fb758ea74a0b391bea04e
diff --git a/media-video/vidify/files/vidify-2.2.6-python310.patch b/media-video/vidify/files/vidify-2.2.6-python310.patch
new file mode 100644
index 000000000000..4b78ea559333
--- /dev/null
+++ b/media-video/vidify/files/vidify-2.2.6-python310.patch
@@ -0,0 +1,16 @@
+diff --git a/vidify/player/vlc.py b/vidify/player/vlc.py
+index a7c9ec0..cb50f89 100644
+--- a/vidify/player/vlc.py
++++ b/vidify/player/vlc.py
+@@ -75,9 +75,9 @@ class VLCPlayer(PlayerBase):
+ def start_video(self, media: str, is_playing: bool = True) -> None:
+ logging.info("Starting new video")
+ if CURRENT_PLATFORM in (Platform.LINUX, Platform.BSD):
+- self._player.set_xwindow(self.winId())
++ self._player.set_xwindow(int(self.winId()))
+ elif CURRENT_PLATFORM == Platform.WINDOWS:
+- self._player.set_hwnd(self.winId())
++ self._player.set_hwnd(int(self.winId()))
+ elif CURRENT_PLATFORM == Platform.MACOS:
+ self._player.set_nsobject(int(self.winId()))
+
diff --git a/media-video/vidify/files/vidify-2.2.6-yt-dlp.patch b/media-video/vidify/files/vidify-2.2.6-yt-dlp.patch
new file mode 100644
index 000000000000..6ce0f836d5fd
--- /dev/null
+++ b/media-video/vidify/files/vidify-2.2.6-yt-dlp.patch
@@ -0,0 +1,122 @@
+diff --git a/README.md b/README.md
+index c4ea164..51e65e6 100644
+--- a/README.md
++++ b/README.md
+@@ -79,7 +79,7 @@ Audiosync is only available on Linux for now. It's strongly recommended to use M
+ * FFTW: `libfftw3` on Debian-based distros.
+ * ffmpeg: `ffmpeg` on most repositories. It must be available on your path.
+ * pulseaudio: `pulseaudio`, pre-installed on most repos.
+-* youtube-dl: this is installed by default with Vidify, but make sure it's available on your path.
++* yt-dlp: this is installed by default with Vidify, but make sure it's available on your path.
+
+ It's also available as [`vidify-audiosync`](https://aur.archlinux.org/packages/vidify-audiosync) on the AUR, and it comes pre-installed in the binaries.
+
+diff --git a/dev/build_requires.txt b/dev/build_requires.txt
+index ed682fd..a8bbc30 100644
+--- a/dev/build_requires.txt
++++ b/dev/build_requires.txt
+@@ -14,5 +14,5 @@ QtPy
+ SwSpotify>=1.1.1; platform_system == "Windows" or platform_system == "Darwin"
+ tekore < 2.0
+ vidify-audiosync == 0.2.*
+-youtube-dl
++yt-dlp
+ zeroconf
+diff --git a/dev/snapcraft.yaml b/dev/snapcraft.yaml
+index a5446de..00d2aae 100644
+--- a/dev/snapcraft.yaml
++++ b/dev/snapcraft.yaml
+@@ -22,7 +22,7 @@ parts:
+ - python3-pyqt5
+ - python3-appdirs
+ - python3-pydbus
+- - youtube-dl
++ - yt-dlp
+ # Mpv is used by default because it's lighter and works better
+ # with the audiosync feature.
+ - libmpv-dev
+diff --git a/setup.py b/setup.py
+index 3fdb656..9b1c093 100644
+--- a/setup.py
++++ b/setup.py
+@@ -19,7 +19,7 @@ install_deps = [
+ # Base package
+ 'QtPy',
+ 'lyricwikia',
+- 'youtube-dl',
++ 'yt-dlp',
+ 'appdirs',
+ 'qdarkstyle',
+ 'dataclasses; python_version<"3.7"',
+diff --git a/vidify/player/mpv.py b/vidify/player/mpv.py
+index 4b92571..68bd1a5 100644
+--- a/vidify/player/mpv.py
++++ b/vidify/player/mpv.py
+@@ -30,7 +30,7 @@ locale.setlocale(locale.LC_NUMERIC, 'C')
+
+ class MpvPlayer(PlayerBase):
+ # The audio is always muted, which is needed because not all the
+- # youtube-dl videos are silent. The keep-open flag stops mpv from closing
++ # yt-dlp videos are silent. The keep-open flag stops mpv from closing
+ # after the video is over.
+ DEFAULT_FLAGS = ['mute']
+ DEFAULT_ARGS = {
+diff --git a/vidify/player/vlc.py b/vidify/player/vlc.py
+index 6a0bec7..a7c9ec0 100644
+--- a/vidify/player/vlc.py
++++ b/vidify/player/vlc.py
+@@ -31,7 +31,7 @@ class VLCPlayer(PlayerBase):
+ else:
+ vlc_args += " --quiet"
+ # The audio is always muted, which is needed because not all the
+- # youtube-dl videos are silent.
++ # yt-dlp videos are silent.
+ # Needed for the audiosync feature: set the Group of Pictures size to
+ # one, so that seeking is more precise.
+ vlc_args += " --no-audio --sout-x264-min-keyint 1"
+diff --git a/vidify/youtube.py b/vidify/youtube.py
+index 1b23bfb..b959f34 100644
+--- a/vidify/youtube.py
++++ b/vidify/youtube.py
+@@ -1,5 +1,5 @@
+ """
+-This module uses youtube-dl to obtain the actual URL of a YouTube link.
++This module uses yt-dlp to obtain the actual URL of a YouTube link.
+ That way, the video can be played directly with a video player like VLC
+ or mpv.
+ """
+@@ -7,7 +7,7 @@ or mpv.
+ import logging
+ from typing import Optional
+
+-from youtube_dl import YoutubeDL
++from yt_dlp import YoutubeDL
+ from qtpy.QtCore import QObject, Signal
+
+
+@@ -63,7 +63,7 @@ class YouTubeDLWorker(QObject):
+
+ def get_url(self) -> None:
+ """
+- Getting the youtube direct link with youtube-dl, intended to be used
++ Getting the youtube direct link with yt-dlp, intended to be used
+ with a QThread. It's guaranteed that either a success signal or a
+ fail signal will be emitted.
+ """
+@@ -74,13 +74,13 @@ class YouTubeDLWorker(QObject):
+ except Exception as e:
+ # Any kind of error has to be caught, so that it doesn't only
+ # send the error signal when the download wasn't successful
+- # (a DownloadError from youtube_dl).
+- logging.info("YouTube-dl wasn't able to obtain the video: %s",
++ # (a DownloadError from yt_dlp).
++ logging.info("yt-dlp wasn't able to obtain the video: %s",
+ str(e))
+ self.fail.emit()
+ else:
+ if len(data['entries']) == 0:
+- logging.info("YouTube-dl returned no entries")
++ logging.info("yt-dlp returned no entries")
+ self.fail.emit()
+ else:
+ self.success.emit(data)
diff --git a/media-video/vidify/vidify-2.2.6-r2.ebuild b/media-video/vidify/vidify-2.2.6-r2.ebuild
new file mode 100644
index 000000000000..fe640744473d
--- /dev/null
+++ b/media-video/vidify/vidify-2.2.6-r2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit xdg distutils-r1 optfeature virtualx
+
+DESCRIPTION="Watch music videos in real time for the songs playing on your device"
+HOMEPAGE="https://vidify.org"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="dbus vlc mpv zeroconf"
+
+REQUIRED_USE="|| ( vlc mpv zeroconf )"
+
+RDEPEND="
+ dev-python/appdirs[${PYTHON_USEDEP}]
+ dev-python/QtPy[gui,webengine,${PYTHON_USEDEP}]
+ net-misc/lyricwikia[${PYTHON_USEDEP}]
+ net-misc/yt-dlp[${PYTHON_USEDEP}]
+ dbus? ( dev-python/pydbus[${PYTHON_USEDEP}] )
+ !dbus? ( dev-python/tekore[${PYTHON_USEDEP}] )
+ mpv? ( dev-python/python-mpv[${PYTHON_USEDEP}] )
+ vlc? ( dev-python/python-vlc[${PYTHON_USEDEP}] )
+ zeroconf? ( dev-python/zeroconf[${PYTHON_USEDEP}] )
+"
+
+# use yt-dlp instead of youtube-dl, otherwise download is too slow for playback
+PATCHES=(
+ "${FILESDIR}/${P}-yt-dlp.patch"
+ "${FILESDIR}/${P}-python310.patch"
+)
+
+distutils_enable_tests unittest
+
+python_prepare_all() {
+ # skip online test
+ rm tests/api/test_spotify_web.py || die
+ rm tests/player/test_external.py || die
+
+ # this needs dbus and a player running
+ rm tests/api/test_mpris.py || die
+
+ # can't parse non-existent config
+ rm tests/test_api_and_player_data.py || die
+
+ # do not hard depend on this
+ sed -i \
+ -e '/qdarkstyle/d' \
+ -e '/python-vlc/d' \
+ -e '/python-mpv/d' \
+ -e '/pydbus/d' \
+ -e '/tekore/d' \
+ -e '/zeroconf/d' \
+ -e '/If PySide2 is installed and PyQt5/,/PyQtWebEngine/d' \
+ setup.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ virtx "${EPYTHON}" -m unittest discover -v
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ elog "If video playback is not working please check 'vidify --debug' for missing-codec-errors"
+ elog "and recompile media-video/vlc or media-video/mpv with the missing codecs"
+
+ optfeature "using an MPRIS(D-Bus) audio player (e.g spotify)" dev-python/pydbus
+ optfeature "using the Spotify Web API as audio player" dev-python/tekore
+ optfeature "using an external network player" dev-python/zeroconf
+ optfeature "using media-video/mpv for video playback" dev-python/python-mpv
+ optfeature "using media-video/vlc for video playback" dev-python/python-vlc
+ optfeature "'vidify --dark-mode'" dev-python/qdarkstyle
+ optfeature "'vidify --audiosync'" media-video/vidify-audiosync
+}
diff --git a/media-video/vidify/vidify-2.2.6.ebuild b/media-video/vidify/vidify-2.2.6.ebuild
deleted file mode 100644
index 94b2caead30c..000000000000
--- a/media-video/vidify/vidify-2.2.6.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit xdg distutils-r1 optfeature virtualx
-
-DESCRIPTION="Watch music videos in real time for the songs playing on your device"
-HOMEPAGE="https://vidify.org"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="dbus vlc mpv zeroconf"
-
-REQUIRED_USE="|| ( vlc mpv zeroconf )"
-
-RDEPEND="
- dev-python/appdirs[${PYTHON_USEDEP}]
- dev-python/QtPy[gui,webengine,${PYTHON_USEDEP}]
- net-misc/lyricwikia[${PYTHON_USEDEP}]
- net-misc/youtube-dl[${PYTHON_USEDEP}]
- dbus? ( dev-python/pydbus[${PYTHON_USEDEP}] )
- !dbus? ( dev-python/tekore[${PYTHON_USEDEP}] )
- mpv? ( dev-python/python-mpv[${PYTHON_USEDEP}] )
- vlc? ( dev-python/python-vlc[${PYTHON_USEDEP}] )
- zeroconf? ( dev-python/zeroconf[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests unittest
-
-python_prepare_all() {
- # skip online test
- rm tests/api/test_spotify_web.py || die
- rm tests/player/test_external.py || die
-
- # this needs dbus and a player running
- rm tests/api/test_mpris.py || die
-
- # can't parse non-existent config
- rm tests/test_api_and_player_data.py || die
-
- # do not hard depend on this
- sed -i \
- -e '/qdarkstyle/d' \
- -e '/python-vlc/d' \
- -e '/python-mpv/d' \
- -e '/pydbus/d' \
- -e '/tekore/d' \
- -e '/zeroconf/d' \
- -e '/If PySide2 is installed and PyQt5/,/PyQtWebEngine/d' \
- setup.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- virtx "${EPYTHON}" -m unittest discover -v
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- elog "If video playback is not working please check 'vidify --debug' for missing-codec-errors"
- elog "and recompile media-video/vlc or media-video/mpv with the missing codecs"
-
- optfeature "using an MPRIS(D-Bus) audio player (e.g spotify)" dev-python/pydbus
- optfeature "using the Spotify Web API as audio player" dev-python/tekore
- optfeature "using an external network player" dev-python/zeroconf
- optfeature "using media-video/mpv for video playback" dev-python/python-mpv
- optfeature "using media-video/vlc for video playback" dev-python/python-vlc
- optfeature "'vidify --dark-mode'" dev-python/qdarkstyle
- optfeature "'vidify --audiosync'" media-video/vidify-audiosync
-}
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 6205353bbe58..f33ccc78913b 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -10,6 +10,6 @@ AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bc
AUX vlc-configure_lua_version.patch 2057 BLAKE2B 995291bab038c912b5d76982da803da34afd4ddce4e21f2aeff8ebe2be760857d169f904a0ce96658b6810e1030031f0a33d0c57f7bc514b1bbdc17e0d67157c SHA512 119f2fff52b334cb073c73979a6bec8710695c67e5ab3ff80d846ede52e922138ac77f8f3f9cccb6f750c74a00baf1529e27c683f0b93a6698436bdcdd930e99
DIST vlc-3.0.16.tar.xz 26439328 BLAKE2B 1971b88f3faf6d3b019c3fcb83108242bb218f1472dc3c1763a8eaa996befcb36a685a75beb8c2513e3365e77a9df6623d194ef511b5271e3114f2f46588e1ff SHA512 35cdf191071224d0cf1b5a83c00773ff87b9e5bfcf0f5523f7edd53f75b23eda6b27bb49ffa97d69a1d176b8fe4786d959aeeb00d4380beab71c9f7e6b7c7298
EBUILD vlc-3.0.16-r7.ebuild 13944 BLAKE2B 3d5bf8d410492da8614845eab3e1fb58756f5b01559f014856dab785df4f5877df92d16e776fc73e6fd3be8d44d10aa3dd4b76bbd8d32129ccecb36d768665a7 SHA512 c459f6b79d293ca0ca42c80331b0948044042eee77d97308b4540738332c26bbc9dd556f1d7dc08d20018bfa301eb25b5d281c985373c1a8ceff0788e368669e
-EBUILD vlc-3.0.9999.ebuild 13486 BLAKE2B 51ee12e042e6d656b4a5cb016397e70e1fcd5d9c13a37170dffc4100b127ded3817764d68591b7303695e697fd004f184c251c332908ecc0f68236dca6d5eb1f SHA512 f88809f93fde7e0190cc8fdca801446a212d2e15b83b7511be24a353ca8e45555f57a3218195d973f2b8b1ab6473f9b3313715f7d53cb8632e8b2bcc5a962cf0
-EBUILD vlc-9999.ebuild 13498 BLAKE2B 5c5dcc2579d2935b643298f17ad8ca7e21c9602fa17eac72f63324efb29ff25c39d6ce4a4509daccaf9a63b86da55e9aeeca4923802bcb21849d7d55aed1deae SHA512 dd8094cb589b74dfbfd5e802e0e8de52c9c724b4a5cde660615beccca3af9d490e645f85070e196f0dac46231cb2e1bcfc946640e96b30820e474489e8c92145
+EBUILD vlc-3.0.9999.ebuild 13436 BLAKE2B 3145ab87a47f4ac4b7a8f2616684636962b13a072201eb21281cc262c8b388768d6936f8f71a80aaf0cc9ae9f653d0a83e8edfce7fdfc518ba09ae08c75a8fc5 SHA512 8aa3d0e873c309b79ef6f9e9d740cc9f41df070ee214634d5a790a1fbd0acbe6b079d354ae4d577d1fd4fb6a93d8450c7d8c0142f26d5fa719823f22fd855d0d
+EBUILD vlc-9999.ebuild 13451 BLAKE2B 8bfa3beb2a237c07433a295a82c3c5b577860f1fc0fb7408e16ae0efe8047f1b852ef5e191cf11055a9998f5113a21d1c735d639e6c70c2c7968d9a0996fe0bd SHA512 5188090068e87a34380fd933c34da8a6b7d631c8a66cf5976695737e0239a39583606bfa6dfe7281245ea7bbd2817213cbd1e665a2552cdf9ce1f2d9cc1a8445
MISC metadata.xml 4912 BLAKE2B 97661f54c1c16cb3084e12ce7899c080e7e69b203c1539b90048cf3d7c1f673b29051fd68216b6bed54f8842990f0c47e2c67038d85e911dcd1c905b54093719 SHA512 c24db55603932f9b52808e0b9d5687a333078d1735c05e1b561d91c08b99246b321b5b60f8111b286041c524d5913ec6f4f321a79c0773cbb9aaaa3fea9a50d6
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index fb2127172d31..0f61491ae7b1 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -10,10 +10,9 @@ MY_PV="${MY_PV/-beta/-test}"
MY_P="${PN}-${MY_PV}"
if [[ ${PV} = *9999 ]] ; then
if [[ ${PV%.9999} != ${PV} ]] ; then
- EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git"
- else
- EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
+ EGIT_BRANCH="3.0.x"
fi
+ EGIT_REPO_URI="https://code.videolan.org/videolan/vlc.git"
inherit git-r3
else
if [[ ${MY_P} = ${P} ]] ; then
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 62677697baa2..29ca66497185 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -10,10 +10,9 @@ MY_PV="${MY_PV/-beta/-test}"
MY_P="${PN}-${MY_PV}"
if [[ ${PV} = *9999 ]] ; then
if [[ ${PV%.9999} != ${PV} ]] ; then
- EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git"
- else
- EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
+ EGIT_BRANCH="3.0.x"
fi
+ EGIT_REPO_URI="https://code.videolan.org/videolan/vlc.git"
inherit git-r3
else
if [[ ${MY_P} = ${P} ]] ; then
@@ -236,7 +235,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-configure_lua_version.patch
)
-DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
+DOCS=( AUTHORS THANKS NEWS README.md doc/fortunes.txt )
S="${WORKDIR}/${MY_P}"
diff --git a/media-video/wireplumber/Manifest b/media-video/wireplumber/Manifest
index ba91fb439e52..af11c789f197 100644
--- a/media-video/wireplumber/Manifest
+++ b/media-video/wireplumber/Manifest
@@ -2,8 +2,10 @@ AUX wireplumber-0.4.5-alsa-handle-the-release-requested-signal.patch 1009 BLAKE2
AUX wireplumber-0.4.5-lib-don-t-read-hidden-files-from-the-config-director.patch 742 BLAKE2B 480dfc48954a13323bc171e3b4672cedad27fdde05d8f28e263eddffd80c51ecdaa5046c30f57cd1a28a08270e59a38a3202fe496e4af84494d3b52614858880 SHA512 5400a2d4d1e61abe8d6c22c6540a83fafb25b6f4555156b66de9ad8350ce176faed00099c7a40b5286c82644ee09b5890da2521078f91e51d5a66fce7ed82a2a
AUX wireplumber-0.4.5-m-reserve-device-replace-the-hash-table-key-on-new-i.patch 1672 BLAKE2B a5d8911754670c9303e35d15df45ecdd5bb4b2d837dea2000ff5e102bfb789ea678ace39356579f0fc86273ec58a7c5cc6eea701c3b7a274d742cddfaa3575d3 SHA512 8605622ed43fef37e1ca49edaae4812618e5ad83904b682b2b903e9de92060fd9b4a0a025d5716cd16339b94ae67b1ee9622949fae73153df0bbc5b9b3c2ebd9
AUX wireplumber-0.4.5-policy-node-wait-for-nodes-when-we-become-unlinked.patch 1203 BLAKE2B 12e07a42d99187cba61d5428c235aba9207bd708e9346d53618b92c0ed06893e6295dbb49b9529e198f53c7ce4b573b897c349de8bb688273656de237ab3bca1 SHA512 4a5bb0a79c507945652a5600304fae1c9bf6fe028053a890c1633be2c82491ada487c9943ac29c6ed26f9e86a5d7f76140ec78bbaa394e41e1f082d50a7b56ef
+DIST wireplumber-0.4.5-endianness-fixes.patch.bz2 2341 BLAKE2B 225b164a4624128b50fe8691e3577de9aea35e85ed0527c605a617227d96ad49646b658da120d118ab45fd1ed82ed188ad1073b0a8954632ec6501535d533009 SHA512 d5b64612aad6d462ffbc78a24cf50ebde83b29e183a6d169976f5d8fdb0ec3c72984135ee75d52f7d7e8261716482ca277c49cf5824028bfaf33e596857de97f
DIST wireplumber-0.4.5.tar.gz 345035 BLAKE2B 177984901790228d8ddeb8ee2a548eb53db07c8077734590c3f964df36cfa47a4099e049ae9a19a136f4147c75b7122359a73b8387a641768f71484b9c4ab119 SHA512 b0d5962e7a83709cc3115fbf0a04b63660085aeea2ebda6d78d692065ccb193cea8b44bb506fa440cf0b88bfae71a4f69a192cd6cba885ebf3c9270bea50c67a
EBUILD wireplumber-0.4.5-r1.ebuild 2830 BLAKE2B c40cc607cf0ad9e563d6e539514ac1875828c54511202a1ac51e585c576db36d127475533a94f3bb40e028860fc237e4564049ef0d526139892f18155412b75b SHA512 a5278113619ee405d88897e55481e4b985f77793667a8e6d0279123a9fa3e170fa05bcdd0f4b0532187777b679eb66717ca6307c19e3143fecedfe4c2e5fe5f4
+EBUILD wireplumber-0.4.5-r2.ebuild 3056 BLAKE2B 2485dea8d7a93b14231de12023ed023483abe1135a9dfed26779d4e4b14b514c01d0aa8fed279156be9165c60a5907ce01bc621a4f188e572246cba96d1c3a5b SHA512 a10e4d07bf89f035d4b81d6f1162d5dc584a4981dbb106451f6c7d45fbe8b1f71311cbafc2cdaea2d953ede18bb1f7743911ad06d99dd5a1a3b8d5577c027817
EBUILD wireplumber-0.4.5.ebuild 2487 BLAKE2B f0e2ef02c38c1d37656d38fe42515f9a29b4d205f1d6cc77a89e015ed23ef944c1ffac03f1abd7e95bd7408b25b914cebdffb2a71afdcab9b9f3e4f0c2af90ff SHA512 bf2be2d1c6caae3d3e4a994fcb5ff913b539bbcec96b1fc3729cb8971b2eb83adecc50edd9ccf2f15f35dd94a1aeccc89a599fc0f08546ef4a7cadcc4620f367
-EBUILD wireplumber-9999.ebuild 2487 BLAKE2B f0e2ef02c38c1d37656d38fe42515f9a29b4d205f1d6cc77a89e015ed23ef944c1ffac03f1abd7e95bd7408b25b914cebdffb2a71afdcab9b9f3e4f0c2af90ff SHA512 bf2be2d1c6caae3d3e4a994fcb5ff913b539bbcec96b1fc3729cb8971b2eb83adecc50edd9ccf2f15f35dd94a1aeccc89a599fc0f08546ef4a7cadcc4620f367
+EBUILD wireplumber-9999.ebuild 2494 BLAKE2B 3d1f071adedb4279f81453bf6bf27038d961ccfd6da29c2360b634c733d4155e6bd3ae07f81e89a81c2e1323688819e191601a4c6108a1b54c9fd85256cc911b SHA512 2ce7749ed4d3c6c7e5ede85f1bab00c8152e432595d0802e38eb7ba040e716e0d46157998457fb64c7e15aecc96f003208daf73a6709e20317fbf157fc625297
MISC metadata.xml 673 BLAKE2B 71a411815b61a970653e39cf33ef56e04268805b98d5d5fbc405f4739b71adee9137e0198bf4ebaad208b4e878ab3087766ee223e1e18aaff90fac14d2c5dc23 SHA512 ba6121c54e9f6208b0b5c471790b005c51105d479a0dd2464563b7320530b3d8c176ff38bdb6c760d3f31a18fb993647244d944a222991110f14508ce63c4a96
diff --git a/media-video/wireplumber/wireplumber-0.4.5-r2.ebuild b/media-video/wireplumber/wireplumber-0.4.5-r2.ebuild
new file mode 100644
index 000000000000..8e8a9b7ebc8e
--- /dev/null
+++ b/media-video/wireplumber/wireplumber-0.4.5-r2.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+
+ # One commit is in git, the rest are in a PR which should be merged soon
+ # bug #817881
+ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-0.4.5-endianness-fixes.patch.bz2"
+ KEYWORDS="~amd64 ~arm ~arm64 ~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 systemd test"
+
+REQUIRED_USE="
+ ${LUA_REQUIRED_USE}
+ ?? ( elogind 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
+"
+
+DEPEND="
+ ${LUA_DEPS}
+ >=dev-libs/glib-2.62
+ >=media-video/pipewire-0.3.42:=
+ virtual/libc
+ 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}"
+
+DOCS=( {NEWS,README}.rst )
+
+PATCHES=(
+ "${FILESDIR}"/${P}-m-reserve-device-replace-the-hash-table-key-on-new-i.patch
+ "${FILESDIR}"/${P}-policy-node-wait-for-nodes-when-we-become-unlinked.patch
+ "${FILESDIR}"/${P}-lib-don-t-read-hidden-files-from-the-config-director.patch
+ "${FILESDIR}"/${P}-alsa-handle-the-release-requested-signal.patch
+ "${WORKDIR}"/${P}-endianness-fixes.patch
+)
+
+src_configure() {
+ local emesonargs=(
+ -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)
+ -Dsystemd-system-service=false # Matches upstream
+ $(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
+}
+
+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
+ ewarn
+}
diff --git a/media-video/wireplumber/wireplumber-9999.ebuild b/media-video/wireplumber/wireplumber-9999.ebuild
index 4773af0d6c42..ce558e3165e2 100644
--- a/media-video/wireplumber/wireplumber-9999.ebuild
+++ b/media-video/wireplumber/wireplumber-9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
LUA_COMPAT=( lua5-{3,4} )
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
fi
DESCRIPTION="Replacement for pipewire-media-session"
@@ -40,7 +40,7 @@ BDEPEND="
DEPEND="
${LUA_DEPS}
>=dev-libs/glib-2.62
- >=media-video/pipewire-0.3.39
+ >=media-video/pipewire-0.3.42:=
virtual/libc
elogind? ( sys-auth/elogind )
systemd? ( sys-apps/systemd )
diff --git a/media-video/yle-dl/Manifest b/media-video/yle-dl/Manifest
index 8a380465b71a..6ce301d0450c 100644
--- a/media-video/yle-dl/Manifest
+++ b/media-video/yle-dl/Manifest
@@ -1,5 +1,5 @@
DIST yle-dl-20210917.tar.gz 66746 BLAKE2B 91849a5d88615fc01f12ac19cd6c5bc3acf40548c5c024eff6141b6996d0b7b2c9363d1a2d2820cd61f99105fdd1bca835506ba199bf05d2a3b537dc88f41f10 SHA512 a26d4516f932561fe49da4a2c5e7dbc5eb65bcc4e5a7073f3636b70825c54fa9ba74feea55b3f6fcc538f4a300f99262eb4f26ba1e73efd56ff612a86971ac81
-DIST yle-dl-20211203.tar.gz 67057 BLAKE2B 79646d1251ae6e7d99d2b85d5a30d932ff1c8733d4403628561cb5261764349af7a284505b8c1afe2247730e4f1fc523e1d2e862a8df728a26c77102caf412fc SHA512 c407d185a5c703a6e840d1e9c375b492cb2154d568f35f9e33bba06aa79469c4a5c51ea52d6dd67f8757a171fc7344a476c3214339cf3387276a790a9ae574f0
+DIST yle-dl-20211213.tar.gz 67655 BLAKE2B 7283ecd6e3502dbceae9aeecee1dcea992c3ba8a9433360e7f1a10cb198b352ce0efd450fcd60a6aada6041c15132e6fd7819fa8975b669c7abc4f543cb65d45 SHA512 d696d5aab8c4a4612ee6dc5e80d81f875e52807ff1704a3c08e449f76d8cf57b89f96830aedd8862063d42d8a84276abbaf6ec6e389657e2ef25c350017d863f
EBUILD yle-dl-20210917.ebuild 1416 BLAKE2B 907d00143913da09ace5c35e88dccc76559677059eb3332b7f451fb8ee77a6096ee018bde13b8a2f25665b31916336fec467c7cad3ce39efd9408df824dd2770 SHA512 e069ac257aa7aa01e0e419a31ff8c3c12985e5ab1b422f9b6d3f6d0781c171e6f7ded419de8c64b766c1be534fe7fb465271bb35167d3c102bf732abc6818de8
-EBUILD yle-dl-20211203.ebuild 1434 BLAKE2B 555e801edf7a081ef526b32f17f00f96b54ced6a060abc959edcd0699769c2907c7cbb60333a5d72ac851f81b56560b8174d57374a4f016d7f3437f1d36b8ac5 SHA512 5956a60898bb0103e125681852aa0a72505027b6ea369c1fb0a9a92aa5db85dbc7d5a445751131b0c6fab5bede8d452ce59b3e6b24f1e199140d894747e3305f
+EBUILD yle-dl-20211213.ebuild 1434 BLAKE2B 555e801edf7a081ef526b32f17f00f96b54ced6a060abc959edcd0699769c2907c7cbb60333a5d72ac851f81b56560b8174d57374a4f016d7f3437f1d36b8ac5 SHA512 5956a60898bb0103e125681852aa0a72505027b6ea369c1fb0a9a92aa5db85dbc7d5a445751131b0c6fab5bede8d452ce59b3e6b24f1e199140d894747e3305f
MISC metadata.xml 280 BLAKE2B 30756c19f90277ebe700cf4641848ae376453c6031a019f348f04ee8d4c30146947ec383fa4bf12b669df790417eec9285df363210138e39f611d345d127ed27 SHA512 cf301b82fada2d4ca02e1dd9ba7b5234c42b7c63f87b96d81cb06ebc7853934533b75d0fc77eff0dc39f3c0a9e2d468b6bc03ac98fcb3834da67a11b254a0b77
diff --git a/media-video/yle-dl/yle-dl-20211203.ebuild b/media-video/yle-dl/yle-dl-20211203.ebuild
deleted file mode 100644
index afbe7baaaff1..000000000000
--- a/media-video/yle-dl/yle-dl-20211203.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Download media files from Yle Areena"
-HOMEPAGE="https://aajanki.github.io/yle-dl/ https://github.com/aajanki/yle-dl"
-SRC_URI="https://github.com/aajanki/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Requires an active internet connection during tests,
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND="media-video/ffmpeg
- net-misc/wget
- >=dev-python/attrs-18.1.0[${PYTHON_USEDEP}]
- >=dev-python/configargparse-0.13.0[${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/progress[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]"
-BDEPEND="test? (
- ${RDEPEND}
- media-video/ffmpeg[gnutls]
- dev-python/pip[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- dev-python/wheel[${PYTHON_USEDEP}]
- )"
-
-distutils_enable_tests setup.py
-
-DOCS=( COPYING ChangeLog README.fi README.md yledl.conf.sample )
-
-src_install() {
- docompress -x "/usr/share/doc/${PF}/yledl.conf.sample"
- distutils-r1_src_install
-}
-
-pkg_postinst() {
- elog "Sample configuration file has been installed to "
- elog " /usr/share/doc/yle-dl-${PVR}/yledl.conf.sample"
- elog
- optfeature "youtube-dl download engine" net-misc/youtube-dl net-misc/yt-dlp
-}
diff --git a/media-video/yle-dl/yle-dl-20211213.ebuild b/media-video/yle-dl/yle-dl-20211213.ebuild
new file mode 100644
index 000000000000..afbe7baaaff1
--- /dev/null
+++ b/media-video/yle-dl/yle-dl-20211213.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Download media files from Yle Areena"
+HOMEPAGE="https://aajanki.github.io/yle-dl/ https://github.com/aajanki/yle-dl"
+SRC_URI="https://github.com/aajanki/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Requires an active internet connection during tests,
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="media-video/ffmpeg
+ net-misc/wget
+ >=dev-python/attrs-18.1.0[${PYTHON_USEDEP}]
+ >=dev-python/configargparse-0.13.0[${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/progress[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]"
+BDEPEND="test? (
+ ${RDEPEND}
+ media-video/ffmpeg[gnutls]
+ dev-python/pip[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/wheel[${PYTHON_USEDEP}]
+ )"
+
+distutils_enable_tests setup.py
+
+DOCS=( COPYING ChangeLog README.fi README.md yledl.conf.sample )
+
+src_install() {
+ docompress -x "/usr/share/doc/${PF}/yledl.conf.sample"
+ distutils-r1_src_install
+}
+
+pkg_postinst() {
+ elog "Sample configuration file has been installed to "
+ elog " /usr/share/doc/yle-dl-${PVR}/yledl.conf.sample"
+ elog
+ optfeature "youtube-dl download engine" net-misc/youtube-dl net-misc/yt-dlp
+}
--
cgit v1.2.3