Match latest upstream changes

2 files changed, 18 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c8aad442b84c..f9dbb694c7d2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = intel-graphics-compiler-git
 	pkgdesc = Intel Graphics Compiler for OpenCL (git version)
-	pkgver = 1.0.4155.r113.g036fb054
+	pkgver = 1.0.4361.r125.ga3bf2c5b
 	pkgrel = 1
 	epoch = 1
 	url = https://github.com/intel/intel-graphics-compiler/
@@ -10,17 +10,20 @@ pkgbase = intel-graphics-compiler-git
 	makedepends = cmake
 	makedepends = clang
 	makedepends = llvm
-	makedepends = zlib
 	makedepends = python
 	depends = llvm-libs
 	depends = intel-opencl-clang
+	depends = ncurses
+	depends = zlib
 	provides = intel-graphics-compiler
 	conflicts = intel-graphics-compiler
 	options = !emptydirs
 	source = git+https://github.com/intel/intel-graphics-compiler.git
-	source = 010-igc-gcc10-fix.patch::https://github.com/intel/intel-graphics-compiler/commit/f4efb15429bdaca0122640ae63042a8950b491df.patch
+	source = git+https://github.com/intel/vc-intrinsics.git
+	source = git+https://github.com/KhronosGroup/SPIRV-LLVM-Translator.git
+	sha256sums = SKIP
+	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = dd9fb728757a83f9d61770b77b4a17685dade697767a37826c8dc1e8fa78728c
 
 pkgname = intel-graphics-compiler-git
 
diff --git a/PKGBUILD b/PKGBUILD
index e16fd3dd568e..d0d452870af0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,24 @@
 # Maintainer: Daniel Bermond <dbermond@archlinux.org>
 
 pkgname=intel-graphics-compiler-git
-pkgver=1.0.4155.r113.g036fb054
+pkgver=1.0.4361.r125.ga3bf2c5b
 pkgrel=1
 epoch=1
 pkgdesc='Intel Graphics Compiler for OpenCL (git version)'
 arch=('x86_64')
 url='https://github.com/intel/intel-graphics-compiler/'
 license=('MIT')
-depends=('llvm-libs' 'intel-opencl-clang')
-makedepends=('git' 'cmake' 'clang' 'llvm' 'zlib' 'python')
+depends=('llvm-libs' 'intel-opencl-clang' 'ncurses' 'zlib')
+makedepends=('git' 'cmake' 'clang' 'llvm' 'python')
 provides=('intel-graphics-compiler')
 conflicts=('intel-graphics-compiler')
 options=('!emptydirs')
 source=('git+https://github.com/intel/intel-graphics-compiler.git'
-        '010-igc-gcc10-fix.patch'::'https://github.com/intel/intel-graphics-compiler/commit/f4efb15429bdaca0122640ae63042a8950b491df.patch')
+        'git+https://github.com/intel/vc-intrinsics.git'
+        'git+https://github.com/KhronosGroup/SPIRV-LLVM-Translator.git')
 sha256sums=('SKIP'
-            'dd9fb728757a83f9d61770b77b4a17685dade697767a37826c8dc1e8fa78728c')
-
-prepare() {
-    patch -d intel-graphics-compiler -Np1 -i "${srcdir}/010-igc-gcc10-fix.patch"
-}
+            'SKIP'
+            'SKIP')
 
 pkgver() {
     git -C intel-graphics-compiler describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^igc\.//'
@@ -31,7 +29,9 @@ build() {
         -DCMAKE_BUILD_TYPE='Release' \
         -DCMAKE_INSTALL_PREFIX='/usr' \
         -DIGC_OPTION__ARCHITECTURE_TARGET='Linux64' \
-        -DIGC_PREFERRED_LLVM_VERSION='10.0.0' \
+        -DIGC_PREFERRED_LLVM_VERSION='10.0.1' \
+        -DVC_INTRINSICS_SRC="${srcdir}/vc-intrinsics" \
+        -DSPIRV_SRC="${srcdir}/SPIRV-LLVM-Translator" \
         -DINSTALL_GENX_IR='ON' \
         -Wno-dev
     make -C build
@@ -40,4 +40,5 @@ build() {
 package() {
     make -C build DESTDIR="$pkgdir" install
     install -D -m644 intel-graphics-compiler/LICENSE.md -t "${pkgdir}/usr/share/licenses/${pkgname}"
+    mv "${pkgdir}/usr/lib/igc/NOTICES.txt" "${pkgdir}/usr/share/licenses/${pkgname}"
 }