Skip to content

Commit 88f4db9

Browse files
berosetMagneFire
authored andcommitted
Remove obsolete patches for libhybris
This removes some obsolete patches for libhybris and adjusts the diff file to match current version of glesv2. Signed-off-by: Ed Beroset <[email protected]>
1 parent 3a9827d commit 88f4db9

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

recipes-core/libhybris/libhybris/0001-Report-support-for-only-2.0-instead-of-3.0.patch

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ Subject: [PATCH] Report support for only 2.0 instead of 3.0. It looks like we
99
1 file changed, 13 insertions(+), 1 deletion(-)
1010

1111
diff --git a/hybris/glesv2/glesv2.c b/hybris/glesv2/glesv2.c
12-
index 716bbde..ed7f366 100644
12+
index 470e34b..ad47d43 100644
1313
--- a/hybris/glesv2/glesv2.c
1414
+++ b/hybris/glesv2/glesv2.c
15-
@@ -105,7 +105,19 @@ HYBRIS_IMPLEMENT_VOID_FUNCTION3(glesv2, glGetShaderiv, GLuint, GLenum, GLint *);
15+
@@ -104,7 +104,19 @@ HYBRIS_IMPLEMENT_VOID_FUNCTION3(glesv2, glGetShaderiv, GLuint, GLenum, GLint *);
1616
HYBRIS_IMPLEMENT_VOID_FUNCTION4(glesv2, glGetShaderInfoLog, GLuint, GLsizei, GLsizei *, GLchar *);
1717
HYBRIS_IMPLEMENT_VOID_FUNCTION4(glesv2, glGetShaderPrecisionFormat, GLenum, GLenum, GLint *, GLint *);
1818
HYBRIS_IMPLEMENT_VOID_FUNCTION4(glesv2, glGetShaderSource, GLuint, GLsizei, GLsizei *, GLchar *);
@@ -34,4 +34,5 @@ index 716bbde..ed7f366 100644
3434
HYBRIS_IMPLEMENT_VOID_FUNCTION3(glesv2, glGetTexParameteriv, GLenum, GLenum, GLint *);
3535
HYBRIS_IMPLEMENT_VOID_FUNCTION3(glesv2, glGetUniformfv, GLuint, GLint, GLfloat *);
3636
--
37-
2.31.1
37+
2.42.1
38+

recipes-core/libhybris/libhybris_git.bbappend

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
FILESEXTRAPATHS:prepend := "${THISDIR}/libhybris:"
2-
SRCREV = "a108a1d30fbbdb562f7748292dab0e2d6e5250ce"
3-
4-
SRC_URI:remove = "file://0001-Add-EGL_OPENGL_ES3_BIT_KHR-define.patch;patchdir=.."
5-
SRC_URI:remove = "file://0001-wayland-egl.pc.in-bump-Version-from-libhybris-s-0.1..patch;patchdir=.."
6-
LIC_FILES_CHKSUM = "file://../LICENSE.Apache2;md5=3b83ef96387f14655fc854ddc3c6bd57"
72

83
DEPENDS:append = " wayland "
94
EXTRA_OECONF:append = " --enable-wayland --with-default-egl-platform=wayland --with-default-hybris-ld-library-path=/usr/libexec/hal-droid/system/lib:/vendor/lib:/system/lib"

0 commit comments

Comments
 (0)