iHD: Re-apply "Disable-IPC-usage."
This CL re-applies the aforementioned patch. That patch was originally
introduced by CL:2012591. It was removed in CL:2269975 with the
intention to re-apply it in its own CL to allow for bisectability.
The patch is needed because it's a Chrome-specific workaround. There's
a bug upstream [1] to make the naming more meaningful, but it's still
open.
[1] https://github.com/intel/media-driver/issues/854
BUG=b:159825228
TEST=emerge-eve x11-libs/libva-intel-media-driver
Cq-Depend: chromium:2278393
Change-Id: I73232ba75398b5bfa694e8a1da76c04e3cc00e7f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/chromiumos-overlay/+/2278035
Tested-by: Andres Calderon Jaramillo <andrescj@chromium.org>
Commit-Queue: Andres Calderon Jaramillo <andrescj@chromium.org>
Reviewed-by: Miguel Casas <mcasas@chromium.org>
diff --git a/x11-libs/libva-intel-media-driver/files/0002-Disable-IPC-usage.patch b/x11-libs/libva-intel-media-driver/files/0002-Disable-IPC-usage.patch
new file mode 100644
index 0000000..ea9e178
--- /dev/null
+++ b/x11-libs/libva-intel-media-driver/files/0002-Disable-IPC-usage.patch
@@ -0,0 +1,43 @@
+From 4fbc89a4b5775a3f300883077d8c41a45b50ad78 Mon Sep 17 00:00:00 2001
+From: Yu Kang Ku <yu.kang.ku@intel.com>
+Date: Fri, 18 Oct 2019 15:02:42 -0700
+Subject: [PATCH 2/5] Disable IPC usage
+
+This allows iHD to be used within the Chrome OS sandbox.
+
+Change-Id: I7c9d438ab7072bbeb35b295a624b71e310ade6f7
+Signed-off-by: Yu Kang Ku <yu.kang.ku@intel.com>
+---
+ media_driver/linux/common/os/mos_context_specific.cpp | 2 ++
+ media_driver/linux/common/os/mos_os_specific.c | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/media_driver/linux/common/os/mos_context_specific.cpp b/media_driver/linux/common/os/mos_context_specific.cpp
+index 97769e08..4817e76a 100644
+--- a/media_driver/linux/common/os/mos_context_specific.cpp
++++ b/media_driver/linux/common/os/mos_context_specific.cpp
+@@ -32,6 +32,8 @@
+ #include "hwinfo_linux.h"
+ #include <stdlib.h>
+
++#define ANDROID 1
++
+ #ifndef ANDROID
+ #include <sys/ipc.h>
+ #include <sys/shm.h>
+diff --git a/media_driver/linux/common/os/mos_os_specific.c b/media_driver/linux/common/os/mos_os_specific.c
+index 2f837a03..33bcb44d 100644
+--- a/media_driver/linux/common/os/mos_os_specific.c
++++ b/media_driver/linux/common/os/mos_os_specific.c
+@@ -50,6 +50,8 @@
+ #endif // MOS_MEDIASOLO_SUPPORTED
+ #include "mos_solo_generic.h"
+
++#define ANDROID 1
++
+ #ifndef ANDROID
+ #include <sys/ipc.h>
+ #include <sys/shm.h>
+--
+2.26.2
+
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.1.1-r2.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.1.1-r3.ebuild
similarity index 100%
rename from x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.1.1-r2.ebuild
rename to x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.1.1-r3.ebuild
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.1.1.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.1.1.ebuild
index c9dc86f..00a35f2 100644
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.1.1.ebuild
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.1.1.ebuild
@@ -23,6 +23,7 @@
PATCHES=(
"${FILESDIR}"/0001-Encoder-VP8-GEN9-GEN10-GEN11-Ensure-forced_lf_adjust.patch
+ "${FILESDIR}"/0002-Disable-IPC-usage.patch
)
src_configure() {
