From 824525d94bf71ff06db964d62651ebc3d449598b Mon Sep 17 00:00:00 2001 From: Francesco Giancane Date: Thu, 1 Mar 2018 17:19:22 +0100 Subject: libepoxy: update to version 1.5.0 libepoxy 1.4.3 did not compile successfully because of implicit symbol definitions and link-time errors. Patch to disable 'dlvsym' has also been forward-ported to be applicable to version 1.5.0. The patch 'Add-fallback-definition-for-EGL-CAST.patch' is mainline now; thus it can be safely removed. Also, the patch 0001-Define-MESA_EGL_NO_X11_HEADERS-before-including-eglp.patch is no longer required since mainline fixed this too. (From OE-Core rev: b72154eccfbcc178a2c09c7c7d4cd0264d4cf0f6) Signed-off-by: Francesco Giancane Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- ..._EGL_NO_X11_HEADERS-before-including-eglp.patch | 30 -------------------- ...sible-to-disable-the-use-of-dlvsym-needed.patch | 27 ++++++++++-------- .../Add-fallback-definition-for-EGL-CAST.patch | 33 ---------------------- meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb | 27 ------------------ meta/recipes-graphics/libepoxy/libepoxy_1.5.0.bb | 25 ++++++++++++++++ 5 files changed, 40 insertions(+), 102 deletions(-) delete mode 100644 meta/recipes-graphics/libepoxy/libepoxy/0001-Define-MESA_EGL_NO_X11_HEADERS-before-including-eglp.patch delete mode 100644 meta/recipes-graphics/libepoxy/libepoxy/Add-fallback-definition-for-EGL-CAST.patch delete mode 100644 meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb create mode 100644 meta/recipes-graphics/libepoxy/libepoxy_1.5.0.bb (limited to 'meta/recipes-graphics') diff --git a/meta/recipes-graphics/libepoxy/libepoxy/0001-Define-MESA_EGL_NO_X11_HEADERS-before-including-eglp.patch b/meta/recipes-graphics/libepoxy/libepoxy/0001-Define-MESA_EGL_NO_X11_HEADERS-before-including-eglp.patch deleted file mode 100644 index ebe5754a7a..0000000000 --- a/meta/recipes-graphics/libepoxy/libepoxy/0001-Define-MESA_EGL_NO_X11_HEADERS-before-including-eglp.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 62e178ddae24c7633d2a03b129dc52261e0a15bf Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 7 Feb 2018 00:48:03 -0800 -Subject: [PATCH] Define MESA_EGL_NO_X11_HEADERS before including eglplatform.h - when X11 is disabled - -This helps in compiling when GL implementations e.g. mesa use -this define to exclude X11 headers - -Signed-off-by: Khem Raj ---- -Upstream-Status: Submitted [https://github.com/anholt/libepoxy/pull/153] - - src/dispatch_common.h | 3 +++ - 1 file changed, 3 insertions(+) - -Index: libepoxy-1.4.3/src/dispatch_common.h -=================================================================== ---- libepoxy-1.4.3.orig/src/dispatch_common.h -+++ libepoxy-1.4.3/src/dispatch_common.h -@@ -46,6 +46,9 @@ - #include "epoxy/glx.h" - #endif - #if PLATFORM_HAS_EGL -+#if !PLATFORM_HAS_GLX -+#define MESA_EGL_NO_X11_HEADERS 1 -+#endif - #include "epoxy/egl.h" - #endif - #if PLATFORM_HAS_WGL diff --git a/meta/recipes-graphics/libepoxy/libepoxy/0001-Make-it-possible-to-disable-the-use-of-dlvsym-needed.patch b/meta/recipes-graphics/libepoxy/libepoxy/0001-Make-it-possible-to-disable-the-use-of-dlvsym-needed.patch index c2a2fa3453..bd49e36314 100644 --- a/meta/recipes-graphics/libepoxy/libepoxy/0001-Make-it-possible-to-disable-the-use-of-dlvsym-needed.patch +++ b/meta/recipes-graphics/libepoxy/libepoxy/0001-Make-it-possible-to-disable-the-use-of-dlvsym-needed.patch @@ -1,36 +1,39 @@ -From 7bcefd311cd696955376fe2c5298ec85e8f954ce Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 15 Nov 2017 12:48:27 +0200 +From 9c964427656ef71210e2c5b48b279857806574e9 Mon Sep 17 00:00:00 2001 +From: Francesco Giancane +Date: Wed, 28 Feb 2018 21:32:24 +0100 Subject: [PATCH] Make it possible to disable the use of dlvsym() (needed for musl) -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin +Add a patch to work around absence of dlvsym() on musl +(wasn't previously a problem as autotools weren't building tests by default) +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin +Signed-off-by: Francesco Giancane --- meson_options.txt | 3 +++ test/meson.build | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/meson_options.txt b/meson_options.txt -index 244476a..071f0b6 100644 +index b5d7c98..aa849c2 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,6 +1,9 @@ - option('enable-docs', + option('docs', type: 'boolean', value: false, description: 'Enable generating the Epoxy API reference (depends on Doxygen)') +option('has-dlvsym', + type: 'boolean', value: true, + description: 'Whether dlvsym() is available (it is not when using musl C library)') - option('enable-glx', + option('glx', type: 'combo', choices: [ 'auto', 'yes', 'no' ], diff --git a/test/meson.build b/test/meson.build -index 2340fc6..bc4330b 100644 +index c5788b4..4c46ae6 100644 --- a/test/meson.build +++ b/test/meson.build -@@ -86,8 +86,8 @@ if build_glx +@@ -92,8 +92,8 @@ if build_glx [ 'glx_has_extension_nocontext', [ 'glx_has_extension_nocontext.c' ], [], [], true ], [ 'glx_static', [ 'glx_static.c' ], [ '-DNEEDS_TO_BE_STATIC'], [ '-static' ], libtype == 'static' ], [ 'glx_shared_znow', [ 'glx_static.c', ], [], [ '-Wl,-z,now' ], has_znow ], @@ -41,7 +44,7 @@ index 2340fc6..bc4330b 100644 ] foreach test: glx_tests -@@ -108,7 +108,7 @@ if build_glx +@@ -114,7 +114,7 @@ if build_glx endif endforeach @@ -51,5 +54,5 @@ index 2340fc6..bc4330b 100644 if build_egl glx_egl_sources = [ -- -2.15.0 +2.14.3 diff --git a/meta/recipes-graphics/libepoxy/libepoxy/Add-fallback-definition-for-EGL-CAST.patch b/meta/recipes-graphics/libepoxy/libepoxy/Add-fallback-definition-for-EGL-CAST.patch deleted file mode 100644 index b9297257dc..0000000000 --- a/meta/recipes-graphics/libepoxy/libepoxy/Add-fallback-definition-for-EGL-CAST.patch +++ /dev/null @@ -1,33 +0,0 @@ -Add fallback definition for EGL_CAST - -The EGL API update from d11104f introduced a dependency on the -EGL_CAST() macro, provided by an updated eglplatform.h. Given that we -don't provide eglplatform.h, add a fallback definition for if we're -building against Mesa 17.0.x or similar. - -https://bugs.gentoo.org/show_bug.cgi?id=623926 - -Upstream-Status: Backport [https://github.com/anholt/libepoxy/commit/ebe3a53db1c0bb34e1ca963b95d1f222115f93f8] - -Signed-off-by: Tom Hochstein - -Index: libepoxy-1.4.3/src/gen_dispatch.py -=================================================================== ---- libepoxy-1.4.3.orig/src/gen_dispatch.py 2017-06-06 04:24:13.000000000 -0500 -+++ libepoxy-1.4.3/src/gen_dispatch.py 2017-11-06 12:45:43.594966473 -0600 -@@ -491,6 +491,15 @@ - self.outln('#include "epoxy/gl.h"') - if self.target == "egl": - self.outln('#include "EGL/eglplatform.h"') -+ # Account for older eglplatform.h, which doesn't define -+ # the EGL_CAST macro. -+ self.outln('#ifndef EGL_CAST') -+ self.outln('#if defined(__cplusplus)') -+ self.outln('#define EGL_CAST(type, value) (static_cast(value))') -+ self.outln('#else') -+ self.outln('#define EGL_CAST(type, value) ((type) (value))') -+ self.outln('#endif') -+ self.outln('#endif') - else: - # Add some ridiculous inttypes.h redefinitions that are - # from khrplatform.h and not included in the XML. We diff --git a/meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb b/meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb deleted file mode 100644 index 8a5cb8f49f..0000000000 --- a/meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "OpenGL function pointer management library" -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://Add-fallback-definition-for-EGL-CAST.patch \ - file://0001-Make-it-possible-to-disable-the-use-of-dlvsym-needed.patch \ - file://0001-Define-MESA_EGL_NO_X11_HEADERS-before-including-eglp.patch \ - " -SRC_URI[md5sum] = "af4c3ce0fb1143bdc4e43f85695a9bed" -SRC_URI[sha256sum] = "0b808a06c9685a62fca34b680abb8bc7fb2fda074478e329b063c1f872b826f6" -UPSTREAM_CHECK_URI = "https://github.com/anholt/libepoxy/releases" - -inherit meson pkgconfig distro_features_check - -REQUIRED_DISTRO_FEATURES = "opengl" - -DEPENDS = "util-macros" - -PACKAGECONFIG[egl] = "-Denable-egl=yes, -Denable-egl=no, virtual/egl" -PACKAGECONFIG[x11] = "-Denable-glx=yes, -Denable-glx=no, virtual/libx11" -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} egl" - -EXTRA_OEMESON_append_libc-musl = " -Dhas-dlvsym=false " diff --git a/meta/recipes-graphics/libepoxy/libepoxy_1.5.0.bb b/meta/recipes-graphics/libepoxy/libepoxy_1.5.0.bb new file mode 100644 index 0000000000..dfdd19248d --- /dev/null +++ b/meta/recipes-graphics/libepoxy/libepoxy_1.5.0.bb @@ -0,0 +1,25 @@ +SUMMARY = "OpenGL function pointer management library" +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-Make-it-possible-to-disable-the-use-of-dlvsym-needed.patch \ + " +SRC_URI[md5sum] = "63fe3847789258254dcd7e3fdb9e7f5e" +SRC_URI[sha256sum] = "4c94995398a6ebf691600dda2e9685a0cac261414175c2adf4645cdfab42a5d5" +UPSTREAM_CHECK_URI = "https://github.com/anholt/libepoxy/releases" + +inherit meson pkgconfig distro_features_check + +REQUIRED_DISTRO_FEATURES = "opengl" + +DEPENDS = "util-macros" + +PACKAGECONFIG[egl] = "-Degl=yes, -Degl=no, virtual/egl" +PACKAGECONFIG[x11] = "-Dglx=yes, -Dglx=no, virtual/libx11 virtual/libgl" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} egl" + +EXTRA_OEMESON_append_libc-musl = " -Dhas-dlvsym=false " -- cgit v1.2.3-54-g00ecf