gentoo resync : 28.04.2021

4 files changed, 140 insertions, 4 deletions

diff --git a/media-video/libva-utils/Manifest b/media-video/libva-utils/Manifest
index c5bac7e92058..48bdf5fa4055 100644
--- a/media-video/libva-utils/Manifest
+++ b/media-video/libva-utils/Manifest
@@ -1,15 +1,17 @@
 AUX libva-utils-2.10.0_test_in_sandbox.patch 526 BLAKE2B 8275555ee777b8e66852730a084911a44b74ebb3cfe378d5f60d2e1a95f3cf8185506788af2e8606a23bc233623a59eaa7554b68f16555ba35b941b1c59dae3a SHA512 980424fbbd5215da672819963fd5e36a7900955752f42632cf8258efef577f5a511e8a961e273141c4acf83f8c6bb5783561c256b730992a03bd9c914510209e
 DIST libva-utils-2.10.0.tar.gz 1203536 BLAKE2B c7b51e07618204c55e992f57dd2d80b289d2edd7b4f526c3afaaec1081f5497ac86614e097bc14a1e79d380ca2c529359d02cee601502e292ca8f89073d5fdbb SHA512 2d44c5e3f52ff4ce8bfb206af95c4d790b6d31ec21f899f0ec9604391359f55de06c63b446e19cd8f0ea0c36ccb4ac7cc5ae7fe68361eb263c01454682d18402
+DIST libva-utils-2.11.1.tar.gz 1205472 BLAKE2B 251a318d10eb5907e0ee54f101a153cfe76a98d61fc1f4fabf890901b52e980439d77acfbb4e1b566d361a7cda5c7ab504e575067eb932b0e121904be34b801f SHA512 d64c4767269a810386e02426fce3bde6aa693ac899ace22900e4ae4918dfe461736fe0a031db36751281d5bd78960354cdfa4ca13c5f7c30cc67d05abdd0bcd2
 DIST libva-utils-2.4.0.tar.bz2 1030271 BLAKE2B b57947f9bd63f34b27a403484ae6b66e750f854dd87c8448afb3d361581d83b20a5ffd8d7e22c9dbf5fae6f7ff3fd62d70cc248b29a862066ff10928629e4d11 SHA512 c5c674179ed589968fd296a7e33dd57a3476c237d8e15258938b364051d501e156c22b41b98fe59d6bc36805495a934dee602ec9e9bb5350c72aa65d3d300ff6
 DIST libva-utils-2.8.0.tar.bz2 1037112 BLAKE2B 9168d7d489e1574d970e9e3a270946de522a4063b80c4cafe38cc6917b99deb6394570592d3ed29a0ff7b92f819b9bbc9eb2a8f3b70077625a2714f70ee1959e SHA512 b3412349234ad2923953296674926ee7cb33c43ce17df8942f751789f0208064a4557ca16e1a5878a4e1b35e5bbbd415a9c9f182ffb24e589ac4757e990576b5
 DIST libva-utils-2.8.0.tar.gz 1198057 BLAKE2B 7c3332fcd2f4631cb2f77d0775e7f542b8ffbbb77aac0fb0629fb2474563320dbbefa546999fc7c991e8081e82a2c48b1406a34d2f075c80fca391088d779fcc SHA512 2102c5bc2b9b1caa99852892b2b7c1f5db7846283781cec84fe9683ac245ea366120096c1032a2c8b36a7c5fc8e4cd68e3939b0a2712a15f453c33560217585d
 DIST libva-utils-2.9.1.tar.gz 1198337 BLAKE2B 58f5a6a537c68eed74aec5dc8f1c4b5a0431062d1d9803d8ccb1e5c3b534edf4f91288009d5940a0ddab49beeadae92bf361bec0bee8a3214f04f3c6767b0992 SHA512 39d79d4eed1fc0890fbf89d5689d4f01f704d3c71b4986e0eaf4c4a2f836cc36338d0a01630092a31b740588426398d0381eae1dc0302b0df94859d9161d8378
 EBUILD libva-utils-2.10.0.ebuild 1576 BLAKE2B 6479521cd60b67dcd56420a1f6c905f118e6f5513668bb6bfb0cd51971f0e0ed3558b2646580226a2379e53f45b893d8fa22010105572a3572985afb251d9953 SHA512 c46d4576732e21524a79fc712d3241891f0daac3bc52d9f1bbefcee73447886790842a09064f3027ba33bcf7879187f389ad15625a40c0c42127e79db075a125
+EBUILD libva-utils-2.11.1.ebuild 2347 BLAKE2B 9acd1f4e00da2d1cadcaefea94551274118322e170fbd8fd60f3fc27346f460817906ae20b75883dfcfb9804cdd25cddc7677b82e7b55b3d25a3f9c23c6e1b52 SHA512 53fe221cfc639a8d657148cc5c3f2d90a0c6fdc522686afccc1d55682dcd7b50318fb9ee0d881117dd2c885349528e87fe7eb63595039519bfd9a3b72a33cb94
 EBUILD libva-utils-2.4.0.ebuild 1260 BLAKE2B 21e0954fabf17181f30f73ab9e04fff01fc1ee90aa37983e83a0937eba1e334154931d854b424072be433afacfeae9fc9abd449e335d5f1b5d0ab44262949d31 SHA512 5cf59b4ad3ab602a9a548b1ba7fdfd19096c92fc09c2d860d7e4277e10d070d80d0ce995b54d6d3140fa5837437c765b58f2b2b926d28b20a90277eaf36361cc
 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
 EBUILD libva-utils-2.8.0.ebuild 1264 BLAKE2B 184c33bb8683bb8d86e9fdf8f12dfb33a4fd5ae1ed25a6fc1ca75835c8d791b1805abf20ef9096ffa69bc30d2d9e767d5b9f3f2f47ad1a58ffd50de9cc8789d4 SHA512 ccfccee30aba5857f484b6d8a308a3d895ba89cabac7d7d5b1240f7ed5b9b0d672efef4f02be591864dfa8ce9a530eed848831af971897685e1fc1ced57d3788
 EBUILD libva-utils-2.9.1-r1.ebuild 1576 BLAKE2B 6479521cd60b67dcd56420a1f6c905f118e6f5513668bb6bfb0cd51971f0e0ed3558b2646580226a2379e53f45b893d8fa22010105572a3572985afb251d9953 SHA512 c46d4576732e21524a79fc712d3241891f0daac3bc52d9f1bbefcee73447886790842a09064f3027ba33bcf7879187f389ad15625a40c0c42127e79db075a125
 EBUILD libva-utils-2.9.1.ebuild 1269 BLAKE2B 7a67145af77dab26119aada7dc4ce3a341d605802c0e514693dd02de71848a1f0435f8591449af69dbe69554f6d28b700cd8e723e183eb2b39f2d10d7a07bb56 SHA512 0c3d37d06de6b2aa4f2156c3ea09c49a8f4066ea5e11003e077a405767abf299ac1fb37c585c8674f5c21dae94f3585842ccbb83baae4aed96e9db68b5874e1a
-EBUILD libva-utils-9999.ebuild 1576 BLAKE2B 6479521cd60b67dcd56420a1f6c905f118e6f5513668bb6bfb0cd51971f0e0ed3558b2646580226a2379e53f45b893d8fa22010105572a3572985afb251d9953 SHA512 c46d4576732e21524a79fc712d3241891f0daac3bc52d9f1bbefcee73447886790842a09064f3027ba33bcf7879187f389ad15625a40c0c42127e79db075a125
-MISC metadata.xml 414 BLAKE2B 172a3ddb5fec4b701f6f0fdf1c99ec916312151513e3505a6b37087204283040cffaced290a092f6ce71e8e499a134c882754b011a2dce2e9195f74d8b3eab4c SHA512 180a80f82f063806dac28be27bedc9d968ac74134e4c63a45a11b94db8cbd531971530844d1988f1fa1d4e389fa40bfdc8ce0c65109ae8f64accf9e5a607970a
+EBUILD libva-utils-9999.ebuild 2347 BLAKE2B 95b8b81383867046a9a236cc5902bcc7e26968d6071757a8ddf0d2386d256bc52737649298d59c1f18822f703d685427a1bc9729f28d191d7928cf6f85054031 SHA512 7d5be3598482b126269a22fcbb950c7f7d75d240cf75199048dd8230dd8cb012eb43677383f50b6296573351e7efe7d825e3d8c6c1a4a5e99a9f9d3a87d7504a
+MISC metadata.xml 760 BLAKE2B a25a8e5142620cd1cad39a334a278322319bae8965c2358a541cb70b52324a4eb5d49a525af36b00d7755643ac7f411f6b810153f9f88677b63ea8f3f5505684 SHA512 8a1ad7340171a8b2160f91c616b131f2ded08b9ed5c916c7482f45375aa9537eb0a0248839cf47169de2f851b01b7ea0171e37bc28350ae28e4b5537c9c67a81
diff --git a/media-video/libva-utils/libva-utils-2.11.1.ebuild b/media-video/libva-utils/libva-utils-2.11.1.ebuild
new file mode 100644
index 000000000000..2af7d4a1fc0c
--- /dev/null
+++ b/media-video/libva-utils/libva-utils-2.11.1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Collection of utilities and tests for VA-API"
+HOMEPAGE="https://01.org/linuxmedia/vaapi"
+if [[ ${PV} = *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/intel/libva-utils"
+else
+	# Tarball with pre-built 'configure' not always available, portage use tarballs
+	# without pre-built 'configure' as they are always avaialbe upstream.
+	# SRC_URI="https://github.com/intel/libva-utils/releases/download/${PV}/${P}.tar.bz2"
+	SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="+drm examples putsurface test test-va-api +vainfo wayland X"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	|| ( drm wayland X )
+	putsurface? ( || ( wayland X ) )
+	|| ( examples putsurface test-va-api vainfo )
+"
+
+BDEPEND="virtual/pkgconfig"
+
+if [[ ${PV} = *9999 ]] ; then
+	DEPEND="~x11-libs/libva-${PV}:=[drm?,wayland?,X?]"
+else
+	DEPEND=">=x11-libs/libva-$(ver_cut 1-2).0:=[drm?,wayland?,X?]"
+fi
+
+DEPEND+="
+	wayland? ( >=dev-libs/wayland-1.0.6 )
+	X? ( >=x11-libs/libX11-1.6.2 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-2.10.0_test_in_sandbox.patch" )
+
+# CONTRIBUTING.md and README.md are available only in .tar.gz tarballs and in git
+DOCS=( NEWS CONTRIBUTING.md README.md )
+
+src_prepare() {
+	default
+
+	sed -e 's/-Werror//' -i test/Makefile.am || die
+
+	if ! use examples ; then
+		sed -E -e '/^SUBDIRS \+?=/s!( decode\>| encode\>| videoprocess\>| vendor/intel\>| vendor/intel/sfcsample\>)!!g' -i Makefile.am || die
+	fi
+
+	if ! use putsurface ; then
+		sed -E -e '/^SUBDIRS \+?=/s! putsurface\>!!g' -i Makefile.am || die
+	fi
+
+	if ! use vainfo ; then
+		sed -E -e '/^SUBDIRS \+?=/s! vainfo\>!!g' -i Makefile.am || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable drm)
+		$(use_enable test tests)
+		$(use_enable wayland)
+		$(use_enable X x11)
+	)
+
+	if use test || use test-va-api ; then
+		myeconfargs+=( --enable-tests )
+	else
+		myeconfargs+=( --disable-tests )
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	if ! use test-va-api ; then
+		if [[ -e "${ED}"/usr/bin/test_va_api ]] ; then
+			rm -f "${ED}"/usr/bin/test_va_api || die
+		fi
+	fi
+}
diff --git a/media-video/libva-utils/libva-utils-9999.ebuild b/media-video/libva-utils/libva-utils-9999.ebuild
index 7803d68b4896..a363b5cb3856 100644
--- a/media-video/libva-utils/libva-utils-9999.ebuild
+++ b/media-video/libva-utils/libva-utils-9999.ebuild
@@ -20,10 +20,14 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="+drm test wayland X"
+IUSE="+drm examples putsurface test test-va-api +vainfo wayland X"
 RESTRICT="!test? ( test )"
 
-REQUIRED_USE="|| ( drm wayland X )"
+REQUIRED_USE="
+	|| ( drm wayland X )
+	putsurface? ( || ( wayland X ) )
+	|| ( examples putsurface test-va-api vainfo )
+"
 
 BDEPEND="virtual/pkgconfig"
 
@@ -46,7 +50,21 @@ DOCS=( NEWS CONTRIBUTING.md README.md )
 
 src_prepare() {
 	default
+
 	sed -e 's/-Werror//' -i test/Makefile.am || die
+
+	if ! use examples ; then
+		sed -E -e '/^SUBDIRS \+?=/s!( decode\>| encode\>| videoprocess\>| vendor/intel\>| vendor/intel/sfcsample\>)!!g' -i Makefile.am || die
+	fi
+
+	if ! use putsurface ; then
+		sed -E -e '/^SUBDIRS \+?=/s! putsurface\>!!g' -i Makefile.am || die
+	fi
+
+	if ! use vainfo ; then
+		sed -E -e '/^SUBDIRS \+?=/s! vainfo\>!!g' -i Makefile.am || die
+	fi
+
 	eautoreconf
 }
 
@@ -57,5 +75,22 @@ src_configure() {
 		$(use_enable wayland)
 		$(use_enable X x11)
 	)
+
+	if use test || use test-va-api ; then
+		myeconfargs+=( --enable-tests )
+	else
+		myeconfargs+=( --disable-tests )
+	fi
+
 	econf "${myeconfargs[@]}"
 }
+
+src_install() {
+	default
+
+	if ! use test-va-api ; then
+		if [[ -e "${ED}"/usr/bin/test_va_api ]] ; then
+			rm -f "${ED}"/usr/bin/test_va_api || die
+		fi
+	fi
+}
diff --git a/media-video/libva-utils/metadata.xml b/media-video/libva-utils/metadata.xml
index 8d6b2fa413db..b7e200e4ca0d 100644
--- a/media-video/libva-utils/metadata.xml
+++ b/media-video/libva-utils/metadata.xml
@@ -7,6 +7,10 @@
   </maintainer>
   <use>
     <flag name="drm">Enables VA/DRM API support.</flag>
+    <flag name="examples">Build and install decode, encode, videoprocess and other VA-API examples.</flag>
+    <flag name="putsurface">Build and install putsurface tool.</flag>
+    <flag name="test-va-api">Install test_va_api tool for thorough testing of the installed VA-API.</flag>
+    <flag name="vainfo">Build and install vainfo tool.</flag>
   </use>
   <upstream>
     <remote-id type="github">intel/libva-utils</remote-id>