upgpkg: beignet 1.2.1-1

upstream release

3 files changed, 11 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0f276ff3e04f..89e51a27adfa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,13 @@
 pkgbase = beignet
 	pkgdesc = A GPGPU System for Intel Ivybridge GPUs
-	pkgver = 1.2.0
-	pkgrel = 3
+	pkgver = 1.2.1
+	pkgrel = 1
 	url = https://01.org/beignet
 	arch = x86_64
 	license = LGPL2.1
 	makedepends = clang
 	makedepends = cmake
-	makedepends = python2
+	makedepends = python
 	depends = glu
 	depends = llvm
 	depends = mesa
@@ -15,10 +15,8 @@ pkgbase = beignet
 	depends = opencl-headers
 	provides = opencl-intel
 	conflicts = opencl-intel
-	source = https://01.org/sites/default/files/beignet-1.2.0-source.tar.gz
-	source = libdrm2471.patch
-	sha256sums = fc7af19efb7596b04510d26c558a576eba3e95e1ef86fd6951213c6a4bf58bff
-	sha256sums = a71ddc57c943f02a73fff24de190f078f0f6864a5c66fd5f859d63ea9d5daf54
+	source = https://01.org/sites/default/files/beignet-1.2.1-source.tar.gz
+	sha256sums = b74eb03534a12b86a896cdbd8209b072c8a38e7af456195793a498428a7ac81f
 
 pkgname = beignet
 
diff --git a/PKGBUILD b/PKGBUILD
index 1b5abf0d84fe..35a635aaee19 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,24 +4,18 @@
 # Contributor: Michal Krenek (a.k.a. Mikos) <m.krenek@gmail.com>
 
 pkgname=beignet
-pkgver=1.2.0
-pkgrel=3
+pkgver=1.2.1
+pkgrel=1
 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' 'opencl-headers')
-makedepends=('clang' 'cmake' 'python2')
+makedepends=('clang' 'cmake' 'python')
 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"
-    patch -p1 < "${srcdir}/libdrm2471.patch"
-}
+source=("https://01.org/sites/default/files/${pkgname}-${pkgver}-source.tar.gz")
+sha256sums=('b74eb03534a12b86a896cdbd8209b072c8a38e7af456195793a498428a7ac81f')
 
 build() {
     mkdir -p "${srcdir}/Beignet-${pkgver}-Source/build"
@@ -29,8 +23,7 @@ build() {
     cmake .. \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DCMAKE_INSTALL_LIBDIR=/usr/lib \
-        -DCMAKE_BUILD_TYPE=RELEASE \
-        -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python2
+        -DCMAKE_BUILD_TYPE=RELEASE
     make
 }
 
diff --git a/libdrm2471.patch b/libdrm2471.patch
deleted file mode 100644
index 232a92fec530..000000000000
--- a/libdrm2471.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/src/intel/intel_driver.c b/src/intel/intel_driver.c
-index f503b55..484346c 100644
---- a/src/intel/intel_driver.c
-+++ b/src/intel/intel_driver.c
-@@ -957,14 +957,14 @@ intel_update_device_info(cl_device_id device)
-
- #ifdef HAS_POOLED_EU
-   /* BXT pooled eu, 3*6 to 2*9, like sub slice count is 2 */
--  unsigned int has_pooled_eu = 0;
--  if(!drm_intel_get_pooled_eu(driver->fd, &has_pooled_eu) && has_pooled_eu)
-+  int has_pooled_eu;
-+  if((has_pooled_eu = drm_intel_get_pooled_eu(driver->fd)) > 0)
-     device->sub_slice_count = 2;
-
- #ifdef HAS_MIN_EU_IN_POOL
--  unsigned int min_eu;
-+  int min_eu;
-   /* for fused down 2x6 devices, beignet don't support. */
--  if (has_pooled_eu && !drm_intel_get_min_eu_in_pool(driver->fd, &min_eu)) {
-+  if (has_pooled_eu > 0 && (min_eu = drm_intel_get_min_eu_in_pool(driver->fd)) > 0) {
-     assert(min_eu == 9); //don't support fuse down device.
-   }
- #endif //HAS_MIN_EU_IN_POOL