summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancesco Giancane <francescogiancane8@gmail.com>2018-03-01 17:19:22 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-04 11:35:41 +0000
commit824525d94bf71ff06db964d62651ebc3d449598b (patch)
tree768a1d232f7fa158d99f4b5e192a181159e7ad93
parent2aa530f24a7f768568543300efc5bbac5e9d36e0 (diff)
downloadpoky-824525d94bf71ff06db964d62651ebc3d449598b.tar.gz
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 <francescogiancane8@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/libepoxy/libepoxy/0001-Define-MESA_EGL_NO_X11_HEADERS-before-including-eglp.patch30
-rw-r--r--meta/recipes-graphics/libepoxy/libepoxy/0001-Make-it-possible-to-disable-the-use-of-dlvsym-needed.patch27
-rw-r--r--meta/recipes-graphics/libepoxy/libepoxy/Add-fallback-definition-for-EGL-CAST.patch33
-rw-r--r--meta/recipes-graphics/libepoxy/libepoxy_1.5.0.bb (renamed from meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb)10
4 files changed, 19 insertions, 81 deletions
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 @@
1From 62e178ddae24c7633d2a03b129dc52261e0a15bf Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 7 Feb 2018 00:48:03 -0800
4Subject: [PATCH] Define MESA_EGL_NO_X11_HEADERS before including eglplatform.h
5 when X11 is disabled
6
7This helps in compiling when GL implementations e.g. mesa use
8this define to exclude X11 headers
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12Upstream-Status: Submitted [https://github.com/anholt/libepoxy/pull/153]
13
14 src/dispatch_common.h | 3 +++
15 1 file changed, 3 insertions(+)
16
17Index: libepoxy-1.4.3/src/dispatch_common.h
18===================================================================
19--- libepoxy-1.4.3.orig/src/dispatch_common.h
20+++ libepoxy-1.4.3/src/dispatch_common.h
21@@ -46,6 +46,9 @@
22 #include "epoxy/glx.h"
23 #endif
24 #if PLATFORM_HAS_EGL
25+#if !PLATFORM_HAS_GLX
26+#define MESA_EGL_NO_X11_HEADERS 1
27+#endif
28 #include "epoxy/egl.h"
29 #endif
30 #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 @@
1From 7bcefd311cd696955376fe2c5298ec85e8f954ce Mon Sep 17 00:00:00 2001 1From 9c964427656ef71210e2c5b48b279857806574e9 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Francesco Giancane <francescogiancane8@gmail.com>
3Date: Wed, 15 Nov 2017 12:48:27 +0200 3Date: Wed, 28 Feb 2018 21:32:24 +0100
4Subject: [PATCH] Make it possible to disable the use of dlvsym() (needed for 4Subject: [PATCH] Make it possible to disable the use of dlvsym() (needed for
5 musl) 5 musl)
6 6
7Upstream-Status: Pending 7Add a patch to work around absence of dlvsym() on musl
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 8(wasn't previously a problem as autotools weren't building tests by default)
9 9
10Upstream-Status: Pending
11Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
12Signed-off-by: Francesco Giancane <francescogiancane8@gmail.com>
10--- 13---
11 meson_options.txt | 3 +++ 14 meson_options.txt | 3 +++
12 test/meson.build | 6 +++--- 15 test/meson.build | 6 +++---
13 2 files changed, 6 insertions(+), 3 deletions(-) 16 2 files changed, 6 insertions(+), 3 deletions(-)
14 17
15diff --git a/meson_options.txt b/meson_options.txt 18diff --git a/meson_options.txt b/meson_options.txt
16index 244476a..071f0b6 100644 19index b5d7c98..aa849c2 100644
17--- a/meson_options.txt 20--- a/meson_options.txt
18+++ b/meson_options.txt 21+++ b/meson_options.txt
19@@ -1,6 +1,9 @@ 22@@ -1,6 +1,9 @@
20 option('enable-docs', 23 option('docs',
21 type: 'boolean', value: false, 24 type: 'boolean', value: false,
22 description: 'Enable generating the Epoxy API reference (depends on Doxygen)') 25 description: 'Enable generating the Epoxy API reference (depends on Doxygen)')
23+option('has-dlvsym', 26+option('has-dlvsym',
24+ type: 'boolean', value: true, 27+ type: 'boolean', value: true,
25+ description: 'Whether dlvsym() is available (it is not when using musl C library)') 28+ description: 'Whether dlvsym() is available (it is not when using musl C library)')
26 option('enable-glx', 29 option('glx',
27 type: 'combo', 30 type: 'combo',
28 choices: [ 'auto', 'yes', 'no' ], 31 choices: [ 'auto', 'yes', 'no' ],
29diff --git a/test/meson.build b/test/meson.build 32diff --git a/test/meson.build b/test/meson.build
30index 2340fc6..bc4330b 100644 33index c5788b4..4c46ae6 100644
31--- a/test/meson.build 34--- a/test/meson.build
32+++ b/test/meson.build 35+++ b/test/meson.build
33@@ -86,8 +86,8 @@ if build_glx 36@@ -92,8 +92,8 @@ if build_glx
34 [ 'glx_has_extension_nocontext', [ 'glx_has_extension_nocontext.c' ], [], [], true ], 37 [ 'glx_has_extension_nocontext', [ 'glx_has_extension_nocontext.c' ], [], [], true ],
35 [ 'glx_static', [ 'glx_static.c' ], [ '-DNEEDS_TO_BE_STATIC'], [ '-static' ], libtype == 'static' ], 38 [ 'glx_static', [ 'glx_static.c' ], [ '-DNEEDS_TO_BE_STATIC'], [ '-static' ], libtype == 'static' ],
36 [ 'glx_shared_znow', [ 'glx_static.c', ], [], [ '-Wl,-z,now' ], has_znow ], 39 [ 'glx_shared_znow', [ 'glx_static.c', ], [], [ '-Wl,-z,now' ], has_znow ],
@@ -41,7 +44,7 @@ index 2340fc6..bc4330b 100644
41 ] 44 ]
42 45
43 foreach test: glx_tests 46 foreach test: glx_tests
44@@ -108,7 +108,7 @@ if build_glx 47@@ -114,7 +114,7 @@ if build_glx
45 endif 48 endif
46 endforeach 49 endforeach
47 50
@@ -51,5 +54,5 @@ index 2340fc6..bc4330b 100644
51 if build_egl 54 if build_egl
52 glx_egl_sources = [ 55 glx_egl_sources = [
53-- 56--
542.15.0 572.14.3
55 58
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 @@
1Add fallback definition for EGL_CAST
2
3The EGL API update from d11104f introduced a dependency on the
4EGL_CAST() macro, provided by an updated eglplatform.h. Given that we
5don't provide eglplatform.h, add a fallback definition for if we're
6building against Mesa 17.0.x or similar.
7
8https://bugs.gentoo.org/show_bug.cgi?id=623926
9
10Upstream-Status: Backport [https://github.com/anholt/libepoxy/commit/ebe3a53db1c0bb34e1ca963b95d1f222115f93f8]
11
12Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
13
14Index: libepoxy-1.4.3/src/gen_dispatch.py
15===================================================================
16--- libepoxy-1.4.3.orig/src/gen_dispatch.py 2017-06-06 04:24:13.000000000 -0500
17+++ libepoxy-1.4.3/src/gen_dispatch.py 2017-11-06 12:45:43.594966473 -0600
18@@ -491,6 +491,15 @@
19 self.outln('#include "epoxy/gl.h"')
20 if self.target == "egl":
21 self.outln('#include "EGL/eglplatform.h"')
22+ # Account for older eglplatform.h, which doesn't define
23+ # the EGL_CAST macro.
24+ self.outln('#ifndef EGL_CAST')
25+ self.outln('#if defined(__cplusplus)')
26+ self.outln('#define EGL_CAST(type, value) (static_cast<type>(value))')
27+ self.outln('#else')
28+ self.outln('#define EGL_CAST(type, value) ((type) (value))')
29+ self.outln('#endif')
30+ self.outln('#endif')
31 else:
32 # Add some ridiculous inttypes.h redefinitions that are
33 # 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.5.0.bb
index 8a5cb8f49f..dfdd19248d 100644
--- a/meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb
+++ b/meta/recipes-graphics/libepoxy/libepoxy_1.5.0.bb
@@ -6,12 +6,10 @@ LICENSE = "MIT"
6LIC_FILES_CHKSUM = "file://COPYING;md5=58ef4c80d401e07bd9ee8b6b58cf464b" 6LIC_FILES_CHKSUM = "file://COPYING;md5=58ef4c80d401e07bd9ee8b6b58cf464b"
7 7
8SRC_URI = "https://github.com/anholt/${BPN}/releases/download/${PV}/${BP}.tar.xz \ 8SRC_URI = "https://github.com/anholt/${BPN}/releases/download/${PV}/${BP}.tar.xz \
9 file://Add-fallback-definition-for-EGL-CAST.patch \
10 file://0001-Make-it-possible-to-disable-the-use-of-dlvsym-needed.patch \ 9 file://0001-Make-it-possible-to-disable-the-use-of-dlvsym-needed.patch \
11 file://0001-Define-MESA_EGL_NO_X11_HEADERS-before-including-eglp.patch \
12 " 10 "
13SRC_URI[md5sum] = "af4c3ce0fb1143bdc4e43f85695a9bed" 11SRC_URI[md5sum] = "63fe3847789258254dcd7e3fdb9e7f5e"
14SRC_URI[sha256sum] = "0b808a06c9685a62fca34b680abb8bc7fb2fda074478e329b063c1f872b826f6" 12SRC_URI[sha256sum] = "4c94995398a6ebf691600dda2e9685a0cac261414175c2adf4645cdfab42a5d5"
15UPSTREAM_CHECK_URI = "https://github.com/anholt/libepoxy/releases" 13UPSTREAM_CHECK_URI = "https://github.com/anholt/libepoxy/releases"
16 14
17inherit meson pkgconfig distro_features_check 15inherit meson pkgconfig distro_features_check
@@ -20,8 +18,8 @@ REQUIRED_DISTRO_FEATURES = "opengl"
20 18
21DEPENDS = "util-macros" 19DEPENDS = "util-macros"
22 20
23PACKAGECONFIG[egl] = "-Denable-egl=yes, -Denable-egl=no, virtual/egl" 21PACKAGECONFIG[egl] = "-Degl=yes, -Degl=no, virtual/egl"
24PACKAGECONFIG[x11] = "-Denable-glx=yes, -Denable-glx=no, virtual/libx11" 22PACKAGECONFIG[x11] = "-Dglx=yes, -Dglx=no, virtual/libx11 virtual/libgl"
25PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} egl" 23PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} egl"
26 24
27EXTRA_OEMESON_append_libc-musl = " -Dhas-dlvsym=false " 25EXTRA_OEMESON_append_libc-musl = " -Dhas-dlvsym=false "