Xorgproto 2018.4 mingw-64

3 files changed, 167 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..be8c0578f19d
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,105 @@
+pkgbase = mingw-w64-xorgproto
+	pkgdesc = combined X.Org X11 Protocol headers (mingw-w64)
+	pkgver = 2018.4
+	pkgrel = 1
+	url = https://xorg.freedesktop.org/
+	arch = any
+	license = custom
+	makedepends = mingw-w64-xorg-util-macros
+	makedepends = mingw-w64-meson
+	provides = mingw-w64-bigreqsproto
+	provides = mingw-w64-compositeproto
+	provides = mingw-w64-damageproto
+	provides = mingw-w64-dmxproto
+	provides = mingw-w64-dri2proto
+	provides = mingw-w64-dri3proto
+	provides = mingw-w64-fixesproto
+	provides = mingw-w64-fontsproto
+	provides = mingw-w64-glproto
+	provides = mingw-w64-inputproto
+	provides = mingw-w64-kbproto
+	provides = mingw-w64-presentproto
+	provides = mingw-w64-printproto
+	provides = mingw-w64-randrproto
+	provides = mingw-w64-recordproto
+	provides = mingw-w64-renderproto
+	provides = mingw-w64-resourceproto
+	provides = mingw-w64-scrnsaverproto
+	provides = mingw-w64-videoproto
+	provides = mingw-w64-xcmiscproto
+	provides = mingw-w64-xextproto
+	provides = mingw-w64-xf86dgaproto
+	provides = mingw-w64-xf86driproto
+	provides = mingw-w64-xf86miscproto
+	provides = mingw-w64-xf86vidmodeproto
+	provides = mingw-w64-xineramaproto
+	provides = mingw-w64-xproto
+	conflicts = mingw-w64-bigreqsproto
+	conflicts = mingw-w64-compositeproto
+	conflicts = mingw-w64-damageproto
+	conflicts = mingw-w64-dmxproto
+	conflicts = mingw-w64-dri2proto
+	conflicts = mingw-w64-dri3proto
+	conflicts = mingw-w64-fixesproto
+	conflicts = mingw-w64-fontsproto
+	conflicts = mingw-w64-glproto
+	conflicts = mingw-w64-inputproto
+	conflicts = mingw-w64-kbproto
+	conflicts = mingw-w64-presentproto
+	conflicts = mingw-w64-printproto
+	conflicts = mingw-w64-randrproto
+	conflicts = mingw-w64-recordproto
+	conflicts = mingw-w64-renderproto
+	conflicts = mingw-w64-resourceproto
+	conflicts = mingw-w64-scrnsaverproto
+	conflicts = mingw-w64-videoproto
+	conflicts = mingw-w64-xcmiscproto
+	conflicts = mingw-w64-xextproto
+	conflicts = mingw-w64-xf86dgaproto
+	conflicts = mingw-w64-xf86driproto
+	conflicts = mingw-w64-xf86miscproto
+	conflicts = mingw-w64-xf86vidmodeproto
+	conflicts = mingw-w64-xineramaproto
+	conflicts = mingw-w64-xproto
+	replaces = mingw-w64-bigreqsproto
+	replaces = mingw-w64-compositeproto
+	replaces = mingw-w64-damageproto
+	replaces = mingw-w64-dmxproto
+	replaces = mingw-w64-dri2proto
+	replaces = mingw-w64-dri3proto
+	replaces = mingw-w64-fixesproto
+	replaces = mingw-w64-fontsproto
+	replaces = mingw-w64-glproto
+	replaces = mingw-w64-inputproto
+	replaces = mingw-w64-kbproto
+	replaces = mingw-w64-presentproto
+	replaces = mingw-w64-printproto
+	replaces = mingw-w64-randrproto
+	replaces = mingw-w64-recordproto
+	replaces = mingw-w64-renderproto
+	replaces = mingw-w64-resourceproto
+	replaces = mingw-w64-scrnsaverproto
+	replaces = mingw-w64-videoproto
+	replaces = mingw-w64-xcmiscproto
+	replaces = mingw-w64-xextproto
+	replaces = mingw-w64-xf86dgaproto
+	replaces = mingw-w64-xf86driproto
+	replaces = mingw-w64-xf86miscproto
+	replaces = mingw-w64-xf86vidmodeproto
+	replaces = mingw-w64-xineramaproto
+	replaces = mingw-w64-xproto
+	options = staticlibs
+	options = !buildflags
+	options = !strip
+	source = https://xorg.freedesktop.org/archive/individual/proto/xorgproto-2018.4.tar.bz2
+	source = https://xorg.freedesktop.org/archive/individual/proto/xorgproto-2018.4.tar.bz2.sig
+	source = meson.patch
+	validpgpkeys = 995ED5C8A6138EB0961F18474C09DD83CAAA50B2
+	validpgpkeys = DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3
+	validpgpkeys = C383B778255613DFDB409D91DB221A6900000011
+	sha512sums = 2db682d10280ca58cdc04d8eb9fef30c111d4cd379de9fec86cff317865b859a576de5426447be9231d24be9762cc1d684c57383a99ad499398e8b7d62b1c03c
+	sha512sums = SKIP
+	sha512sums = cec486d47dbea1fcb4338a849b71b69756a8c5bdd4dde16dd8ae963f70bf5231fee227970016a3ab9924934644e7c9c0ccba85c5d9c12caf0be124c3d2ffb645
+
+pkgname = mingw-w64-xorgproto
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..1ae2f40b6c8f
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,48 @@
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+
+pkgname=mingw-w64-xorgproto
+_name=xorgproto
+pkgver=2018.4
+pkgrel=1
+pkgdesc="combined X.Org X11 Protocol headers (mingw-w64)"
+arch=('any')
+url="https://xorg.freedesktop.org/"
+license=('custom')
+makedepends=('mingw-w64-xorg-util-macros' 'mingw-w64-meson')
+provides=('mingw-w64-bigreqsproto' 'mingw-w64-compositeproto' 'mingw-w64-damageproto' 'mingw-w64-dmxproto' 'mingw-w64-dri2proto' 'mingw-w64-dri3proto' 'mingw-w64-fixesproto' 'mingw-w64-fontsproto' 'mingw-w64-glproto' 'mingw-w64-inputproto' 'mingw-w64-kbproto' 'mingw-w64-presentproto' 'mingw-w64-printproto' 'mingw-w64-randrproto' 'mingw-w64-recordproto' 'mingw-w64-renderproto' 'mingw-w64-resourceproto' 'mingw-w64-scrnsaverproto' 'mingw-w64-videoproto' 'mingw-w64-xcmiscproto' 'mingw-w64-xextproto' 'mingw-w64-xf86dgaproto' 'mingw-w64-xf86driproto' 'mingw-w64-xf86miscproto' 'mingw-w64-xf86vidmodeproto' 'mingw-w64-xineramaproto' 'mingw-w64-xproto')
+conflicts=('mingw-w64-bigreqsproto' 'mingw-w64-compositeproto' 'mingw-w64-damageproto' 'mingw-w64-dmxproto' 'mingw-w64-dri2proto' 'mingw-w64-dri3proto' 'mingw-w64-fixesproto' 'mingw-w64-fontsproto' 'mingw-w64-glproto' 'mingw-w64-inputproto' 'mingw-w64-kbproto' 'mingw-w64-presentproto' 'mingw-w64-printproto' 'mingw-w64-randrproto' 'mingw-w64-recordproto' 'mingw-w64-renderproto' 'mingw-w64-resourceproto' 'mingw-w64-scrnsaverproto' 'mingw-w64-videoproto' 'mingw-w64-xcmiscproto' 'mingw-w64-xextproto' 'mingw-w64-xf86dgaproto' 'mingw-w64-xf86driproto' 'mingw-w64-xf86miscproto' 'mingw-w64-xf86vidmodeproto' 'mingw-w64-xineramaproto' 'mingw-w64-xproto')
+replaces=('mingw-w64-bigreqsproto' 'mingw-w64-compositeproto' 'mingw-w64-damageproto' 'mingw-w64-dmxproto' 'mingw-w64-dri2proto' 'mingw-w64-dri3proto' 'mingw-w64-fixesproto' 'mingw-w64-fontsproto' 'mingw-w64-glproto' 'mingw-w64-inputproto' 'mingw-w64-kbproto' 'mingw-w64-presentproto' 'mingw-w64-printproto' 'mingw-w64-randrproto' 'mingw-w64-recordproto' 'mingw-w64-renderproto' 'mingw-w64-resourceproto' 'mingw-w64-scrnsaverproto' 'mingw-w64-videoproto' 'mingw-w64-xcmiscproto' 'mingw-w64-xextproto' 'mingw-w64-xf86dgaproto' 'mingw-w64-xf86driproto' 'mingw-w64-xf86miscproto' 'mingw-w64-xf86vidmodeproto' 'mingw-w64-xineramaproto' 'mingw-w64-xproto')
+options=('staticlibs' '!buildflags' '!strip')
+source=(https://xorg.freedesktop.org/archive/individual/proto/$_name-$pkgver.tar.bz2{,.sig}
+        meson.patch)
+sha512sums=('2db682d10280ca58cdc04d8eb9fef30c111d4cd379de9fec86cff317865b859a576de5426447be9231d24be9762cc1d684c57383a99ad499398e8b7d62b1c03c'
+            'SKIP'
+            'cec486d47dbea1fcb4338a849b71b69756a8c5bdd4dde16dd8ae963f70bf5231fee227970016a3ab9924934644e7c9c0ccba85c5d9c12caf0be124c3d2ffb645')
+validpgpkeys=('995ED5C8A6138EB0961F18474C09DD83CAAA50B2'  #  "Adam Jackson <ajax@nwnk.net>"
+              'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3'  # "Adam Jackson <ajax@benzedrine.nwnk.net>"
+              'C383B778255613DFDB409D91DB221A6900000011') #  "Keith Packard <keithp@keithp.com>"
+
+_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
+
+prepare() {
+  cd "$srcdir/$_name-$pkgver"
+  patch -p1 -i "$srcdir/meson.patch"
+}
+
+build() {
+  cd "$srcdir/$_name-$pkgver"
+  for _arch in ${_architectures}; do
+    mkdir -p build-${_arch}
+    ${_arch}-meson build-${_arch} \
+      -Dlegacy=true
+
+    ninja -C build-${_arch}
+  done
+}
+
+package() {
+  cd "$srcdir/$_name-$pkgver"
+  for _arch in ${_architectures}; do
+    DESTDIR="$pkgdir" ninja -C build-${_arch} install
+  done
+}
diff --git a/meson.patch b/meson.patch
new file mode 100644
index 000000000000..802dd42abae4
--- /dev/null
+++ b/meson.patch
@@ -0,0 +1,14 @@
+--- xorgproto-2018.4.orig/include/X11/meson.build	2018-02-28 16:45:07.000000000 +0000
++++ xorgproto-2018.4/include/X11/meson.build	2019-01-26 02:34:52.763165148 +0000
+@@ -10,8 +10,10 @@
+     endif
+ endforeach
+ 
+ # generated headers. try not to make more of these, please.
+-if cc.has_member('fd_set', 'fds_bits', prefix: fd_set_headers)
++if cc.get_define('_WIN32') == '1' and cc.get_define('CYGWIN') != '1'
++    fds_bits = 'dummy'
++elif cc.has_member('fd_set', 'fds_bits', prefix: fd_set_headers)
+     fds_bits = 'fds_bits'
+ elif cc.has_member('fd_set', '__fds_bits', prefix: fd_set_headers)
+     fds_bits = '__fds_bits'