Rebased on glmark2

https://aur.archlinux.org/packages/glmark2/

3 files changed, 33 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 62535a50f8db..2988e08f421c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,27 @@
 pkgbase = glmark2-git
-	pkgdesc = OpenGL (ES) 2.0 benchmark (X11, Wayland, DRM)
-	pkgver = r870.b949d5f
+	pkgdesc = An OpenGL 2.0 and ES 2.0 benchmark (X11, Wayland, DRM)
+	pkgver = r960.ca8de51
 	pkgrel = 1
-	url = https://launchpad.net/glmark2
-	arch = i686
+	url = https://github.com/glmark2/glmark2
 	arch = x86_64
-	license = GPL3
-	makedepends = git
-	makedepends = python2
+	arch = aarch64
+	license = GPL
+	license = custom
+	makedepends = meson
+	makedepends = systemd
+	makedepends = wayland-protocols
 	depends = libjpeg-turbo
-	depends = libpng12
+	depends = libpng
 	depends = libx11
-	depends = libxcb
-	depends = wayland
+	depends = mesa
+	depends = systemd-libs
 	depends = libgl
 	depends = libgles
+	depends = wayland
+	depends = egl-wayland
 	provides = glmark2
 	conflicts = glmark2
 	source = glmark2-git::git://github.com/glmark2/glmark2.git
 	md5sums = SKIP
 
 pkgname = glmark2-git
-
diff --git a/PKGBUILD b/PKGBUILD
index f235c6612747..7b7f63d23eff 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,20 @@
 # Maintainer: Ryo Munakata <afpacket@gmail.com>
+# Rebased on glmark2 (https://aur.archlinux.org/packages/glmark2/)
+# Maintainer: Mark Wagie <mark dot wagie at tutanota dot com>
+# Contributor: farseerfc <farseerfc@gmail.com>
 pkgname=glmark2-git
-pkgver=r870.b949d5f
+pkgver=r960.ca8de51
 pkgrel=1
-pkgdesc="OpenGL (ES) 2.0 benchmark (X11, Wayland, DRM)"
-arch=('i686' 'x86_64')
-url="https://launchpad.net/glmark2"
-license=('GPL3')
-depends=('libjpeg-turbo' 'libpng12' 'libx11' 'libxcb' 'wayland' 'libgl' 'libgles')
-makedepends=('git' 'python2')
+pkgdesc="An OpenGL 2.0 and ES 2.0 benchmark (X11, Wayland, DRM)"
+arch=('x86_64' 'aarch64')
+url="https://github.com/glmark2/glmark2"
+license=('GPL' 'custom')
+depends=('libjpeg-turbo' 'libpng' 'libx11' 'mesa' 'systemd-libs' 'libgl' 'libgles' 'wayland' 'egl-wayland')
+makedepends=('meson' 'systemd' 'wayland-protocols')
 conflicts=('glmark2')
 provides=('glmark2')
-source=(
-    "$pkgname"::'git://github.com/glmark2/glmark2.git'
-    )
-md5sums=(
-    'SKIP'
-    )
+source=("$pkgname"::'git://github.com/glmark2/glmark2.git')
+md5sums=('SKIP')
 
 # GLMARK2 features
 GM2_FLAVORS="x11-gl,x11-glesv2,wayland-gl,wayland-glesv2,drm-gl,drm-glesv2"
@@ -25,19 +24,15 @@ pkgver() {
     printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
-prepare() {
-    cd "${srcdir}/${pkgname}"
-}
-
 build() {
-    cd "${srcdir}/${pkgname}"
-    python2 ./waf configure \
-        --prefix=/usr \
-        --with-flavors=${GM2_FLAVORS}
-    python2 ./waf -j4
+    pwd
+    arch-meson "$pkgname" build -Dflavors=${GM2_FLAVORS}
+    meson compile -C build
 }
 
 package() {
-    cd "${srcdir}/${pkgname}"
-    DESTDIR="${pkgdir}" python2 ./waf install
+    DESTDIR="$pkgdir" meson install -C build
+
+    cd "$pkgname"
+    install -Dm644 COPYING.SGI -t "$pkgdir/usr/share/licenses/$pkgname"
 }
diff --git a/unfuck.patch b/unfuck.patch
deleted file mode 100644
index 572573eaa9bd..000000000000
--- a/unfuck.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/glmark2-git/wscript.orig        2016-05-17 23:18:02.468475747 +0200
-+++ src/glmark2-git/wscript     2016-05-17 23:18:25.791307210 +0200
-@@ -90,7 +90,7 @@
-         ctx.check_cxx(lib = lib, uselib_store = uselib)
- 
-     # Check required functions
--    req_funcs = [('memset', 'string.h', []) ,('sqrt', 'math.h', ['m'])]
-+    req_funcs = [('memset', 'string.h', [])]
-     for func, header, uselib in req_funcs:
-         ctx.check_cxx(function_name = func, header_name = header,
-                       uselib = uselib, mandatory = True)
\ No newline at end of file