git: ff26131d838e - main - devel/intel-graphics-compiler: switch to proposed upstream llvm12 fix

The branch main has been updated by jbeich:

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

commit ff26131d838e0f7745580375b4abebb7ed93ea97
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2021-11-26 17:42:45 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2021-11-26 18:37:41 +0000

    devel/intel-graphics-compiler: switch to proposed upstream llvm12 fix
---
 devel/intel-graphics-compiler/Makefile           |  1 +
 devel/intel-graphics-compiler/distinfo           |  2 ++
 devel/intel-graphics-compiler/files/patch-llvm12 | 22 ----------------------
 3 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/devel/intel-graphics-compiler/Makefile b/devel/intel-graphics-compiler/Makefile
index 7ea82934a77e..834397a833db 100644
--- a/devel/intel-graphics-compiler/Makefile
+++ b/devel/intel-graphics-compiler/Makefile
@@ -5,6 +5,7 @@ CATEGORIES=	devel
 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+=	99edbf49d7c9.patch:-p1 # clang
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/devel/intel-graphics-compiler/distinfo b/devel/intel-graphics-compiler/distinfo
index 80773a109b84..c958e9ab3b76 100644
--- a/devel/intel-graphics-compiler/distinfo
+++ b/devel/intel-graphics-compiler/distinfo
@@ -5,5 +5,7 @@ SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-123-g814e728_GH0.tar.g
 SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-123-g814e728_GH0.tar.gz) = 416402
 SHA256 (KhronosGroup-SPIRV-Tools-v2021.4_GH0.tar.gz) = d68de260708dda785d109ff1ceeecde2d2ab71142fa5bf59061bb9f47dd3bb2c
 SIZE (KhronosGroup-SPIRV-Tools-v2021.4_GH0.tar.gz) = 2887505
+SHA256 (aa7df33aebe0.patch) = b2da1a00ac59ce7e98fd6cfb554f8974b1500bc1b9973387181414ffa4cffea5
+SIZE (aa7df33aebe0.patch) = 2242
 SHA256 (99edbf49d7c9.patch) = c7a96b5629384422ff2d848624ac60d5cc6dffd0289bce430df1ba813a45474c
 SIZE (99edbf49d7c9.patch) = 1151
diff --git a/devel/intel-graphics-compiler/files/patch-llvm12 b/devel/intel-graphics-compiler/files/patch-llvm12
deleted file mode 100644
index 68e7995988dd..000000000000
--- a/devel/intel-graphics-compiler/files/patch-llvm12
+++ /dev/null
@@ -1,22 +0,0 @@
-CMake Error at external/llvm/llvm_deps.cmake:50 (file):
-  file COPY cannot find
-  "IGC/DEFAULT_IGC_LLVM_SOURCES_DIR-NOTFOUND/libunwind/include/mach-o/compact_unwind_encoding.h":
-  No such file or directory.
-Call Stack (most recent call first):
-  IGC/CMakeLists.txt:1250 (include)
-
---- external/llvm/llvm_deps.cmake.orig	2021-09-16 08:50:38 UTC
-+++ external/llvm/llvm_deps.cmake
-@@ -44,12 +44,6 @@ include(llvm_spirv_source_hook)
- # LLD source hook.
- if(IGC_OPTION__LLVM_LLD)
-   include(llvm_lld_source_hook)
--  if(NOT EXISTS "${IGC_LLVM_WORKSPACE_SRC}/libunwind/include/mach-o" AND ${IGC_OPTION__LLVM_PREFERRED_VERSION} GREATER_EQUAL "12.0.0")
--    # Need to copy one header from unwind package for LLD (only for building from sources)
--    file(MAKE_DIRECTORY ${IGC_LLVM_WORKSPACE_SRC}/libunwind/include/mach-o)
--    file(COPY ${DEFAULT_IGC_LLVM_SOURCES_DIR}/libunwind/include/mach-o/compact_unwind_encoding.h
--         DESTINATION ${IGC_LLVM_WORKSPACE_SRC}/libunwind/include/mach-o/)
--  endif()
- endif()
- 
- # Process LLVM.