[PULL] hw/xwin: Find GL specs, rather than downloading them

Jon TURNEY jon.turney at dronecode.org.uk
Thu Apr 28 11:38:01 PDT 2011


On 27/04/2011 20:31, Jon TURNEY wrote:
> On 27/04/2011 20:18, Keith Packard wrote:
>> On Tue, 26 Apr 2011 10:48:41 +0100, Jon TURNEY <jon.turney-GrJqePx9RPPAJUdA+FbntA at public.gmane.org> wrote:
>>> Hi Keith,
>>>
>>> The following set of patches removes the downloading of GL specs from hw/xwin.
>>>  Please consider pulling into master.
>>
>> I'm getting a failure in distcheck with this merged in:
>>
>> make[3]: Entering directory `/local/src/xorg/xserver/hw/xwin/glx'
>> make[3]: *** No rule to make target `auto/gl.spec', needed by `generated_gl_wrappers.c'.  Stop.
> 
> Oh dear :-(
> 
> It looks like this is only going to work correctly if ./configure decides to
> --enable-xwin
> 
> Thanks for catching this, I guess I'll have another go...

Fixed and re-pushed, so here is the pull request again.

I've tested make check/dist/distcheck on linux and cygwin with this change, so
hopefully no more lurking surprises :-)

The following changes since commit 4318e6a147e78b2663c5e0ea6ba0d351a1e87f98:

  Cygwin/X: Handle failure during winScreenInit() (2011-04-27 14:25:16 +0100)

are available in the git repository at:
  git://anongit.freedesktop.org/~jturney/xserver remove-opengl-spec-download

Jon TURNEY (3):
      configure: Let configure --enable/disable-aiglx control building of
AIGLX for all DDXs
      configure: Look for Khronos OpenGL spec files using pkg-config
      hw/xwin: wglext.h should be provided by w32api, rather than downloaded

 configure.ac                   |   25 ++++++++++++++++++++-----
 glx/Makefile.am                |    2 +-
 hw/xfree86/dixmods/Makefile.am |    2 +-
 hw/xwin/glx/.gitignore         |    7 +------
 hw/xwin/glx/Makefile.am        |   34 +++++++---------------------------
 hw/xwin/glx/wgl_ext_api.c      |    2 +-
 hw/xwin/glx/wgl_ext_api.h      |    2 +-
 7 files changed, 32 insertions(+), 42 deletions(-)


More information about the xorg-devel mailing list