From 2719f73b6813d11d13a9650cdd2ab8ec6e69385d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 9 Jul 2022 15:43:36 +0100 Subject: gentoo resync : 09.07.2022 --- media-video/libva-utils/Manifest | 9 +- .../files/libva-utils-2.10.0_test_in_sandbox.patch | 17 ---- media-video/libva-utils/libva-utils-2.13.0.ebuild | 97 ---------------------- media-video/libva-utils/libva-utils-2.15.0.ebuild | 91 ++++++++++++++++++++ media-video/libva-utils/libva-utils-9999.ebuild | 23 ++--- media-video/libva-utils/metadata.xml | 2 - 6 files changed, 104 insertions(+), 135 deletions(-) delete mode 100644 media-video/libva-utils/files/libva-utils-2.10.0_test_in_sandbox.patch delete mode 100644 media-video/libva-utils/libva-utils-2.13.0.ebuild create mode 100644 media-video/libva-utils/libva-utils-2.15.0.ebuild (limited to 'media-video/libva-utils') diff --git a/media-video/libva-utils/Manifest b/media-video/libva-utils/Manifest index b26c32897c88..421e556c36b3 100644 --- a/media-video/libva-utils/Manifest +++ b/media-video/libva-utils/Manifest @@ -1,7 +1,6 @@ -AUX libva-utils-2.10.0_test_in_sandbox.patch 526 BLAKE2B 8275555ee777b8e66852730a084911a44b74ebb3cfe378d5f60d2e1a95f3cf8185506788af2e8606a23bc233623a59eaa7554b68f16555ba35b941b1c59dae3a SHA512 980424fbbd5215da672819963fd5e36a7900955752f42632cf8258efef577f5a511e8a961e273141c4acf83f8c6bb5783561c256b730992a03bd9c914510209e -DIST libva-utils-2.13.0.tar.gz 1230036 BLAKE2B 4e70a13fb9b4362713b6f461a0ee199b8f7e9d9cbac7bc664c11870db92a87873d73306b5777c554830b932a15e726965e1db3591fd1349fb62f068617dd8558 SHA512 81c7c122a4d1bdf8d390a4ea3e0d34499158fb7b7fe0f7aa9d556158895e755139975fd01d73d883897c0a4390612d131b6349febbdf16fa5edcd46a6a82acd2 DIST libva-utils-2.14.0.tar.gz 1241072 BLAKE2B 17f1e0badb05e39f3979bde652dfe6832e8bfb2accd99fd6c5d972090cfce630e2a93ad96e5d17bc7bd9c393b12c2a7b066cb60a715c2dbb128dd263c480bcca SHA512 631e9becf5b2f6d083906962c004c9080d2e2b2d98b6003638a31dde8ad4e2549606301b97e88822471e29007232fc470a2116be09dc0c55d3cc2df6a45a7be1 -EBUILD libva-utils-2.13.0.ebuild 2365 BLAKE2B 9bf8572aabdbf1eecb5d7ee1d4fb66d1193d1082862e5a1e8839c819c57d2f79f242ecc8dfa83571a9e6e461c0d68b4d68763985797c79436bba78f8d064b4d2 SHA512 78e1c3582322968308b135f165296481881d0cc07d34d4defe2388c6a791283fc077c03e66dd68598c60e967b4648fe349fcf94a9c170dba5612be20e0e47e39 +DIST libva-utils-2.15.0.tar.gz 1245559 BLAKE2B 92fe1e7dbd3c953eecb351625213c2b537ad640f61534f3316d3a46070cb3818b4acafbc7a666e24b51d0900cea044074a7a6519f3c4aba6d2a38cf6ed0b2d66 SHA512 90cfa83fb7443fc90558c148c740c9c272796197fba49ff0179af94c40e97c830fc26c534e9a74fa58f597075f9ba68b477aabc784148c14dc09bde07f23cdeb EBUILD libva-utils-2.14.0.ebuild 2008 BLAKE2B a8aac0631df452323aa175609632443c38f76f7d0d1bdb9a818d170a384416ddb51b14d264a83944fa97aee452024f44a387f3992d9fcb5d1275f143e2bd8147 SHA512 52e8fe84be9f693b1297f220fc8498fe7cc6dff6a343a9b515fb99b256d0a2b5fa31f027ee9bcd4b6f3c67283f751dea233e0b971b58e6f0330cc95e2ecc5629 -EBUILD libva-utils-9999.ebuild 2012 BLAKE2B 92feda6a6485ba3ad93f2e29e9d555c93492455bb87c37296ada700311d29b95c45b6504f6ebcfe45cb721cf64a1acd92dd13f7f23386d2b517e4d5b0ce4a382 SHA512 1ec5d41926a58d4d57c7025abcf61c07fde1c211f6a897e314730de8a24eb51ec08458a50b43c86a5e59cc4df38510fa6fe9d691452f32ed9436e1db26414ec3 -MISC metadata.xml 761 BLAKE2B 5aaf0b0be9bf41a00d7df2bfd5975ea0f0e2b257e091b77752db8e29ed358a919fd9c9aaf6296f665a2d5f8864766893044064f8ccff9be7d66c41993d6bd454 SHA512 e5fdc3992abc81021b2ec939ea4ab11a997ae0374e3bc6ba87b49127a7478e023283614a9fc39ec9f33f5221469587196d932bf85da9f0a99f134673d6d5f006 +EBUILD libva-utils-2.15.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/files/libva-utils-2.10.0_test_in_sandbox.patch b/media-video/libva-utils/files/libva-utils-2.10.0_test_in_sandbox.patch deleted file mode 100644 index c35e5926796f..000000000000 --- a/media-video/libva-utils/files/libva-utils-2.10.0_test_in_sandbox.patch +++ /dev/null @@ -1,17 +0,0 @@ -There are only two test compatible with portage sandbox. -All other tests require access to install VA driver and -Intel video on the host machine. - -https://bugs.gentoo.org/647746 -https://bugs.gentoo.org/632180 -https://bugs.gentoo.org/714126 -https://bugs.gentoo.org/758620 ---- a/test/Makefile.am -+++ b/test/Makefile.am -@@ -91,4 +91,4 @@ test_va_api_CXXFLAGS = \ - $(NULL) - - check-local: test_va_api -- $(builddir)/test_va_api -+ $(builddir)/test_va_api '--gtest_filter=Internal.*:VAAPIInitTerminate.InitTermWithoutDisplay' - diff --git a/media-video/libva-utils/libva-utils-2.13.0.ebuild b/media-video/libva-utils/libva-utils-2.13.0.ebuild deleted file mode 100644 index 20c064a87332..000000000000 --- a/media-video/libva-utils/libva-utils-2.13.0.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# 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 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" -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 ) ) - putsurface? ( drm ) - || ( 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 || 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-2.15.0.ebuild b/media-video/libva-utils/libva-utils-2.15.0.ebuild new file mode 100644 index 000000000000..428cc77cbc2d --- /dev/null +++ b/media-video/libva-utils/libva-utils-2.15.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/libva-utils/libva-utils-9999.ebuild b/media-video/libva-utils/libva-utils-9999.ebuild index 4decf846c639..428cc77cbc2d 100644 --- a/media-video/libva-utils/libva-utils-9999.ebuild +++ b/media-video/libva-utils/libva-utils-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit meson @@ -25,29 +25,24 @@ REQUIRED_USE=" || ( examples putsurface test 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+=" +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=() - # Fix broken dependency check - # https://github.com/intel/libva-utils/pull/260 - sed_args+=(-e "s/dependency('drm'/dependency('libdrm'/") - if ! use examples ; then sed_args+=( -e "/^subdir('decode')$/d" diff --git a/media-video/libva-utils/metadata.xml b/media-video/libva-utils/metadata.xml index 1952a21fa412..16a009c1734f 100644 --- a/media-video/libva-utils/metadata.xml +++ b/media-video/libva-utils/metadata.xml @@ -6,10 +6,8 @@ Alexis Ballier - Enables VA/DRM API support. Build and install decode, encode, videoprocess and other VA-API examples. Build and install putsurface tool. - Install test_va_api tool for thorough testing of the installed VA-API. Build and install vainfo tool. -- cgit v1.2.3