summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2018-01-03 14:49:06 +0100
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2018-03-22 14:01:09 +0100
commit57b5fbe0cb6d1465b19ba8027cb53cf5a8f029e6 (patch)
tree74e8791761a642290cdb4dc4ab44d4eda7175b30
parent4931a667e17a72819331265ca8b3b0f176ef6293 (diff)
tdx-nv-binaries: egl: Add alias for EGL_PLATFORM_X11_KHR
New EGL code uses EGL_PLATFORM_X11_KHR (for example glmark2) and the value is the same, so we can provide an alias for it instead of patching every code using it. (Adapted from meta-freescale, commit e1d249bb067aa6c472367cff1e77ba2ddbc8303f) Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
-rw-r--r--recipes-bsp/tdx-nv-binaries/files/0001-egl-Add-EGL_PLATFORM_X11_KHR-alias-to-EGL_PLATFORM_X.patch33
-rw-r--r--recipes-bsp/tdx-nv-binaries/tdx-nv-binaries.bb3
2 files changed, 36 insertions, 0 deletions
diff --git a/recipes-bsp/tdx-nv-binaries/files/0001-egl-Add-EGL_PLATFORM_X11_KHR-alias-to-EGL_PLATFORM_X.patch b/recipes-bsp/tdx-nv-binaries/files/0001-egl-Add-EGL_PLATFORM_X11_KHR-alias-to-EGL_PLATFORM_X.patch
new file mode 100644
index 0000000..9228251
--- /dev/null
+++ b/recipes-bsp/tdx-nv-binaries/files/0001-egl-Add-EGL_PLATFORM_X11_KHR-alias-to-EGL_PLATFORM_X.patch
@@ -0,0 +1,33 @@
+From b677a9f2d252c8ed4754917ff120589e225adf7e Mon Sep 17 00:00:00 2001
+From: Max Krummenacher <max.krummenacher@toradex.com>
+Date: Wed, 3 Jan 2018 13:54:04 +0100
+Subject: [PATCH] egl: Add EGL_PLATFORM_X11_KHR alias to EGL_PLATFORM_X11_EXT
+
+New EGL code uses EGL_PLATFORM_X11_KHR (for example glmark2) and the
+value is the same, so we can provide an alias for it instead of
+patching every code using it.
+
+Upstream-Status: Pending
+
+(Adapted from meta-freescale, commit e1d249bb067aa6c472367cff1e77ba2ddbc8303f)
+
+Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
+---
+ EGL/eglext.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/EGL/eglext.h b/EGL/eglext.h
+index 80b539a..eb349c2 100644
+--- a/EGL/eglext.h
++++ b/EGL/eglext.h
+@@ -445,6 +445,7 @@ EGLAPI EGLSurface EGLAPIENTRY eglCreatePlatformPixmapSurfaceEXT (EGLDisplay dpy,
+ #ifndef EGL_EXT_platform_x11
+ #define EGL_EXT_platform_x11 1
+ #define EGL_PLATFORM_X11_EXT 0x31D5
++#define EGL_PLATFORM_X11_KHR EGL_PLATFORM_X11_EXT
+ #define EGL_PLATFORM_X11_SCREEN_EXT 0x31D6
+ #endif /* EGL_EXT_platform_x11 */
+
+--
+2.13.6
+
diff --git a/recipes-bsp/tdx-nv-binaries/tdx-nv-binaries.bb b/recipes-bsp/tdx-nv-binaries/tdx-nv-binaries.bb
index 508cbea..28d6080 100644
--- a/recipes-bsp/tdx-nv-binaries/tdx-nv-binaries.bb
+++ b/recipes-bsp/tdx-nv-binaries/tdx-nv-binaries.bb
@@ -20,6 +20,7 @@ SRC_COMMON = " \
file://mimeapps.list \
file://nvgstplayer.desktop \
https://www.khronos.org/registry/omxil/api/1.1.2/OpenMAX_IL_1_1_2_Header.zip;name=openmax-h;unpack=no \
+ file://0001-egl-Add-EGL_PLATFORM_X11_KHR-alias-to-EGL_PLATFORM_X.patch;apply=no \
"
SRC_URI_tegra2 = " \
@@ -96,6 +97,8 @@ INSANE_SKIP_${PN}-nv-gstapps = "build-deps dev-so ldflags already-stripped textr
do_patch () {
mkdir -p OpenMAX/il
unzip -o -d OpenMAX/il OpenMAX_IL_1_1_2_Header.zip
+ cd ${WORKDIR}/khronos_headers
+ patch -p 1 < ${WORKDIR}/0001-egl-Add-EGL_PLATFORM_X11_KHR-alias-to-EGL_PLATFORM_X.patch
}
do_compile () {