upgpkg: pixman-git 0.42.2.r26.g7883ab8-1

2 files changed, 51 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 05248413cc86..02ac7fe2896d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,20 @@
 pkgbase = pixman-git
-	pkgdesc = The pixel-manipulation library for X and cairo
-	pkgver = pixman+0.38.4+11+gfd5c0da
+	pkgdesc = Library for pixel manipulation
+	pkgver = 0.42.2.r26.g7883ab8
 	pkgrel = 1
-	url = https://cgit.freedesktop.org/pixman/
+	url = https://www.pixman.org/
+	arch = i686
 	arch = x86_64
-	license = custom
-	makedepends = meson
+	license = MIT
+	makedepends = git
 	makedepends = libpng
+	makedepends = meson
 	depends = glibc
-	provides = pixman
+	provides = pixman=0.42.2.r26.g7883ab8
+	provides = libpixman-1.so
 	conflicts = pixman
-	source = git+https://gitlab.freedesktop.org/pixman/pixman.git
-	sha1sums = SKIP
+	options = staticlibs
+	source = git+https://gitlab.freedesktop.org/pixman/pixman
+	sha256sums = SKIP
 
 pkgname = pixman-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 5028d36272c4..868c168903f1 100755..100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,46 +1,55 @@
-# Maintainer:  Vincent Grande <shoober420@gmail.com>
+# Maintainer: Chocobo1 <chocobo1 AT archlinux DOT net>
+# Previous maintainer:  Vincent Grande <shoober420@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=pixman-git
-pkgver=pixman+0.38.4+11+gfd5c0da
+pkgver=0.42.2.r26.g7883ab8
 pkgrel=1
-pkgdesc="The pixel-manipulation library for X and cairo"
-arch=(x86_64)
-url="https://cgit.freedesktop.org/pixman/"
-license=('custom')
-provides=(pixman)
-conflicts=(pixman)
+pkgdesc="Library for pixel manipulation"
+arch=('i686' 'x86_64')
+url="https://www.pixman.org/"
+license=('MIT')
 depends=('glibc')
-makedepends=('meson' 'libpng')
-source=(git+https://gitlab.freedesktop.org/pixman/pixman.git)
-sha1sums=('SKIP')
+makedepends=('git' 'libpng' 'meson')
+provides=("pixman=$pkgver" 'libpixman-1.so')
+conflicts=('pixman')
+options=('staticlibs')
+source=("git+https://gitlab.freedesktop.org/pixman/pixman")
+sha256sums=('SKIP')
+
 
 pkgver() {
-    cd pixman
-      git describe --tags | sed 's/-/+/g'
-    }
+  cd "pixman"
+
+  _tag=$(git tag -l --sort -v:refname | grep -E '^pixman-[0-9\.]+$' | head -n1)
+  _rev=$(git rev-list --count $_tag..HEAD)
+  _hash=$(git rev-parse --short HEAD)
+  printf "%s.r%s.g%s" "$_tag" "$_rev" "$_hash" | sed 's/^pixman-//'
+}
 
 build() {
-  arch-meson pixman build \
-    -D loongson-mmi=disabled \
-    -D vmx=disabled \
-    -D arm-simd=disabled \
-    -D neon=disabled \
-    -D iwmmxt=disabled \
-    -D mips-dspr2=disabled \
-    -D gtk=disabled
-  ninja $NINJAFLAGS -C build
+  cd "pixman"
+
+  meson setup \
+    --buildtype=plain \
+    --prefix="/usr" \
+    -Ddefault_library="both" \
+    -Dgtk=disabled \
+    "_build"
+  meson compile -C "_build"
 }
 
-#check() {
-#  meson test -C build
-#}
+check() {
+  cd "pixman"
 
-package() {
-  DESTDIR="$pkgdir" meson install -C build
-  install -Dt "$pkgdir/usr/share/licenses/pixman" -m644 pixman/COPYING
+  #meson test -C "_build"
 }
 
-# vim:set et sw=2:
+package() {
+  cd "pixman"
+
+  meson install -C "_build" --destdir "$pkgdir"
+  install -Dm644 "COPYING" -t "$pkgdir/usr/share/licenses/pixman"
+}