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

[Jeremy Huddleston]

New branch '10.5-darwin-build-fixes' available with the following commits:
commit 7527d2c3ac566e154598312ea337520e3c3a04b8
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>

commit 822d0e7dec352e9732afcf6468612f56b6f6033d
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>

commit 84eb77b735ca6796ca4b6f452de26d4f60aa01ed
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

commit 2ead8978b0ff1ff98775a32385eabe9ba2044e50
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>