[132829] trunk/dports/x11

jeremyhu at macports.org jeremyhu at macports.org
Wed Feb 11 02:04:22 PST 2015


Revision: 132829
          https://trac.macports.org/changeset/132829
Author:   jeremyhu at macports.org
Date:     2015-02-11 02:04:22 -0800 (Wed, 11 Feb 2015)
Log Message:
-----------
mesa: Bump to 10.4.4 and move libGLU to a separate port

This also removes support for the +iglx variant and moves libOSMesa to a new variant (+osmesa).

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

Added Paths:
-----------
    trunk/dports/x11/libGLU/
    trunk/dports/x11/libGLU/Portfile
    trunk/dports/x11/mesa/files/0001-darwin-build-fix.patch
    trunk/dports/x11/mesa/files/0002-darwin-build-fix.patch
    trunk/dports/x11/mesa/files/5001-swrast-Build-fix-for-darwin.patch
    trunk/dports/x11/mesa/files/5002-darwin-Suppress-type-conversion-warnings-for-GLhandl.patch
    trunk/dports/x11/mesa/files/5003-applegl-Provide-requirements-of-_SET_DrawBuffers.patch

Removed Paths:
-------------
    trunk/dports/x11/mesa/files/0003-mesa-fix-per-level-max-texture-size-error-checking.patch
    trunk/dports/x11/mesa/files/0008-glsl-initialise-const-force-glsl-extension-warning-i.patch
    trunk/dports/x11/mesa/files/0009-mesa-test-for-GL_EXT_framebuffer_sRGB-in-glPopAttrib.patch
    trunk/dports/x11/mesa/files/0011-Apple-glFlush-is-not-needed-with-CGLFlushDrawable.patch
    trunk/dports/x11/mesa/files/0012-glapi-Avoid-heap-corruption-in-_glapi_table.patch
    trunk/dports/x11/mesa/files/0013-darwin-Fix-test-for-kCGLPFAOpenGLProfile-support-at-.patch
    trunk/dports/x11/mesa/files/1001-appleglx-Improve-error-reporting-if-CGLChoosePixelFo.patch
    trunk/dports/x11/mesa/files/1002-darwin-Write-errors-in-choosing-the-pixel-format-to-.patch
    trunk/dports/x11/mesa/files/1003-darwin-Guard-Core-Profile-usage-behind-a-testing-env.patch
    trunk/dports/x11/mesa/files/iglx.patch
    trunk/dports/x11/mesa/files/patch-src-mapi-vgapi-Makefile.diff
    trunk/dports/x11/mesa/files/patch-src-mesa-Makefile.diff
    trunk/dports/x11/mesa/files/tiger-exports.patch

Added: trunk/dports/x11/libGLU/Portfile
===================================================================
--- trunk/dports/x11/libGLU/Portfile	                        (rev 0)
+++ trunk/dports/x11/libGLU/Portfile	2015-02-11 10:04:22 UTC (rev 132829)
@@ -0,0 +1,29 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem          1.0
+
+name                libGLU
+version             9.0.0
+categories          x11 graphics
+maintainers         jeremyhu openmaintainer
+license             MIT
+description         SGI's OpenGL Utility Library
+long_description    ${description}
+
+homepage            http://mesa3d.sourceforge.net
+distname            glu-${version}
+platforms           macosx darwin
+use_bzip2           yes
+master_sites        ftp://ftp.freedesktop.org/pub/mesa/glu
+
+checksums           sha1    c2814bbaf1e60e28a75ec80f4646047c0da742bd \
+                    rmd160  567991e97a0702699d9db33f45c2dc0cef1006f1 \
+                    sha256  1f7ad0d379a722fcbd303aa5650c6d7d5544fde83196b42a73d1193568a4df12
+
+depends_lib         port:mesa
+
+configure.args \
+    --disable-silent-rules
+
+livecheck.type      none


Property changes on: trunk/dports/x11/libGLU/Portfile
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Modified: trunk/dports/x11/mesa/Portfile
===================================================================
--- trunk/dports/x11/mesa/Portfile	2015-02-11 09:21:23 UTC (rev 132828)
+++ trunk/dports/x11/mesa/Portfile	2015-02-11 10:04:22 UTC (rev 132829)
@@ -5,8 +5,7 @@
 
 name                mesa
 epoch               1
-version             8.0.5
-revision            3
+version             10.4.4
 categories          x11 graphics
 maintainers         jeremyhu openmaintainer
 license             MIT
@@ -19,68 +18,42 @@
 worksrcdir          Mesa-${version}
 platforms           macosx darwin
 use_bzip2           yes
-master_sites        ftp://ftp.freedesktop.org/pub/mesa/older-versions/8.x/${version}/ \
-                    ftp://ftp.freedesktop.org/pub/mesa/${version}/
-checksums           sha1    c30ef84363dc9ace0504bd5bcae14cfc718f1d62 \
-                    rmd160  c4b2547a95950ea07708251a5f260888267d5cd0 \
-                    sha256  511b8da34f8e69ed24caf422964fb7ae747f3b1d8093f6b8aa2602164a475a5e
+master_sites        ftp://ftp.freedesktop.org/pub/mesa/${version}/
+checksums           sha1    4d5b2cc992a21cdef07da5ccd7a705039df6f094 \
+                    rmd160  3a6ebe589d73d10f0127f70684d744a434c5156c \
+                    sha256  f18a967e9c4d80e054b2fdff8c130ce6e6d1f8eecfc42c9f354f8628d8b4df1c
 
-depends_build       bin:makedepend:makedepend \
-                    bin:tclsh8.5:tcl
-
 depends_lib         port:xorg-glproto \
                     port:xorg-dri2proto \
                     port:xorg-libXfixes \
                     port:xorg-libXi \
                     port:xorg-libXmu
 
+patch.pre_args      -p1
 patchfiles \
-    patch-src-mapi-vgapi-Makefile.diff \
-    0003-mesa-fix-per-level-max-texture-size-error-checking.patch \
-    0008-glsl-initialise-const-force-glsl-extension-warning-i.patch \
-    0009-mesa-test-for-GL_EXT_framebuffer_sRGB-in-glPopAttrib.patch \
-    0011-Apple-glFlush-is-not-needed-with-CGLFlushDrawable.patch \
-    0012-glapi-Avoid-heap-corruption-in-_glapi_table.patch \
-    0013-darwin-Fix-test-for-kCGLPFAOpenGLProfile-support-at-.patch \
-    1001-appleglx-Improve-error-reporting-if-CGLChoosePixelFo.patch \
-    1002-darwin-Write-errors-in-choosing-the-pixel-format-to-.patch \
-    1003-darwin-Guard-Core-Profile-usage-behind-a-testing-env.patch
-patch.pre_args -p1
+    0001-darwin-build-fix.patch \
+    0002-darwin-build-fix.patch \
+    5001-swrast-Build-fix-for-darwin.patch \
+    5002-darwin-Suppress-type-conversion-warnings-for-GLhandl.patch \
+    5003-applegl-Provide-requirements-of-_SET_DrawBuffers.patch
 
-use_configure  no
-use_parallel_build yes
+use_autoreconf      yes
+autoreconf.args     -fvi
 
-build.target darwin
-build.args-append INSTALL_DIR=${prefix}
-destroot.args-append INSTALL_DIR=${prefix}
+configure.args \
+    --disable-silent-rules \
+    --disable-egl \
+    --disable-osmesa \
+    --disable-openvg \
+    --with-gallium-drivers=
 
-variant universal {}
-build.args-append RC_CFLAGS="[get_canonical_archflags]"
-
 if { ![file exists /usr/include/Xplugin.h] } {
     # Xplugin.h is missing on Tiger
     configure.cppflags-append -I${filespath}/include
 }
 
-set cxx_stdlibflags {}
-if {[string match *clang* ${configure.cxx}]} {
-    set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
-}
-
 configure.cppflags-delete -I${prefix}/include
 
-post-extract {
-    if {! [file exists "${worksrcpath}/configs/current"]} {
-        ln -s darwin ${worksrcpath}/configs/current
-    }
-}
-
-post-patch {
-    # Ensure correct compilers are used in mklib.
-    reinplace "s:LINK=\"g++\":LINK=\"${configure.cxx} ${cxx_stdlibflags}\":"  ${worksrcpath}/bin/mklib
-    reinplace "s:LINK=\"cc\":LINK=\"${configure.cc}\":"    ${worksrcpath}/bin/mklib
-}
-
 pre-configure {
     if { ![file exists /usr/lib/libXplugin.dylib] } {
         ui_error "Detected a problem with your development environment.  Please work around it by executing:"
@@ -89,60 +62,36 @@
     }
 }
 
-pre-build {
-    build.args-append \
-        CC="${configure.cc} ${configure.cppflags}" \
-        CXX="${configure.cxx} ${configure.cppflags} ${cxx_stdlibflags}"
-}
-
-variant iglx description {Install a libGL that uses your X11 server's indirect GLX path for rendering (the default is off which allows libGL to accelerate rendering using OpenGL.framework)} {
-    patchfiles-append iglx.patch
-}
-
 variant python26 conflicts python27 description {Use python 2.6} {
     depends_build-append \
         port:py26-libxml2
-    build.args-append \
+    configure.env-append \
         PYTHON2="${prefix}/bin/python2.6"
 }
 
 variant python27 conflicts python26 description {Use python 2.7} {
     depends_build-append \
         port:py27-libxml2
-    build.args-append \
+    configure.env-append \
         PYTHON2="${prefix}/bin/python2.7"
 }
 
 if {![variant_isset python26] && ![variant_isset python27]} {
-    default_variants +python27
+    default_variants-append +python27
 }
 
-platform darwin 8 {
-    patchfiles-append tiger-exports.patch
-
-    # https://trac.macports.org/ticket/24345
-    # https://trac.macports.org/ticket/24393
-    # https://trac.macports.org/ticket/29860
-    if {${build_arch} eq "ppc"} {
-        patchfiles-append patch-src-mesa-Makefile.diff
-        post-patch {
-            reinplace "/SRC_DIRS/ s/gallium//" ${worksrcpath}/configs/darwin
-        }
-    }
-    
-    post-patch {
-        # These are being comented out to find out if they're still broken
-        # 6/6/2011
-        #reinplace "/SRC_DIRS/ s/mesa//" ${worksrcpath}/configs/darwin
-
-        # libOSMesa fails on Tiger, too...
-        #reinplace "/DRIVER_DIRS/ s/osmesa//" ${worksrcpath}/configs/darwin
-
-        # http://trac.macports.org/ticket/24366
-        reinplace "s:-fno-strict-aliasing:-fno-strict-aliasing -fno-common:g" ${worksrcpath}/configs/darwin
-    }
+variant osmesa description {enable OSMesa library} {
+    configure.args-delete --disable-osmesa
+    configure.args-append --enable-osmesa
 }
+default_variants-append +osmesa
 
+#variant openvg description {enable support for OpenVG API} {
+#    configure.args-delete --disable-egl --disable-openvg
+#    configure.args-append --enable-egl --enable-openvg
+#}
+#default_variants-append +openvg
+
 livecheck.type  regex
 livecheck.url   http://www.mesa3d.org/news.html
 livecheck.regex {relnotes-([0-9.]+)\.html}

Added: trunk/dports/x11/mesa/files/0001-darwin-build-fix.patch
===================================================================
--- trunk/dports/x11/mesa/files/0001-darwin-build-fix.patch	                        (rev 0)
+++ trunk/dports/x11/mesa/files/0001-darwin-build-fix.patch	2015-02-11 10:04:22 UTC (rev 132829)
@@ -0,0 +1,28 @@
+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
+

Added: trunk/dports/x11/mesa/files/0002-darwin-build-fix.patch
===================================================================
--- trunk/dports/x11/mesa/files/0002-darwin-build-fix.patch	                        (rev 0)
+++ trunk/dports/x11/mesa/files/0002-darwin-build-fix.patch	2015-02-11 10:04:22 UTC (rev 132829)
@@ -0,0 +1,46 @@
+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
+

Deleted: trunk/dports/x11/mesa/files/0003-mesa-fix-per-level-max-texture-size-error-checking.patch
===================================================================
--- trunk/dports/x11/mesa/files/0003-mesa-fix-per-level-max-texture-size-error-checking.patch	2015-02-11 09:21:23 UTC (rev 132828)
+++ trunk/dports/x11/mesa/files/0003-mesa-fix-per-level-max-texture-size-error-checking.patch	2015-02-11 10:04:22 UTC (rev 132829)
@@ -1,147 +0,0 @@
-From 9cf1afbf8ae87ddbb29b24a0f9f2724e9e2935c1 Mon Sep 17 00:00:00 2001
-From: Brian Paul <brianp at vmware.com>
-Date: Tue, 4 Sep 2012 20:17:15 -0600
-Subject: [PATCH 03/13] mesa: fix per-level max texture size error checking
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This is a long-standing omission in Mesa's texture image size checking.
-We need to take the mipmap level into consideration when checking if the
-width, height and depth are too large.
-
-Fixes the new piglit max-texture-size-level test.
-Thanks to Stéphane Marchesin for finding this problem.
-
-Note: This is a candidate for the stable branches.
-
-Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>
-(cherry picked from commit 771e7b6d884bb4294a89f276a904d90b28efb90a)
----
- src/mesa/main/teximage.c | 36 +++++++++++++++++++++---------------
- 1 file changed, 21 insertions(+), 15 deletions(-)
-
-diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
-index 3aecc0f..ed22fa9 100644
---- a/src/mesa/main/teximage.c
-+++ b/src/mesa/main/teximage.c
-@@ -1251,11 +1251,12 @@ _mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level,
- 
-    switch (target) {
-    case GL_PROXY_TEXTURE_1D:
--      maxSize = 1 << (ctx->Const.MaxTextureLevels - 1);
--      if (width < 2 * border || width > 2 * border + maxSize)
--         return GL_FALSE;
-       if (level >= ctx->Const.MaxTextureLevels)
-          return GL_FALSE;
-+      maxSize = 1 << (ctx->Const.MaxTextureLevels - 1); /* level zero size */
-+      maxSize >>= level;  /* level size */
-+      if (width < 2 * border || width > 2 * border + maxSize)
-+         return GL_FALSE;
-       if (!ctx->Extensions.ARB_texture_non_power_of_two) {
-          if (width > 0 && !_mesa_is_pow_two(width - 2 * border))
-             return GL_FALSE;
-@@ -1263,13 +1264,14 @@ _mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level,
-       return GL_TRUE;
- 
-    case GL_PROXY_TEXTURE_2D:
-+      if (level >= ctx->Const.MaxTextureLevels)
-+         return GL_FALSE;
-       maxSize = 1 << (ctx->Const.MaxTextureLevels - 1);
-+      maxSize >>= level;
-       if (width < 2 * border || width > 2 * border + maxSize)
-          return GL_FALSE;
-       if (height < 2 * border || height > 2 * border + maxSize)
-          return GL_FALSE;
--      if (level >= ctx->Const.MaxTextureLevels)
--         return GL_FALSE;
-       if (!ctx->Extensions.ARB_texture_non_power_of_two) {
-          if (width > 0 && !_mesa_is_pow_two(width - 2 * border))
-             return GL_FALSE;
-@@ -1279,15 +1281,16 @@ _mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level,
-       return GL_TRUE;
- 
-    case GL_PROXY_TEXTURE_3D:
-+      if (level >= ctx->Const.Max3DTextureLevels)
-+         return GL_FALSE;
-       maxSize = 1 << (ctx->Const.Max3DTextureLevels - 1);
-+      maxSize >>= level;
-       if (width < 2 * border || width > 2 * border + maxSize)
-          return GL_FALSE;
-       if (height < 2 * border || height > 2 * border + maxSize)
-          return GL_FALSE;
-       if (depth < 2 * border || depth > 2 * border + maxSize)
-          return GL_FALSE;
--      if (level >= ctx->Const.Max3DTextureLevels)
--         return GL_FALSE;
-       if (!ctx->Extensions.ARB_texture_non_power_of_two) {
-          if (width > 0 && !_mesa_is_pow_two(width - 2 * border))
-             return GL_FALSE;
-@@ -1299,23 +1302,24 @@ _mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level,
-       return GL_TRUE;
- 
-    case GL_PROXY_TEXTURE_RECTANGLE_NV:
-+      if (level != 0)
-+         return GL_FALSE;
-       maxSize = ctx->Const.MaxTextureRectSize;
-       if (width < 0 || width > maxSize)
-          return GL_FALSE;
-       if (height < 0 || height > maxSize)
-          return GL_FALSE;
--      if (level != 0)
--         return GL_FALSE;
-       return GL_TRUE;
- 
-    case GL_PROXY_TEXTURE_CUBE_MAP_ARB:
-+      if (level >= ctx->Const.MaxCubeTextureLevels)
-+         return GL_FALSE;
-       maxSize = 1 << (ctx->Const.MaxCubeTextureLevels - 1);
-+      maxSize >>= level;
-       if (width < 2 * border || width > 2 * border + maxSize)
-          return GL_FALSE;
-       if (height < 2 * border || height > 2 * border + maxSize)
-          return GL_FALSE;
--      if (level >= ctx->Const.MaxCubeTextureLevels)
--         return GL_FALSE;
-       if (!ctx->Extensions.ARB_texture_non_power_of_two) {
-          if (width > 0 && !_mesa_is_pow_two(width - 2 * border))
-             return GL_FALSE;
-@@ -1325,13 +1329,14 @@ _mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level,
-       return GL_TRUE;
- 
-    case GL_PROXY_TEXTURE_1D_ARRAY_EXT:
-+      if (level >= ctx->Const.MaxTextureLevels)
-+         return GL_FALSE;
-       maxSize = 1 << (ctx->Const.MaxTextureLevels - 1);
-+      maxSize >>= level;
-       if (width < 2 * border || width > 2 * border + maxSize)
-          return GL_FALSE;
-       if (height < 1 || height > ctx->Const.MaxArrayTextureLayers)
-          return GL_FALSE;
--      if (level >= ctx->Const.MaxTextureLevels)
--         return GL_FALSE;
-       if (!ctx->Extensions.ARB_texture_non_power_of_two) {
-          if (width > 0 && !_mesa_is_pow_two(width - 2 * border))
-             return GL_FALSE;
-@@ -1339,15 +1344,16 @@ _mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level,
-       return GL_TRUE;
- 
-    case GL_PROXY_TEXTURE_2D_ARRAY_EXT:
-+      if (level >= ctx->Const.MaxTextureLevels)
-+         return GL_FALSE;
-       maxSize = 1 << (ctx->Const.MaxTextureLevels - 1);
-+      maxSize >>= level;
-       if (width < 2 * border || width > 2 * border + maxSize)
-          return GL_FALSE;
-       if (height < 2 * border || height > 2 * border + maxSize)
-          return GL_FALSE;
-       if (depth < 1 || depth > ctx->Const.MaxArrayTextureLayers)
-          return GL_FALSE;
--      if (level >= ctx->Const.MaxTextureLevels)
--         return GL_FALSE;
-       if (!ctx->Extensions.ARB_texture_non_power_of_two) {
-          if (width > 0 && !_mesa_is_pow_two(width - 2 * border))
-             return GL_FALSE;
--- 
-1.9.2
-

Deleted: trunk/dports/x11/mesa/files/0008-glsl-initialise-const-force-glsl-extension-warning-i.patch
===================================================================
--- trunk/dports/x11/mesa/files/0008-glsl-initialise-const-force-glsl-extension-warning-i.patch	2015-02-11 09:21:23 UTC (rev 132828)
+++ trunk/dports/x11/mesa/files/0008-glsl-initialise-const-force-glsl-extension-warning-i.patch	2015-02-11 10:04:22 UTC (rev 132829)
@@ -1,33 +0,0 @@
-From db8cb2250335a93cad6e877e634116e5cd6b42fc Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied at redhat.com>
-Date: Tue, 13 Mar 2012 14:53:25 +0000
-Subject: [PATCH 08/13] glsl: initialise const force glsl extension warning in
- fake ctx
-
-valgrind complained about an uninitialised value being used in
-glsl_parser_extras.cpp, and this was the one it was giving out about.
-
-Just initialise the value in the fakectx.
-
-Signed-off-by: Dave Airlie <airlied at redhat.com>
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=48057
-(cherry picked from commit b78a77f979b21a84aecb6fa4f19a2ed51a48c306)
----
- src/glsl/builtins/tools/generate_builtins.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/glsl/builtins/tools/generate_builtins.py b/src/glsl/builtins/tools/generate_builtins.py
-index 72d12bb..bd15c4d 100755
---- a/src/glsl/builtins/tools/generate_builtins.py
-+++ b/src/glsl/builtins/tools/generate_builtins.py
-@@ -156,6 +156,7 @@ read_builtins(GLenum target, const char *protos, const char **functions, unsigne
-    fakeCtx.API = API_OPENGL;
-    fakeCtx.Const.GLSLVersion = 130;
-    fakeCtx.Extensions.ARB_ES2_compatibility = true;
-+   fakeCtx.Const.ForceGLSLExtensionsWarn = false;
-    gl_shader *sh = _mesa_new_shader(NULL, 0, target);
-    struct _mesa_glsl_parse_state *st =
-       new(sh) _mesa_glsl_parse_state(&fakeCtx, target, sh);
--- 
-1.9.2
-

Deleted: trunk/dports/x11/mesa/files/0009-mesa-test-for-GL_EXT_framebuffer_sRGB-in-glPopAttrib.patch
===================================================================
--- trunk/dports/x11/mesa/files/0009-mesa-test-for-GL_EXT_framebuffer_sRGB-in-glPopAttrib.patch	2015-02-11 09:21:23 UTC (rev 132828)
+++ trunk/dports/x11/mesa/files/0009-mesa-test-for-GL_EXT_framebuffer_sRGB-in-glPopAttrib.patch	2015-02-11 10:04:22 UTC (rev 132829)
@@ -1,28 +0,0 @@
-From 2286bd68a832a4d4908d50e1a4496853e1f3305a Mon Sep 17 00:00:00 2001
-From: Brian Paul <brianp at vmware.com>
-Date: Mon, 27 Aug 2012 21:52:07 -0600
-Subject: [PATCH 09/13] mesa: test for GL_EXT_framebuffer_sRGB in glPopAttrib()
-
-To avoid spurious GL_INVALID_ENUM errors if the extension isn't supported.
-(cherry picked from commit 1aee8803f83f7ae24d9c2150c70afff2b1ee4c2f)
----
- src/mesa/main/attrib.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
-index 225ac89..cc384c7 100644
---- a/src/mesa/main/attrib.c
-+++ b/src/mesa/main/attrib.c
-@@ -993,7 +993,8 @@ _mesa_PopAttrib(void)
-                _mesa_ClampColorARB(GL_CLAMP_READ_COLOR_ARB, color->ClampReadColor);
- 
-                /* GL_ARB_framebuffer_sRGB / GL_EXT_framebuffer_sRGB */
--               _mesa_set_enable(ctx, GL_FRAMEBUFFER_SRGB, color->sRGBEnabled);
-+               if (ctx->Extensions.EXT_framebuffer_sRGB)
-+                  _mesa_set_enable(ctx, GL_FRAMEBUFFER_SRGB, color->sRGBEnabled);
-             }
-             break;
-          case GL_CURRENT_BIT:
--- 
-1.9.2
-

Deleted: trunk/dports/x11/mesa/files/0011-Apple-glFlush-is-not-needed-with-CGLFlushDrawable.patch
===================================================================
--- trunk/dports/x11/mesa/files/0011-Apple-glFlush-is-not-needed-with-CGLFlushDrawable.patch	2015-02-11 09:21:23 UTC (rev 132828)
+++ trunk/dports/x11/mesa/files/0011-Apple-glFlush-is-not-needed-with-CGLFlushDrawable.patch	2015-02-11 10:04:22 UTC (rev 132829)
@@ -1,29 +0,0 @@
-From 9c50093adff0c7531ab32a7ec9ce3b91712b4d20 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-Date: Sat, 20 Jul 2013 10:25:28 -0700
-Subject: [PATCH 11/13] Apple: glFlush() is not needed with CGLFlushDrawable()
-
-<rdar://problem/14496373>
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-(cherry picked from commit fa5ed99d8e809fb86e486a40273a4a6971055398)
----
- src/glx/apple/apple_glx.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/glx/apple/apple_glx.c b/src/glx/apple/apple_glx.c
-index 56cff64..4e2aa33 100644
---- a/src/glx/apple/apple_glx.c
-+++ b/src/glx/apple/apple_glx.c
-@@ -132,8 +132,6 @@ apple_glx_swap_buffers(void *ptr)
- {
-    struct apple_glx_context *ac = ptr;
- 
--   /* This may not be needed with CGLFlushDrawable: */
--   glFlush();
-    apple_cgl.flush_drawable(ac->context_obj);
- }
- 
--- 
-1.9.2
-

Deleted: trunk/dports/x11/mesa/files/0012-glapi-Avoid-heap-corruption-in-_glapi_table.patch
===================================================================
--- trunk/dports/x11/mesa/files/0012-glapi-Avoid-heap-corruption-in-_glapi_table.patch	2015-02-11 09:21:23 UTC (rev 132828)
+++ trunk/dports/x11/mesa/files/0012-glapi-Avoid-heap-corruption-in-_glapi_table.patch	2015-02-11 10:04:22 UTC (rev 132829)
@@ -1,28 +0,0 @@
-From 629600450b3845a768c0edc92ea3f444d03a2738 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-Date: Tue, 20 May 2014 01:37:58 -0700
-Subject: [PATCH 12/13] glapi: Avoid heap corruption in _glapi_table
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-Reviewed-by: Chia-I Wu <olv at lunarg.com>
-(cherry picked from commit ff5456d1acf6f627a6837be3f3f37c6a268c9e8e)
----
- src/mapi/glapi/gen/gl_gentable.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/mapi/glapi/gen/gl_gentable.py b/src/mapi/glapi/gen/gl_gentable.py
-index 5657e32..0d0a02d 100644
---- a/src/mapi/glapi/gen/gl_gentable.py
-+++ b/src/mapi/glapi/gen/gl_gentable.py
-@@ -111,7 +111,7 @@ __glapi_gentable_set_remaining_noop(struct _glapi_table *disp) {
- 
- struct _glapi_table *
- _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) {
--    struct _glapi_table *disp = calloc(1, sizeof(struct _glapi_table));
-+    struct _glapi_table *disp = calloc(1, _glapi_get_dispatch_table_size() * sizeof(_glapi_proc));
-     char symboln[512];
- 
-     if(!disp)
--- 
-1.9.2
-

Deleted: trunk/dports/x11/mesa/files/0013-darwin-Fix-test-for-kCGLPFAOpenGLProfile-support-at-.patch
===================================================================
--- trunk/dports/x11/mesa/files/0013-darwin-Fix-test-for-kCGLPFAOpenGLProfile-support-at-.patch	2015-02-11 09:21:23 UTC (rev 132828)
+++ trunk/dports/x11/mesa/files/0013-darwin-Fix-test-for-kCGLPFAOpenGLProfile-support-at-.patch	2015-02-11 10:04:22 UTC (rev 132829)
@@ -1,40 +0,0 @@
-From ba59a779ed41e08fa16805c1c60da39885546d0e Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-Date: Tue, 20 May 2014 10:53:00 -0700
-Subject: [PATCH 13/13] darwin: Fix test for kCGLPFAOpenGLProfile support at
- runtime
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-(cherry picked from commit 7a109268ab5b3544e7f7b99e84ef1fdf54023fb4)
----
- src/glx/apple/apple_visual.c | 14 +++++++++-----
- 1 file changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/src/glx/apple/apple_visual.c b/src/glx/apple/apple_visual.c
-index 282934f..238c248 100644
---- a/src/glx/apple/apple_visual.c
-+++ b/src/glx/apple/apple_visual.c
-@@ -73,11 +73,15 @@ apple_visual_create_pfobj(CGLPixelFormatObj * pfobj, const struct glx_config * m
-    GLint vsref = 0;
-    CGLError error = 0;
- 
--   /* Request an OpenGL 3.2 profile if one is available */
--   if(apple_cgl.version_major > 1 || (apple_cgl.version_major == 1 && apple_cgl.version_minor >= 3)) {
--      attr[numattr++] = kCGLPFAOpenGLProfile;
--      attr[numattr++] = kCGLOGLPVersion_3_2_Core;
--   }
-+   /* Request an OpenGL 3.2 profile if one is available and supported */
-+   attr[numattr++] = kCGLPFAOpenGLProfile;
-+   attr[numattr++] = kCGLOGLPVersion_3_2_Core;
-+
-+   /* Test for kCGLPFAOpenGLProfile support at runtime and roll it out if not supported */
-+   attr[numattr] = 0;
-+   error = apple_cgl.choose_pixel_format(attr, pfobj, &vsref);
-+   if (error == kCGLBadAttribute)
-+      numattr -= 2;
- 
-    if (offscreen) {
-       apple_glx_diagnostic
--- 
-1.9.2
-

Deleted: trunk/dports/x11/mesa/files/1001-appleglx-Improve-error-reporting-if-CGLChoosePixelFo.patch
===================================================================
--- trunk/dports/x11/mesa/files/1001-appleglx-Improve-error-reporting-if-CGLChoosePixelFo.patch	2015-02-11 09:21:23 UTC (rev 132828)
+++ trunk/dports/x11/mesa/files/1001-appleglx-Improve-error-reporting-if-CGLChoosePixelFo.patch	2015-02-11 10:04:22 UTC (rev 132829)
@@ -1,30 +0,0 @@
-From f0702d6e631bb912a230c081463bb51a0dde1bff Mon Sep 17 00:00:00 2001
-From: Jon TURNEY <jon.turney at dronecode.org.uk>
-Date: Mon, 12 May 2014 15:38:26 +0100
-Subject: [PATCH 1001/1003] appleglx: Improve error reporting if
- CGLChoosePixelFormat() didn't find any matching pixel formats.
-
-Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
-Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-(cherry picked from commit 002a3a74273b81dfb226e1c3f0a8c18525ed0af4)
----
- src/glx/apple/apple_visual.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/glx/apple/apple_visual.c b/src/glx/apple/apple_visual.c
-index 238c248..c6ede51 100644
---- a/src/glx/apple/apple_visual.c
-+++ b/src/glx/apple/apple_visual.c
-@@ -167,4 +167,9 @@ apple_visual_create_pfobj(CGLPixelFormatObj * pfobj, const struct glx_config * m
-       fprintf(stderr, "error: %s\n", apple_cgl.error_string(error));
-       abort();
-    }
-+
-+   if (!*pfobj) {
-+      fprintf(stderr, "No matching pixelformats found, perhaps try using LIBGL_ALLOW_SOFTWARE\n");
-+      abort();
-+   }
- }
--- 
-1.9.2 (Apple Git-49)
-

Deleted: trunk/dports/x11/mesa/files/1002-darwin-Write-errors-in-choosing-the-pixel-format-to-.patch
===================================================================
--- trunk/dports/x11/mesa/files/1002-darwin-Write-errors-in-choosing-the-pixel-format-to-.patch	2015-02-11 09:21:23 UTC (rev 132828)
+++ trunk/dports/x11/mesa/files/1002-darwin-Write-errors-in-choosing-the-pixel-format-to-.patch	2015-02-11 10:04:22 UTC (rev 132829)
@@ -1,55 +0,0 @@
-From 1b2f877c8ef052b183c1f20ece6c6e4a7bfd237c Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-Date: Sat, 24 May 2014 14:13:33 -0700
-Subject: [PATCH 1002/1003] darwin: Write errors in choosing the pixel format
- to the crash log
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-(cherry picked from commit 9eb1d36c978a9b15ae2e999c630492dfffd7f165)
----
- src/glx/apple/apple_visual.c | 18 ++++++++++++++++--
- 1 file changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/src/glx/apple/apple_visual.c b/src/glx/apple/apple_visual.c
-index c6ede51..951b213 100644
---- a/src/glx/apple/apple_visual.c
-+++ b/src/glx/apple/apple_visual.c
-@@ -63,6 +63,16 @@ enum
-    MAX_ATTR = 60
- };
- 
-+static char __crashreporter_info_buff__[4096] = { 0 };
-+static const char *__crashreporter_info__ __attribute__((__used__)) =
-+    &__crashreporter_info_buff__[0];
-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
-+// This is actually a toolchain requirement, but I'm not sure the correct check,
-+// but it should be fine to just only include it for Leopard and later.  This line
-+// just tells the linker to never strip this symbol (such as for space optimization)
-+__asm__ (".desc ___crashreporter_info__, 0x10");
-+#endif
-+
- void
- apple_visual_create_pfobj(CGLPixelFormatObj * pfobj, const struct glx_config * mode,
-                           bool * double_buffered, bool * uses_stereo,
-@@ -164,12 +174,16 @@ apple_visual_create_pfobj(CGLPixelFormatObj * pfobj, const struct glx_config * m
-    error = apple_cgl.choose_pixel_format(attr, pfobj, &vsref);
- 
-    if (error) {
--      fprintf(stderr, "error: %s\n", apple_cgl.error_string(error));
-+      snprintf(__crashreporter_info_buff__, sizeof(__crashreporter_info_buff__),
-+               "CGLChoosePixelFormat error: %s\n", apple_cgl.error_string(error));
-+      fprintf(stderr, "%s", __crashreporter_info_buff__);
-       abort();
-    }
- 
-    if (!*pfobj) {
--      fprintf(stderr, "No matching pixelformats found, perhaps try using LIBGL_ALLOW_SOFTWARE\n");
-+      snprintf(__crashreporter_info_buff__, sizeof(__crashreporter_info_buff__),
-+               "No matching pixelformats found, perhaps try using LIBGL_ALLOW_SOFTWARE\n");
-+      fprintf(stderr, "%s", __crashreporter_info_buff__);
-       abort();
-    }
- }
--- 
-1.9.2 (Apple Git-49)
-

Deleted: trunk/dports/x11/mesa/files/1003-darwin-Guard-Core-Profile-usage-behind-a-testing-env.patch
===================================================================
--- trunk/dports/x11/mesa/files/1003-darwin-Guard-Core-Profile-usage-behind-a-testing-env.patch	2015-02-11 09:21:23 UTC (rev 132828)
+++ trunk/dports/x11/mesa/files/1003-darwin-Guard-Core-Profile-usage-behind-a-testing-env.patch	2015-02-11 10:04:22 UTC (rev 132829)
@@ -1,69 +0,0 @@
-From 9d6e12eb6b06202519e48a7321f32944d7a34b0f Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-Date: Sat, 24 May 2014 14:08:16 -0700
-Subject: [PATCH 1003/1003] darwin: Guard Core Profile usage behind a testing
- envvar
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-(cherry picked from commit 04ce3be4010305902cc5ae81e8e0c8550d043a1e)
----
- src/glx/apple/apple_visual.c | 30 ++++++++++++++++++++----------
- 1 file changed, 20 insertions(+), 10 deletions(-)
-
-diff --git a/src/glx/apple/apple_visual.c b/src/glx/apple/apple_visual.c
-index 951b213..046581b 100644
---- a/src/glx/apple/apple_visual.c
-+++ b/src/glx/apple/apple_visual.c
-@@ -82,16 +82,7 @@ apple_visual_create_pfobj(CGLPixelFormatObj * pfobj, const struct glx_config * m
-    int numattr = 0;
-    GLint vsref = 0;
-    CGLError error = 0;
--
--   /* Request an OpenGL 3.2 profile if one is available and supported */
--   attr[numattr++] = kCGLPFAOpenGLProfile;
--   attr[numattr++] = kCGLOGLPVersion_3_2_Core;
--
--   /* Test for kCGLPFAOpenGLProfile support at runtime and roll it out if not supported */
--   attr[numattr] = 0;
--   error = apple_cgl.choose_pixel_format(attr, pfobj, &vsref);
--   if (error == kCGLBadAttribute)
--      numattr -= 2;
-+   bool use_core_profile = getenv("LIBGL_PROFILE_CORE");
- 
-    if (offscreen) {
-       apple_glx_diagnostic
-@@ -167,12 +158,31 @@ apple_visual_create_pfobj(CGLPixelFormatObj * pfobj, const struct glx_config * m
-       attr[numattr++] = mode->samples;
-    }
- 
-+   /* Debugging support for Core profiles to support newer versions of OpenGL */
-+   if (use_core_profile) {
-+      attr[numattr++] = kCGLPFAOpenGLProfile;
-+      attr[numattr++] = kCGLOGLPVersion_3_2_Core;
-+   }
-+
-    attr[numattr++] = 0;
- 
-    assert(numattr < MAX_ATTR);
- 
-    error = apple_cgl.choose_pixel_format(attr, pfobj, &vsref);
- 
-+   if ((error == kCGLBadAttribute || vsref == 0) && use_core_profile) {
-+      apple_glx_diagnostic
-+         ("Trying again without CoreProfile: error=%s, vsref=%d\n", apple_cgl.error_string(error), vsref);
-+
-+      if (!error)
-+         apple_cgl.destroy_pixel_format(*pfobj);
-+
-+      numattr -= 3;
-+      attr[numattr++] = 0;
-+
-+      error = apple_cgl.choose_pixel_format(attr, pfobj, &vsref);
-+   }
-+
-    if (error) {
-       snprintf(__crashreporter_info_buff__, sizeof(__crashreporter_info_buff__),
-                "CGLChoosePixelFormat error: %s\n", apple_cgl.error_string(error));
--- 
-1.9.2 (Apple Git-49)
-

Added: trunk/dports/x11/mesa/files/5001-swrast-Build-fix-for-darwin.patch
===================================================================
--- trunk/dports/x11/mesa/files/5001-swrast-Build-fix-for-darwin.patch	                        (rev 0)
+++ trunk/dports/x11/mesa/files/5001-swrast-Build-fix-for-darwin.patch	2015-02-11 10:04:22 UTC (rev 132829)
@@ -0,0 +1,60 @@
+From 9a5cbbb85222baa1c8c10ca1c1a970cbf5d11895 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Thu, 1 Jan 2015 19:48:40 -0800
+Subject: [PATCH 5001/5003] swrast: Build fix for darwin
+
+Fixes regression from commit 64b1dc44495890cbc2c7c5509cb830264020998c
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+CC: Emil Velikov <emil.l.velikov at gmail.com>
+CC: jon.turney at dronecode.org.uk
+CC: ionic at macports.org
+(cherry picked from commit 8da9f46f18fd4c73f2a9d708c86e7e3d5535b3d8)
+---
+ src/mesa/drivers/dri/swrast/swrast.c | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/src/mesa/drivers/dri/swrast/swrast.c b/src/mesa/drivers/dri/swrast/swrast.c
+index e8a2c12..fd8c59a 100644
+--- a/src/mesa/drivers/dri/swrast/swrast.c
++++ b/src/mesa/drivers/dri/swrast/swrast.c
+@@ -59,6 +59,9 @@
+ #include "swrast_priv.h"
+ #include "swrast/s_context.h"
+ 
++#include <sys/types.h>
++#include <sys/sysctl.h>
++
+ const __DRIextension **__driDriverGetExtensions_swrast(void);
+ 
+ const char const *swrast_vendor_string = "Mesa Project";
+@@ -135,6 +138,16 @@ swrast_query_renderer_integer(__DRIscreen *psp, int param,
+       value[0] = 0;
+       return 0;
+    case __DRI2_RENDERER_VIDEO_MEMORY: {
++      /* This should probably share code with os_get_total_physical_memory()
++       * from src/gallium/auxiliary/os/os_misc.c
++       */
++#if defined(CTL_HW) && defined(HW_MEMSIZE)
++        int mib[2] = { CTL_HW, HW_MEMSIZE };
++        unsigned long system_memory_bytes;
++        size_t len = sizeof(system_memory_bytes);
++        if (sysctl(mib, 2, &system_memory_bytes, &len, NULL, 0) != 0)
++            return -1;
++#elif defined(_SC_PHYS_PAGES) && defined(_SC_PAGE_SIZE)
+       /* XXX: Do we want to return the full amount of system memory ? */
+       const long system_memory_pages = sysconf(_SC_PHYS_PAGES);
+       const long system_page_size = sysconf(_SC_PAGE_SIZE);
+@@ -144,6 +157,9 @@ swrast_query_renderer_integer(__DRIscreen *psp, int param,
+ 
+       const uint64_t system_memory_bytes = (uint64_t) system_memory_pages
+          * (uint64_t) system_page_size;
++#else
++#error "Unsupported platform"
++#endif
+ 
+       const unsigned system_memory_megabytes =
+          (unsigned) (system_memory_bytes / (1024 * 1024));
+-- 
+2.3.0
+

Added: trunk/dports/x11/mesa/files/5002-darwin-Suppress-type-conversion-warnings-for-GLhandl.patch
===================================================================
--- trunk/dports/x11/mesa/files/5002-darwin-Suppress-type-conversion-warnings-for-GLhandl.patch	                        (rev 0)
+++ trunk/dports/x11/mesa/files/5002-darwin-Suppress-type-conversion-warnings-for-GLhandl.patch	2015-02-11 10:04:22 UTC (rev 132829)
@@ -0,0 +1,75 @@
+From 9280d8353799867ae7804eee8a7ad429e1ed442f Mon Sep 17 00:00:00 2001
+From: Jon TURNEY <jon.turney at dronecode.org.uk>
+Date: Sun, 11 May 2014 14:40:07 +0100
+Subject: [PATCH 5002/5003] darwin: Suppress type conversion warnings for
+ GLhandleARB
+
+On darwin, GLhandleARB is defined as a void *, not the unsigned int it is on
+linux.
+
+For the moment, apply a cast to supress the warning
+
+Possibly this is safe, as for the mesa software renderer the shader program
+handle is not a real pointer, but a integer handle
+
+Probably this is not the right thing to do, and we should pay closer attention
+to how the GLhandlerARB type is used.
+
+main/shader_query.cpp:49:7: error: no matching function for call to '_mesa_lookup_shader_program_err'
+      _mesa_lookup_shader_program_err(ctx, program, "glBindAttribLocation");
+      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+../../src/mesa/main/shaderobj.h:81:1: note: candidate function not viable: cannot convert argument of incomplete type 'GLhandleARB' (aka 'void *') to 'GLuint' (aka 'unsigned int')
+_mesa_lookup_shader_program_err(struct gl_context *ctx, GLuint name,
+^
+main/shader_query.cpp:111:13: error: no matching function for call to '_mesa_lookup_shader_program_err'
+   shProg = _mesa_lookup_shader_program_err(ctx, program, "glGetActiveAttrib");
+            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+../../src/mesa/main/shaderobj.h:81:1: note: candidate function not viable: cannot convert argument of incomplete type 'GLhandleARB' (aka 'void *') to 'GLuint' (aka 'unsigned int')
+_mesa_lookup_shader_program_err(struct gl_context *ctx, GLuint name,
+^
+main/shader_query.cpp:218:7: error: no matching function for call to '_mesa_lookup_shader_program_err'
+      _mesa_lookup_shader_program_err(ctx, program, "glGetAttribLocation");
+      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+../../src/mesa/main/shaderobj.h:81:1: note: candidate function not viable: cannot convert argument of incomplete type 'GLhandleARB' (aka 'void *') to 'GLuint' (aka 'unsigned int')
+_mesa_lookup_shader_program_err(struct gl_context *ctx, GLuint name,
+
+Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
+(cherry picked from commit 6a74bac7137219d8bba9e1dc2738f76151e618ae)
+---
+ src/mesa/main/shader_query.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/mesa/main/shader_query.cpp b/src/mesa/main/shader_query.cpp
+index 766ad29..74bd301 100644
+--- a/src/mesa/main/shader_query.cpp
++++ b/src/mesa/main/shader_query.cpp
+@@ -46,7 +46,7 @@ _mesa_BindAttribLocation(GLhandleARB program, GLuint index,
+    GET_CURRENT_CONTEXT(ctx);
+ 
+    struct gl_shader_program *const shProg =
+-      _mesa_lookup_shader_program_err(ctx, program, "glBindAttribLocation");
++      _mesa_lookup_shader_program_err(ctx, (uintptr_t)program, "glBindAttribLocation");
+    if (!shProg)
+       return;
+ 
+@@ -109,7 +109,7 @@ _mesa_GetActiveAttrib(GLhandleARB program, GLuint desired_index,
+    GET_CURRENT_CONTEXT(ctx);
+    struct gl_shader_program *shProg;
+ 
+-   shProg = _mesa_lookup_shader_program_err(ctx, program, "glGetActiveAttrib");
++   shProg = _mesa_lookup_shader_program_err(ctx, (uintptr_t)program, "glGetActiveAttrib");
+    if (!shProg)
+       return;
+ 
+@@ -227,7 +227,7 @@ _mesa_GetAttribLocation(GLhandleARB program, const GLcharARB * name)
+ {
+    GET_CURRENT_CONTEXT(ctx);
+    struct gl_shader_program *const shProg =
+-      _mesa_lookup_shader_program_err(ctx, program, "glGetAttribLocation");
++      _mesa_lookup_shader_program_err(ctx, (uintptr_t)program, "glGetAttribLocation");
+ 
+    if (!shProg) {
+       return -1;
+-- 
+2.3.0
+

Added: trunk/dports/x11/mesa/files/5003-applegl-Provide-requirements-of-_SET_DrawBuffers.patch
===================================================================
--- trunk/dports/x11/mesa/files/5003-applegl-Provide-requirements-of-_SET_DrawBuffers.patch	                        (rev 0)
+++ trunk/dports/x11/mesa/files/5003-applegl-Provide-requirements-of-_SET_DrawBuffers.patch	2015-02-11 10:04:22 UTC (rev 132829)
@@ -0,0 +1,60 @@
+From b5c7d50daaf878ef234780285d24cb9032818a5a Mon Sep 17 00:00:00 2001
+From: Jon TURNEY <jon.turney at dronecode.org.uk>
+Date: Mon, 12 May 2014 16:30:26 +0100
+Subject: [PATCH 5003/5003] applegl: Provide requirements of _SET_DrawBuffers
+
+_SET_DrawBuffers requires driDispatchRemapTable, so we need to link with libmesa
+for remap.c.  libmesa requires the C++ linker.
+
+Also need to arrange to call _mesa_init_remap_table() to initialize the remap
+table.
+
+XXX: There has to be a better way fixing this.
+
+Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
+(cherry picked from commit fd9583edffb17028253ecd267b21a137522d67e4)
+---
+ src/glx/Makefile.am         | 5 ++++-
+ src/glx/apple/apple_glapi.c | 3 +++
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am
+index 4515312..33a6c52 100644
+--- a/src/glx/Makefile.am
++++ b/src/glx/Makefile.am
+@@ -118,7 +118,10 @@ libglx_la_SOURCES += \
+ 	  applegl_glx.c
+ 
+ SUBDIRS += apple
+-libglx_la_LIBADD += $(builddir)/apple/libappleglx.la
++libglx_la_LIBADD += \
++	$(builddir)/apple/libappleglx.la \
++	$(top_builddir)/src/mesa/libmesa.la
++nodist_EXTRA_lib at GL_LIB@_la_SOURCES = dummy.cpp
+ endif
+ 
+ GL_LIBS = \
+diff --git a/src/glx/apple/apple_glapi.c b/src/glx/apple/apple_glapi.c
+index 4d19f7f..849044b 100644
+--- a/src/glx/apple/apple_glapi.c
++++ b/src/glx/apple/apple_glapi.c
+@@ -39,6 +39,7 @@
+ #include <GL/gl.h>
+ 
+ #include "main/glheader.h"
++#include "main/remap.h"
+ #include "glapi.h"
+ #include "glapitable.h"
+ #include "main/dispatch.h"
+@@ -54,6 +55,8 @@ static void _apple_glapi_create_table(void) {
+     if (__applegl_api)
+         return;
+ 
++    _mesa_init_remap_table();
++
+     __ogl_framework_api = _glapi_create_table_from_handle(apple_cgl_get_dl_handle(), "gl");
+     assert(__ogl_framework_api);
+ 
+-- 
+2.3.0
+

Deleted: trunk/dports/x11/mesa/files/iglx.patch
===================================================================
--- trunk/dports/x11/mesa/files/iglx.patch	2015-02-11 09:21:23 UTC (rev 132828)
+++ trunk/dports/x11/mesa/files/iglx.patch	2015-02-11 10:04:22 UTC (rev 132829)
@@ -1,27 +0,0 @@
---- a/configs/darwin.orig	2012-03-23 01:10:16.000000000 +0800
-+++ b/configs/darwin	2014-01-09 20:28:20.000000000 +0800
-@@ -13,8 +13,7 @@
- CXX = $(shell xcrun -find c++)
- PIC_FLAGS = -fPIC
- DEFINES =  -D_DARWIN_C_SOURCE -DPTHREADS -D_GNU_SOURCE \
--	   -DGLX_ALIAS_UNSUPPORTED \
--	   -DGLX_DIRECT_RENDERING -DGLX_USE_APPLEGL
-+	   -DGLX_ALIAS_UNSUPPORTED -DGLX_INDIRECT_RENDERING
- 
- # -DGLX_INDIRECT_RENDERING \
- 
-@@ -47,12 +46,12 @@
- OSMESA_LIB_GLOB = lib$(OSMESA_LIB).*dylib
- VG_LIB_GLOB = lib$(VG_LIB).*dylib
- 
--GL_LIB_DEPS = -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11-xcb -lxcb -lX11 -lXext $(EXTRA_LDFLAGS)
-+GL_LIB_DEPS = -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11-xcb -lxcb -lxcb-glx -lX11 -lXext $(EXTRA_LDFLAGS)
- OSMESA_LIB_DEPS = $(EXTRA_LDFLAGS)
- GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LDFLAGS)
- GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXt $(EXTRA_LDFLAGS)
- 
--SRC_DIRS = glsl mapi/glapi mapi/vgapi glx/apple mesa gallium glu
-+SRC_DIRS = glsl mapi/glapi mapi/vgapi glx mesa gallium glu
- GLU_DIRS = sgi
- DRIVER_DIRS = osmesa
- #DRIVER_DIRS = dri

Deleted: trunk/dports/x11/mesa/files/patch-src-mapi-vgapi-Makefile.diff
===================================================================
--- trunk/dports/x11/mesa/files/patch-src-mapi-vgapi-Makefile.diff	2015-02-11 09:21:23 UTC (rev 132828)
+++ trunk/dports/x11/mesa/files/patch-src-mapi-vgapi-Makefile.diff	2015-02-11 10:04:22 UTC (rev 132829)
@@ -1,11 +0,0 @@
---- a/src/mapi/vgapi/Makefile	2012-11-30 12:06:24.000000000 -0500
-+++ b/src/mapi/vgapi/Makefile	2012-11-30 12:06:52.000000000 -0500
-@@ -75,6 +75,8 @@
- install-headers:
- 	$(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/VG
- 	$(INSTALL) -m 644 $(TOP)/include/VG/*.h $(DESTDIR)$(INSTALL_INC_DIR)/VG
-+	$(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/KHR
-+	$(INSTALL) -m 644 $(TOP)/include/KHR/*.h $(DESTDIR)$(INSTALL_INC_DIR)/KHR
- 
- install: default install-headers install-pc
- 	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)

Deleted: trunk/dports/x11/mesa/files/patch-src-mesa-Makefile.diff
===================================================================
--- trunk/dports/x11/mesa/files/patch-src-mesa-Makefile.diff	2015-02-11 09:21:23 UTC (rev 132828)
+++ trunk/dports/x11/mesa/files/patch-src-mesa-Makefile.diff	2015-02-11 10:04:22 UTC (rev 132829)
@@ -1,11 +0,0 @@
---- a/src/mesa/Makefile.orig	2012-02-14 17:44:00.000000000 -0600
-+++ b/src/mesa/Makefile	2012-03-26 17:02:40.000000000 -0500
-@@ -3,7 +3,7 @@
- TOP = ../..
- include $(TOP)/configs/current
- 
--MESA_LIBS := libmesa.a libmesagallium.a
-+MESA_LIBS := libmesa.a
- DEPENDS := depend
- 
- MESA_OBJ_DIR := .

Deleted: trunk/dports/x11/mesa/files/tiger-exports.patch
===================================================================
--- trunk/dports/x11/mesa/files/tiger-exports.patch	2015-02-11 09:21:23 UTC (rev 132828)
+++ trunk/dports/x11/mesa/files/tiger-exports.patch	2015-02-11 10:04:22 UTC (rev 132829)
@@ -1,121 +0,0 @@
---- a/src/glu/sgi/glu.exports.darwin.orig
-+++ b/src/glu/sgi/glu.exports.darwin
-@@ -1,59 +1,59 @@
--_*gluBeginCurve
--_*gluBeginPolygon
--_*gluBeginSurface
--_*gluBeginTrim
--_*gluBuild1DMipmapLevels
--_*gluBuild1DMipmaps
--_*gluBuild2DMipmapLevels
--_*gluBuild2DMipmaps
--_*gluBuild3DMipmapLevels
--_*gluBuild3DMipmaps
--_*gluCheckExtension
--_*gluCylinder
--_*gluDeleteNurbsRenderer
--_*gluDeleteQuadric
--_*gluDeleteTess
--_*gluDisk
--_*gluEndCurve
--_*gluEndPolygon
--_*gluEndSurface
--_*gluEndTrim
--_*gluErrorString
--_*gluGetNurbsProperty
--_*gluGetString
--_*gluGetTessProperty
--_*gluLoadSamplingMatrices
--_*gluLookAt
--_*gluNewNurbsRenderer
--_*gluNewQuadric
--_*gluNewTess
--_*gluNextContour
--_*gluNurbsCallback
--_*gluNurbsCallbackData
--_*gluNurbsCallbackDataEXT
--_*gluNurbsCurve
--_*gluNurbsProperty
--_*gluNurbsSurface
--_*gluOrtho2D
--_*gluPartialDisk
--_*gluPerspective
--_*gluPickMatrix
--_*gluProject
--_*gluPwlCurve
--_*gluQuadricCallback
--_*gluQuadricDrawStyle
--_*gluQuadricNormals
--_*gluQuadricOrientation
--_*gluQuadricTexture
--_*gluScaleImage
--_*gluSphere
--_*gluTessBeginContour
--_*gluTessBeginPolygon
--_*gluTessCallback
--_*gluTessEndContour
--_*gluTessEndPolygon
--_*gluTessNormal
--_*gluTessProperty
--_*gluTessVertex
--_*gluUnProject
--_*gluUnProject4
-+_gluBeginCurve
-+_gluBeginPolygon
-+_gluBeginSurface
-+_gluBeginTrim
-+_gluBuild1DMipmapLevels
-+_gluBuild1DMipmaps
-+_gluBuild2DMipmapLevels
-+_gluBuild2DMipmaps
-+_gluBuild3DMipmapLevels
-+_gluBuild3DMipmaps
-+_gluCheckExtension
-+_gluCylinder
-+_gluDeleteNurbsRenderer
-+_gluDeleteQuadric
-+_gluDeleteTess
-+_gluDisk
-+_gluEndCurve
-+_gluEndPolygon
-+_gluEndSurface
-+_gluEndTrim
-+_gluErrorString
-+_gluGetNurbsProperty
-+_gluGetString
-+_gluGetTessProperty
-+_gluLoadSamplingMatrices
-+_gluLookAt
-+_gluNewNurbsRenderer
-+_gluNewQuadric
-+_gluNewTess
-+_gluNextContour
-+_gluNurbsCallback
-+_gluNurbsCallbackData
-+_gluNurbsCallbackDataEXT
-+_gluNurbsCurve
-+_gluNurbsProperty
-+_gluNurbsSurface
-+_gluOrtho2D
-+_gluPartialDisk
-+_gluPerspective
-+_gluPickMatrix
-+_gluProject
-+_gluPwlCurve
-+_gluQuadricCallback
-+_gluQuadricDrawStyle
-+_gluQuadricNormals
-+_gluQuadricOrientation
-+_gluQuadricTexture
-+_gluScaleImage
-+_gluSphere
-+_gluTessBeginContour
-+_gluTessBeginPolygon
-+_gluTessCallback
-+_gluTessEndContour
-+_gluTessEndPolygon
-+_gluTessNormal
-+_gluTessProperty
-+_gluTessVertex
-+_gluUnProject
-+_gluUnProject4
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150211/bfcccea6/attachment-0001.html>


More information about the macports-changes mailing list