<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ef67a254854832580ceb0fa04e76311b6b0be355">https://github.com/macports/macports-ports/commit/ef67a254854832580ceb0fa04e76311b6b0be355</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new ef67a25 libepoxy: update to version 1.4.1
</span>ef67a25 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ef67a254854832580ceb0fa04e76311b6b0be355
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Thu Mar 16 06:22:10 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> libepoxy: update to version 1.4.1
</span>---
graphics/libepoxy/Portfile | 27 +----
...-platforms-based-on-configuration-results.patch | 124 ---------------------
...0002-add-an-option-to-disable-glx-support.patch | 38 -------
...able-glx-actually-work-on-OSX-and-Windows.patch | 66 -----------
...GLX-instead-of-OpenGL.framework-if-it-is-.patch | 95 ----------------
...ion-in-string-when-extension-list-is-null.patch | 16 ---
.../fix-epoxy-glx-version-if-glx-not-active.patch | 41 -------
graphics/libepoxy/files/prefix.patch | 6 +-
8 files changed, 9 insertions(+), 404 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libepoxy/Portfile b/graphics/libepoxy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 593b27f..b4adce7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/libepoxy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/libepoxy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,7 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup anholt libepoxy 1.3.1 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup anholt libepoxy 1.4.1
</span> license MIT permissive
categories graphics
maintainers {devans @dbevans} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,8 +14,8 @@ description Epoxy is a library for handling OpenGL function \
</span>
long_description ${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 fc67ebfc18fe1209d23d8ef315cc9ab387731563 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2c8155016e6bcf2ad604094ba84f0404edda3278dea851d6ce44830291eb885b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 f7fc500d443c8e424fbff7ac9c2ff112f37c7e2f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 15ad83bdc857da926739aa7ecb296f5bc7ec3e232d3e9948b85f67179bc0b23f
</span>
# Yes, mesa and xorg-libX11 are *build* dependencies. The library will function correctly
# if they are not present because it loads mesa dynamically only when GLX is used. When
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,20 +32,7 @@ depends_build port:pkgconfig \
</span> port:mesa \
port:xorg-libX11
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- prefix.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0001-select-platforms-based-on-configuration-results.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0002-add-an-option-to-disable-glx-support.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0003-Make-enable-glx-actually-work-on-OSX-and-Windows.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0004-darwin-Use-GLX-instead-of-OpenGL.framework-if-it-is-.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/51911
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/anholt/libepoxy/issues/72
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/yaronct/libepoxy/commit/b3b8bd9af7bf1fcfe544fd131f4d4f0d117ae7bc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/anholt/libepoxy/pull/84
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append fix-epoxy-glx-version-if-glx-not-active.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fix-epoxy-extension-in-string-when-extension-list-is-null.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles prefix.patch
</span>
post-patch {
reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/src/dispatch_common.c
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,9 +40,8 @@ post-patch {
</span>
configure.cmd ./autogen.sh
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-silent-rules \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-glx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --disable-silent-rules \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-glx
</span>
variant python27 conflicts python34 python35 python36 description {build with python 2.7} {
depends_lib-append port:python27
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libepoxy/files/0001-select-platforms-based-on-configuration-results.patch b/graphics/libepoxy/files/0001-select-platforms-based-on-configuration-results.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3756736..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/libepoxy/files/0001-select-platforms-based-on-configuration-results.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,124 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 7eff2bf8e27599c1c94217b2bb1b73d4b7d18e59 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 6 May 2015 10:45:22 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1/4] select platforms based on configuration results
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-MIME-Version: 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Content-Type: text/plain; charset=UTF-8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Content-Transfer-Encoding: 8bit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ac | 13 +++++--------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/dispatch_common.c | 9 ++++++---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/dispatch_common.h | 9 +++++----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3 files changed, 16 insertions(+), 15 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/configure.ac b/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2d67726..225ab73 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -58,6 +58,10 @@ AC_CHECK_HEADER([KHR/khrplatform.h],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # uintptr_t to a void *") by default. Kill that.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- XORG_TESTSET_CFLAG(CWARNFLAGS, [-Wno-int-conversion])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PKG_CHECK_MODULES(X11, [x11], [x11=yes], [x11=no])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AM_CONDITIONAL(HAVE_X11, test x$x11 = xyes)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- has_znow=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case $host_os in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -86,7 +90,7 @@ case $host_os in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build_egl=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- build_glx=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ build_glx=$x11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build_wgl=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # On platforms with dlopen, we load everything dynamically and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # don't link against a specific window system or GL implementation.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -144,13 +148,6 @@ esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_SUBST([VISIBILITY_CFLAGS])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PKG_CHECK_MODULES(X11, [x11], [x11=yes], [x11=no])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test x$x11 = xno -a x$build_glx = xyes; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_MSG_ERROR([libX11 headers (libx11-dev) required to build with GLX support])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AM_CONDITIONAL(HAVE_X11, test x$x11 = xyes)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PKG_CHECK_MODULES(GL, [gl], [gl=yes], [gl=no])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CONFIG_FILES([
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/dispatch_common.c b/src/dispatch_common.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 013027f..163d348 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/dispatch_common.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/dispatch_common.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -656,10 +656,13 @@ epoxy_get_proc_address(const char *name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return epoxy_gl_dlsym(name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if PLATFORM_HAS_GLX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (epoxy_current_context_is_glx()) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return glXGetProcAddressARB((const GLubyte *)name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* PLATFORM_HAS_GLX */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if PLATFORM_HAS_EGL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GLenum egl_api = epoxy_egl_get_current_gl_context_api();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- switch (egl_api) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -669,10 +672,10 @@ epoxy_get_proc_address(const char *name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case EGL_NONE:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* PLATFORM_HAS_EGL */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- errx(1, "Couldn't find current GLX or EGL context.\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* _WIN32 | __APPLE__*/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WRAPPER_VISIBILITY (void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/dispatch_common.h b/src/dispatch_common.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 676a4d5..2728b45 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/dispatch_common.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/dispatch_common.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,12 +21,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * IN THE SOFTWARE.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <config.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdbool.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef _WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PLATFORM_HAS_EGL 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PLATFORM_HAS_GLX 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define PLATFORM_HAS_WGL 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define PLATFORM_HAS_WGL BUILD_WGL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define EPOXY_IMPORTEXPORT __declspec(dllexport)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PLATFORM_HAS_EGL 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34,13 +35,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PLATFORM_HAS_WGL 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define EPOXY_IMPORTEXPORT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(ANDROID)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define PLATFORM_HAS_EGL 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define PLATFORM_HAS_EGL BUILD_EGL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PLATFORM_HAS_GLX 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PLATFORM_HAS_WGL 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define EPOXY_IMPORTEXPORT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define PLATFORM_HAS_EGL 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define PLATFORM_HAS_GLX 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define PLATFORM_HAS_EGL BUILD_EGL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define PLATFORM_HAS_GLX BUILD_GLX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PLATFORM_HAS_WGL 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define EPOXY_IMPORTEXPORT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.7.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libepoxy/files/0002-add-an-option-to-disable-glx-support.patch b/graphics/libepoxy/files/0002-add-an-option-to-disable-glx-support.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9171961..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/libepoxy/files/0002-add-an-option-to-disable-glx-support.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,38 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From a9efde0fb2678cd26bdf26d256732d97ded0c595 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 6 May 2015 11:05:48 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 2/4] add an option to disable glx support
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-MIME-Version: 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Content-Type: text/plain; charset=UTF-8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Content-Transfer-Encoding: 8bit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-this option would help us in yocto to get deterministic build results
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ac | 9 ++++++++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 8 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/configure.ac b/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 225ab73..d3d947c 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -58,7 +58,14 @@ AC_CHECK_HEADER([KHR/khrplatform.h],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # uintptr_t to a void *") by default. Kill that.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- XORG_TESTSET_CFLAG(CWARNFLAGS, [-Wno-int-conversion])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PKG_CHECK_MODULES(X11, [x11], [x11=yes], [x11=no])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AC_ARG_ENABLE([glx],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [AS_HELP_STRING([--disable-glx],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [disable if you don't want x11/glx support])],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [enable_glx=yes]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PKG_CHECK_MODULES(X11, [x11], [x11=$enable_glx], [x11=no])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AM_CONDITIONAL(HAVE_X11, test x$x11 = xyes)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.7.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libepoxy/files/0003-Make-enable-glx-actually-work-on-OSX-and-Windows.patch b/graphics/libepoxy/files/0003-Make-enable-glx-actually-work-on-OSX-and-Windows.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f18dd98..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/libepoxy/files/0003-Make-enable-glx-actually-work-on-OSX-and-Windows.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,66 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 902ea1eb073187603ec2eda4d2a146bef96592d4 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 18 Jan 2016 10:08:44 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 3/4] Make --enable-glx actually work on OSX and Windows
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Followup for anholt/libepoxy#52
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ac | 6 +++---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/dispatch_common.h | 4 ++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2 files changed, 5 insertions(+), 5 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/configure.ac b/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d3d947c..b4c7ede 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -61,7 +61,7 @@ XORG_TESTSET_CFLAG(CWARNFLAGS, [-Wno-int-conversion])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_ARG_ENABLE([glx],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [AS_HELP_STRING([--disable-glx],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [disable if you don't want x11/glx support])],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [enable_glx=$enableval],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [enable_glx=yes]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -74,7 +74,7 @@ has_znow=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case $host_os in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mingw*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build_egl=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- build_glx=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ build_glx=$x11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build_wgl=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # On windows, the DLL has to have all of its functions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # resolved at link time, so we have to link directly aginst
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -89,7 +89,7 @@ case $host_os in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- darwin*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build_egl=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- build_glx=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ build_glx=$x11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build_wgl=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build_apple=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- has_znow=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/dispatch_common.h b/src/dispatch_common.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2728b45..c30ce44 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/dispatch_common.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/dispatch_common.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26,12 +26,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef _WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PLATFORM_HAS_EGL 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define PLATFORM_HAS_GLX 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define PLATFORM_HAS_GLX BUILD_GLX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PLATFORM_HAS_WGL BUILD_WGL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define EPOXY_IMPORTEXPORT __declspec(dllexport)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PLATFORM_HAS_EGL 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define PLATFORM_HAS_GLX 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define PLATFORM_HAS_GLX BUILD_GLX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PLATFORM_HAS_WGL 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define EPOXY_IMPORTEXPORT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(ANDROID)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.7.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libepoxy/files/0004-darwin-Use-GLX-instead-of-OpenGL.framework-if-it-is-.patch b/graphics/libepoxy/files/0004-darwin-Use-GLX-instead-of-OpenGL.framework-if-it-is-.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c741701..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/libepoxy/files/0004-darwin-Use-GLX-instead-of-OpenGL.framework-if-it-is-.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,95 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From d010922282580a32dfebcda12ee1c307b3ef6005 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 18 Jan 2016 09:49:55 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 4/4] darwin: Use GLX instead of OpenGL.framework if it is the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- current context
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Also makes a stab at similar support for Win32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-anholt/libepoxy#63
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/dispatch_common.c | 29 ++++++++++++++++-------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 16 insertions(+), 13 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/dispatch_common.c b/src/dispatch_common.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 163d348..cb9f76a 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/dispatch_common.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/dispatch_common.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -482,16 +482,20 @@ epoxy_glx_dlsym(const char *name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- epoxy_gl_dlsym(const char *name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef _WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(_WIN32) || defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if (!epoxy_current_context_is_glx()) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# if defined(_WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return do_dlsym(&api.gl_handle, "OPENGL32", name, true);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# elif defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return do_dlsym(&api.gl_handle,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "/System/Library/Frameworks/OpenGL.framework/Versions/Current/OpenGL",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- name, true);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* There's no library for desktop GL support independent of GLX. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return epoxy_glx_dlsym(name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -615,7 +619,7 @@ epoxy_get_bootstrap_proc_address(const char *name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if PLATFORM_HAS_GLX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (api.glx_handle && glXGetCurrentContext())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return epoxy_gl_dlsym(name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return epoxy_glx_dlsym(name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* If epoxy hasn't loaded any API-specific library yet, try to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -644,22 +648,17 @@ epoxy_get_bootstrap_proc_address(const char *name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* PLATFORM_HAS_EGL */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* Fall back to GLX */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Fall back to the platform default */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return epoxy_gl_dlsym(name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- epoxy_get_proc_address(const char *name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef _WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return wglGetProcAddress(name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return epoxy_gl_dlsym(name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if PLATFORM_HAS_GLX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (epoxy_current_context_is_glx()) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return glXGetProcAddressARB((const GLubyte *)name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- } else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* PLATFORM_HAS_GLX */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if PLATFORM_HAS_EGL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -674,8 +673,12 @@ epoxy_get_proc_address(const char *name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* PLATFORM_HAS_EGL */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(_WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return wglGetProcAddress(name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return epoxy_gl_dlsym(name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- errx(1, "Couldn't find current GLX or EGL context.\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* _WIN32 | __APPLE__*/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WRAPPER_VISIBILITY (void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.7.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libepoxy/files/fix-epoxy-extension-in-string-when-extension-list-is-null.patch b/graphics/libepoxy/files/fix-epoxy-extension-in-string-when-extension-list-is-null.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index eef16a1..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/libepoxy/files/fix-epoxy-extension-in-string-when-extension-list-is-null.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/dispatch_common.c 2016-07-29 10:24:17.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/dispatch_common.c 2016-07-29 10:25:06.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -348,7 +348,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- epoxy_extension_in_string(const char *extension_list, const char *ext)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char *ptr = extension_list;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int len = strlen(ext);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int len;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!extension_list)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ len = strlen(ext);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Make sure that don't just find an extension with our name as a prefix. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- while (true) {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libepoxy/files/fix-epoxy-glx-version-if-glx-not-active.patch b/graphics/libepoxy/files/fix-epoxy-glx-version-if-glx-not-active.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index af6fd0e..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/libepoxy/files/fix-epoxy-glx-version-if-glx-not-active.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,41 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/dispatch_glx.c.orig 2016-07-26 13:43:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/dispatch_glx.c 2016-07-26 13:44:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -54,22 +54,23 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int client_major, client_minor;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int server, client;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char *version_string;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int ret;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int ret=0, sscanf_ret;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- version_string = glXQueryServerString(dpy, screen, GLX_VERSION);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ret = sscanf(version_string, "%d.%d", &server_major, &server_minor);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- assert(ret == 2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- server = server_major * 10 + server_minor;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- version_string = glXGetClientString(dpy, GLX_VERSION);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ret = sscanf(version_string, "%d.%d", &client_major, &client_minor);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- assert(ret == 2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- client = client_major * 10 + client_minor;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (client < server)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return client;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return server;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ((version_string = glXQueryServerString(dpy, screen, GLX_VERSION)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sscanf_ret = sscanf(version_string, "%d.%d", &server_major, &server_minor);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ assert(sscanf_ret == 2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ server = server_major * 10 + server_minor;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ((version_string = glXGetClientString(dpy, GLX_VERSION)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sscanf_ret = sscanf(version_string, "%d.%d", &client_major, &client_minor);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ assert(sscanf_ret == 2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ client = client_major * 10 + client_minor;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ret = client <= server ? client : server;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return ret;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /**
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libepoxy/files/prefix.patch b/graphics/libepoxy/files/prefix.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 5d7e3f2..9f58d02 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/libepoxy/files/prefix.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/libepoxy/files/prefix.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/dispatch_common.c 2015-07-15 16:46:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/dispatch_common.c 2015-12-05 09:38:47.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -103,7 +103,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/dispatch_common.c 2015-07-15 16:46:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/dispatch_common.c 2015-12-05 09:38:47.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -174,7 +174,7 @@
</span> #include "dispatch_common.h"
#ifdef __APPLE__
</pre><pre style='margin:0'>
</pre>