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>
This commit is contained in:
Ross Burton
Richard Purdie
parent
4766960304
commit
ddd2fbf722
|
|
@ -1,128 +0,0 @@
|
|||
From 3a93150bc0aec86afdb7d053247dc2448925e09a Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Wed, 6 May 2015 10:45:22 +0200
|
||||
Subject: [PATCH 1/2] select platforms based on configuration results
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Submitted [1]
|
||||
|
||||
[1] https://github.com/anholt/libepoxy/pull/52
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
configure.ac | 13 +++++--------
|
||||
src/dispatch_common.c | 9 ++++++---
|
||||
src/dispatch_common.h | 9 +++++----
|
||||
3 files changed, 16 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index a52fc58..bdd70da 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -58,6 +58,10 @@ AC_CHECK_HEADER([KHR/khrplatform.h],
|
||||
# uintptr_t to a void *") by default. Kill that.
|
||||
XORG_TESTSET_CFLAG(CWARNFLAGS, [-Wno-int-conversion])
|
||||
|
||||
+PKG_CHECK_MODULES(X11, [x11], [x11=yes], [x11=no])
|
||||
+
|
||||
+AM_CONDITIONAL(HAVE_X11, test x$x11 = xyes)
|
||||
+
|
||||
has_znow=yes
|
||||
|
||||
case $host_os in
|
||||
@@ -86,7 +90,7 @@ case $host_os in
|
||||
;;
|
||||
*)
|
||||
build_egl=yes
|
||||
- build_glx=yes
|
||||
+ build_glx=$x11
|
||||
build_wgl=no
|
||||
# On platforms with dlopen, we load everything dynamically and
|
||||
# don't link against a specific window system or GL implementation.
|
||||
@@ -144,13 +148,6 @@ esac
|
||||
|
||||
AC_SUBST([VISIBILITY_CFLAGS])
|
||||
|
||||
-PKG_CHECK_MODULES(X11, [x11], [x11=yes], [x11=no])
|
||||
-if test x$x11 = xno -a x$build_glx = xyes; then
|
||||
- AC_MSG_ERROR([libX11 headers (libx11-dev) required to build with GLX support])
|
||||
-fi
|
||||
-
|
||||
-AM_CONDITIONAL(HAVE_X11, test x$x11 = xyes)
|
||||
-
|
||||
PKG_CHECK_MODULES(GL, [gl], [gl=yes], [gl=no])
|
||||
|
||||
AC_CONFIG_FILES([
|
||||
diff --git a/src/dispatch_common.c b/src/dispatch_common.c
|
||||
index 4e34d6e..2ab84ed 100644
|
||||
--- a/src/dispatch_common.c
|
||||
+++ b/src/dispatch_common.c
|
||||
@@ -615,10 +615,13 @@ epoxy_get_proc_address(const char *name)
|
||||
#elif defined(__APPLE__)
|
||||
return epoxy_gl_dlsym(name);
|
||||
#else
|
||||
+#if PLATFORM_HAS_GLX
|
||||
if (epoxy_current_context_is_glx()) {
|
||||
return glXGetProcAddressARB((const GLubyte *)name);
|
||||
- } else {
|
||||
+ } else
|
||||
+#endif /* PLATFORM_HAS_GLX */
|
||||
#if PLATFORM_HAS_EGL
|
||||
+ {
|
||||
GLenum egl_api = epoxy_egl_get_current_gl_context_api();
|
||||
|
||||
switch (egl_api) {
|
||||
@@ -628,10 +631,10 @@ epoxy_get_proc_address(const char *name)
|
||||
case EGL_NONE:
|
||||
break;
|
||||
}
|
||||
-#endif
|
||||
}
|
||||
+#endif /* PLATFORM_HAS_EGL */
|
||||
errx(1, "Couldn't find current GLX or EGL context.\n");
|
||||
-#endif
|
||||
+#endif /* _WIN32 | __APPLE__*/
|
||||
}
|
||||
|
||||
void
|
||||
diff --git a/src/dispatch_common.h b/src/dispatch_common.h
|
||||
index 6b8503a..82681e4 100644
|
||||
--- a/src/dispatch_common.h
|
||||
+++ b/src/dispatch_common.h
|
||||
@@ -21,12 +21,13 @@
|
||||
* IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
+#include <config.h>
|
||||
#include <stdbool.h>
|
||||
|
||||
#ifdef _WIN32
|
||||
#define PLATFORM_HAS_EGL 0
|
||||
#define PLATFORM_HAS_GLX 0
|
||||
-#define PLATFORM_HAS_WGL 1
|
||||
+#define PLATFORM_HAS_WGL BUILD_WGL
|
||||
#define EPOXY_IMPORTEXPORT __declspec(dllexport)
|
||||
#elif defined(__APPLE__)
|
||||
#define PLATFORM_HAS_EGL 0
|
||||
@@ -34,13 +35,13 @@
|
||||
#define PLATFORM_HAS_WGL 0
|
||||
#define EPOXY_IMPORTEXPORT
|
||||
#elif defined(ANDROID)
|
||||
-#define PLATFORM_HAS_EGL 1
|
||||
+#define PLATFORM_HAS_EGL BUILD_EGL
|
||||
#define PLATFORM_HAS_GLX 0
|
||||
#define PLATFORM_HAS_WGL 0
|
||||
#define EPOXY_IMPORTEXPORT
|
||||
#else
|
||||
-#define PLATFORM_HAS_EGL 1
|
||||
-#define PLATFORM_HAS_GLX 1
|
||||
+#define PLATFORM_HAS_EGL BUILD_EGL
|
||||
+#define PLATFORM_HAS_GLX BUILD_GLX
|
||||
#define PLATFORM_HAS_WGL 0
|
||||
#define EPOXY_IMPORTEXPORT
|
||||
#endif
|
||||
--
|
||||
1.9.3
|
||||
|
||||
|
|
@ -1,42 +0,0 @@
|
|||
From 24868cbfb9dda5f6929dd277c47d35df016e8754 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Wed, 6 May 2015 11:05:48 +0200
|
||||
Subject: [PATCH 2/2] add an option to disable glx support
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
this option would help us in yocto to get deterministic build results
|
||||
|
||||
Upstream-Status: Submitted [1]
|
||||
|
||||
[1] https://github.com/anholt/libepoxy/pull/52
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
configure.ac | 9 ++++++++-
|
||||
1 file changed, 8 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index bdd70da..6c7153d 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -58,7 +58,14 @@ AC_CHECK_HEADER([KHR/khrplatform.h],
|
||||
# uintptr_t to a void *") by default. Kill that.
|
||||
XORG_TESTSET_CFLAG(CWARNFLAGS, [-Wno-int-conversion])
|
||||
|
||||
-PKG_CHECK_MODULES(X11, [x11], [x11=yes], [x11=no])
|
||||
+AC_ARG_ENABLE([glx],
|
||||
+ [AS_HELP_STRING([--disable-glx],
|
||||
+ [disable if you don't want x11/glx support])],
|
||||
+ [],
|
||||
+ [enable_glx=yes]
|
||||
+ )
|
||||
+
|
||||
+PKG_CHECK_MODULES(X11, [x11], [x11=$enable_glx], [x11=no])
|
||||
|
||||
AM_CONDITIONAL(HAVE_X11, test x$x11 = xyes)
|
||||
|
||||
--
|
||||
1.9.3
|
||||
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
There is no need to use python3 by this package (the python scripts
|
||||
that are using during configuration only need python2.7+)
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
Signed-off-by: Gary Thomas <gary@mlbassoc.com>
|
||||
--
|
||||
Index: git/configure.ac
|
||||
===================================================================
|
||||
--- git.orig/configure.ac
|
||||
+++ git/configure.ac
|
||||
@@ -40,7 +40,7 @@ m4_ifndef([XORG_MACROS_VERSION],
|
||||
XORG_MACROS_VERSION(1.8)
|
||||
XORG_DEFAULT_OPTIONS
|
||||
|
||||
-AC_CHECK_PROGS([PYTHON], [python3 python2 python])
|
||||
+AC_CHECK_PROGS([PYTHON], [python2 python])
|
||||
|
||||
# Initialize libtool
|
||||
AC_DISABLE_STATIC
|
||||
|
|
@ -5,20 +5,12 @@ SECTION = "libs"
|
|||
LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=58ef4c80d401e07bd9ee8b6b58cf464b"
|
||||
|
||||
|
||||
SRC_URI = " \
|
||||
git://github.com/anholt/libepoxy.git \
|
||||
file://0001-select-platforms-based-on-configuration-results.patch \
|
||||
file://0002-add-an-option-to-disable-glx-support.patch \
|
||||
file://no-need-for-python3.patch \
|
||||
"
|
||||
SRCREV="e2c33af5bfcfc9d168f9e776156dd47c33f428b3"
|
||||
PV = "1.3.1"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
SRC_URI = "https://github.com/anholt/${BPN}/releases/download/v1.4/${BP}.tar.xz"
|
||||
SRC_URI[md5sum] = "d8d8cbf2beb64975d424fcc5167a2a38"
|
||||
SRC_URI[sha256sum] = "25a906b14a921bc2b488cfeaa21a00486fe92630e4a9dd346e4ecabeae52ab41"
|
||||
|
||||
inherit autotools pkgconfig distro_features_check
|
||||
# depends on virtual/egl
|
||||
|
||||
REQUIRED_DISTRO_FEATURES = "opengl"
|
||||
|
||||
DEPENDS = "util-macros virtual/egl"
|
||||
Loading…
Reference in New Issue