<!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>[143164] 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/143164">143164</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2015-12-05 10:34:59 -0800 (Sat, 05 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>libepoxy: update to version 1.3.1 using mcalhoun's patch (#49913).</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="#trunkdportsgraphicslibepoxyfilespatchglxdiff">trunk/dports/graphics/libepoxy/files/patch-glx.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicslibepoxyfilespatchsrcdispatch_commoncdiff">trunk/dports/graphics/libepoxy/files/patch-src-dispatch_common.c.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 (143163 => 143164)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/libepoxy/Portfile 2015-12-05 14:08:57 UTC (rev 143163)
+++ trunk/dports/graphics/libepoxy/Portfile 2015-12-05 18:34:59 UTC (rev 143164)
</span><span class="lines">@@ -4,8 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx"> PortGroup github 1.0
</span><span class="cx">
</span><del>-github.setup anholt libepoxy 1.2 v
-revision 1
</del><ins>+github.setup anholt libepoxy 1.3.1 v
</ins><span class="cx"> license MIT permissive
</span><span class="cx"> categories graphics
</span><span class="cx"> maintainers devans openmaintainer
</span><span class="lines">@@ -16,28 +15,48 @@
</span><span class="cx">
</span><span class="cx"> long_description ${description}
</span><span class="cx">
</span><del>-checksums rmd160 ffe7d6d6c85af31dca7a0fea7a3c9bf7af103807 \
- sha256 3364f09ef5cf0c53f8879b6b6165d4d7bd82756ee44f019075fad679346be6d8
</del><ins>+checksums rmd160 fc67ebfc18fe1209d23d8ef315cc9ab387731563 \
+ sha256 2c8155016e6bcf2ad604094ba84f0404edda3278dea851d6ce44830291eb885b
</ins><span class="cx">
</span><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 \
- port:python34
</del><ins>+ port:xorg-util-macros
</ins><span class="cx">
</span><span class="cx"> depends_lib port:mesa \
</span><span class="cx"> port:xorg-libX11
</span><span class="cx">
</span><del>-patchfiles patch-configure.ac.diff \
- patch-src-dispatch_common.c.diff
</del><ins>+patchfiles patch-configure.ac.diff
</ins><span class="cx">
</span><ins>+# 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
+
</ins><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.python ${prefix}/bin/python3.4
</del><ins>+configure.args --disable-silent-rules
</ins><span class="cx">
</span><del>-configure.args --disable-silent-rules
</del><ins>+variant python27 conflicts python34 python35 description {build with python 2.7} {
+ depends_lib-append port:python27
+ configure.python ${prefix}/bin/python2.7
+}
+
+variant python34 conflicts python27 python35 description {build with python 3.4} {
+ depends_lib-append port:python34
+ configure.python ${prefix}/bin/python3.4
+}
+
+variant python35 conflicts python27 python34 description {build with python 3.5} {
+ depends_lib-append port:python35
+ configure.python ${prefix}/bin/python3.5
+}
+
+if {![variant_isset python27] && ![variant_isset python34] && ![variant_isset python35]} {
+ default_variants +python34
+}
</ins></span></pre></div>
<a id="trunkdportsgraphicslibepoxyfilespatchglxdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/libepoxy/files/patch-glx.diff (0 => 143164)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/libepoxy/files/patch-glx.diff (rev 0)
+++ trunk/dports/graphics/libepoxy/files/patch-glx.diff 2015-12-05 18:34:59 UTC (rev 143164)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+--- 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
</ins></span></pre></div>
<a id="trunkdportsgraphicslibepoxyfilespatchsrcdispatch_commoncdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/libepoxy/files/patch-src-dispatch_common.c.diff (143163 => 143164)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/libepoxy/files/patch-src-dispatch_common.c.diff 2015-12-05 14:08:57 UTC (rev 143163)
+++ trunk/dports/graphics/libepoxy/files/patch-src-dispatch_common.c.diff 2015-12-05 18:34:59 UTC (rev 143164)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- src/dispatch_common.c.orig 2014-05-13 19:22:08.000000000 -0500
-+++ src/dispatch_common.c 2015-05-24 19:28:19.000000000 -0500
-@@ -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"
- #else
- #define GLX_LIB "libGL.so.1"
- #endif
</del></span></pre>
</div>
</div>
</body>
</html>