git: 1f5b63db91a8 - main - devel/intel-graphics-compiler: switch 0b8840600bb3 to upstream version

The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1f5b63db91a8cc1b13fc9d464cc8e97c699c39fd

commit 1f5b63db91a8cc1b13fc9d464cc8e97c699c39fd
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2022-02-23 23:54:23 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2022-02-24 00:51:34 +0000

    devel/intel-graphics-compiler: switch 0b8840600bb3 to upstream version
---
 devel/intel-graphics-compiler/Makefile              |  4 +++-
 devel/intel-graphics-compiler/distinfo              |  2 ++
 .../files/patch-system-vc-intrinsics                | 21 ---------------------
 3 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/devel/intel-graphics-compiler/Makefile b/devel/intel-graphics-compiler/Makefile
index 2c4b1437810d..3c592dd465d1 100644
--- a/devel/intel-graphics-compiler/Makefile
+++ b/devel/intel-graphics-compiler/Makefile
@@ -6,6 +6,7 @@ PKGNAMESUFFIX=	-${FLAVOR}
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	aa7df33aebe0.patch:-p1 # https://github.com/intel/intel-graphics-compiler/pull/210
+PATCHFILES+=	35c947c2631e.patch:-p1 # https://github.com/intel/intel-graphics-compiler/issues/142
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Intel Graphics Compiler for OpenCL
@@ -32,7 +33,8 @@ GH_ACCOUNT=	intel
 GH_TUPLE=	KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-123-g814e728:headers/../SPIRV-Headers \
 		KhronosGroup:SPIRV-Tools:v2021.4:tools/../SPIRV-Tools
 CMAKE_ARGS=	-DCMAKE_PREFIX_PATH:PATH="${LOCALBASE}/${FLAVOR}" \
-		-DIGC_OPTION__LLVM_PREFERRED_VERSION:STRING="${FLAVOR:S/llvm//}"
+		-DIGC_OPTION__LLVM_PREFERRED_VERSION:STRING="${FLAVOR:S/llvm//}" \
+		-DIGC_OPTION__VC_INTRINSICS_MODE:STRING=Prebuilds
 CFLAGS+=	-Wno-macro-redefined # __fastcall
 PLIST_SUB=	ARCH_SUFX=${ARCH:S/i386/32/:S/amd//:S/x86_//}
 
diff --git a/devel/intel-graphics-compiler/distinfo b/devel/intel-graphics-compiler/distinfo
index b593827831ab..ee91257b8635 100644
--- a/devel/intel-graphics-compiler/distinfo
+++ b/devel/intel-graphics-compiler/distinfo
@@ -7,3 +7,5 @@ SHA256 (KhronosGroup-SPIRV-Tools-v2021.4_GH0.tar.gz) = d68de260708dda785d109ff1c
 SIZE (KhronosGroup-SPIRV-Tools-v2021.4_GH0.tar.gz) = 2887505
 SHA256 (aa7df33aebe0.patch) = b2da1a00ac59ce7e98fd6cfb554f8974b1500bc1b9973387181414ffa4cffea5
 SIZE (aa7df33aebe0.patch) = 2242
+SHA256 (35c947c2631e.patch) = fea59a67ebba1debed6d4948139184ba8677989c1b966794ac60161936846153
+SIZE (35c947c2631e.patch) = 3354
diff --git a/devel/intel-graphics-compiler/files/patch-system-vc-intrinsics b/devel/intel-graphics-compiler/files/patch-system-vc-intrinsics
deleted file mode 100644
index 9aed7b874894..000000000000
--- a/devel/intel-graphics-compiler/files/patch-system-vc-intrinsics
+++ /dev/null
@@ -1,21 +0,0 @@
-https://git.yoctoproject.org/cgit/cgit.cgi/meta-intel/tree/dynamic-layers/clang-layer/recipes-opencl/igc/files/link-to-LLVMGenXIntrinsics.patch
-
---- IGC/VectorCompiler/CMakeLists.txt.orig	2021-07-18 10:00:28 UTC
-+++ IGC/VectorCompiler/CMakeLists.txt
-@@ -44,6 +44,8 @@ endif()
- 
- # --- VC Intrinsics ---
- 
-+find_package(LLVMGenXIntrinsics)
-+if(NOT LLVMGenXIntrinsics_FOUND)
- if(DEFINED VC_INTRINSICS_SRC)
-   set(INTRSRC "${VC_INTRINSICS_SRC}/GenXIntrinsics")
- endif()
-@@ -58,6 +61,7 @@ set(BUILD_EXTERNAL YES)
- # We are using prebuilt SPIRV and building intrinsics.
- set(INTRBUILD "${CMAKE_CURRENT_BINARY_DIR}/intrbuild")
- add_subdirectory(${INTRSRC} ${INTRBUILD} EXCLUDE_FROM_ALL)
-+endif(NOT LLVMGenXIntrinsics_FOUND)
- 
- include(cmake/spirv.cmake)
-