aboutsummaryrefslogtreecommitdiffstats
path: root/meta-rcar-gen3
diff options
context:
space:
mode:
authorKhang Nguyen <khang.nguyen.xv@rvc.renesas.com>2018-03-12 08:27:09 +0700
committerKhang Nguyen <khang.nguyen.xv@rvc.renesas.com>2018-03-22 13:36:54 +0700
commit366e360ee6c896c47963f09e03d9b66170ebb58b (patch)
treee9bd40c8672210cf1a0289710f776574b75bd423 /meta-rcar-gen3
parent993df9522c8eca2c172302b2afc410ee50f1b56b (diff)
Revert "rcar-gen3: gles-user-module: WORKAROUND to fix compile error because of lacking GLES3/gl3ext.h"
Gstreamer source code have been updated. This reverts commit 4f50fe1d6f208f535d663325288e34fce4f0c358. Signed-off-by: Khang Nguyen <khang.nguyen.xv@rvc.renesas.com> Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com>
Diffstat (limited to 'meta-rcar-gen3')
-rw-r--r--meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bb1
-rw-r--r--meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module/0001-WORKAROUND-using-GLES3-gl3ext.h-from-mesa-to-prevent.patch51
2 files changed, 0 insertions, 52 deletions
diff --git a/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bb b/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bb
index afa152f..3db9369 100644
--- a/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bb
+++ b/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bb
@@ -20,7 +20,6 @@ SRC_URI_r8a77990 = "file://r8a77990_linux_gsx_binaries_gles.tar.bz2"
SRC_URI_append = " \
file://change-shell.patch \
file://rc.pvr.service \
- file://0001-WORKAROUND-using-GLES3-gl3ext.h-from-mesa-to-prevent.patch \
"
inherit update-rc.d systemd
diff --git a/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module/0001-WORKAROUND-using-GLES3-gl3ext.h-from-mesa-to-prevent.patch b/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module/0001-WORKAROUND-using-GLES3-gl3ext.h-from-mesa-to-prevent.patch
deleted file mode 100644
index a5773c4..0000000
--- a/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module/0001-WORKAROUND-using-GLES3-gl3ext.h-from-mesa-to-prevent.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From d1f61050d5723681cd27da60d86885618003f952 Mon Sep 17 00:00:00 2001
-From: Thao Nguyen <thao.nguyen.yb@renesas.com>
-Date: Sat, 5 Aug 2017 12:39:02 +0700
-Subject: [PATCH] WORKAROUND: using GLES3/gl3ext.h from mesa to prevent error
- of gstreamer1.0-plugins-bad
-
-According to the Khronos OpenGL ES Registry, the extension header for
-GLES 3.0 is actually <GLES2/gl2ext.h>.
-gl3ext.h should be empty and provided only for legacy compatibility.
-
-Signed-off-by: Thao Nguyen <thao.nguyen.yb@renesas.com>
-Signed-off-by: Thuy Tran <thuy.tran.xh@rvc.renesas.com>
----
- usr/include/GLES3/gl3ext.h | 24 ++++++++++++++++++++++++
- 1 file changed, 24 insertions(+)
- create mode 100644 usr/include/GLES3/gl3ext.h
-
-diff --git a/usr/include/GLES3/gl3ext.h b/usr/include/GLES3/gl3ext.h
-new file mode 100644
-index 0000000..4d4ea96
---- /dev/null
-+++ b/usr/include/GLES3/gl3ext.h
-@@ -0,0 +1,24 @@
-+#ifndef __gl3ext_h_
-+#define __gl3ext_h_
-+
-+#include <GLES2/gl2ext.h>
-+/* $Revision: 17809 $ on $Date:: 2012-05-14 08:03:36 -0700 #$ */
-+
-+/*
-+ * This document is licensed under the SGI Free Software B License Version
-+ * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .
-+ */
-+
-+/* OpenGL ES 3 Extensions
-+ *
-+ * After an OES extension's interactions with OpenGl ES 3.0 have been documented,
-+ * its tokens and function definitions should be added to this file in a manner
-+ * that does not conflict with gl2ext.h or gl3.h.
-+ *
-+ * Tokens and function definitions for extensions that have become standard
-+ * features in OpenGL ES 3.0 will not be added to this file.
-+ *
-+ * Applications using OpenGL-ES-2-only extensions should include gl2ext.h
-+ */
-+
-+#endif /* __gl3ext_h_ */
-+
---
-1.9.1
-