Previously the XWin build required a live internet connection (and Khronos's servers to not be down for maintenance, etc) in order to download the (W)GL specs to autogenerate files from. Even if you weren't building XWin, this broke distcheck.
It's a fairly upsetting diffstat, but not being able to distcheck on the train makes me sad-in-pants. Signed-off-by: Daniel Stone <dan...@fooishbar.org> --- Note that this is not the real patch: SMTP doesn't allow even 1024-character lines, let alone 31488 characters (sigh). The real patch can be found at: git://people.freedesktop.org/~daniels/xserver in the master branch But you get the idea. hw/xwin/glx/.gitignore | 5 - hw/xwin/glx/Makefile.am | 19 +- hw/xwin/glx/gl.spec |31488 +++++++++++++++++++++++++++++++++++++++++++++++ hw/xwin/glx/gl.tm | 328 + hw/xwin/glx/wgl.tm | 36 + hw/xwin/glx/wglext.h | 901 ++ hw/xwin/glx/wglext.spec | 1126 ++ 7 files changed, 33880 insertions(+), 23 deletions(-) create mode 100644 hw/xwin/glx/gl.spec create mode 100644 hw/xwin/glx/gl.tm create mode 100644 hw/xwin/glx/wgl.tm create mode 100644 hw/xwin/glx/wglext.h create mode 100644 hw/xwin/glx/wglext.spec diff --git a/hw/xwin/glx/.gitignore b/hw/xwin/glx/.gitignore index e7c7617..6cdb91f 100644 --- a/hw/xwin/glx/.gitignore +++ b/hw/xwin/glx/.gitignore @@ -1,8 +1,3 @@ # ignore downloaded and generated files generated_gl_wrappers.c generated_wgl_wrappers.c -gl.spec -gl.tm -wgl.tm -wglext.spec -wglext.h diff --git a/hw/xwin/glx/Makefile.am b/hw/xwin/glx/Makefile.am index e9fea50..b672c02 100644 --- a/hw/xwin/glx/Makefile.am +++ b/hw/xwin/glx/Makefile.am @@ -30,19 +30,6 @@ wgl_ext_api.c: generated_wgl_wrappers.c wglext.h wgl_ext_api.h: wglext.h indirect.c: wgl_ext_api.h -SPEC_FILES = gl.spec gl.tm wglext.spec wgl.tm - -gl.spec: - wget http://www.opengl.org/registry/api/gl.spec - -gl.tm: - wget http://www.opengl.org/registry/api/gl.tm - -wglext.spec: - wget http://www.opengl.org/registry/api/wglext.spec - -wgl.tm: - wget http://www.opengl.org/registry/api/wgl.tm generated_gl_wrappers.c: gen_gl_wrappers.py gl.spec gl.tm $(srcdir)/gen_gl_wrappers.py --spec=$(srcdir)/gl.spec --typemap=$(srcdir)/gl.tm --dispatch-header=$(top_srcdir)/glx/dispatch.h --staticwrappers >generated_gl_wrappers.c @@ -50,11 +37,7 @@ generated_gl_wrappers.c: gen_gl_wrappers.py gl.spec gl.tm generated_wgl_wrappers.c: gen_gl_wrappers.py wglext.spec wgl.tm $(srcdir)/gen_gl_wrappers.py --spec=$(srcdir)/wglext.spec --typemap=$(srcdir)/wgl.tm --prefix=wgl --preresolve >generated_wgl_wrappers.c -wglext.h: - wget http://www.opengl.org/registry/api/wglext.h - BUILT_SOURCES = generated_gl_wrappers.c generated_wgl_wrappers.c CLEANFILES = $(BUILT_SOURCES) -DISTCLEANFILES = $(SPEC_FILES) wglext.h -EXTRA_DIST = gen_gl_wrappers.py $(SPEC_FILES) wglext.h +EXTRA_DIST = gen_gl_wrappers.py gl.spec gl.tm wglext.spec wgl.tm wglext.h diff --git a/hw/xwin/glx/gl.spec b/hw/xwin/glx/gl.spec new file mode 100644 index 0000000..86a6064 --- /dev/null +++ b/hw/xwin/glx/gl.spec @@ -0,0 +1,31488 @@ [...] diff --git a/hw/xwin/glx/gl.tm b/hw/xwin/glx/gl.tm new file mode 100644 index 0000000..f7b3856 --- /dev/null +++ b/hw/xwin/glx/gl.tm @@ -0,0 +1,328 @@ [...] diff --git a/hw/xwin/glx/wgl.tm b/hw/xwin/glx/wgl.tm new file mode 100644 index 0000000..baceced --- /dev/null +++ b/hw/xwin/glx/wgl.tm @@ -0,0 +1,36 @@ [...] diff --git a/hw/xwin/glx/wglext.h b/hw/xwin/glx/wglext.h new file mode 100644 index 0000000..e60c652 --- /dev/null +++ b/hw/xwin/glx/wglext.h @@ -0,0 +1,901 @@ [...] diff --git a/hw/xwin/glx/wglext.spec b/hw/xwin/glx/wglext.spec new file mode 100644 index 0000000..a2276fc --- /dev/null +++ b/hw/xwin/glx/wglext.spec @@ -0,0 +1,1126 @@ [...] -- 1.7.2.3 _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
