meson

Signed-off-by: Yurii Kolesnykov <root@yurikoles.com>

3 files changed, 50 insertions, 120 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 26a8396d427c..11267f59d725 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,97 +1,17 @@
 pkgbase = xorgproto-git
-	pkgdesc = Combined X.Org X11 Protocol headers - Git version
-	pkgver = 2018.1.2.r2585.g5c6e9a6
+	pkgdesc = Combined X.Org X11 Protocol headers (git version)
+	pkgver = 2020.1.16.r2653.ge4d9ffd
 	pkgrel = 1
-	url = http://cgit.freedesktop.org/xorg/proto/xorgproto/
+	url = https://xorg.freedesktop.org/
 	arch = any
 	license = custom
-	makedepends = git
 	makedepends = xorg-util-macros
+	makedepends = meson
+	makedepends = git
 	provides = xorgproto
-	provides = bigreqsproto
-	provides = compositeproto
-	provides = damageproto
-	provides = dmxproto
-	provides = dri2proto
-	provides = dri3proto
-	provides = fixesproto
-	provides = fontsproto
-	provides = glproto
-	provides = inputproto
-	provides = kbproto
-	provides = presentproto
-	provides = printproto
-	provides = randrproto
-	provides = recordproto
-	provides = renderproto
-	provides = resourceproto
-	provides = scrnsaverproto
-	provides = videoproto
-	provides = xcmiscproto
-	provides = xextproto
-	provides = xf86dgaproto
-	provides = xf86driproto
-	provides = xf86miscproto
-	provides = xf86vidmodeproto
-	provides = xineramaproto
-	provides = xproto
 	conflicts = xorgproto
-	conflicts = bigreqsproto
-	conflicts = compositeproto
-	conflicts = damageproto
-	conflicts = dmxproto
-	conflicts = dri2proto
-	conflicts = dri3proto
-	conflicts = fixesproto
-	conflicts = fontsproto
-	conflicts = glproto
-	conflicts = inputproto
-	conflicts = kbproto
-	conflicts = presentproto
-	conflicts = printproto
-	conflicts = randrproto
-	conflicts = recordproto
-	conflicts = renderproto
-	conflicts = resourceproto
-	conflicts = scrnsaverproto
-	conflicts = videoproto
-	conflicts = xcmiscproto
-	conflicts = xextproto
-	conflicts = xf86dgaproto
-	conflicts = xf86driproto
-	conflicts = xf86miscproto
-	conflicts = xf86vidmodeproto
-	conflicts = xineramaproto
-	conflicts = xproto
-	replaces = bigreqsproto
-	replaces = compositeproto
-	replaces = damageproto
-	replaces = dmxproto
-	replaces = dri2proto
-	replaces = dri3proto
-	replaces = fixesproto
-	replaces = fontsproto
-	replaces = glproto
-	replaces = inputproto
-	replaces = kbproto
-	replaces = presentproto
-	replaces = printproto
-	replaces = randrproto
-	replaces = recordproto
-	replaces = renderproto
-	replaces = resourceproto
-	replaces = scrnsaverproto
-	replaces = videoproto
-	replaces = xcmiscproto
-	replaces = xextproto
-	replaces = xf86dgaproto
-	replaces = xf86driproto
-	replaces = xf86miscproto
-	replaces = xf86vidmodeproto
-	replaces = xineramaproto
-	replaces = xproto
-	source = git://anongit.freedesktop.org/xorg/proto/xorgproto
-	md5sums = SKIP
+	source = xorgproto-git::git://anongit.freedesktop.org/xorg/proto/xorgproto
+	sha512sums = SKIP
 
 pkgname = xorgproto-git
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..bbf2ca83b060
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+xorgproto-git
+src
+pkg
+*.pkg.*
+*.log
diff --git a/PKGBUILD b/PKGBUILD
index aa946a173508..de4aa5ae743a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,51 +1,56 @@
-# Maintainer: Det <nimetonmaili g-mail>  
-# Based on [extra]'s xorgproto: https://projects.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/xorgproto
+# Maintainer: Yurii Kolesnykov
+# Based on [extra]'s xorgproto by AndyRTR <andyrtr@archlinux.org>
 
 _pkgname=xorgproto
 pkgname=$_pkgname-git
-pkgver=2018.1.2.r2585.g5c6e9a6
+pkgver=2020.1.16.r2653.ge4d9ffd
 pkgrel=1
-pkgdesc="Combined X.Org X11 Protocol headers - Git version"
+pkgdesc="Combined X.Org X11 Protocol headers (git version)"
 arch=('any')
-url="http://cgit.freedesktop.org/xorg/proto/$_pkgname/"
+url="https://xorg.freedesktop.org/"
 license=('custom')
-makedepends=('git' 'xorg-util-macros') # 'xmlto' 'libxslt' 'linuxdoc-tools' 'docbook-sgml' 'fop')
-provides=('xorgproto' 'bigreqsproto' 'compositeproto' 'damageproto' 'dmxproto' 'dri2proto' 'dri3proto' 'fixesproto' 'fontsproto' 'glproto' 'inputproto' 'kbproto' 'presentproto' 'printproto' 'randrproto' 'recordproto' 'renderproto' 'resourceproto' 'scrnsaverproto' 'videoproto' 'xcmiscproto' 'xextproto' 'xf86dgaproto' 'xf86driproto' 'xf86miscproto' 'xf86vidmodeproto' 'xineramaproto' 'xproto')
+makedepends=('xorg-util-macros' 'meson' 'git')
+provides=('xorgproto')
 conflicts=(${provides[@]})
-replaces=(${provides[@]/xorgproto})
-source=("git://anongit.freedesktop.org/xorg/proto/$_pkgname")
-md5sums=('SKIP')
+source=("$pkgname::git://anongit.freedesktop.org/xorg/proto/$_pkgname")
+sha512sums=('SKIP')
 
 pkgver() {
-  cd $_pkgname
+  cd "$pkgname"
   echo $(git describe --long | cut -d "-" -f2-3 | tr - .).r$(git rev-list HEAD --count).$(git describe --long | cut -d "-" -f4)
 }
 
-build() {
-  cd $_pkgname
+prepare() {
+  rm -rf build
+  mkdir build
+}
 
-  msg2 "Starting autogen.sh..."
-  ./autogen.sh  --prefix=/usr \
-    --without-xmlto \
-    --without-xsltproc \
-    --without-fop
+build() {
+  arch-meson "$pkgname" build
+  ninja -C build
+}
 
-  msg2 "Starting make..."
-  make
+check() {
+  meson test -C build
 }
 
 package() {
-  cd $_pkgname
-
-  msg2 "Starting make install..."
-  make DESTDIR="$pkgdir" install
-
-  for i in COPYING*; do
-    install -Dm644 $i "$pkgdir"/usr/share/licenses/$_pkgname/$i
-  done
-
-  # Cleanup
-  rm -f "$pkgdir"/usr/include/X11/extensions/{apple,windows}*
-  rm -f "$pkgdir"/usr/share/licenses/$_pkgname/COPYING-{apple,windows}wmproto
-  rm -f "$pkgdir"/usr/share/pkgconfig/{apple,windows}wmproto.pc
+  DESTDIR="$pkgdir" ninja -C build install
+
+  # missing docs
+  install -m755 -d "${pkgdir}/usr/share/doc/${pkgname}"
+  install -m644 "$pkgname"/*.txt "${pkgdir}/usr/share/doc/${pkgname}/"
+  install -m644 "$pkgname"/PM_spec "${pkgdir}/usr/share/doc/${pkgname}/"
+  rm "${pkgdir}"/usr/share/doc/${pkgname}/meson_options.txt
+
+  # licenses
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 "${pkgname}"/COPYING* "${pkgdir}/usr/share/licenses/${pkgname}/"
+  # remove licences of legacy stuff we don't ship anymore
+  rm -f "${pkgdir}"/usr/share/licenses/${pkgname}/COPYING-{evieproto,fontcacheproto,lg3dproto,printproto,xcalibrateproto,xf86rushproto}
+
+  # cleanup
+  rm -f "${pkgdir}"/usr/include/X11/extensions/apple*
+  rm -f "${pkgdir}"/usr/share/licenses/${pkgname}/COPYING-{apple,windows}wmproto
+  rm -f "${pkgdir}"/usr/share/pkgconfig/applewmproto.pc
 }