summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2021-08-04 21:53:42 +0100
committerSam James <sam@gentoo.org>2021-08-04 21:54:15 +0100
commit7f967315cf184fd09f6691e4381c92535efa819d (patch)
tree7d60d11d9837da2630fd2ad41e4931d924821c33 /media-libs
parentdev-perl/REST-Client: EAPI=8 bump (diff)
downloadgentoo-7f967315cf184fd09f6691e4381c92535efa819d.tar.gz
gentoo-7f967315cf184fd09f6691e4381c92535efa819d.tar.bz2
gentoo-7f967315cf184fd09f6691e4381c92535efa819d.zip
media-libs/intel-mediasdk: add missing libdrm dep, fix GCC 11 build
Closes: https://bugs.gentoo.org/805224 Closes: https://bugs.gentoo.org/789726 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/intel-mediasdk/files/intel-mediasdk-20.3.0-missing-limits-include.patch26
-rw-r--r--media-libs/intel-mediasdk/intel-mediasdk-20.3.0-r1.ebuild (renamed from media-libs/intel-mediasdk/intel-mediasdk-20.3.0.ebuild)8
-rw-r--r--media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild4
3 files changed, 36 insertions, 2 deletions
diff --git a/media-libs/intel-mediasdk/files/intel-mediasdk-20.3.0-missing-limits-include.patch b/media-libs/intel-mediasdk/files/intel-mediasdk-20.3.0-missing-limits-include.patch
new file mode 100644
index 000000000000..a3a5c1e06ec4
--- /dev/null
+++ b/media-libs/intel-mediasdk/files/intel-mediasdk-20.3.0-missing-limits-include.patch
@@ -0,0 +1,26 @@
+https://bugs.gentoo.org/789726
+
+From fb9829058e35405081c8b361fb402eeaa6b78ed9 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 4 Aug 2021 21:47:49 +0100
+Subject: [PATCH] Add missing limits include
+
+---
+ _studio/mfx_lib/mctf_package/mctf/src/mctf_common.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/_studio/mfx_lib/mctf_package/mctf/src/mctf_common.cpp b/_studio/mfx_lib/mctf_package/mctf/src/mctf_common.cpp
+index 5774702..ed1c1b7 100644
+--- a/_studio/mfx_lib/mctf_package/mctf/src/mctf_common.cpp
++++ b/_studio/mfx_lib/mctf_package/mctf/src/mctf_common.cpp
+@@ -44,6 +44,7 @@
+ #include <algorithm>
+ #include <climits>
+ #include <cmath>
++#include <limits>
+ #include "cmrt_cross_platform.h"
+
+ using std::min;
+--
+2.32.0
+
diff --git a/media-libs/intel-mediasdk/intel-mediasdk-20.3.0.ebuild b/media-libs/intel-mediasdk/intel-mediasdk-20.3.0-r1.ebuild
index 930261567424..2849dead015e 100644
--- a/media-libs/intel-mediasdk/intel-mediasdk-20.3.0.ebuild
+++ b/media-libs/intel-mediasdk/intel-mediasdk-20.3.0-r1.ebuild
@@ -25,13 +25,19 @@ fi
LICENSE="MIT"
SLOT="0"
-IUSE=""
+# x11-libs/libdrm[video_cards_intel] for intel_bufmgr.h in samples
+# bug #805224
DEPEND="
>=x11-libs/libva-intel-media-driver-${PV}
+ x11-libs/libdrm[video_cards_intel]
"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}"/${PN}-20.3.0-missing-limits-include.patch
+)
+
src_configure() {
local mycmakeargs=(
-DENABLE_OPENCL=OFF
diff --git a/media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild b/media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild
index 930261567424..33349a103358 100644
--- a/media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild
+++ b/media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild
@@ -25,10 +25,12 @@ fi
LICENSE="MIT"
SLOT="0"
-IUSE=""
+# x11-libs/libdrm[video_cards_intel] for intel_bufmgr.h in samples
+# bug #805224
DEPEND="
>=x11-libs/libva-intel-media-driver-${PV}
+ x11-libs/libdrm[video_cards_intel]
"
RDEPEND="${DEPEND}"