Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/libva-utils/files/, media-video/libva-utils/
Date: Wed, 31 Aug 2022 19:33:54
Message-Id: 1661974423.1ee936b10508ee7bf8454a0eb203fbf88daa6228.sam@gentoo
1 commit: 1ee936b10508ee7bf8454a0eb203fbf88daa6228
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 31 19:16:37 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 31 19:33:43 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ee936b1
7
8 media-video/libva-utils: fix build w/ USE=-examples
9
10 Closes: https://bugs.gentoo.org/835508
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 .../libva-utils-2.15.0-fix-threads-option.patch | 29 ++++++++++++++++++++++
14 media-video/libva-utils/libva-utils-2.15.0.ebuild | 4 +++
15 2 files changed, 33 insertions(+)
16
17 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
18 new file mode 100644
19 index 000000000000..4683dcbdd557
20 --- /dev/null
21 +++ b/media-video/libva-utils/files/libva-utils-2.15.0-fix-threads-option.patch
22 @@ -0,0 +1,29 @@
23 +https://bugs.gentoo.org/835508
24 +https://github.com/intel/libva-utils/pull/261
25 +
26 +From 83fb9c9bbda86f1bd224b20b082aff6e9f3d6ff6 Mon Sep 17 00:00:00 2001
27 +From: Matt Turner <mattst88@×××××.com>
28 +Date: Fri, 18 Mar 2022 10:52:29 -0700
29 +Subject: [PATCH] meson: Search for threads in top-level meson.build
30 +
31 +In Gentoo we allow disabling the tools and putsuface separately, so
32 +moving the threads check out of the encode subdirectory helps.
33 +--- a/encode/meson.build
34 ++++ b/encode/meson.build
35 +@@ -1,4 +1,3 @@
36 +-threads = dependency('threads')
37 + m = c.find_library('m')
38 +
39 +
40 +--- a/meson.build
41 ++++ b/meson.build
42 +@@ -10,6 +10,8 @@ project('libva-utils', 'c', 'cpp',
43 +
44 + c = meson.get_compiler('c')
45 +
46 ++threads = dependency('threads')
47 ++
48 + libva_dep = dependency('libva', version: '>= 1.1.0')
49 +
50 + libva_utils_flags = [ '-Wno-unused-parameter',
51 +
52
53 diff --git a/media-video/libva-utils/libva-utils-2.15.0.ebuild b/media-video/libva-utils/libva-utils-2.15.0.ebuild
54 index 428cc77cbc2d..19188e469b1f 100644
55 --- a/media-video/libva-utils/libva-utils-2.15.0.ebuild
56 +++ b/media-video/libva-utils/libva-utils-2.15.0.ebuild
57 @@ -38,6 +38,10 @@ fi
58 RDEPEND="${DEPEND}"
59 BDEPEND="virtual/pkgconfig"
60
61 +PATCHES=(
62 + "${FILESDIR}"/${P}-fix-threads-option.patch
63 +)
64 +
65 src_prepare() {
66 default