* [gentoo-commits] repo/gentoo:master commit in: media-video/libva-utils/files/, media-video/libva-utils/
@ 2021-01-14 20:11 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2021-01-14 20:11 UTC (permalink / raw
To: gentoo-commits
commit: 9af1c62279dfabf68fabfcbaa69594a3201dd6fa
Author: Karlson2k (Evgeny Grin) <k2k <AT> narod <DOT> ru>
AuthorDate: Wed Jan 13 08:00:11 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 14 20:11:34 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9af1c622
media-video/libva-utils: fixed test in portage sandbox in 2.10.0
There are only two tests out of >17000 tests that can be run in portage
sandbox. Let's use these two tests as this is better than do not test at
all.
Signed-off-by: Karlson2k (Evgeny Grin) <k2k <AT> narod.ru>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/libva-utils-2.10.0_test_in_sandbox.patch | 14 ++++++++++++++
media-video/libva-utils/libva-utils-2.10.0.ebuild | 2 ++
media-video/libva-utils/libva-utils-9999.ebuild | 2 ++
3 files changed, 18 insertions(+)
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 00000000000..14cf5304402
--- /dev/null
+++ b/media-video/libva-utils/files/libva-utils-2.10.0_test_in_sandbox.patch
@@ -0,0 +1,14 @@
+
+ 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.
+
+--- 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
index 71421dd2d08..7803d68b489 100644
--- a/media-video/libva-utils/libva-utils-2.10.0.ebuild
+++ b/media-video/libva-utils/libva-utils-2.10.0.ebuild
@@ -39,6 +39,8 @@ DEPEND+="
"
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 )
diff --git a/media-video/libva-utils/libva-utils-9999.ebuild b/media-video/libva-utils/libva-utils-9999.ebuild
index 71421dd2d08..7803d68b489 100644
--- a/media-video/libva-utils/libva-utils-9999.ebuild
+++ b/media-video/libva-utils/libva-utils-9999.ebuild
@@ -39,6 +39,8 @@ DEPEND+="
"
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 )
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/libva-utils/files/, media-video/libva-utils/
@ 2021-01-14 20:29 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2021-01-14 20:29 UTC (permalink / raw
To: gentoo-commits
commit: 494a49a76dd64eda29b162ca42d3d795d75453bd
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 14 20:28:38 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 14 20:28:38 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=494a49a7
media-video/libva-utils: add bug links to tests patch
Closes: https://bugs.gentoo.org/647746
Closes: https://bugs.gentoo.org/632180
Closes: https://bugs.gentoo.org/714126
Closes: https://bugs.gentoo.org/758620
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/libva-utils/Manifest | 2 +-
.../files/libva-utils-2.10.0_test_in_sandbox.patch | 11 +++++++----
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/media-video/libva-utils/Manifest b/media-video/libva-utils/Manifest
index abdad94026d..8e6d0783b5f 100644
--- a/media-video/libva-utils/Manifest
+++ b/media-video/libva-utils/Manifest
@@ -1,4 +1,4 @@
+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.gz 1198337 BLAKE2B 58f5a6a537c68eed74aec5dc8f1c4b5a0431062d1d9803d8ccb1e5c3b534edf4f91288009d5940a0ddab49beeadae92bf361bec0bee8a3214f04f3c6767b0992 SHA512 39d79d4eed1fc0890fbf89d5689d4f01f704d3c71b4986e0eaf4c4a2f836cc36338d0a01630092a31b740588426398d0381eae1dc0302b0df94859d9161d8378
-DIST libva-utils-2.10.0.tar.gz 1203536 BLAKE2B c7b51e07618204c55e992f57dd2d80b289d2edd7b4f526c3afaaec1081f5497ac86614e097bc14a1e79d380ca2c529359d02cee601502e292ca8f89073d5fdbb SHA512 2d44c5e3f52ff4ce8bfb206af95c4d790b6d31ec21f899f0ec9604391359f55de06c63b446e19cd8f0ea0c36ccb4ac7cc5ae7fe68361eb263c01454682d18402
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
index 14cf5304402..c35e5926796 100644
--- 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
@@ -1,8 +1,11 @@
+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.
- 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 = \
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/libva-utils/files/, media-video/libva-utils/
@ 2022-07-04 2:41 Matt Turner
0 siblings, 0 replies; 4+ messages in thread
From: Matt Turner @ 2022-07-04 2:41 UTC (permalink / raw
To: gentoo-commits
commit: 8520c69ede1dee39e72cc97e84b5a97370a2d197
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 4 02:23:43 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Jul 4 02:40:29 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8520c69e
media-video/libva-utils: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
media-video/libva-utils/Manifest | 1 -
.../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/metadata.xml | 2 -
4 files changed, 117 deletions(-)
diff --git a/media-video/libva-utils/Manifest b/media-video/libva-utils/Manifest
index a5f74d971097..e8905bbfec08 100644
--- a/media-video/libva-utils/Manifest
+++ b/media-video/libva-utils/Manifest
@@ -1,3 +1,2 @@
-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
DIST libva-utils-2.15.0.tar.gz 1245559 BLAKE2B 92fe1e7dbd3c953eecb351625213c2b537ad640f61534f3316d3a46070cb3818b4acafbc7a666e24b51d0900cea044074a7a6519f3c4aba6d2a38cf6ed0b2d66 SHA512 90cfa83fb7443fc90558c148c740c9c272796197fba49ff0179af94c40e97c830fc26c534e9a74fa58f597075f9ba68b477aabc784148c14dc09bde07f23cdeb
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/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 @@
<name>Alexis Ballier</name>
</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>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/libva-utils/files/, media-video/libva-utils/
@ 2022-08-31 19:33 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-08-31 19:33 UTC (permalink / raw
To: gentoo-commits
commit: 1ee936b10508ee7bf8454a0eb203fbf88daa6228
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 31 19:16:37 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 31 19:33:43 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ee936b1
media-video/libva-utils: fix build w/ USE=-examples
Closes: https://bugs.gentoo.org/835508
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../libva-utils-2.15.0-fix-threads-option.patch | 29 ++++++++++++++++++++++
media-video/libva-utils/libva-utils-2.15.0.ebuild | 4 +++
2 files changed, 33 insertions(+)
diff --git a/media-video/libva-utils/files/libva-utils-2.15.0-fix-threads-option.patch b/media-video/libva-utils/files/libva-utils-2.15.0-fix-threads-option.patch
new file mode 100644
index 000000000000..4683dcbdd557
--- /dev/null
+++ b/media-video/libva-utils/files/libva-utils-2.15.0-fix-threads-option.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/835508
+https://github.com/intel/libva-utils/pull/261
+
+From 83fb9c9bbda86f1bd224b20b082aff6e9f3d6ff6 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Fri, 18 Mar 2022 10:52:29 -0700
+Subject: [PATCH] meson: Search for threads in top-level meson.build
+
+In Gentoo we allow disabling the tools and putsuface separately, so
+moving the threads check out of the encode subdirectory helps.
+--- a/encode/meson.build
++++ b/encode/meson.build
+@@ -1,4 +1,3 @@
+-threads = dependency('threads')
+ m = c.find_library('m')
+
+
+--- a/meson.build
++++ b/meson.build
+@@ -10,6 +10,8 @@ project('libva-utils', 'c', 'cpp',
+
+ c = meson.get_compiler('c')
+
++threads = dependency('threads')
++
+ libva_dep = dependency('libva', version: '>= 1.1.0')
+
+ libva_utils_flags = [ '-Wno-unused-parameter',
+
diff --git a/media-video/libva-utils/libva-utils-2.15.0.ebuild b/media-video/libva-utils/libva-utils-2.15.0.ebuild
index 428cc77cbc2d..19188e469b1f 100644
--- a/media-video/libva-utils/libva-utils-2.15.0.ebuild
+++ b/media-video/libva-utils/libva-utils-2.15.0.ebuild
@@ -38,6 +38,10 @@ fi
RDEPEND="${DEPEND}"
BDEPEND="virtual/pkgconfig"
+PATCHES=(
+ "${FILESDIR}"/${P}-fix-threads-option.patch
+)
+
src_prepare() {
default
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-08-31 19:33 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-14 20:11 [gentoo-commits] repo/gentoo:master commit in: media-video/libva-utils/files/, media-video/libva-utils/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2021-01-14 20:29 Sam James
2022-07-04 2:41 Matt Turner
2022-08-31 19:33 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox