From abaa75b10f899ada8dd05b23cc03205064394bc6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 22 Jan 2021 20:28:19 +0000 Subject: gentoo resync : 22.01.2021 --- media-video/libva-utils/Manifest | 8 +-- .../files/libva-utils-2.10.0_test_in_sandbox.patch | 17 ++++++ media-video/libva-utils/libva-utils-2.10.0.ebuild | 61 ++++++++++++++++++++++ .../libva-utils/libva-utils-2.9.1-r1.ebuild | 60 ++++++++------------- media-video/libva-utils/libva-utils-9999.ebuild | 60 ++++++++------------- 5 files changed, 129 insertions(+), 77 deletions(-) create mode 100644 media-video/libva-utils/files/libva-utils-2.10.0_test_in_sandbox.patch create mode 100644 media-video/libva-utils/libva-utils-2.10.0.ebuild (limited to 'media-video/libva-utils') diff --git a/media-video/libva-utils/Manifest b/media-video/libva-utils/Manifest index ce26b52f1b7e..ae7c02743a39 100644 --- a/media-video/libva-utils/Manifest +++ b/media-video/libva-utils/Manifest @@ -1,11 +1,13 @@ +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.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.9.1.tar.bz2 1037281 BLAKE2B 862b52ae8b1552e1150fadff9e45371e7065bf1c1fc9244a5ad0466a3109d56e9f3dd4d937f7474e6df2eaf806e93d520b1f2a986a0aa6bad7328f89d458706b SHA512 6573a2aa4844c10fd34fb5ed6edded33e15e65b7bd55d437da45a22dd5ef2116a3f137966433d986177705d544e6ea9a2a6582f49bb2eca6756970f341283d35 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.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.ebuild 1264 BLAKE2B 184c33bb8683bb8d86e9fdf8f12dfb33a4fd5ae1ed25a6fc1ca75835c8d791b1805abf20ef9096ffa69bc30d2d9e767d5b9f3f2f47ad1a58ffd50de9cc8789d4 SHA512 ccfccee30aba5857f484b6d8a308a3d895ba89cabac7d7d5b1240f7ed5b9b0d672efef4f02be591864dfa8ce9a530eed848831af971897685e1fc1ced57d3788 -EBUILD libva-utils-2.9.1-r1.ebuild 1538 BLAKE2B 9eadf3aa52ba47a3fb498827c6a0be47c254b46b47e4207695b11f371a4f86df9d8cdd134d60fae63ad47a806f5591589439a54d8832c37310cf8d07fe492619 SHA512 35aff9abeeb2f0b4c0acbaa94b7c46d1e1450948184a93e34701f00bf8a6b8325625409742b3ea4558cc65e3d2b54af26d30d3d74e22475efd51f6be844909bf +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 1538 BLAKE2B 9eadf3aa52ba47a3fb498827c6a0be47c254b46b47e4207695b11f371a4f86df9d8cdd134d60fae63ad47a806f5591589439a54d8832c37310cf8d07fe492619 SHA512 35aff9abeeb2f0b4c0acbaa94b7c46d1e1450948184a93e34701f00bf8a6b8325625409742b3ea4558cc65e3d2b54af26d30d3d74e22475efd51f6be844909bf +EBUILD libva-utils-9999.ebuild 1576 BLAKE2B 6479521cd60b67dcd56420a1f6c905f118e6f5513668bb6bfb0cd51971f0e0ed3558b2646580226a2379e53f45b893d8fa22010105572a3572985afb251d9953 SHA512 c46d4576732e21524a79fc712d3241891f0daac3bc52d9f1bbefcee73447886790842a09064f3027ba33bcf7879187f389ad15625a40c0c42127e79db075a125 MISC metadata.xml 414 BLAKE2B 38e8ac043ae6960cdc20190dd2f7f802b006c4d1f71920d1b699a8750a53c65ceeaa32f4d82f0699a5989f2f252daa1fbe5e2dfa330b9eb745a12cce8da045f8 SHA512 a515f432546c6063a66694fb5fbd310d498d2970cac15dea1c9497d086cb517557c15da0837f068bf28bd2e000345f95c68f4aa6170d65b960ba7e6d44e8ad57 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 new file mode 100644 index 000000000000..c35e5926796f --- /dev/null +++ b/media-video/libva-utils/files/libva-utils-2.10.0_test_in_sandbox.patch @@ -0,0 +1,17 @@ +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.10.0.ebuild b/media-video/libva-utils/libva-utils-2.10.0.ebuild new file mode 100644 index 000000000000..7803d68b4896 --- /dev/null +++ b/media-video/libva-utils/libva-utils-2.10.0.ebuild @@ -0,0 +1,61 @@ +# 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 test wayland X" +RESTRICT="!test? ( test )" + +REQUIRED_USE="|| ( drm wayland X )" + +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 + eautoreconf +} + +src_configure() { + local myeconfargs=( + $(use_enable drm) + $(use_enable test tests) + $(use_enable wayland) + $(use_enable X x11) + ) + econf "${myeconfargs[@]}" +} diff --git a/media-video/libva-utils/libva-utils-2.9.1-r1.ebuild b/media-video/libva-utils/libva-utils-2.9.1-r1.ebuild index 93c23cd9a5ca..7803d68b4896 100644 --- a/media-video/libva-utils/libva-utils-2.9.1-r1.ebuild +++ b/media-video/libva-utils/libva-utils-2.9.1-r1.ebuild @@ -3,29 +3,18 @@ EAPI=7 -if [[ ${PV} = *9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/intel/libva-utils" -fi - -if [[ ${PV} = 2.9.1 ]]; then - AUTOCONFIGURED="true" -else - AUTOCONFIGURED="false" -fi - -if ! ${AUTOCONFIGURED}; then - inherit autotools -fi +inherit autotools DESCRIPTION="Collection of utilities and tests for VA-API" HOMEPAGE="https://01.org/linuxmedia/vaapi" -if [[ ${PV} != *9999* ]] ; then - if ${AUTOCONFIGURED}; then - SRC_URI="https://github.com/intel/libva-utils/releases/download/${PV}/${P}.tar.bz2" - else - SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz" - fi +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 @@ -36,27 +25,29 @@ RESTRICT="!test? ( test )" REQUIRED_USE="|| ( drm wayland X )" -BDEPEND=" - virtual/pkgconfig -" -DEPEND=" - >=x11-libs/libva-2.9.0:=[drm?,wayland?,X?] +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}" -DOCS=( NEWS ) +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 ${AUTOCONFIGURED}; then - sed -e 's/-Werror//' -i test/Makefile.in || die - touch ./configure || die - else - eautoreconf - fi + eautoreconf } src_configure() { @@ -68,8 +59,3 @@ src_configure() { ) econf "${myeconfargs[@]}" } - -src_install() { - [[ ${PV} = *9999* ]] && DOCS+=( CONTRIBUTING.md README.md ) - default -} diff --git a/media-video/libva-utils/libva-utils-9999.ebuild b/media-video/libva-utils/libva-utils-9999.ebuild index 93c23cd9a5ca..7803d68b4896 100644 --- a/media-video/libva-utils/libva-utils-9999.ebuild +++ b/media-video/libva-utils/libva-utils-9999.ebuild @@ -3,29 +3,18 @@ EAPI=7 -if [[ ${PV} = *9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/intel/libva-utils" -fi - -if [[ ${PV} = 2.9.1 ]]; then - AUTOCONFIGURED="true" -else - AUTOCONFIGURED="false" -fi - -if ! ${AUTOCONFIGURED}; then - inherit autotools -fi +inherit autotools DESCRIPTION="Collection of utilities and tests for VA-API" HOMEPAGE="https://01.org/linuxmedia/vaapi" -if [[ ${PV} != *9999* ]] ; then - if ${AUTOCONFIGURED}; then - SRC_URI="https://github.com/intel/libva-utils/releases/download/${PV}/${P}.tar.bz2" - else - SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz" - fi +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 @@ -36,27 +25,29 @@ RESTRICT="!test? ( test )" REQUIRED_USE="|| ( drm wayland X )" -BDEPEND=" - virtual/pkgconfig -" -DEPEND=" - >=x11-libs/libva-2.9.0:=[drm?,wayland?,X?] +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}" -DOCS=( NEWS ) +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 ${AUTOCONFIGURED}; then - sed -e 's/-Werror//' -i test/Makefile.in || die - touch ./configure || die - else - eautoreconf - fi + eautoreconf } src_configure() { @@ -68,8 +59,3 @@ src_configure() { ) econf "${myeconfargs[@]}" } - -src_install() { - [[ ${PV} = *9999* ]] && DOCS+=( CONTRIBUTING.md README.md ) - default -} -- cgit v1.2.3