summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-02-06 23:26:34 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-15 20:06:41 -0800
commitddd2fbf722bf2a218f360007d7d463f8349e84ca (patch)
tree871300395fec6e1a3548d8806eb0ee51a3529949 /meta
parent476696030492b09a5985f948e38db8304cadd512 (diff)
downloadpoky-ddd2fbf722bf2a218f360007d7d463f8349e84ca.tar.gz
libepoxy: upgrade to 1.4.0
Drop the two patches that add the ability to disable GLX, this has been added upstream. Drop the Python3 patch as the code generator works with Py3 now. (From OE-Core rev: 8ba197b3ae10a90ca988f0021597dfd20463c2d2) (From OE-Core rev: 0066327d79b2ea942c414208a3daa0ecf4361730) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/libepoxy/libepoxy/0001-select-platforms-based-on-configuration-results.patch128
-rw-r--r--meta/recipes-graphics/libepoxy/libepoxy/0002-add-an-option-to-disable-glx-support.patch42
-rw-r--r--meta/recipes-graphics/libepoxy/libepoxy/no-need-for-python3.patch20
-rw-r--r--meta/recipes-graphics/libepoxy/libepoxy_1.4.0.bb (renamed from meta/recipes-graphics/libepoxy/libepoxy_git.bb)16
4 files changed, 4 insertions, 202 deletions
diff --git a/meta/recipes-graphics/libepoxy/libepoxy/0001-select-platforms-based-on-configuration-results.patch b/meta/recipes-graphics/libepoxy/libepoxy/0001-select-platforms-based-on-configuration-results.patch
deleted file mode 100644
index 674c8e8330..0000000000
--- a/meta/recipes-graphics/libepoxy/libepoxy/0001-select-platforms-based-on-configuration-results.patch
+++ /dev/null
@@ -1,128 +0,0 @@
1From 3a93150bc0aec86afdb7d053247dc2448925e09a Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Wed, 6 May 2015 10:45:22 +0200
4Subject: [PATCH 1/2] select platforms based on configuration results
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Upstream-Status: Submitted [1]
10
11[1] https://github.com/anholt/libepoxy/pull/52
12
13Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
14---
15 configure.ac | 13 +++++--------
16 src/dispatch_common.c | 9 ++++++---
17 src/dispatch_common.h | 9 +++++----
18 3 files changed, 16 insertions(+), 15 deletions(-)
19
20diff --git a/configure.ac b/configure.ac
21index a52fc58..bdd70da 100644
22--- a/configure.ac
23+++ b/configure.ac
24@@ -58,6 +58,10 @@ AC_CHECK_HEADER([KHR/khrplatform.h],
25 # uintptr_t to a void *") by default. Kill that.
26 XORG_TESTSET_CFLAG(CWARNFLAGS, [-Wno-int-conversion])
27
28+PKG_CHECK_MODULES(X11, [x11], [x11=yes], [x11=no])
29+
30+AM_CONDITIONAL(HAVE_X11, test x$x11 = xyes)
31+
32 has_znow=yes
33
34 case $host_os in
35@@ -86,7 +90,7 @@ case $host_os in
36 ;;
37 *)
38 build_egl=yes
39- build_glx=yes
40+ build_glx=$x11
41 build_wgl=no
42 # On platforms with dlopen, we load everything dynamically and
43 # don't link against a specific window system or GL implementation.
44@@ -144,13 +148,6 @@ esac
45
46 AC_SUBST([VISIBILITY_CFLAGS])
47
48-PKG_CHECK_MODULES(X11, [x11], [x11=yes], [x11=no])
49-if test x$x11 = xno -a x$build_glx = xyes; then
50- AC_MSG_ERROR([libX11 headers (libx11-dev) required to build with GLX support])
51-fi
52-
53-AM_CONDITIONAL(HAVE_X11, test x$x11 = xyes)
54-
55 PKG_CHECK_MODULES(GL, [gl], [gl=yes], [gl=no])
56
57 AC_CONFIG_FILES([
58diff --git a/src/dispatch_common.c b/src/dispatch_common.c
59index 4e34d6e..2ab84ed 100644
60--- a/src/dispatch_common.c
61+++ b/src/dispatch_common.c
62@@ -615,10 +615,13 @@ epoxy_get_proc_address(const char *name)
63 #elif defined(__APPLE__)
64 return epoxy_gl_dlsym(name);
65 #else
66+#if PLATFORM_HAS_GLX
67 if (epoxy_current_context_is_glx()) {
68 return glXGetProcAddressARB((const GLubyte *)name);
69- } else {
70+ } else
71+#endif /* PLATFORM_HAS_GLX */
72 #if PLATFORM_HAS_EGL
73+ {
74 GLenum egl_api = epoxy_egl_get_current_gl_context_api();
75
76 switch (egl_api) {
77@@ -628,10 +631,10 @@ epoxy_get_proc_address(const char *name)
78 case EGL_NONE:
79 break;
80 }
81-#endif
82 }
83+#endif /* PLATFORM_HAS_EGL */
84 errx(1, "Couldn't find current GLX or EGL context.\n");
85-#endif
86+#endif /* _WIN32 | __APPLE__*/
87 }
88
89 void
90diff --git a/src/dispatch_common.h b/src/dispatch_common.h
91index 6b8503a..82681e4 100644
92--- a/src/dispatch_common.h
93+++ b/src/dispatch_common.h
94@@ -21,12 +21,13 @@
95 * IN THE SOFTWARE.
96 */
97
98+#include <config.h>
99 #include <stdbool.h>
100
101 #ifdef _WIN32
102 #define PLATFORM_HAS_EGL 0
103 #define PLATFORM_HAS_GLX 0
104-#define PLATFORM_HAS_WGL 1
105+#define PLATFORM_HAS_WGL BUILD_WGL
106 #define EPOXY_IMPORTEXPORT __declspec(dllexport)
107 #elif defined(__APPLE__)
108 #define PLATFORM_HAS_EGL 0
109@@ -34,13 +35,13 @@
110 #define PLATFORM_HAS_WGL 0
111 #define EPOXY_IMPORTEXPORT
112 #elif defined(ANDROID)
113-#define PLATFORM_HAS_EGL 1
114+#define PLATFORM_HAS_EGL BUILD_EGL
115 #define PLATFORM_HAS_GLX 0
116 #define PLATFORM_HAS_WGL 0
117 #define EPOXY_IMPORTEXPORT
118 #else
119-#define PLATFORM_HAS_EGL 1
120-#define PLATFORM_HAS_GLX 1
121+#define PLATFORM_HAS_EGL BUILD_EGL
122+#define PLATFORM_HAS_GLX BUILD_GLX
123 #define PLATFORM_HAS_WGL 0
124 #define EPOXY_IMPORTEXPORT
125 #endif
126--
1271.9.3
128
diff --git a/meta/recipes-graphics/libepoxy/libepoxy/0002-add-an-option-to-disable-glx-support.patch b/meta/recipes-graphics/libepoxy/libepoxy/0002-add-an-option-to-disable-glx-support.patch
deleted file mode 100644
index 262d6845f5..0000000000
--- a/meta/recipes-graphics/libepoxy/libepoxy/0002-add-an-option-to-disable-glx-support.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From 24868cbfb9dda5f6929dd277c47d35df016e8754 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Wed, 6 May 2015 11:05:48 +0200
4Subject: [PATCH 2/2] add an option to disable glx support
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9this option would help us in yocto to get deterministic build results
10
11Upstream-Status: Submitted [1]
12
13[1] https://github.com/anholt/libepoxy/pull/52
14
15Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
16---
17 configure.ac | 9 ++++++++-
18 1 file changed, 8 insertions(+), 1 deletion(-)
19
20diff --git a/configure.ac b/configure.ac
21index bdd70da..6c7153d 100644
22--- a/configure.ac
23+++ b/configure.ac
24@@ -58,7 +58,14 @@ AC_CHECK_HEADER([KHR/khrplatform.h],
25 # uintptr_t to a void *") by default. Kill that.
26 XORG_TESTSET_CFLAG(CWARNFLAGS, [-Wno-int-conversion])
27
28-PKG_CHECK_MODULES(X11, [x11], [x11=yes], [x11=no])
29+AC_ARG_ENABLE([glx],
30+ [AS_HELP_STRING([--disable-glx],
31+ [disable if you don't want x11/glx support])],
32+ [],
33+ [enable_glx=yes]
34+ )
35+
36+PKG_CHECK_MODULES(X11, [x11], [x11=$enable_glx], [x11=no])
37
38 AM_CONDITIONAL(HAVE_X11, test x$x11 = xyes)
39
40--
411.9.3
42
diff --git a/meta/recipes-graphics/libepoxy/libepoxy/no-need-for-python3.patch b/meta/recipes-graphics/libepoxy/libepoxy/no-need-for-python3.patch
deleted file mode 100644
index 4b8fea58df..0000000000
--- a/meta/recipes-graphics/libepoxy/libepoxy/no-need-for-python3.patch
+++ /dev/null
@@ -1,20 +0,0 @@
1There is no need to use python3 by this package (the python scripts
2that are using during configuration only need python2.7+)
3
4Upstream-Status: Inappropriate [configuration]
5
6Signed-off-by: Gary Thomas <gary@mlbassoc.com>
7--
8Index: git/configure.ac
9===================================================================
10--- git.orig/configure.ac
11+++ git/configure.ac
12@@ -40,7 +40,7 @@ m4_ifndef([XORG_MACROS_VERSION],
13 XORG_MACROS_VERSION(1.8)
14 XORG_DEFAULT_OPTIONS
15
16-AC_CHECK_PROGS([PYTHON], [python3 python2 python])
17+AC_CHECK_PROGS([PYTHON], [python2 python])
18
19 # Initialize libtool
20 AC_DISABLE_STATIC
diff --git a/meta/recipes-graphics/libepoxy/libepoxy_git.bb b/meta/recipes-graphics/libepoxy/libepoxy_1.4.0.bb
index 6c247ccafe..4d52f126ff 100644
--- a/meta/recipes-graphics/libepoxy/libepoxy_git.bb
+++ b/meta/recipes-graphics/libepoxy/libepoxy_1.4.0.bb
@@ -5,20 +5,12 @@ SECTION = "libs"
5LICENSE = "MIT" 5LICENSE = "MIT"
6LIC_FILES_CHKSUM = "file://COPYING;md5=58ef4c80d401e07bd9ee8b6b58cf464b" 6LIC_FILES_CHKSUM = "file://COPYING;md5=58ef4c80d401e07bd9ee8b6b58cf464b"
7 7
8 8SRC_URI = "https://github.com/anholt/${BPN}/releases/download/v1.4/${BP}.tar.xz"
9SRC_URI = " \ 9SRC_URI[md5sum] = "d8d8cbf2beb64975d424fcc5167a2a38"
10 git://github.com/anholt/libepoxy.git \ 10SRC_URI[sha256sum] = "25a906b14a921bc2b488cfeaa21a00486fe92630e4a9dd346e4ecabeae52ab41"
11 file://0001-select-platforms-based-on-configuration-results.patch \
12 file://0002-add-an-option-to-disable-glx-support.patch \
13 file://no-need-for-python3.patch \
14"
15SRCREV="e2c33af5bfcfc9d168f9e776156dd47c33f428b3"
16PV = "1.3.1"
17
18S = "${WORKDIR}/git"
19 11
20inherit autotools pkgconfig distro_features_check 12inherit autotools pkgconfig distro_features_check
21# depends on virtual/egl 13
22REQUIRED_DISTRO_FEATURES = "opengl" 14REQUIRED_DISTRO_FEATURES = "opengl"
23 15
24DEPENDS = "util-macros virtual/egl" 16DEPENDS = "util-macros virtual/egl"