diff options
| author | Buildbot system user <buildbot@medusa> | 2020-03-31 22:01:52 +0100 |
|---|---|---|
| committer | Buildbot system user <buildbot@medusa> | 2020-03-31 22:01:52 +0100 |
| commit | a8618f01d11d30cae3ffcac9cdb4d958c3da9c26 (patch) | |
| tree | 7de3454e08e307fd05c21533dd2c3d67bb2766c8 | |
| parent | af7a186592cb2ffb29acb164530ef5f7bfcf0d3f (diff) | |
Update khronos registry patches
| -rw-r--r-- | patches/khronos-opengl-registry/Makefile.patch | 52 | ||||
| -rw-r--r-- | xorg.modules | 4 |
2 files changed, 33 insertions, 23 deletions
diff --git a/patches/khronos-opengl-registry/Makefile.patch b/patches/khronos-opengl-registry/Makefile.patch index 379847a..9e246c9 100644 --- a/patches/khronos-opengl-registry/Makefile.patch +++ b/patches/khronos-opengl-registry/Makefile.patch @@ -1,28 +1,38 @@ ---- opengl-registry/Makefile.orig 2015-09-03 14:35:47.186888400 +0100 -+++ opengl-registry/Makefile 2015-09-03 16:48:40.047997700 +0100 -@@ -24,7 +24,7 @@ - - PYFILES = genheaders.py reg.py - GENOPTS = --GENHEADERS = genheaders.py $(GENOPTS) -+GENHEADERS = ./genheaders.py $(GENOPTS) - - # Generate all headers for GL / GLES / WGL / GLX / EGL - # Different headers depend on different XML registry files -@@ -70,3 +70,16 @@ - - clobber: clean - -rm -f diag.txt dumpReg.txt errwarn.txt +From d8130a2f27f6507f9bcf6b0e49805a97af27c2b2 Mon Sep 17 00:00:00 2001 +From: Jon Turney <jon.turney@dronecode.org.uk> +Date: Wed, 11 Mar 2020 15:41:38 +0000 +Subject: [PATCH] Add Makefile + +--- + Makefile | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + create mode 100644 Makefile + +diff --git a/Makefile b/Makefile +new file mode 100644 +index 0000000..1619810 +--- /dev/null ++++ b/Makefile +@@ -0,0 +1,19 @@ ++default: + -+all: default ++clean: ++ $(MAKE) -C xml clean + +install: + @mkdir -p $(DESTDIR)$(PREFIX)/share/opengl/api/ -+ $(INSTALL) *.xml readme.pdf *.rnc reg.py $(DESTDIR)$(PREFIX)/share/opengl/api/ ++ $(INSTALL) xml/*.xml xml/readme.pdf xml/*.rnc xml/reg.py $(DESTDIR)$(PREFIX)/share/opengl/api/ + @mkdir -p $(DESTDIR)$(PREFIX)/share/pkgconfig/ -+ @echo "prefix=$(PREFIX)/" >$(DESTDIR)$(PREFIX)/share/pkgconfig/khronos-opengl-registry.pc -+ @echo "datadir=$(PREFIX)/share" >>$(DESTDIR)$(PREFIX)/share/pkgconfig/khronos-opengl-registry.pc ++ @echo "prefix=$(PREFIX)/" >$(DESTDIR)$(PREFIX)/share/pkgconfig/khronos-opengl-registry.pc ++ @echo "datadir=$(PREFIX)/share" >>$(DESTDIR)$(PREFIX)/share/pkgconfig/khronos-opengl-registry.pc + @echo "specdir=$(PREFIX)/share/opengl/api" >>$(DESTDIR)$(PREFIX)/share/pkgconfig/khronos-opengl-registry.pc -+ @echo "Name: khronos-opengl-registry" >>$(DESTDIR)$(PREFIX)/share/pkgconfig/khronos-opengl-registry.pc ++ @echo "Name: khronos-opengl-registry" >>$(DESTDIR)$(PREFIX)/share/pkgconfig/khronos-opengl-registry.pc + @echo "Description: Khronos OpenGL registry" >>$(DESTDIR)$(PREFIX)/share/pkgconfig/khronos-opengl-registry.pc -+ @echo "Version: `date -u +%Y%m%d`" >>$(DESTDIR)$(PREFIX)/share/pkgconfig/khronos-opengl-registry.pc ++ @echo "Version: `date -u +%Y%m%d`" >>$(DESTDIR)$(PREFIX)/share/pkgconfig/khronos-opengl-registry.pc ++ ++check: ++ ++all: default +-- +2.21.0 + diff --git a/xorg.modules b/xorg.modules index 86af063..9020362 100644 --- a/xorg.modules +++ b/xorg.modules @@ -6,10 +6,10 @@ <include href="xorg.modules.upstream"/> <repository type="git" name="git.freedesktop.org" href="git://anongit.freedesktop.org/git/"/> - <repository type="svn" name="khronos" href="https://cvs.khronos.org/svn/repos/" trunk-template="ogl/trunk/doc/registry/public/api/"/> + <repository type="git" name="khronos" href="https://github.com/KhronosGroup/"/> <autotools id="khronos-opengl-registry" supports-non-srcdir-builds="no" skip-autogen="true" check-target="false"> - <branch repo="khronos" checkoutdir="khronos/opengl-registry"/> + <branch repo="khronos" module="OpenGL-Registry" checkoutdir="khronos/opengl-registry" tag="c6a99aff"/> </autotools> <meson id="xserver-meson"> |