Match latest upstream changes and fix build

2 files changed, 34 insertions, 57 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7d3a1f334d94..77585156e3e9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,35 +1,30 @@
 pkgbase = intel-graphics-compiler-git
 	pkgdesc = Intel Graphics Compiler for OpenCL (git version)
-	pkgver = 1.0.8173.r179.ga939ee8ef
+	pkgver = 1.0.11222.r136.g2ea7d9f58
 	pkgrel = 1
 	epoch = 1
 	url = https://github.com/intel/intel-graphics-compiler/
 	arch = x86_64
 	license = MIT
-	license = custom
 	makedepends = git
 	makedepends = cmake
+	makedepends = clang
+	makedepends = lld
+	makedepends = llvm
 	makedepends = python
-	depends = libxml2
+	makedepends = libunwind
+	makedepends = spirv-headers
+	makedepends = vc-intrinsics
+	depends = llvm-libs
+	depends = intel-opencl-clang
+	depends = ncurses
+	depends = spirv-tools
 	depends = zlib
 	provides = intel-graphics-compiler
-	provides = spirv-llvm-translator
-	provides = intel-opencl-clang
 	conflicts = intel-graphics-compiler
-	conflicts = spirv-llvm-translator
-	conflicts = intel-opencl-clang
 	options = !emptydirs
+	options = !lto
 	source = git+https://github.com/intel/intel-graphics-compiler.git
-	source = git+https://github.com/intel/vc-intrinsics.git
-	source = git+https://github.com/KhronosGroup/SPIRV-LLVM-Translator.git#branch=llvm_release_100
-	source = git+https://github.com/intel/opencl-clang.git#branch=ocl-open-100
-	source = git+https://github.com/llvm/llvm-project.git#tag=llvmorg-10.0.0
-	source = 010-intel-graphics-compiler-missing-limits-header.patch::https://github.com/intel/intel-graphics-compiler/commit/8e1a461d3e6b85a6cf018caf6abf4a3ba9a1758d.patch
 	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = d943a3d56ae62bde12caf133ab171777b4a73ee50a8d07449831ffc57e73e514
 
 pkgname = intel-graphics-compiler-git
diff --git a/PKGBUILD b/PKGBUILD
index 876338640e67..0fff56b17842 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,65 +1,47 @@
 # Maintainer: Daniel Bermond <dbermond@archlinux.org>
 
 pkgname=intel-graphics-compiler-git
-pkgver=1.0.8173.r179.ga939ee8ef
+pkgver=1.0.11222.r136.g2ea7d9f58
 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' 'custom')
-depends=('libxml2' 'zlib')
-makedepends=('git' 'cmake' 'python')
-provides=('intel-graphics-compiler' 'spirv-llvm-translator' 'intel-opencl-clang')
-conflicts=('intel-graphics-compiler' 'spirv-llvm-translator' 'intel-opencl-clang')
-options=('!emptydirs')
-source=('git+https://github.com/intel/intel-graphics-compiler.git'
-        'git+https://github.com/intel/vc-intrinsics.git'
-        'git+https://github.com/KhronosGroup/SPIRV-LLVM-Translator.git#branch=llvm_release_100'
-        'git+https://github.com/intel/opencl-clang.git#branch=ocl-open-100'
-        'git+https://github.com/llvm/llvm-project.git#tag=llvmorg-10.0.0'
-        '010-intel-graphics-compiler-missing-limits-header.patch'::'https://github.com/intel/intel-graphics-compiler/commit/8e1a461d3e6b85a6cf018caf6abf4a3ba9a1758d.patch')
-sha256sums=('SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'd943a3d56ae62bde12caf133ab171777b4a73ee50a8d07449831ffc57e73e514')
-
-prepare() {
-    ln -sf intel-graphics-compiler igc
-    ln -sf ../../../SPIRV-LLVM-Translator llvm-project/llvm/projects/llvm-spirv
-    ln -sf ../../../opencl-clang llvm-project/llvm/projects/opencl-clang
-    
-    patch -d intel-graphics-compiler -Np1 -i "${srcdir}/010-intel-graphics-compiler-missing-limits-header.patch"
-}
+license=('MIT')
+depends=('llvm-libs' 'intel-opencl-clang' 'ncurses' 'spirv-tools' 'zlib')
+makedepends=('git' 'cmake' 'clang' 'lld' 'llvm' 'python' 'libunwind' 'spirv-headers' 'vc-intrinsics')
+provides=('intel-graphics-compiler')
+conflicts=('intel-graphics-compiler')
+options=('!emptydirs' '!lto')
+source=('git+https://github.com/intel/intel-graphics-compiler.git')
+sha256sums=('SKIP')
 
 pkgver() {
     git -C intel-graphics-compiler describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^igc\.//'
 }
 
 build() {
-    cmake -B build -S igc \
+    cmake -B build -S intel-graphics-compiler \
         -DCMAKE_BUILD_TYPE='Release' \
         -DCMAKE_INSTALL_PREFIX='/usr' \
+        -DCMAKE_INSTALL_LIBDIR='lib' \
         -DIGC_OPTION__ARCHITECTURE_TARGET='Linux64' \
+        -DIGC_OPTION__CLANG_MODE='Prebuilds' \
+        -DIGC_OPTION__LLD_MODE='Prebuilds' \
+        -DIGC_OPTION__LLVM_PREFERRED_VERSION="$(clang --version | awk 'NR == 1 { print $3 }')" \
+        -DIGC_OPTION__LLVM_MODE='Prebuilds' \
+        -DIGC_OPTION__LINK_KHRONOS_SPIRV_TRANSLATOR='ON' \
+        -DIGC_OPTION__USE_PREINSTALLED_SPRIV_HEADERS='ON' \
+        -DIGC_OPTION__SPIRV_TOOLS_MODE='Prebuilds' \
+        -DIGC_OPTION__SPIRV_TRANSLATOR_MODE='Prebuilds' \
+        -DIGC_OPTION__VC_INTRINSICS_MODE='Prebuilds' \
         -DINSTALL_GENX_IR='ON' \
-        -DCCLANG_FROM_SYSTEM='OFF' \
         -Wno-dev
     make -C build
 }
 
 package() {
-    make -C build DESTDIR="${pkgdir}" install
-    install -D -m644 igc/LICENSE.md -t "${pkgdir}/usr/share/licenses/${pkgname}"
-    mv "${pkgdir}/usr/include"/opencl-c{,-base}.h "${pkgdir}/usr/include/igc"
+    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}"
-    
-    # additional files for spirv-llvm-translator and opencl-clang
-    cp -dr --no-preserve='ownership' build/IGC/VectorCompiler/spirv-install/include/LLVMSPIRVLib "${pkgdir}/usr/include"
-    install -D -m644 build/IGC/VectorCompiler/spirv-install/lib/pkgconfig/*.pc -t "${pkgdir}/usr/lib/pkgconfig"
-    install -D -m644 build/IGC/llvm-deps/src/llvm/projects/opencl-clang/common_clang.h -t "${pkgdir}/usr/include/cclang"
-    install -D -m644 SPIRV-LLVM-Translator/LICENSE.TXT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-spirv-llvm-translator"
-    install -D -m644 opencl-clang/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-opencl-clang"
-    sed -i 's|\(prefix=\).*|\1/usr|' "${pkgdir}/usr/lib/pkgconfig/LLVMSPIRVLib.pc"
 }