diff options
Diffstat (limited to 'media-video/libva-utils')
-rw-r--r-- | media-video/libva-utils/Manifest | 9 | ||||
-rw-r--r-- | media-video/libva-utils/files/libva-utils-2.15.0-fix-threads-option.patch | 29 | ||||
-rw-r--r-- | media-video/libva-utils/libva-utils-2.14.0.ebuild | 96 | ||||
-rw-r--r-- | media-video/libva-utils/libva-utils-2.17.1.ebuild (renamed from media-video/libva-utils/libva-utils-2.15.0.ebuild) | 24 | ||||
-rw-r--r-- | media-video/libva-utils/libva-utils-9999.ebuild | 18 |
5 files changed, 22 insertions, 154 deletions
diff --git a/media-video/libva-utils/Manifest b/media-video/libva-utils/Manifest index 0e587917c380..860297859f94 100644 --- a/media-video/libva-utils/Manifest +++ b/media-video/libva-utils/Manifest @@ -1,9 +1,6 @@ -AUX libva-utils-2.15.0-fix-threads-option.patch 816 BLAKE2B c035b29e21c3eb512768f751717188041e2fbb49570d92e661e9271f1fd746f6d3128d7292de8f80dbd88c4f4cc5e0386fe6173871ea37f138ca0423acf26729 SHA512 a9344fa68fce8f64764777c1f6df464d640fbb76751666dcf597e33f23b898744ee2a258c652068e0c5d821eb58f13585333d4e326a56d3d69e38f06dfabb97e -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 DIST libva-utils-2.16.0.tar.gz 1245723 BLAKE2B 3ce3b54f9b8d1e5960fdb7587da9dc4fa9754f3612155e86d99f2f120e31e0e69a40482d7a4571fefc0a8079ba987303cbb433203de9ef6e203e9419b6d91b91 SHA512 d5395c1de4b95f4d0a86621b0338852250a3893b732c6fd69d0622c989bff530461a183c151f322469b1ed7e4815173dbbcf36cc390db9ebbae6fb7d7a90cb9c -EBUILD libva-utils-2.14.0.ebuild 2012 BLAKE2B 6fb1e146a16a80d34b8ea0c8528953b3ae432a317385e54b860f2079711cf490f83a977f795d74629d78b9cd31ec751b17541258a2813c8addfb005c33a32abb SHA512 58d90d9c308385676d8776303ecd2032025f189f4b2f0de61d75126d0ca465306bdd979e0fc592cd62898eb412585659206d5b0717260e521060b02310c771c7 -EBUILD libva-utils-2.15.0.ebuild 1947 BLAKE2B f601ecb208b1ed24b57cb265e66300b1d6c8ffe6baecc232ace2e9f1591f78ef8d4a3d3fbcfc48ad828be89556a0e355ffad0be469a617ca3e5db844576cd1a0 SHA512 3125e505baa2ca44b084977fd3c01be7460b5ef93b13cf59ca872ef998af1927956390dd953684f975de14106218324155195a6509e87202084a3a87b6323a72 +DIST libva-utils-2.17.1.tar.gz 1276454 BLAKE2B bde2b784c6470721b113d5a4429ac0b02b922a6bf37d3554d4c088736d184cb8d8107b714e37d0ba517fd9a52ba43247cd4985604421b5e63af841b649786366 SHA512 db89f70c6efb34d0e390a443b29d706ac6339e157e6451a96aa50d4246ce08b8276608874f20d115a2576b8876c95a2e34abba8fe0a446f6736a807779517c6c EBUILD libva-utils-2.16.0.ebuild 1889 BLAKE2B c468daa3e5f410c07cfd156284e8aff90cb6c5ee783ca136602a85930133f00e9c6b6514266c111d0203cb4a8fcbe1804acc84442713f5a8c79887a9160d9759 SHA512 103a4bea8a212253a1ebfce46ebc01863fa6bf24c27a80e6a3d95c8b3a863ca6955e4b56c24d04d5f347c78c802bf336ce62c567b943f3b1dc0ad00bb043b13f -EBUILD libva-utils-9999.ebuild 1893 BLAKE2B 2922fd4d86e2f936b00f228662e18555404f5e888014966268326cf07935f02bc57c10534caa34dce14a65ecbde496c7da65bb5d244c326f7a21dac10fd50e75 SHA512 2c4cdc56233da136b0d4a96205ae26b3b43dc15472929b190142e838569005e3b9cec2cdd3dac378acf0510aa4fdbbc354b9846c48b90c3f4973681f8e67d696 +EBUILD libva-utils-2.17.1.ebuild 1891 BLAKE2B 56031d762b08d5f4808003eba8ca7b62d61ae266805007bead8b85f2379f6b72effc0590f7ceb2013b40a24f7324f50fe70dcc052e1a8a070fd9e97eb2f8edec SHA512 f1aaecbcdf93cd3c91be2fd5716ae63175ceb0144d0cb66cbcb8335ec12d6098f5d841f6893c58ccadeb5155771ddfa5be837741a3f23a49ef9a298f4320da0e +EBUILD libva-utils-9999.ebuild 1891 BLAKE2B 56031d762b08d5f4808003eba8ca7b62d61ae266805007bead8b85f2379f6b72effc0590f7ceb2013b40a24f7324f50fe70dcc052e1a8a070fd9e97eb2f8edec SHA512 f1aaecbcdf93cd3c91be2fd5716ae63175ceb0144d0cb66cbcb8335ec12d6098f5d841f6893c58ccadeb5155771ddfa5be837741a3f23a49ef9a298f4320da0e MISC metadata.xml 596 BLAKE2B 856d27918d6cd6c983271e4f762f7b1278bd90231d33181b5381dbc425523d637c65902526ed1b48a0df6aadf41d77bd249e886dbc485edf93f5394fa458cd13 SHA512 46e6d1ef1cc966aadb696293fb1b5f86d1f3fe5d0245ca01a2d9be6d1b35f29830cee41d4e04f0c8d557dd20eb41ae927dc60a854ce24862a2b2f7fc8faee766 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 deleted file mode 100644 index 4683dcbdd557..000000000000 --- a/media-video/libva-utils/files/libva-utils-2.15.0-fix-threads-option.patch +++ /dev/null @@ -1,29 +0,0 @@ -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.14.0.ebuild b/media-video/libva-utils/libva-utils-2.14.0.ebuild deleted file mode 100644 index 9127cfb38dd5..000000000000 --- a/media-video/libva-utils/libva-utils-2.14.0.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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 ) -" - -BDEPEND="virtual/pkgconfig" - -if [[ ${PV} = *9999 ]] ; then - DEPEND="~media-libs/libva-${PV}:=[drm(+),wayland?,X?]" -else - DEPEND=">=media-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}" - -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" - -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-2.15.0.ebuild b/media-video/libva-utils/libva-utils-2.17.1.ebuild index 908a4fa7da64..f2d6709a0a66 100644 --- a/media-video/libva-utils/libva-utils-2.15.0.ebuild +++ b/media-video/libva-utils/libva-utils-2.17.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,7 +12,7 @@ if [[ ${PV} = *9999 ]] ; then 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" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" fi LICENSE="MIT" @@ -31,17 +31,13 @@ DEPEND=" X? ( >=x11-libs/libX11-1.6.2 ) " if [[ ${PV} = *9999 ]] ; then - DEPEND+="~media-libs/libva-${PV}:=[drm(+),wayland?,X?]" + DEPEND+="~media-libs/libva-${PV}:=[wayland?,X?]" else - DEPEND+=">=media-libs/libva-$(ver_cut 1-2).0:=[drm(+),wayland?,X?]" + DEPEND+=">=media-libs/libva-$(ver_cut 1-2).0:=[wayland?,X?]" fi RDEPEND="${DEPEND}" BDEPEND="virtual/pkgconfig" -PATCHES=( - "${FILESDIR}"/${P}-fix-threads-option.patch -) - src_prepare() { default @@ -49,16 +45,16 @@ src_prepare() { 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" + -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") + sed_args+=(-e "/^ subdir('putsurface')$/d") fi if ! use vainfo ; then diff --git a/media-video/libva-utils/libva-utils-9999.ebuild b/media-video/libva-utils/libva-utils-9999.ebuild index 31994ffa0a15..f2d6709a0a66 100644 --- a/media-video/libva-utils/libva-utils-9999.ebuild +++ b/media-video/libva-utils/libva-utils-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -31,9 +31,9 @@ DEPEND=" X? ( >=x11-libs/libX11-1.6.2 ) " if [[ ${PV} = *9999 ]] ; then - DEPEND+="~media-libs/libva-${PV}:=[drm(+),wayland?,X?]" + DEPEND+="~media-libs/libva-${PV}:=[wayland?,X?]" else - DEPEND+=">=media-libs/libva-$(ver_cut 1-2).0:=[drm(+),wayland?,X?]" + DEPEND+=">=media-libs/libva-$(ver_cut 1-2).0:=[wayland?,X?]" fi RDEPEND="${DEPEND}" BDEPEND="virtual/pkgconfig" @@ -45,16 +45,16 @@ src_prepare() { 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" + -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") + sed_args+=(-e "/^ subdir('putsurface')$/d") fi if ! use vainfo ; then |