gentoo auto-resync : 10:10:2022 - 07:33:31

6 files changed, 93 insertions, 139 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 21423b4c95f1..b15f11e82719 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/libva-utils/Manifest b/media-video/libva-utils/Manifest
index 9b95ae56f67c..61bbc36c009d 100644
--- a/media-video/libva-utils/Manifest
+++ b/media-video/libva-utils/Manifest
@@ -1,7 +1,9 @@
 AUX libva-utils-2.15.0-fix-threads-option.patch 816 BLAKE2B c035b29e21c3eb512768f751717188041e2fbb49570d92e661e9271f1fd746f6d3128d7292de8f80dbd88c4f4cc5e0386fe6173871ea37f138ca0423acf26729 SHA512 a9344fa68fce8f64764777c1f6df464d640fbb76751666dcf597e33f23b898744ee2a258c652068e0c5d821eb58f13585333d4e326a56d3d69e38f06dfabb97e
 DIST libva-utils-2.14.0.tar.gz 1241072 BLAKE2B 17f1e0badb05e39f3979bde652dfe6832e8bfb2accd99fd6c5d972090cfce630e2a93ad96e5d17bc7bd9c393b12c2a7b066cb60a715c2dbb128dd263c480bcca SHA512 631e9becf5b2f6d083906962c004c9080d2e2b2d98b6003638a31dde8ad4e2549606301b97e88822471e29007232fc470a2116be09dc0c55d3cc2df6a45a7be1
 DIST libva-utils-2.15.0.tar.gz 1245559 BLAKE2B 92fe1e7dbd3c953eecb351625213c2b537ad640f61534f3316d3a46070cb3818b4acafbc7a666e24b51d0900cea044074a7a6519f3c4aba6d2a38cf6ed0b2d66 SHA512 90cfa83fb7443fc90558c148c740c9c272796197fba49ff0179af94c40e97c830fc26c534e9a74fa58f597075f9ba68b477aabc784148c14dc09bde07f23cdeb
+DIST libva-utils-2.16.0.tar.gz 1245723 BLAKE2B 3ce3b54f9b8d1e5960fdb7587da9dc4fa9754f3612155e86d99f2f120e31e0e69a40482d7a4571fefc0a8079ba987303cbb433203de9ef6e203e9419b6d91b91 SHA512 d5395c1de4b95f4d0a86621b0338852250a3893b732c6fd69d0622c989bff530461a183c151f322469b1ed7e4815173dbbcf36cc390db9ebbae6fb7d7a90cb9c
 EBUILD libva-utils-2.14.0.ebuild 2008 BLAKE2B a8aac0631df452323aa175609632443c38f76f7d0d1bdb9a818d170a384416ddb51b14d264a83944fa97aee452024f44a387f3992d9fcb5d1275f143e2bd8147 SHA512 52e8fe84be9f693b1297f220fc8498fe7cc6dff6a343a9b515fb99b256d0a2b5fa31f027ee9bcd4b6f3c67283f751dea233e0b971b58e6f0330cc95e2ecc5629
 EBUILD libva-utils-2.15.0.ebuild 1944 BLAKE2B b8b4b69e555a83fe5373142bba9ca53d1999db0a5302b14fa59ba52200fc81dd82451769111e881b2fe7aa64ab937fb86923171dc961e9bdaaca8164e50af799 SHA512 6e93c40da4a4e88054dc50b56e1b90c7fac4b7da13bd43fc753a99afaaae952eb20ce131f517d6f243e74adfe5c6ab132f47917d0b5c465f1e8b29da80abdf25
+EBUILD libva-utils-2.16.0.ebuild 1889 BLAKE2B ad1ea2a23c7b442b24a0a60be02f19f67c0e36812d0583cfd3d4254ff91b5b4a6415ae79fcd96702312534dd147b8b6548778d9a1bd39c5c92f331fba5834302 SHA512 034c63820418b13c50e564f61135cc07ef82a4491e6208fdc32c1b9ca0eadc151c7c640a6748ab0ecac8f563f56f7dc672e2442748dae8c9a9dcd872533f2fec
 EBUILD libva-utils-9999.ebuild 1889 BLAKE2B ad1ea2a23c7b442b24a0a60be02f19f67c0e36812d0583cfd3d4254ff91b5b4a6415ae79fcd96702312534dd147b8b6548778d9a1bd39c5c92f331fba5834302 SHA512 034c63820418b13c50e564f61135cc07ef82a4491e6208fdc32c1b9ca0eadc151c7c640a6748ab0ecac8f563f56f7dc672e2442748dae8c9a9dcd872533f2fec
 MISC metadata.xml 598 BLAKE2B 22e12ade6d6847d659971976ffb272dea97d6a8579cf6b39720a0a4eca5336644dbcf7276892f707e9e4e454f9bc523ff5fe6cab2f2e4602c3f09af3d52168cb SHA512 e6f11bd15f5f666fc22a87070e388f5e9244f15c4ef244ae225f7082da39ebd7a48d2539ca6eb0c2c08ff71e1f7613a72d40e0ff9d2919012a68411166d86765
diff --git a/media-video/libva-utils/libva-utils-2.16.0.ebuild b/media-video/libva-utils/libva-utils-2.16.0.ebuild
new file mode 100644
index 000000000000..428cc77cbc2d
--- /dev/null
+++ b/media-video/libva-utils/libva-utils-2.16.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="Collection of utilities and tests for VA-API"
+HOMEPAGE="https://01.org/linuxmedia/vaapi"
+if [[ ${PV} = *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/intel/libva-utils"
+else
+	SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="examples putsurface test +vainfo wayland X"
+RESTRICT="test" # Tests must be run manually
+
+REQUIRED_USE="
+	putsurface? ( || ( wayland X ) )
+	|| ( examples putsurface test vainfo )
+"
+
+DEPEND="
+	x11-libs/libdrm
+	wayland? ( >=dev-libs/wayland-1.0.6 )
+	X? ( >=x11-libs/libX11-1.6.2 )
+"
+if [[ ${PV} = *9999 ]] ; then
+	DEPEND+="~x11-libs/libva-${PV}:=[drm(+),wayland?,X?]"
+else
+	DEPEND+=">=x11-libs/libva-$(ver_cut 1-2).0:=[drm(+),wayland?,X?]"
+fi
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	local sed_args=()
+
+	if ! use examples ; then
+		sed_args+=(
+			-e "/^subdir('decode')$/d"
+			-e "/^subdir('encode')$/d"
+			-e "/^subdir('videoprocess')$/d"
+			-e "/^subdir('vendor\/intel')$/d"
+			-e "/^subdir('vendor\/intel\/sfcsample')$/d"
+		)
+	fi
+
+	if ! use putsurface ; then
+		sed_args+=(-e "/^subdir('putsurface')$/d")
+	fi
+
+	if ! use vainfo ; then
+		sed_args+=(-e "/^subdir('vainfo')$/d")
+	fi
+
+	if [[ ${#sed_args[@]} -gt 0 ]] ; then
+		sed "${sed_args[@]}" -i meson.build || die
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddrm=true
+		$(meson_use X x11)
+		$(meson_use wayland)
+		$(meson_use test tests)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if ! use test ; then
+		rm -f "${ED}"/usr/bin/test_va_api || die
+	fi
+}
+
+pkg_postinst() {
+	if use test ; then
+		elog "Tests must be run manually with the test_va_api binary"
+	fi
+}
diff --git a/media-video/pitivi/Manifest b/media-video/pitivi/Manifest
index fe170e361aa6..0a8a7601f3da 100644
--- a/media-video/pitivi/Manifest
+++ b/media-video/pitivi/Manifest
@@ -1,7 +1,4 @@
-AUX pitivi-2021.05-meson-compatibility.patch 1452 BLAKE2B 453356f66c217b0ae527219819a5ca3ff4a7da60664e21f2fda211c846c3efd9139d8564d93eb907e72e56f2b4f497135c7f7f5d0728a2380844d5b5de040db5 SHA512 394ad3c1317598d7bb020176e1572598f310eb5fa2e37e274fd572a9c8a3338c52accd1a66be8e9322032a1c677481a219bb25da223f348d2469320bde80a2fd
 AUX pitivi-2021.05-python-collections.patch 406 BLAKE2B e3c70bb271d95ac5b6bd6f0fb8738b24e8db544140e565173aa71c652ee1c25f8e50f77ef822c3843e4609d531e5f9b25ce299cf82f59db975121a44c1ad0e58 SHA512 20c6c6df1d86a3e5e126b5f3d851fa56651a18a86313c358eef63a423d70e501b28abfc767e7fca8d01e0cd2106d346e2dcdbf8075f60596ac6ada8059e2f5e8
-DIST pitivi-2021.05.tar.xz 11303884 BLAKE2B f87f16cc1ab7ea0f97bc92cdd9f1d5993051ed67b26473748aeb327a4cb51bb32510c845e1665ec3eb3b67c3f0f113c05a514076bad4e13d0fadbd725bcb6bb6 SHA512 3ecb571d501b634ca3a369d4020954cc0b2bc101ceb12bee74d6b38c9ca8f2bf15fe94030421c43503870128d8218548feca7d32cf25b4afcf610365784ca9bb
 DIST pitivi-2022.06.tar.xz 11352412 BLAKE2B f7d14f9bff136a8b50c0ce82e66fad92ba7df429d8cf588c526ae04f673617d882a0cc024c5a21c97471d2b31cb0001cefdeb8e32c9f62e1c6600d9500d1e428 SHA512 649c8e61d9545cbf35a0a0c8f648490c14c8bfb6c6637794887c03bffd6998c63cb2cc22102cd2f7a59974f79488a13f29beceadab29ddd1c1c01abff33a85fa
-EBUILD pitivi-2021.05-r1.ebuild 2209 BLAKE2B 7696097b20863ebdfb15d33cc7f52ea73e8320ba4163e1da5c746eef684e737a26e158c3450ac372f4b27a2abb3984676d040cff479634a82bb38db5d210344c SHA512 05a8643450c5ca897c627b782bdf3d3d3de466d80ee00335a033eb79d07640b53776f8e27733d96d9a109c79b412c6b2cb1e5e59d53bc2ceffedcd24e7f2626d
 EBUILD pitivi-2022.06.ebuild 2014 BLAKE2B ee9b5fb21c0a6ee376eaf95782d5ee1917b8286eed504bf5a85ab88da0a02baf5d9ede57ba65095ef15e5bab43561fae9b6a9c68e3da1c12ad668873c404353d SHA512 16c582d40a36a46b4a608b64ec8e7ada63c66f5eabaf36ea2d0fdee086d99592a771294fc37c45a906e5a2a129ffd40c22a5c34afd7dc4e5b002abf01a013d86
 MISC metadata.xml 380 BLAKE2B 3ba78024c7a1f5dd825bdb63ea42c4a4c6fef74a881f5acbfb6d707c27f9e0bddab88470f03cb663f564e26a3343e8a849d9f000ba7cf3e1df437ba5ae66086a SHA512 2c728bee57e023b734c64c65824c25ab02744bf49b33f91bc231a5a2ea47f821e5951f628fd558de55e0cad0cc6b95faecb924e226c581008ee342b4e58d6459
diff --git a/media-video/pitivi/files/pitivi-2021.05-meson-compatibility.patch b/media-video/pitivi/files/pitivi-2021.05-meson-compatibility.patch
deleted file mode 100644
index 990f84b06795..000000000000
--- a/media-video/pitivi/files/pitivi-2021.05-meson-compatibility.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From ddf2369d1fc6fddd63f676cc905a8b8e96291a4c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
-Date: Tue, 25 Jan 2022 15:37:34 +0200
-Subject: [PATCH] Fix compatibility with meson 0.61
-
-Previously positional arguments to i18n.merge_files() were just ignored
-but this became an error.
----
- data/meson.build | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index 2ea82cf12..60d23169b 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -6,7 +6,7 @@ install_subdir('audiopresets', install_dir: pkgdatadir)
- install_subdir('videopresets', install_dir: pkgdatadir)
- install_subdir('gstpresets', install_dir: pkgdatadir)
- 
--desktop_file = i18n.merge_file('org.pitivi.Pitivi.desktop',
-+desktop_file = i18n.merge_file(
-     type: 'desktop',
-     output : 'org.pitivi.Pitivi.desktop',
-     input : 'org.pitivi.Pitivi.desktop.in',
-@@ -25,7 +25,7 @@ if desktop_file_validate.found()
-   )
- endif
- 
--appdata_file = i18n.merge_file('org.pitivi.Pitivi.appdata.xml',
-+appdata_file = i18n.merge_file(
-     type: 'xml',
-     output : 'org.pitivi.Pitivi.appdata.xml',
-     input : 'org.pitivi.Pitivi.appdata.xml.in',
-@@ -43,7 +43,7 @@ if appstream_util.found()
-   )
- endif
- 
--i18n.merge_file('org.pitivi.Pitivi-mime.xml',
-+i18n.merge_file(
-     output : 'org.pitivi.Pitivi-mime.xml',
-     input : 'org.pitivi.Pitivi-mime.xml.in',
-     po_dir: podir,
--- 
-GitLab
-
diff --git a/media-video/pitivi/pitivi-2021.05-r1.ebuild b/media-video/pitivi/pitivi-2021.05-r1.ebuild
deleted file mode 100644
index 92d0aad1b722..000000000000
--- a/media-video/pitivi/pitivi-2021.05-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite"
-
-inherit gnome.org meson python-single-r1 xdg
-
-DESCRIPTION="A non-linear video editor using the GStreamer multimedia framework"
-HOMEPAGE="https://www.pitivi.org"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Do not forget to check pitivi/check.py for dependencies!!!
-# gsound, libav, libnotify and v4l are optional
-GST_VER="1.18.4"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		>=dev-python/pycairo-1.10[${PYTHON_USEDEP}]
-	')
-	>=x11-libs/cairo-1.10
-
-	>=media-libs/gstreamer-${GST_VER}:1.0[introspection]
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-libs/glib-2.30.0:2
-
-	>=dev-libs/gobject-introspection-1.34:=
-
-	dev-libs/libpeas[${PYTHON_SINGLE_USEDEP}]
-
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		>=dev-python/gst-python-1.4:1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		>=dev-python/pygobject-3.8:3[${PYTHON_USEDEP}]
-	')
-
-	gnome-base/librsvg:=
-
-	>=media-libs/gstreamer-editing-services-${GST_VER}:1.0[introspection]
-	>=media-libs/gst-plugins-base-${GST_VER}:1.0[introspection,theora]
-	>=media-libs/gst-plugins-bad-${GST_VER}:1.0
-	>=media-plugins/gst-plugins-gtk-${GST_VER}:1.0
-	>=media-libs/gst-plugins-good-${GST_VER}:1.0
-	>=media-plugins/gst-plugins-libav-${GST_VER}:1.0
-	>=media-plugins/gst-plugins-gdkpixbuf-${GST_VER}:1.0
-
-	>=x11-libs/libnotify-0.7[introspection]
-	x11-libs/libwnck:3[introspection]
-	>=x11-libs/gtk+-3.20.0:3[introspection]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-text/yelp-tools
-	$(python_gen_cond_dep '
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	')
-	>=dev-util/intltool-0.35.5
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# https://gitlab.gnome.org/GNOME/pitivi/-/commit/ddf2369d1fc6fddd63f676cc905a8b8e96291a4c
-	"${FILESDIR}"/${P}-meson-compatibility.patch
-	"${FILESDIR}"/${P}-python-collections.patch
-)
-
-src_configure() {
-	meson_src_configure
-}
-
-src_compile() {
-	meson_src_compile
-}
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${D}"
-}