New upstream 20.26.17199, needs new gmm/igc

2 files changed, 44 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 23d5e339d933..db65008427c7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,25 @@
-# Generated by mksrcinfo v8
-# Fri Dec 28 07:20:42 UTC 2018
 pkgbase = intel-opencl-runtime
-	pkgdesc = OpenCL runtime for Intel Core and Xeon processors
-	pkgver = 18.1.0.013
-	pkgrel = 2
+	pkgdesc = OpenCL runtime for Intel processors
+	pkgver = 20.26.17199
+	pkgrel = 1
 	epoch = 1
 	url = https://software.intel.com/en-us/articles/opencl-drivers#latest_CPU_runtime
 	arch = x86_64
-	license = custom:intel
+	license = MIT
+	makedepends = debtap
 	depends = numactl
 	depends = intel-tbb
 	depends = zlib
-	depends = ncurses5-compat-libs
+	depends = ncurses
+	depends = intel-gmmlib
 	optdepends = intel-opencl-sdk: Intel SDK for OpenCL Applications
 	provides = opencl-intel
 	provides = opencl-driver
-	source = http://registrationcenter-download.intel.com/akdlm/irc_nas/13793/l_opencl_p_18.1.0.013.tgz
-	sha256sums = 208806279b0b9219ca6a17c64cbe0e4a3876a8b5d3f172bf296d85c0f1c74126
+	conflicts = intel-compute-sdk
+	source = https://github.com/intel/compute-runtime/releases/download/20.26.17199/intel-opencl_20.26.17199_amd64.deb
+	source = https://github.com/intel/compute-runtime/releases/download/20.26.17199/intel-ocloc_20.26.17199_amd64.deb
+	sha256sums = 752c08c9e9703c6ab065de10103b0b1c0c2ce29c8038da25e6734f6f72de555b
+	sha256sums = b0887fad48d67a4a5b0afa1da98f3b6bef686fbf75d47c5f0f4a1da232dce7a3
 
 pkgname = intel-opencl-runtime
 
diff --git a/PKGBUILD b/PKGBUILD
index 4cfd61174c3a..e6d4b91b97bb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,47 @@
-# Maintainer: ava1ar <mail@ava1ar.me>
+# Maintainer: Nick Black <nickblack@linux.com>
+# Contributor: ava1ar <mail@ava1ar.me>
 # Contributor: Duong Pham <dthpham@gmail.com>
 # Contributor: Eric Quackenbush <mail@ericquackenbush.com>
 # Contributor: Wei-Ning Huang <aitjcize@gmail.com>
 
 pkgname=intel-opencl-runtime
 epoch=1
-pkgver=18.1.0.013
-_package=l_opencl_p_${pkgver}
-pkgrel=2
-pkgdesc="OpenCL runtime for Intel Core and Xeon processors"
+pkgver=20.26.17199
+pkgrel=1
+pkgdesc="OpenCL runtime for Intel processors"
 arch=('x86_64')
 url="https://software.intel.com/en-us/articles/opencl-drivers#latest_CPU_runtime"
-license=('custom:intel')
-depends=('numactl' 'intel-tbb' 'zlib' 'ncurses5-compat-libs')
+license=('MIT')
+depends=('numactl' 'intel-tbb' 'zlib' 'ncurses' 'intel-gmmlib')
 optdepends=('intel-opencl-sdk: Intel SDK for OpenCL Applications')
+makedepends=('debtap')
 provides=('opencl-intel' 'opencl-driver')
-source=(http://registrationcenter-download.intel.com/akdlm/irc_nas/13793/${_package}.tgz)
-sha256sums=('208806279b0b9219ca6a17c64cbe0e4a3876a8b5d3f172bf296d85c0f1c74126')
+conflicts=('intel-compute-sdk')
+source=("https://github.com/intel/compute-runtime/releases/download/${pkgver}/intel-opencl_${pkgver}_amd64.deb"
+        "https://github.com/intel/compute-runtime/releases/download/20.26.17199/intel-ocloc_20.26.17199_amd64.deb"
+)
 
 package() {
-    cd "${srcdir}"/${_package}/
+    cd "${srcdir}"
 
-    # Copy license
-    install -Dm644 license.txt "${pkgdir}"/usr/share/licenses/intel-opencl-runtime/license
+    for i in *deb ; do
+      echo "Unpacking $i to $(basename -s deb $i)..."
+      mkdir -p $(basename -s deb $i)
+      pushd $(basename -s deb $i) > /dev/null
+      ar x ../$i
+      tar xJf data.tar.xz -C ${pkgdir}
+      popd > /dev/null
+    done
 
-    # Unpack RPM
-    rm rpm/intel-openclrt-pset-*.rpm
-    for i in rpm/*.rpm; do bsdtar -xf "$i"; done
-
-    # Register ICD
-    mkdir -p "${pkgdir}/etc/OpenCL/vendors"
-    echo "/opt/intel/opencl-runtime/linux/compiler/lib/intel64_lin/libintelocl.so" > "${pkgdir}/etc/OpenCL/vendors/intel.icd"
-
-    # Install files
-    mkdir -p "${pkgdir}/opt/intel/opencl-runtime"
-    cp -r opt/intel/opencl_*/* "${pkgdir}/opt/intel/opencl-runtime"
+    sed -i -e 's/\/local\//\//g' ${pkgdir}/etc/OpenCL/vendors/intel.icd
+    for i in bin include lib ; do
+      [ ! -e ${pkgdir}/usr/$i ] || { echo "${pkgdir}/usr/$i already exists, aborting" >&2 ; return 1; }
+      mv ${pkgdir}/usr/local/$i ${pkgdir}/usr/$i
+    done
+    ls -lR ${pkgdir}/usr/local/
+    rmdir ${pkgdir}/usr/local/
 }
+
+sha256sums=('752c08c9e9703c6ab065de10103b0b1c0c2ce29c8038da25e6734f6f72de555b'
+            'b0887fad48d67a4a5b0afa1da98f3b6bef686fbf75d47c5f0f4a1da232dce7a3'
+)