Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/libva-utils/
Date: Mon, 04 Jul 2022 02:41:16
Message-Id: 1656902429.b6e3751885a971b0bffa3af6e466b1ae69ae9153.mattst88@gentoo
1 commit: b6e3751885a971b0bffa3af6e466b1ae69ae9153
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jul 4 02:13:38 2022 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Mon Jul 4 02:40:29 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6e37518
7
8 media-video/libva-utils: Switch to EAPI=8
9
10 * Add missing dep on libdrm
11 * Drop unnecessary sed (now fixed upstream)
12 * Restructure dependencies
13
14 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
15
16 media-video/libva-utils/libva-utils-9999.ebuild | 23 +++++++++--------------
17 1 file changed, 9 insertions(+), 14 deletions(-)
18
19 diff --git a/media-video/libva-utils/libva-utils-9999.ebuild b/media-video/libva-utils/libva-utils-9999.ebuild
20 index 4decf846c639..428cc77cbc2d 100644
21 --- a/media-video/libva-utils/libva-utils-9999.ebuild
22 +++ b/media-video/libva-utils/libva-utils-9999.ebuild
23 @@ -1,7 +1,7 @@
24 # Copyright 1999-2022 Gentoo Authors
25 # Distributed under the terms of the GNU General Public License v2
26
27 -EAPI=7
28 +EAPI=8
29
30 inherit meson
31
32 @@ -25,29 +25,24 @@ REQUIRED_USE="
33 || ( examples putsurface test vainfo )
34 "
35
36 -BDEPEND="virtual/pkgconfig"
37 -
38 -if [[ ${PV} = *9999 ]] ; then
39 - DEPEND="~x11-libs/libva-${PV}:=[drm(+),wayland?,X?]"
40 -else
41 - DEPEND=">=x11-libs/libva-$(ver_cut 1-2).0:=[drm(+),wayland?,X?]"
42 -fi
43 -
44 -DEPEND+="
45 +DEPEND="
46 + x11-libs/libdrm
47 wayland? ( >=dev-libs/wayland-1.0.6 )
48 X? ( >=x11-libs/libX11-1.6.2 )
49 "
50 +if [[ ${PV} = *9999 ]] ; then
51 + DEPEND+="~x11-libs/libva-${PV}:=[drm(+),wayland?,X?]"
52 +else
53 + DEPEND+=">=x11-libs/libva-$(ver_cut 1-2).0:=[drm(+),wayland?,X?]"
54 +fi
55 RDEPEND="${DEPEND}"
56 +BDEPEND="virtual/pkgconfig"
57
58 src_prepare() {
59 default
60
61 local sed_args=()
62
63 - # Fix broken dependency check
64 - # https://github.com/intel/libva-utils/pull/260
65 - sed_args+=(-e "s/dependency('drm'/dependency('libdrm'/")
66 -
67 if ! use examples ; then
68 sed_args+=(
69 -e "/^subdir('decode')$/d"