libepoxy: bump to version 1.4.0
PATCH 1/1 libepoxy: bump to version 1.4.0
Drop all patches since they're upstream, yay!
Switch to the gnome mirror since it's more handy than github, and it also allows to drop autoreconf since it's a distribution tarball with the configure script is already generated.
--- ...-platforms-based-on-configuration-results.patch | 125 --------------------- ...0002-add-an-option-to-disable-glx-support.patch | 39 ------- ...able-glx-actually-work-on-osx-and-windows.patch | 67 ----------- ...arwin-use-glx-instead-of-opengl-framework.patch | 95 ---------------- .../0005-Forward-egl-cflags-into-epoxy.pc.patch | 45 -------- package/libepoxy/0006-Make-egl-conditional.patch | 59 ---------- package/libepoxy/libepoxy.hash | 4 +- package/libepoxy/libepoxy.mk | 8 +- 8 files changed, 6 insertions(+), 436 deletions(-) delete mode 100644 package/libepoxy/0001-select-platforms-based-on-configuration-results.patch delete mode 100644 package/libepoxy/0002-add-an-option-to-disable-glx-support.patch delete mode 100644 package/libepoxy/0003-make-enable-glx-actually-work-on-osx-and-windows.patch delete mode 100644 package/libepoxy/0004-darwin-use-glx-instead-of-opengl-framework.patch delete mode 100644 package/libepoxy/0005-Forward-egl-cflags-into-epoxy.pc.patch delete mode 100644 package/libepoxy/0006-Make-egl-conditional.patch
package/libepoxy/0001-select-platforms-based-on-configuration-results.patch deleted +0 -125
@@ -1,125 +0,0 @@ -From 7eff2bf8e27599c1c94217b2bb1b73d4b7d18e59 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> -Date: Wed, 6 May 2015 10:45:22 +0200 -Subject: [PATCH 1/4] select platforms based on configuration results -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Andreas M?ller <[email protected]> -Fetched from pull #81 on github for libepoxy: -https://github.com/anholt/libepoxy/pull/81/commits -Signed-off-by: Gustavo Zacarias <[email protected]> ---- - 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 2d67726..225ab73 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 013027f..163d348 100644 ---- a/src/dispatch_common.c -+++ b/src/dispatch_common.c -@@ -656,10 +656,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) { -@@ -669,10 +672,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__*/ - } - - WRAPPER_VISIBILITY (void) -diff --git a/src/dispatch_common.h b/src/dispatch_common.h -index 676a4d5..2728b45 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 -
package/libepoxy/0002-add-an-option-to-disable-glx-support.patch deleted +0 -39
@@ -1,39 +0,0 @@ -From a9efde0fb2678cd26bdf26d256732d97ded0c595 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> -Date: Wed, 6 May 2015 11:05:48 +0200 -Subject: [PATCH 2/4] 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 - -Signed-off-by: Andreas M?ller <[email protected]> -Fetched from pull #81 on github for libepoxy: -https://github.com/anholt/libepoxy/pull/81/commits -Signed-off-by: Gustavo Zacarias <[email protected]> ---- - configure.ac | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 225ab73..d3d947c 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) - -
package/libepoxy/0003-make-enable-glx-actually-work-on-osx-and-windows.patch deleted +0 -67
67 lines not on this page · raw message
package/libepoxy/0004-darwin-use-glx-instead-of-opengl-framework.patch deleted +0 -95
95 lines not on this page · raw message
package/libepoxy/0005-Forward-egl-cflags-into-epoxy.pc.patch deleted +0 -45
45 lines not on this page · raw message
package/libepoxy/0006-Make-egl-conditional.patch deleted +0 -59
59 lines not on this page · raw message
package/libepoxy/libepoxy.hash +2 -2
@@ -1,2 +1,2 @@ -# Locally calculated -sha256 6700ddedffb827b42c72cce1e0be6fba67b678b19bf256e1b5efd3ea38cc2bb4 libepoxy-v1.3.1.tar.gz +# From ftp://ftp.gnome.org/pub/gnome/sources/libepoxy/1.4/libepoxy-1.4.0.sha256sum +sha256 25a906b14a921bc2b488cfeaa21a00486fe92630e4a9dd346e4ecabeae52ab41 libepoxy-1.4.0.tar.xz
package/libepoxy/libepoxy.mk +4 -4
@@ -4,11 +4,11 @@ # ################################################################################ -LIBEPOXY_VERSION = v1.3.1 -LIBEPOXY_SITE = $(call github,anholt,libepoxy,$(LIBEPOXY_VERSION)) +LIBEPOXY_VERSION_MAJOR = 1.4 +LIBEPOXY_VERSION = $(LIBEPOXY_VERSION_MAJOR).0 +LIBEPOXY_SITE = http://ftp.gnome.org/pub/gnome/sources/libepoxy/$(LIBEPOXY_VERSION_MAJOR) +LIBEPOXY_SOURCE = libepoxy-$(LIBEPOXY_VERSION).tar.xz LIBEPOXY_INSTALL_STAGING = YES -# For patches 0001-0006: -LIBEPOXY_AUTORECONF = YES LIBEPOXY_DEPENDENCIES = xutil_util-macros LIBEPOXY_LICENSE = MIT LIBEPOXY_LICENSE_FILES = COPYING
Signature · 1 line
2.10.2
PATCH 1/1 libepoxy: bump to version 1.4.0
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Gustavo" == Gustavo Zacarias <[email protected]> writes:
Drop all patches since they're upstream, yay!
Switch to the gnome mirror since it's more handy than github, and it also allows to drop autoreconf since it's a distribution tarball with the configure script is already generated.
Nice - Committed to next, thanks.
Signature · 1 line
Bye, Peter Korsgaard