<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[144798] trunk/dports/graphics/libepoxy</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/144798">144798</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2016-01-18 10:24:23 -0800 (Mon, 18 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>libepoxy: Cleanup symbol lookups and dependencies</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicslibepoxyPortfile">trunk/dports/graphics/libepoxy/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicslibepoxyfiles0001selectplatformsbasedonconfigurationresultspatch">trunk/dports/graphics/libepoxy/files/0001-select-platforms-based-on-configuration-results.patch</a></li>
<li><a href="#trunkdportsgraphicslibepoxyfiles0002addanoptiontodisableglxsupportpatch">trunk/dports/graphics/libepoxy/files/0002-add-an-option-to-disable-glx-support.patch</a></li>
<li><a href="#trunkdportsgraphicslibepoxyfiles0003MakeenableglxactuallyworkonOSXandWindowspatch">trunk/dports/graphics/libepoxy/files/0003-Make-enable-glx-actually-work-on-OSX-and-Windows.patch</a></li>
<li><a href="#trunkdportsgraphicslibepoxyfiles0004darwinUseGLXinsteadofOpenGLframeworkifitispatch">trunk/dports/graphics/libepoxy/files/0004-darwin-Use-GLX-instead-of-OpenGL.framework-if-it-is-.patch</a></li>
<li><a href="#trunkdportsgraphicslibepoxyfilesprefixpatch">trunk/dports/graphics/libepoxy/files/prefix.patch</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicslibepoxyfilespatchconfigureacdiff">trunk/dports/graphics/libepoxy/files/patch-configure.ac.diff</a></li>
<li><a href="#trunkdportsgraphicslibepoxyfilespatchglxdiff">trunk/dports/graphics/libepoxy/files/patch-glx.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgraphicslibepoxyPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/libepoxy/Portfile (144797 => 144798)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/libepoxy/Portfile 2016-01-18 17:40:28 UTC (rev 144797)
+++ trunk/dports/graphics/libepoxy/Portfile 2016-01-18 18:24:23 UTC (rev 144798)
</span><span class="lines">@@ -5,6 +5,7 @@
</span><span class="cx"> PortGroup github 1.0
</span><span class="cx">
</span><span class="cx"> github.setup anholt libepoxy 1.3.1 v
</span><ins>+revision 1
</ins><span class="cx"> license MIT permissive
</span><span class="cx"> categories graphics
</span><span class="cx"> maintainers devans openmaintainer
</span><span class="lines">@@ -18,29 +19,38 @@
</span><span class="cx"> checksums rmd160 fc67ebfc18fe1209d23d8ef315cc9ab387731563 \
</span><span class="cx"> sha256 2c8155016e6bcf2ad604094ba84f0404edda3278dea851d6ce44830291eb885b
</span><span class="cx">
</span><ins>+# 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
+# OpenGL.framework is used, there is no need to have mesa at runtime.
+#
+# Clients of this library must link mesa directly and have it listed as their dependency
+# in order to use mesa with libepoxy.
+
</ins><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:autoconf \
</span><span class="cx"> port:automake \
</span><span class="cx"> port:libtool \
</span><del>- port:xorg-util-macros
-
-depends_lib port:mesa \
</del><ins>+ port:xorg-util-macros \
+ port:mesa \
</ins><span class="cx"> port:xorg-libX11
</span><span class="cx">
</span><del>-patchfiles patch-configure.ac.diff
</del><ins>+patch.pre_args -p1
+patchfiles \
+ prefix.patch \
+ 0001-select-platforms-based-on-configuration-results.patch \
+ 0002-add-an-option-to-disable-glx-support.patch \
+ 0003-Make-enable-glx-actually-work-on-OSX-and-Windows.patch \
+ 0004-darwin-Use-GLX-instead-of-OpenGL.framework-if-it-is-.patch
</ins><span class="cx">
</span><del>-# turn on support for glx that was disabled in v1.3
-# see https://github.com/anholt/libepoxy/commit/e3051481cc9f5b7b36b317aff1454ee16ea9cdb9
-# see https://github.com/anholt/libepoxy/releases/tag/v1.3
-patchfiles-append patch-glx.diff
-
</del><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/src/dispatch_common.c
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> configure.cmd ./autogen.sh
</span><span class="cx">
</span><del>-configure.args --disable-silent-rules
</del><ins>+configure.args \
+ --disable-silent-rules \
+ --enable-glx
</ins><span class="cx">
</span><span class="cx"> variant python27 conflicts python34 python35 description {build with python 2.7} {
</span><span class="cx"> depends_lib-append port:python27
</span><span class="lines">@@ -58,5 +68,5 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {![variant_isset python27] && ![variant_isset python34] && ![variant_isset python35]} {
</span><del>- default_variants +python34
</del><ins>+ default_variants-append +python34
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsgraphicslibepoxyfiles0001selectplatformsbasedonconfigurationresultspatch"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/libepoxy/files/0001-select-platforms-based-on-configuration-results.patch (0 => 144798)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/libepoxy/files/0001-select-platforms-based-on-configuration-results.patch (rev 0)
+++ trunk/dports/graphics/libepoxy/files/0001-select-platforms-based-on-configuration-results.patch 2016-01-18 18:24:23 UTC (rev 144798)
</span><span class="lines">@@ -0,0 +1,124 @@
</span><ins>+From 7eff2bf8e27599c1c94217b2bb1b73d4b7d18e59 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/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 <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 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
+--
+2.7.0
+
</ins></span></pre></div>
<a id="trunkdportsgraphicslibepoxyfiles0002addanoptiontodisableglxsupportpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/libepoxy/files/0002-add-an-option-to-disable-glx-support.patch (0 => 144798)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/libepoxy/files/0002-add-an-option-to-disable-glx-support.patch (rev 0)
+++ trunk/dports/graphics/libepoxy/files/0002-add-an-option-to-disable-glx-support.patch 2016-01-18 18:24:23 UTC (rev 144798)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+From a9efde0fb2678cd26bdf26d256732d97ded0c595 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/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 <schnitzeltony@googlemail.com>
+---
+ 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)
+
+--
+2.7.0
+
</ins></span></pre></div>
<a id="trunkdportsgraphicslibepoxyfiles0003MakeenableglxactuallyworkonOSXandWindowspatch"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/libepoxy/files/0003-Make-enable-glx-actually-work-on-OSX-and-Windows.patch (0 => 144798)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/libepoxy/files/0003-Make-enable-glx-actually-work-on-OSX-and-Windows.patch (rev 0)
+++ trunk/dports/graphics/libepoxy/files/0003-Make-enable-glx-actually-work-on-OSX-and-Windows.patch 2016-01-18 18:24:23 UTC (rev 144798)
</span><span class="lines">@@ -0,0 +1,66 @@
</span><ins>+From 902ea1eb073187603ec2eda4d2a146bef96592d4 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Mon, 18 Jan 2016 10:08:44 -0800
+Subject: [PATCH 3/4] Make --enable-glx actually work on OSX and Windows
+
+Followup for anholt/libepoxy#52
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+---
+ configure.ac | 6 +++---
+ src/dispatch_common.h | 4 ++--
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index d3d947c..b4c7ede 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -61,7 +61,7 @@ XORG_TESTSET_CFLAG(CWARNFLAGS, [-Wno-int-conversion])
+ AC_ARG_ENABLE([glx],
+ [AS_HELP_STRING([--disable-glx],
+ [disable if you don't want x11/glx support])],
+- [],
++ [enable_glx=$enableval],
+ [enable_glx=yes]
+ )
+
+@@ -74,7 +74,7 @@ has_znow=yes
+ case $host_os in
+ mingw*)
+ build_egl=no
+- build_glx=no
++ build_glx=$x11
+ build_wgl=yes
+ # On windows, the DLL has to have all of its functions
+ # resolved at link time, so we have to link directly aginst
+@@ -89,7 +89,7 @@ case $host_os in
+ ;;
+ darwin*)
+ build_egl=no
+- build_glx=no
++ build_glx=$x11
+ build_wgl=no
+ build_apple=yes
+ has_znow=no
+diff --git a/src/dispatch_common.h b/src/dispatch_common.h
+index 2728b45..c30ce44 100644
+--- a/src/dispatch_common.h
++++ b/src/dispatch_common.h
+@@ -26,12 +26,12 @@
+
+ #ifdef _WIN32
+ #define PLATFORM_HAS_EGL 0
+-#define PLATFORM_HAS_GLX 0
++#define PLATFORM_HAS_GLX BUILD_GLX
+ #define PLATFORM_HAS_WGL BUILD_WGL
+ #define EPOXY_IMPORTEXPORT __declspec(dllexport)
+ #elif defined(__APPLE__)
+ #define PLATFORM_HAS_EGL 0
+-#define PLATFORM_HAS_GLX 0
++#define PLATFORM_HAS_GLX BUILD_GLX
+ #define PLATFORM_HAS_WGL 0
+ #define EPOXY_IMPORTEXPORT
+ #elif defined(ANDROID)
+--
+2.7.0
+
</ins></span></pre></div>
<a id="trunkdportsgraphicslibepoxyfiles0004darwinUseGLXinsteadofOpenGLframeworkifitispatch"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/libepoxy/files/0004-darwin-Use-GLX-instead-of-OpenGL.framework-if-it-is-.patch (0 => 144798)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/libepoxy/files/0004-darwin-Use-GLX-instead-of-OpenGL.framework-if-it-is-.patch (rev 0)
+++ trunk/dports/graphics/libepoxy/files/0004-darwin-Use-GLX-instead-of-OpenGL.framework-if-it-is-.patch 2016-01-18 18:24:23 UTC (rev 144798)
</span><span class="lines">@@ -0,0 +1,95 @@
</span><ins>+From d010922282580a32dfebcda12ee1c307b3ef6005 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Mon, 18 Jan 2016 09:49:55 -0800
+Subject: [PATCH 4/4] darwin: Use GLX instead of OpenGL.framework if it is the
+ current context
+
+Also makes a stab at similar support for Win32
+
+anholt/libepoxy#63
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+---
+ src/dispatch_common.c | 29 ++++++++++++++++-------------
+ 1 file changed, 16 insertions(+), 13 deletions(-)
+
+diff --git a/src/dispatch_common.c b/src/dispatch_common.c
+index 163d348..cb9f76a 100644
+--- a/src/dispatch_common.c
++++ b/src/dispatch_common.c
+@@ -482,16 +482,20 @@ epoxy_glx_dlsym(const char *name)
+ void *
+ epoxy_gl_dlsym(const char *name)
+ {
+-#ifdef _WIN32
++#if defined(_WIN32) || defined(__APPLE__)
++if (!epoxy_current_context_is_glx()) {
++# if defined(_WIN32)
+ return do_dlsym(&api.gl_handle, "OPENGL32", name, true);
+-#elif defined(__APPLE__)
++# elif defined(__APPLE__)
+ return do_dlsym(&api.gl_handle,
+ "/System/Library/Frameworks/OpenGL.framework/Versions/Current/OpenGL",
+ name, true);
+-#else
++# endif
++}
++#endif
++
+ /* There's no library for desktop GL support independent of GLX. */
+ return epoxy_glx_dlsym(name);
+-#endif
+ }
+
+ void *
+@@ -615,7 +619,7 @@ epoxy_get_bootstrap_proc_address(const char *name)
+ */
+ #if PLATFORM_HAS_GLX
+ if (api.glx_handle && glXGetCurrentContext())
+- return epoxy_gl_dlsym(name);
++ return epoxy_glx_dlsym(name);
+ #endif
+
+ /* If epoxy hasn't loaded any API-specific library yet, try to
+@@ -644,22 +648,17 @@ epoxy_get_bootstrap_proc_address(const char *name)
+ }
+ #endif /* PLATFORM_HAS_EGL */
+
+- /* Fall back to GLX */
++ /* Fall back to the platform default */
+ return epoxy_gl_dlsym(name);
+ }
+
+ void *
+ epoxy_get_proc_address(const char *name)
+ {
+-#ifdef _WIN32
+- return wglGetProcAddress(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
++ }
+ #endif /* PLATFORM_HAS_GLX */
+ #if PLATFORM_HAS_EGL
+ {
+@@ -674,8 +673,12 @@ epoxy_get_proc_address(const char *name)
+ }
+ }
+ #endif /* PLATFORM_HAS_EGL */
++#if defined(_WIN32)
++ return wglGetProcAddress(name);
++#elif defined(__APPLE__)
++ return epoxy_gl_dlsym(name);
++#endif
+ errx(1, "Couldn't find current GLX or EGL context.\n");
+-#endif /* _WIN32 | __APPLE__*/
+ }
+
+ WRAPPER_VISIBILITY (void)
+--
+2.7.0
+
</ins></span></pre></div>
<a id="trunkdportsgraphicslibepoxyfilespatchconfigureacdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/libepoxy/files/patch-configure.ac.diff (144797 => 144798)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/libepoxy/files/patch-configure.ac.diff 2016-01-18 17:40:28 UTC (rev 144797)
+++ trunk/dports/graphics/libepoxy/files/patch-configure.ac.diff 2016-01-18 18:24:23 UTC (rev 144798)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- configure.ac.orig 2014-11-07 04:56:03.000000000 -0800
-+++ configure.ac 2014-11-07 04:56:27.000000000 -0800
-@@ -40,7 +40,7 @@
- XORG_MACROS_VERSION(1.8)
- XORG_DEFAULT_OPTIONS
-
--AC_CHECK_PROGS([PYTHON], [python3 python2 python])
-+AC_CHECK_PROGS([PYTHON], [$(PYTHON) python3 python2 python])
-
- # Initialize libtool
- AC_DISABLE_STATIC
</del></span></pre></div>
<a id="trunkdportsgraphicslibepoxyfilespatchglxdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/libepoxy/files/patch-glx.diff (144797 => 144798)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/libepoxy/files/patch-glx.diff 2016-01-18 17:40:28 UTC (rev 144797)
+++ trunk/dports/graphics/libepoxy/files/patch-glx.diff 2016-01-18 18:24:23 UTC (rev 144798)
</span><span class="lines">@@ -1,33 +0,0 @@
</span><del>---- configure.ac.orig 2015-07-15 16:46:36.000000000 -0700
-+++ configure.ac 2015-10-18 10:52:14.000000000 -0700
-@@ -78,7 +78,7 @@
- ;;
- darwin*)
- build_egl=no
-- build_glx=no
-+ build_glx=yes
- build_wgl=no
- build_apple=yes
- has_znow=no
---- src/dispatch_common.h.orig 2015-07-15 16:46:36.000000000 -0700
-+++ src/dispatch_common.h 2015-10-18 10:53:18.000000000 -0700
-@@ -30,7 +30,7 @@
- #define EPOXY_IMPORTEXPORT __declspec(dllexport)
- #elif defined(__APPLE__)
- #define PLATFORM_HAS_EGL 0
--#define PLATFORM_HAS_GLX 0
-+#define PLATFORM_HAS_GLX 1
- #define PLATFORM_HAS_WGL 0
- #define EPOXY_IMPORTEXPORT
- #elif defined(ANDROID)
---- src/dispatch_common.c.orig 2015-07-15 16:46:36.000000000 -0700
-+++ src/dispatch_common.c 2015-12-05 09:38:47.000000000 -0800
-@@ -103,7 +103,7 @@
- #include "dispatch_common.h"
-
- #ifdef __APPLE__
--#define GLX_LIB "/opt/X11/lib/libGL.1.dylib"
-+#define GLX_LIB "@PREFIX@/lib/libGL.1.dylib"
- #elif defined(ANDROID)
- #define GLX_LIB "libGLESv2.so"
- #else
</del></span></pre></div>
<a id="trunkdportsgraphicslibepoxyfilesprefixpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/libepoxy/files/prefix.patch (0 => 144798)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/libepoxy/files/prefix.patch (rev 0)
+++ trunk/dports/graphics/libepoxy/files/prefix.patch 2016-01-18 18:24:23 UTC (rev 144798)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- a/src/dispatch_common.c 2015-07-15 16:46:36.000000000 -0700
++++ b/src/dispatch_common.c 2015-12-05 09:38:47.000000000 -0800
+@@ -103,7 +103,7 @@
+ #include "dispatch_common.h"
+
+ #ifdef __APPLE__
+-#define GLX_LIB "/opt/X11/lib/libGL.1.dylib"
++#define GLX_LIB "@PREFIX@/lib/libGL.1.dylib"
+ #elif defined(ANDROID)
+ #define GLX_LIB "libGLESv2.so"
+ #else
</ins></span></pre>
</div>
</div>
</body>
</html>