upgpkg: beignet 1.2.0-3

Fix opencl-headers cohabitation.

2 files changed, 19 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a82c407af1c1..0f276ff3e04f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = beignet
 	pkgdesc = A GPGPU System for Intel Ivybridge GPUs
 	pkgver = 1.2.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://01.org/beignet
 	arch = x86_64
 	license = LGPL2.1
@@ -12,12 +12,9 @@ pkgbase = beignet
 	depends = llvm
 	depends = mesa
 	depends = ocl-icd
+	depends = opencl-headers
 	provides = opencl-intel
-	provides = opencl-headers
-	provides = opencl-headers12
 	conflicts = opencl-intel
-	conflicts = opencl-headers
-	conflicts = opencl-headers12
 	source = https://01.org/sites/default/files/beignet-1.2.0-source.tar.gz
 	source = libdrm2471.patch
 	sha256sums = fc7af19efb7596b04510d26c558a576eba3e95e1ef86fd6951213c6a4bf58bff
diff --git a/PKGBUILD b/PKGBUILD
index 7f6806e77b76..1b5abf0d84fe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,38 +5,38 @@
 
 pkgname=beignet
 pkgver=1.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc='A GPGPU System for Intel Ivybridge GPUs'
 arch=('x86_64')
 url="https://01.org/beignet"
 license=('LGPL2.1')
-depends=('glu' 'llvm' 'mesa' 'ocl-icd')
+depends=('glu' 'llvm' 'mesa' 'ocl-icd' 'opencl-headers')
 makedepends=('clang' 'cmake' 'python2')
-provides=('opencl-intel' 'opencl-headers' 'opencl-headers12')
-conflicts=('opencl-intel' 'opencl-headers' 'opencl-headers12')
+provides=('opencl-intel')
+conflicts=('opencl-intel')
 source=("https://01.org/sites/default/files/beignet-${pkgver}-source.tar.gz" 'libdrm2471.patch')
 sha256sums=('fc7af19efb7596b04510d26c558a576eba3e95e1ef86fd6951213c6a4bf58bff'
             'a71ddc57c943f02a73fff24de190f078f0f6864a5c66fd5f859d63ea9d5daf54')
 
 prepare() {
-	cd "${srcdir}/Beignet-${pkgver}-Source"
+    cd "${srcdir}/Beignet-${pkgver}-Source"
     patch -p1 < "${srcdir}/libdrm2471.patch"
-#	cd "${srcdir}/Beignet-${pkgver}-Source/include/CL"
-#	rm cl.h cl.hpp cl_d3d10.h cl_d3d11.h cl_dx9_media_sharing.h cl_egl.h cl_ext.h cl_gl.h cl_gl_ext.h cl_platform.h opencl.h
 }
 
 build() {
-	mkdir -p "${srcdir}/Beignet-${pkgver}-Source/build"
-	cd "${srcdir}/Beignet-${pkgver}-Source/build"
-	cmake .. \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_INSTALL_LIBDIR=/usr/lib \
-		-DCMAKE_BUILD_TYPE=RELEASE \
-		-DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python2
-	make
+    mkdir -p "${srcdir}/Beignet-${pkgver}-Source/build"
+    cd "${srcdir}/Beignet-${pkgver}-Source/build"
+    cmake .. \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+        -DCMAKE_BUILD_TYPE=RELEASE \
+        -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python2
+    make
 }
 
 package() {
-	cd "${srcdir}/Beignet-${pkgver}-Source/build"
-	make DESTDIR="${pkgdir}/" install
+    cd "${srcdir}/Beignet-${pkgver}-Source/build"
+    make DESTDIR="${pkgdir}/" install
+    cd "${pkgdir}/usr/include/CL"
+    rm cl.h cl.hpp cl_egl.h cl_ext.h cl_gl.h cl_gl_ext.h cl_platform.h opencl.h
 }