[Xquartz-changes] mesa: Changes to '10.4-darwin-build-fixes'

[Jeremy Huddleston]

New branch '10.4-darwin-build-fixes' available with the following commits:
commit b5c7d50daaf878ef234780285d24cb9032818a5a
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date:   Mon May 12 16:30:26 2014 +0100

    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)

commit 9280d8353799867ae7804eee8a7ad429e1ed442f
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date:   Sun May 11 14:40:07 2014 +0100

    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)

commit 9a5cbbb85222baa1c8c10ca1c1a970cbf5d11895
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date:   Thu Jan 1 19:48:40 2015 -0800

    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)

commit 654f197f1965d5be52b96c2f1af27d8bc96f9c78
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date:   Tue Feb 10 22:21:47 2015 -0800

    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)

commit 162cee83ba98abb6ee21bb270ff0c6a09e97cd1f
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date:   Tue Feb 10 20:32:02 2015 -0800

    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)

commit 54da987baec25fbaf6975c93f197ddbfe65a303c
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Sat Feb 7 00:47:18 2015 +0000

    docs: Add sha256 sums for the 10.4.4 release
    
    Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>