update and cleanup

2 files changed, 19 insertions, 51 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1e73916a371a..a1045194b385 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Mar 17 02:03:07 UTC 2016
+# Sat Apr 30 17:19:35 UTC 2016
 pkgbase = beignet
 	pkgdesc = A GPGPU System for Intel Ivybridge GPUs
-	pkgver = 1.1.1
-	pkgrel = 6
+	pkgver = 1.1.2
+	pkgrel = 1
 	url = http://cgit.freedesktop.org/beignet/
 	arch = x86_64
 	license = LGPL2.1
@@ -16,29 +16,13 @@ pkgbase = beignet
 	depends = mesa
 	depends = ncurses
 	depends = ocl-icd
+	depends = opencl-headers
 	depends = llvm
 	provides = opencl-intel
-	provides = opencl-headers
-	provides = opencl-headers12
 	conflicts = opencl-intel
-	conflicts = opencl-headers
-	conflicts = opencl-headers12
-	replaces = opencl-intel
-	replaces = opencl-headers
-	replaces = opencl-headers12
-	source = https://01.org/sites/default/files/beignet-1.1.1-source.tar.gz
-	source = llvm-3.7-patch-1.patch
-	source = llvm-3.7-patch-2.patch
-	source = llvm-3.7-patch-3.patch
-	source = llvm-3.7-patch-4.patch
-	source = llvm-3.7-patch-5.patch
+	source = https://01.org/sites/default/files/beignet-1.1.2-source.tar.gz
 	source = isnan.patch
-	sha256sums = 9bf4c69eb4fbd3c7cc9ef75c1952bca6f05259ffbe753a27e08ed98bb32e1119
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
+	sha256sums = 6a8d875afbb5e3c4fc57da1ea80f79abadd9136bfd87ab1f83c02784659f1d96
 	sha256sums = SKIP
 
 pkgname = beignet
diff --git a/PKGBUILD b/PKGBUILD
index f1321200d6ca..41a06f9baec2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,46 +1,30 @@
 # Original Maintainer: Antoine Lubineau <antoine@lubignon.info>
 # Current Maintainer: Leopold Bloom <blinxwang@gmail.com>
 pkgname=beignet
-pkgver=1.1.1
-pkgrel=6
+pkgver=1.1.2
+pkgrel=1
 pkgdesc='A GPGPU System for Intel Ivybridge GPUs'
 arch=('x86_64')
 url='http://cgit.freedesktop.org/beignet/'
 license=('LGPL2.1')
-depends=('glu' 'libsm' 'libxext' 'mesa' 'ncurses' 'ocl-icd' 'llvm')
+depends=('glu' 'libsm' 'libxext' 'mesa' 'ncurses' 'ocl-icd' 'opencl-headers' 'llvm')
 makedepends=('clang' 'cmake' 'python2')
-provides=('opencl-intel' 'opencl-headers' 'opencl-headers12')
-conflicts=('opencl-intel' 'opencl-headers' 'opencl-headers12')
-replaces=('opencl-intel' 'opencl-headers' 'opencl-headers12')
+provides=('opencl-intel')
+conflicts=('opencl-intel')
 source=("https://01.org/sites/default/files/beignet-$pkgver-source.tar.gz"
-	"llvm-3.7-patch-1.patch"
-	"llvm-3.7-patch-2.patch"
-	"llvm-3.7-patch-3.patch"
-	"llvm-3.7-patch-4.patch"
-	"llvm-3.7-patch-5.patch"
 	"isnan.patch")
-sha256sums=('9bf4c69eb4fbd3c7cc9ef75c1952bca6f05259ffbe753a27e08ed98bb32e1119'
-	    'SKIP'
-	    'SKIP'
-	    'SKIP'
-	    'SKIP'
-	    'SKIP'
+sha256sums=('6a8d875afbb5e3c4fc57da1ea80f79abadd9136bfd87ab1f83c02784659f1d96'
 	    'SKIP')
-
-build() {
-	cp llvm-3.7-patch-1.patch "$srcdir/Beignet-$pkgver-Source"
-	cp llvm-3.7-patch-2.patch "$srcdir/Beignet-$pkgver-Source"
-	cp llvm-3.7-patch-3.patch "$srcdir/Beignet-$pkgver-Source"
-	cp llvm-3.7-patch-4.patch "$srcdir/Beignet-$pkgver-Source"
-	cp llvm-3.7-patch-5.patch "$srcdir/Beignet-$pkgver-Source"
+prepare() {
 	cp isnan.patch "$srcdir/Beignet-$pkgver-Source"
 	cd "$srcdir/Beignet-$pkgver-Source"
-	patch -Np1 -i llvm-3.7-patch-1.patch
-	patch -Np1 -i llvm-3.7-patch-2.patch
-	patch -Np1 -i llvm-3.7-patch-3.patch
-	patch -Np1 -i llvm-3.7-patch-4.patch
-	patch -Np1 -i llvm-3.7-patch-5.patch
 	patch -Np1 -i isnan.patch
+	cd "include/CL"
+	rm {opencl.h,cl_platform.h,cl_gl_ext.h,cl.h,cl.hpp,cl_egl.h,cl_ext.h,cl_gl.h}
+	touch dummy.hpp
+}
+
+build() {
 	mkdir -p "$srcdir/Beignet-$pkgver-Source/build"
 	cd "$srcdir/Beignet-$pkgver-Source/build"
 	cmake .. \