[143164] trunk/dports/graphics/libepoxy

[devans at macports.org]

Revision: 143164
          https://trac.macports.org/changeset/143164
Author:   devans at macports.org
Date:     2015-12-05 10:34:59 -0800 (Sat, 05 Dec 2015)
Log Message:
-----------
libepoxy: update to version 1.3.1 using mcalhoun's patch (#49913).

Modified Paths:
--------------
    trunk/dports/graphics/libepoxy/Portfile

Added Paths:
-----------
    trunk/dports/graphics/libepoxy/files/patch-glx.diff

Removed Paths:
-------------
    trunk/dports/graphics/libepoxy/files/patch-src-dispatch_common.c.diff

Modified: trunk/dports/graphics/libepoxy/Portfile
===================================================================
--- 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)
@@ -4,8 +4,7 @@
 PortSystem          1.0
 PortGroup           github 1.0
 
-github.setup        anholt libepoxy 1.2 v
-revision            1
+github.setup        anholt libepoxy 1.3.1 v
 license             MIT permissive
 categories          graphics
 maintainers         devans openmaintainer
@@ -16,28 +15,48 @@
 
 long_description    ${description}
 
-checksums           rmd160  ffe7d6d6c85af31dca7a0fea7a3c9bf7af103807 \
-                    sha256  3364f09ef5cf0c53f8879b6b6165d4d7bd82756ee44f019075fad679346be6d8
+checksums           rmd160  fc67ebfc18fe1209d23d8ef315cc9ab387731563 \
+                    sha256  2c8155016e6bcf2ad604094ba84f0404edda3278dea851d6ce44830291eb885b
 
 depends_build       port:pkgconfig \
                     port:autoconf \
                     port:automake \
                     port:libtool \
-                    port:xorg-util-macros \
-                    port:python34
+                    port:xorg-util-macros
 
 depends_lib         port:mesa \
                     port:xorg-libX11
 
-patchfiles          patch-configure.ac.diff \
-                    patch-src-dispatch_common.c.diff
+patchfiles          patch-configure.ac.diff
 
+# 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
+
 post-patch {
     reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/src/dispatch_common.c
 }
 
 configure.cmd       ./autogen.sh
 
-configure.python    ${prefix}/bin/python3.4
+configure.args      --disable-silent-rules
 
-configure.args      --disable-silent-rules
+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
+}

Added: trunk/dports/graphics/libepoxy/files/patch-glx.diff
===================================================================
--- 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)
@@ -0,0 +1,33 @@
+--- 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

Deleted: trunk/dports/graphics/libepoxy/files/patch-src-dispatch_common.c.diff
===================================================================
--- 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)
@@ -1,11 +0,0 @@
---- 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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/ccbb73a1/attachment-0001.html>