[134418] trunk/dports/x11/mesa

[jeremyhu at macports.org]

Revision: 134418
          https://trac.macports.org/changeset/134418
Author:   jeremyhu at macports.org
Date:     2015-03-24 23:49:04 -0700 (Tue, 24 Mar 2015)
Log Message:
-----------
mesa: Bump to 10.4.7

Modified Paths:
--------------
    trunk/dports/x11/mesa/Portfile

Removed Paths:
-------------
    trunk/dports/x11/mesa/files/0001-darwin-build-fix.patch
    trunk/dports/x11/mesa/files/0002-darwin-build-fix.patch

Modified: trunk/dports/x11/mesa/Portfile
===================================================================
--- trunk/dports/x11/mesa/Portfile	2015-03-25 03:04:44 UTC (rev 134417)
+++ trunk/dports/x11/mesa/Portfile	2015-03-25 06:49:04 UTC (rev 134418)
@@ -5,8 +5,7 @@
 
 name                mesa
 epoch               1
-version             10.4.4
-revision            2
+version             10.4.7
 categories          x11 graphics
 maintainers         jeremyhu openmaintainer
 license             MIT
@@ -20,9 +19,9 @@
 platforms           macosx darwin
 use_bzip2           yes
 master_sites        ftp://ftp.freedesktop.org/pub/mesa/${version}/
-checksums           sha1    4d5b2cc992a21cdef07da5ccd7a705039df6f094 \
-                    rmd160  3a6ebe589d73d10f0127f70684d744a434c5156c \
-                    sha256  f18a967e9c4d80e054b2fdff8c130ce6e6d1f8eecfc42c9f354f8628d8b4df1c
+checksums           sha1    a7c6dac86f4a4410a82267c3672d6b0d5f45ed48 \
+                    rmd160  27e74e9cb6762916c12c19ca7d38809dad1ffb24 \
+                    sha256  2c351c98671f9a7ab3fd9c601bb7a255801b1580f5dd0992639f99152801b0d2
 
 depends_build       port:pkgconfig \
                     port:flex \
@@ -41,8 +40,6 @@
 
 patch.pre_args      -p1
 patchfiles \
-    0001-darwin-build-fix.patch \
-    0002-darwin-build-fix.patch \
     0001-glext.h-Add-missing-include-of-stddef.h-for-ptrdiff_.patch \
     1001-darwin-Fix-install-name-of-libOSMesa.patch \
     5001-swrast-Build-fix-for-darwin.patch \

Deleted: trunk/dports/x11/mesa/files/0001-darwin-build-fix.patch
===================================================================
--- trunk/dports/x11/mesa/files/0001-darwin-build-fix.patch	2015-03-25 03:04:44 UTC (rev 134417)
+++ trunk/dports/x11/mesa/files/0001-darwin-build-fix.patch	2015-03-25 06:49:04 UTC (rev 134418)
@@ -1,28 +0,0 @@
-From 162cee83ba98abb6ee21bb270ff0c6a09e97cd1f Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-Date: Tue, 10 Feb 2015 20:32:02 -0800
-Subject: [PATCH 1/2] darwin: build fix
-
-../../../src/mesa/main/compiler.h:47:10: fatal error: 'util/macros.h' file not found
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-(cherry picked from commit 1c67a5687a35e984323b6034adb914a66d64bb2f)
----
- src/glx/apple/Makefile.am | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/glx/apple/Makefile.am b/src/glx/apple/Makefile.am
-index 894ab5b..8d03225 100644
---- a/src/glx/apple/Makefile.am
-+++ b/src/glx/apple/Makefile.am
-@@ -1,6 +1,7 @@
- noinst_LTLIBRARIES = libappleglx.la
- 
- AM_CFLAGS = \
-+	-I$(top_srcdir)/src \
- 	-I$(top_srcdir)/include \
- 	-I$(top_srcdir)/src/glx \
- 	-I$(top_srcdir)/src/mesa \
--- 
-2.3.0
-

Deleted: trunk/dports/x11/mesa/files/0002-darwin-build-fix.patch
===================================================================
--- trunk/dports/x11/mesa/files/0002-darwin-build-fix.patch	2015-03-25 03:04:44 UTC (rev 134417)
+++ trunk/dports/x11/mesa/files/0002-darwin-build-fix.patch	2015-03-25 06:49:04 UTC (rev 134418)
@@ -1,46 +0,0 @@
-From 654f197f1965d5be52b96c2f1af27d8bc96f9c78 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-Date: Tue, 10 Feb 2015 22:21:47 -0800
-Subject: [PATCH 2/2] darwin: build fix
-
-xfont.c:237:14: error: implicit declaration of function 'GetGLXDRIDrawable' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
-   glxdraw = GetGLXDRIDrawable(CC->currentDpy, CC->currentDrawable);
-             ^
-Fixes regression from 291be28476ea60c6fb1eb2a882e2e25def5d3735
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-(cherry picked from commit e68b67b53fce39a8c93188262d9e795ca50750ac)
----
- src/glx/xfont.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/glx/xfont.c b/src/glx/xfont.c
-index a086b7a..00498bc 100644
---- a/src/glx/xfont.c
-+++ b/src/glx/xfont.c
-@@ -221,7 +221,10 @@ DRI_glXUseXFont(struct glx_context *CC, Font font, int first, int count, int lis
-    XGCValues values;
-    unsigned long valuemask;
-    XFontStruct *fs;
-+
-+#if !defined(GLX_USE_APPLEGL)
-    __GLXDRIdrawable *glxdraw;
-+#endif
- 
-    GLint swapbytes, lsbfirst, rowlength;
-    GLint skiprows, skippixels, alignment;
-@@ -234,9 +237,11 @@ DRI_glXUseXFont(struct glx_context *CC, Font font, int first, int count, int lis
-    dpy = CC->currentDpy;
-    win = CC->currentDrawable;
- 
-+#if !defined(GLX_USE_APPLEGL)
-    glxdraw = GetGLXDRIDrawable(CC->currentDpy, CC->currentDrawable);
-    if (glxdraw)
-       win = glxdraw->xDrawable;
-+#endif
- 
-    fs = XQueryFont(dpy, font);
-    if (!fs) {
--- 
-2.3.0
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150324/fcb638a5/attachment-0001.html>