update to 2021.1.1

2 files changed, 34 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 65a15f26aeed..bdef87e853e8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,21 @@
 pkgbase = intel-cpu-runtime
 	pkgdesc = Intel(R) CPU Runtime for OpenCL(TM) Applications
-	pkgver = 18.1.0.015
-	pkgrel = 1
-	url = https://software.intel.com/content/www/us/en/develop/articles/opencl-drivers.html#cpu-section
+	pkgver = 2021.1.1
+	pkgrel = 189
+	url = https://software.intel.com/content/www/us/en/develop/articles/opencl-runtime-release-notes.html
 	arch = x86_64
 	license = custom
 	depends = libxml2
-	depends = numactl
 	depends = tbb
-	depends = ncurses5-compat-libs
+	depends = hwloc
 	provides = opencl-intel
 	provides = opencl-driver
-	source = https://registrationcenter-download.intel.com/akdlm/irc_nas/vcp/15532/l_opencl_p_18.1.0.015.tgz
-	sha512sums = 8c00163df272fd6e93c249501b06e4c1de0c994c8e23426705a1c6dc4131fb06e691e98962455f386b26cbf3a21fff3042d6f1a783b97433aa5a7951c007bb36
+	noextract = intel-oneapi-runtime-tbb-2021.1.1-119_amd64.deb
+	noextract = intel-oneapi-runtime-opencl-2021.1.1-189_amd64.deb
+	source = https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-tbb-2021.1.1-119_amd64.deb
+	source = https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-opencl-2021.1.1-189_amd64.deb
+	sha256sums = SKIP
+	sha256sums = SKIP
 
 pkgname = intel-cpu-runtime
 
diff --git a/PKGBUILD b/PKGBUILD
index 4e80c03cfb31..735142452dd7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,41 @@
 # Maintainer: Jack Chen <redchenjs@live.com>
 
 pkgname=intel-cpu-runtime
-pkgver=18.1.0.015
-pkgrel=1
+_pkgver=2021.1.1
+pkgver=2021.1.1
+_pkgrel=119
+pkgrel=189
 pkgdesc="Intel(R) CPU Runtime for OpenCL(TM) Applications"
 arch=('x86_64')
-url="https://software.intel.com/content/www/us/en/develop/articles/opencl-drivers.html#cpu-section"
+url="https://software.intel.com/content/www/us/en/develop/articles/opencl-runtime-release-notes.html"
 license=('custom')
-depends=('libxml2' 'numactl' 'tbb' 'ncurses5-compat-libs')
+depends=('libxml2' 'tbb' 'hwloc')
 provides=('opencl-intel' 'opencl-driver')
-source=("https://registrationcenter-download.intel.com/akdlm/irc_nas/vcp/15532/l_opencl_p_$pkgver.tgz")
-sha512sums=('8c00163df272fd6e93c249501b06e4c1de0c994c8e23426705a1c6dc4131fb06e691e98962455f386b26cbf3a21fff3042d6f1a783b97433aa5a7951c007bb36')
+source=(
+  "https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-tbb-${_pkgver}-${_pkgrel}_amd64.deb"
+  "https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-opencl-${pkgver}-${pkgrel}_amd64.deb"
+)
+sha256sums=(
+  'SKIP'
+  'SKIP'
+)
+noextract=("${source[@]##*/}")
 
 package() {
-  cd "$srcdir/l_opencl_p_$pkgver"
+  cd "$srcdir"
 
-  bsdtar -xf "rpm/intel-openclrt-$pkgver-"*.rpm
+  ar x "intel-oneapi-runtime-tbb-${_pkgver}-${_pkgrel}_amd64.deb"
+  tar -xf data.tar.xz -C "$pkgdir/"
 
-  install -dm755 "$pkgdir/opt"
-  cp -r "opt/intel/opencl_compilers_and_libraries_$pkgver" "$pkgdir/opt/intel-cpu-runtime"
+  ar x "intel-oneapi-runtime-opencl-${pkgver}-${pkgrel}_amd64.deb"
+  tar -xf data.tar.xz -C "$pkgdir/"
 
   install -dm755 "$pkgdir/usr/share/licenses/$pkgname"
-  ln -s /opt/intel-cpu-runtime/licensing/* "$pkgdir/usr/share/licenses/$pkgname/"
+  cp "$pkgdir/opt/intel/oneapi/lib/licensing/opencl/"* "$pkgdir/usr/share/licenses/$pkgname/"
 
   install -dm755 "$pkgdir/etc/OpenCL/vendors"
-  ln -s /opt/intel-cpu-runtime/linux/etc/intel64.icd "$pkgdir/etc/OpenCL/vendors/intel64.icd"
+  echo '/opt/intel/oneapi/lib/intel64/libintelocl.so' > "$pkgdir/etc/OpenCL/vendors/intel64.icd"
 
-  sed -i 's|<INSTALLDIR>|/opt/intel-cpu-runtime|g' "$pkgdir/opt/intel-cpu-runtime/linux/etc/intel64.icd"
+  rm -rf "$pkgdir/opt/intel/oneapi/lib/etc"
+  rm -rf "$pkgdir/opt/intel/oneapi/lib/licensing"
 }