[Mesa-dev] [PATCH 0/3] Fix Apple-DRI GLX (v2)

[Jon TURNEY]

This updates this patch set for master and makes the following minor chages:

Use -Wl,-Bsymbolic, as before, not -Bsymbolic
Test that ld --version-script works, rather than just looking for it in ld --help
darwin's ld doesn't support -Wl,--no-undefined, so don't use it on darwin
Put a 'make check' test which requires DRI2 under HAVE_DRI2
Fix the new apple/Makefile.am for srcdir != builddir

Jon TURNEY (3):
  Fix build for darwin
  Make DRI dependencies and build depend on the target
  Fix build of appleglx

 configure.ac                               | 106 +++++++++++++++++++----
 src/egl/main/Makefile.am                   |   2 +-
 src/gallium/Automake.inc                   |   8 ++
 src/gallium/state_trackers/Makefile.am     |   2 +-
 src/gallium/state_trackers/dri/Makefile.am |   6 +-
 src/gallium/targets/Makefile.am            |  18 ++--
 src/gallium/targets/gbm/Makefile.am        |   2 +-
 src/gallium/targets/opencl/Makefile.am     |   2 +-
 src/gallium/targets/xa/Makefile.am         |   2 +-
 src/gallium/tests/trivial/Makefile.am      |   2 +-
 src/gallium/winsys/Makefile.am             |   2 +-
 src/gbm/Makefile.am                        |   2 +-
 src/glx/Makefile.am                        |  39 +++++++--
 src/glx/apple/Makefile                     | 131 ----------------------------
 src/glx/apple/Makefile.am                  |  33 +++++++
 src/glx/apple/apple_glapi.c                |   1 +
 src/glx/apple/apple_glx.c                  |   2 -
 src/glx/apple/apple_glx.h                  |   1 -
 src/glx/apple/apple_xgl_api_read.c         |   1 +
 src/glx/apple/apple_xgl_api_stereo.c       |   7 +-
 src/glx/apple/apple_xgl_api_viewport.c     |   1 +
 src/glx/apple/glxreply.c                   | 134 -----------------------------
 src/glx/applegl_glx.c                      |   6 +-
 src/glx/glx_pbuffer.c                      |   2 +-
 src/glx/glxcmds.c                          |   4 +-
 src/glx/glxcurrent.c                       |   6 --
 src/glx/glxext.c                           |   4 +-
 src/glx/indirect_glx.c                     |   4 +
 src/glx/render2.c                          |   4 +
 src/glx/tests/Makefile.am                  |   6 +-
 src/glx/vertarr.c                          |   3 +
 src/mapi/glapi/Makefile.am                 |   4 +-
 src/mapi/glapi/Makefile.sources            |   4 +-
 src/mapi/glapi/gen/glX_proto_send.py       |   3 +
 src/mesa/Makefile.am                       |   2 +-
 src/mesa/drivers/dri/Makefile.am           |   2 +-
 36 files changed, 223 insertions(+), 335 deletions(-)
 delete mode 100644 src/glx/apple/Makefile
 create mode 100644 src/glx/apple/Makefile.am
 delete mode 100644 src/glx/apple/glxreply.c

-- 
1.8.5.5