summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-08-31 20:16:37 +0100
committerSam James <sam@gentoo.org>2022-08-31 20:33:43 +0100
commit1ee936b10508ee7bf8454a0eb203fbf88daa6228 (patch)
tree7d98a6c8fd210538b52aa2840f713be30b0b56f7 /media-video/libva-utils
parentapp-emacs/elpy: bump to 1.35.0_p20220627 (diff)
downloadgentoo-1ee936b10508ee7bf8454a0eb203fbf88daa6228.tar.gz
gentoo-1ee936b10508ee7bf8454a0eb203fbf88daa6228.tar.bz2
gentoo-1ee936b10508ee7bf8454a0eb203fbf88daa6228.zip
media-video/libva-utils: fix build w/ USE=-examples
Closes: https://bugs.gentoo.org/835508 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-video/libva-utils')
-rw-r--r--media-video/libva-utils/files/libva-utils-2.15.0-fix-threads-option.patch29
-rw-r--r--media-video/libva-utils/libva-utils-2.15.0.ebuild4
2 files changed, 33 insertions, 0 deletions
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