media-video/libva-utils: new version 2.11.1

Added new libva-utils version 2.11.1.
Added USE flags to control which tools are built and installed as most
people need only vainfo tool.

Signed-off-by: Karlson2k (Evgeny Grin) <k2k@narod.ru>
Closes: https://github.com/gentoo/gentoo/pull/20234
Signed-off-by: Sam James <sam@gentoo.org>

4 files changed, 127 insertions, 3 deletions

diff --git a/media-video/libva-utils/Manifest b/media-video/libva-utils/Manifest
index cfa659e52ebc..2962be949648 100644
--- a/media-video/libva-utils/Manifest
+++ b/media-video/libva-utils/Manifest
@@ -1,5 +1,6 @@
-DIST libva-utils-2.10.0.tar.gz 1203536 BLAKE2B c7b51e07618204c55e992f57dd2d80b289d2edd7b4f526c3afaaec1081f5497ac86614e097bc14a1e79d380ca2c529359d02cee601502e292ca8f89073d5fdbb SHA512 2d44c5e3f52ff4ce8bfb206af95c4d790b6d31ec21f899f0ec9604391359f55de06c63b446e19cd8f0ea0c36ccb4ac7cc5ae7fe68361eb263c01454682d18402
 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
+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
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..86b1d9f1d1b4
--- /dev/null
+++ b/media-video/libva-utils/libva-utils-2.11.1.ebuild
@@ -0,0 +1,90 @@
+# 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 avaialbe only in .tar.gz tarballs and in git
+DOCS=( NEWS CONTRIBUTING.md README.md )
+
+src_prepare() {
+	default
+	sed -e 's/-Werror//' -i test/Makefile.am || die
+
+	if ! use examples ; then
+		sed -E -e '/^SUBDIRS \+?=/s!( decode\>| encode\>| videoprocess\>| vendor/intel\>| vendor/intel/sfcsample\>)!!g' -i Makefile.am
+	fi
+	if ! use putsurface ; then
+		sed -E -e '/^SUBDIRS \+?=/s! putsurface\>!!g' -i Makefile.am
+	fi
+	if ! use vainfo ; then
+		sed -E -e '/^SUBDIRS \+?=/s! vainfo\>!!g' -i Makefile.am
+	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..86b1d9f1d1b4 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"
 
@@ -47,6 +51,17 @@ 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
+	fi
+	if ! use putsurface ; then
+		sed -E -e '/^SUBDIRS \+?=/s! putsurface\>!!g' -i Makefile.am
+	fi
+	if ! use vainfo ; then
+		sed -E -e '/^SUBDIRS \+?=/s! vainfo\>!!g' -i Makefile.am
+	fi
+
 	eautoreconf
 }
 
@@ -57,5 +72,19 @@ 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..8cf9edf4d0e2 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>