git » glmark2-git.git » commit 606afc1

Fix compilation error, thanks to @graysky and @mis

author Ryo Munakata
2016-05-19 00:38:42 UTC
committer Ryo Munakata
2016-05-19 00:40:41 UTC
parent 19b132bd700cd54d80a045a20dc3e6f4e5289331

Fix compilation error, thanks to @graysky and @mis

.SRCINFO +3 -1
PKGBUILD +16 -4
unfuck.patch +11 -0

diff --git a/.SRCINFO b/.SRCINFO
index 593355a..8889f25 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = glmark2-git
 	pkgdesc = OpenGL (ES) 2.0 benchmark (X11, Wayland, DRM)
-	pkgver = r823.e1969fb
+	pkgver = r825.fa71af2
 	pkgrel = 1
 	url = https://launchpad.net/glmark2
 	arch = i686
@@ -17,7 +17,9 @@ pkgbase = glmark2-git
 	provides = glmark2
 	conflicts = glmark2
 	source = glmark2-git::git://github.com/glmark2/glmark2.git
+	source = https://gist.githubusercontent.com/graysky2/83e474d5891cdcd75d8293a47a10b468/raw/892e731ffa98e5901240fbd4127d62c4153eff28/unfuck.patch
 	md5sums = SKIP
+	md5sums = cef375cb34614fbbb26307e06449515d
 
 pkgname = glmark2-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 6c0408c..7834b84 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Ryo Munakata <afpacket@gmail.com>
 pkgname=glmark2-git
-pkgver=r823.e1969fb
+pkgver=r825.fa71af2
 pkgrel=1
 pkgdesc="OpenGL (ES) 2.0 benchmark (X11, Wayland, DRM)"
 arch=('i686' 'x86_64')
@@ -10,8 +10,14 @@ depends=('libjpeg-turbo' 'libpng12' 'libx11' 'libxcb' 'libgl' 'wayland')
 makedepends=('git' 'python2')
 conflicts=('glmark2')
 provides=('glmark2')
-source=("$pkgname"::'git://github.com/glmark2/glmark2.git')
-md5sums=('SKIP')
+source=(
+    "$pkgname"::'git://github.com/glmark2/glmark2.git'
+    "https://gist.githubusercontent.com/graysky2/83e474d5891cdcd75d8293a47a10b468/raw/892e731ffa98e5901240fbd4127d62c4153eff28/unfuck.patch"
+    )
+md5sums=(
+    'SKIP'
+    'cef375cb34614fbbb26307e06449515d'
+    )
 
 # GLMARK2 features
 GM2_FLAVORS="x11-gl,x11-glesv2,wayland-gl,wayland-glesv2,drm-gl,drm-glesv2"
@@ -21,11 +27,17 @@ pkgver() {
     printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
+prepare() {
+    cd "${srcdir}/${pkgname}"
+    patch -i "$srcdir/unfuck.patch"
+}
+
 build() {
     cd "${srcdir}/${pkgname}"
     python2 ./waf configure \
         --prefix=/usr \
-        --with-flavors=${GM2_FLAVORS}
+        --with-flavors=${GM2_FLAVORS} \
+        --no-werror
     python2 ./waf -j4
 }
 
diff --git a/unfuck.patch b/unfuck.patch
new file mode 100644
index 0000000..572573e
--- /dev/null
+++ b/unfuck.patch
@@ -0,0 +1,11 @@
+--- 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