From 464df4b87d64668137585ace234a10e5c73fa827 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Tue, 19 Jan 2021 14:45:36 +0800 Subject: libepoxy: upgrade 1.5.4 -> 1.5.5 (From OE-Core rev: ef24da0af6fe2eab618e01a70093efba26a12557) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- ...-dispatch_common.h-define-also-EGL_NO_X11.patch | 9 +++--- meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb | 33 ---------------------- meta/recipes-graphics/libepoxy/libepoxy_1.5.5.bb | 32 +++++++++++++++++++++ 3 files changed, 37 insertions(+), 37 deletions(-) delete mode 100644 meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb create mode 100644 meta/recipes-graphics/libepoxy/libepoxy_1.5.5.bb diff --git a/meta/recipes-graphics/libepoxy/files/0001-dispatch_common.h-define-also-EGL_NO_X11.patch b/meta/recipes-graphics/libepoxy/files/0001-dispatch_common.h-define-also-EGL_NO_X11.patch index 7262945181..971a3f54e0 100644 --- a/meta/recipes-graphics/libepoxy/files/0001-dispatch_common.h-define-also-EGL_NO_X11.patch +++ b/meta/recipes-graphics/libepoxy/files/0001-dispatch_common.h-define-also-EGL_NO_X11.patch @@ -1,4 +1,4 @@ -From 6f15cc28d17cfdd86f5974f06ad97b8afedd5627 Mon Sep 17 00:00:00 2001 +From 7211120d1e2f059d900f3379b9790484dbcf7761 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 25 Oct 2019 11:09:34 +0000 Subject: [PATCH] dispatch_common.h: define also EGL_NO_X11 @@ -8,16 +8,17 @@ https://github.com/mesa3d/mesa/commit/6202a13b71e18dc31ba7e2f4ea915b67eacc1ddb Signed-off-by: Martin Jansa Upstream-Status: Pending + --- src/dispatch_common.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/dispatch_common.h b/src/dispatch_common.h -index dcb3a35..c206253 100644 +index a136943..448c9b1 100644 --- a/src/dispatch_common.h +++ b/src/dispatch_common.h -@@ -52,6 +52,7 @@ - * should do the same +@@ -55,6 +55,7 @@ + * as EGL_NO_X11 */ # define MESA_EGL_NO_X11_HEADERS 1 +# define EGL_NO_X11 1 diff --git a/meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb b/meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb deleted file mode 100644 index 6646ef79fe..0000000000 --- a/meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "OpenGL function pointer management library" -DESCRIPTION = "It hides the complexity of dlopen(), dlsym(), \ -glXGetProcAddress(), eglGetProcAddress(), etc. from the app developer, with \ -very little knowledge needed on their part. They get to read GL specs and \ -write code using undecorated function names like glCompileShader()." -HOMEPAGE = "https://github.com/anholt/libepoxy/" -SECTION = "libs" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=58ef4c80d401e07bd9ee8b6b58cf464b" - -SRC_URI = "https://github.com/anholt/${BPN}/releases/download/${PV}/${BP}.tar.xz \ - file://0001-dispatch_common.h-define-also-EGL_NO_X11.patch \ - " -SRC_URI[md5sum] = "00f47ad447321f9dc59f85bc1c9d0467" -SRC_URI[sha256sum] = "0bd2cc681dfeffdef739cb29913f8c3caa47a88a451fd2bc6e606c02997289d2" -UPSTREAM_CHECK_URI = "https://github.com/anholt/libepoxy/releases" - -inherit meson pkgconfig features_check - -REQUIRED_DISTRO_FEATURES = "opengl" - -PACKAGECONFIG[egl] = "-Degl=yes, -Degl=no, virtual/egl" -PACKAGECONFIG[x11] = "-Dglx=yes, -Dglx=no -Dx11=false, virtual/libx11 virtual/libgl" -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} egl" - -EXTRA_OEMESON += "-Dtests=false" - -PACKAGECONFIG_class-native = "egl x11" -PACKAGECONFIG_class-nativesdk = "egl x11" - -BBCLASSEXTEND = "native nativesdk" - diff --git a/meta/recipes-graphics/libepoxy/libepoxy_1.5.5.bb b/meta/recipes-graphics/libepoxy/libepoxy_1.5.5.bb new file mode 100644 index 0000000000..a404fe2852 --- /dev/null +++ b/meta/recipes-graphics/libepoxy/libepoxy_1.5.5.bb @@ -0,0 +1,32 @@ +SUMMARY = "OpenGL function pointer management library" +DESCRIPTION = "It hides the complexity of dlopen(), dlsym(), \ +glXGetProcAddress(), eglGetProcAddress(), etc. from the app developer, with \ +very little knowledge needed on their part. They get to read GL specs and \ +write code using undecorated function names like glCompileShader()." +HOMEPAGE = "https://github.com/anholt/libepoxy/" +SECTION = "libs" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=58ef4c80d401e07bd9ee8b6b58cf464b" + +SRC_URI = "https://github.com/anholt/${BPN}/releases/download/${PV}/${BP}.tar.xz \ + file://0001-dispatch_common.h-define-also-EGL_NO_X11.patch \ + " +SRC_URI[sha256sum] = "261663db21bcc1cc232b07ea683252ee6992982276536924271535875f5b0556" +UPSTREAM_CHECK_URI = "https://github.com/anholt/libepoxy/releases" + +inherit meson pkgconfig features_check + +REQUIRED_DISTRO_FEATURES = "opengl" + +PACKAGECONFIG[egl] = "-Degl=yes, -Degl=no, virtual/egl" +PACKAGECONFIG[x11] = "-Dglx=yes, -Dglx=no -Dx11=false, virtual/libx11 virtual/libgl" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} egl" + +EXTRA_OEMESON += "-Dtests=false" + +PACKAGECONFIG_class-native = "egl x11" +PACKAGECONFIG_class-nativesdk = "egl x11" + +BBCLASSEXTEND = "native nativesdk" + -- cgit v1.2.3-54-g00ecf