bump

3 files changed, 25 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ab9c4873daa2..16c6da7388ed 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -19,7 +19,7 @@ pkgbase = khronos-ocl-icd-git
 	source = ocl::git+https://github.com/KhronosGroup/OpenCL-ICD-Loader.git
 	source = 66.diff
 	sha256sums = SKIP
-	sha256sums = dd1fe65856e5f5e3c4a71473ecb99444f2f9388ce96a21a86926e6c8fb1a3790
+	sha256sums = 8bb92b19cc37f44c36f17b1a2f498e85c7fc2b7d612b1089ddefcea5104bc3dd
 
 pkgname = khronos-ocl-icd-git
 
diff --git a/66.diff b/66.diff
index 3972c3d719a7..edb9b624e65d 100644
--- a/66.diff
+++ b/66.diff
@@ -272,7 +272,7 @@ new file mode 100644
 index 0000000..5724c26
 --- /dev/null
 +++ b/loader/windows/CMakeLists.txt
-@@ -0,0 +1,21 @@
+@@ -0,0 +1,43 @@
 +target_sources(OpenCL PRIVATE
 +    ${CMAKE_CURRENT_SOURCE_DIR}/icd_windows.c
 +    ${CMAKE_CURRENT_SOURCE_DIR}/icd_windows.h
@@ -294,6 +294,28 @@ index 0000000..5724c26
 +
 +target_link_libraries(OpenCL PUBLIC cfgmgr32)
 +
++option (OPENCL_ICD_LOADER_REQUIRE_WDK "Build with D3DKMT support, which requires the Windows WDK." ON)
++    if (OPENCL_ICD_LOADER_REQUIRE_WDK)
++        if(DEFINED ENV{WDKContentRoot})
++            file(GLOB D3DKMT_HEADER "$ENV{WDKContentRoot}/Include/*/km/d3dkmthk.h")
++        else()
++            file(GLOB D3DKMT_HEADER "$ENV{HOMEDRIVE}/Program Files */Windows Kits/10/Include/*/km/d3dkmthk.h")
++        endif()
++
++        if(D3DKMT_HEADER)
++            list(GET D3DKMT_HEADER -1 LATEST_D3DKMT_HEADER)
++            get_filename_component(WDK_DIRECTORY ${LATEST_D3DKMT_HEADER} DIRECTORY)
++            get_filename_component(WDK_DIRECTORY ${WDK_DIRECTORY} DIRECTORY)
++            message(STATUS "Found the Windows WDK in: ${WDK_DIRECTORY}")
++            target_compile_definitions(OpenCL PRIVATE OPENCL_ICD_LOADER_REQUIRE_WDK)
++            target_include_directories(OpenCL PRIVATE ${WDK_DIRECTORY}/um)
++            target_include_directories(OpenCL PRIVATE ${WDK_DIRECTORY}/km)
++            target_include_directories(OpenCL PRIVATE ${WDK_DIRECTORY}/shared)
++        else()
++            message(FATAL_ERROR "The Windows WDK was not found. Consider disabling OPENCL_ICD_LOADER_REQUIRE_WDK. Aborting.")
++        endif()
++    endif()
++
 diff --git a/loader/windows/icd_windows.c b/loader/windows/icd_windows.c
 index 1350f11..a7da7c1 100644
 --- a/loader/windows/icd_windows.c
diff --git a/PKGBUILD b/PKGBUILD
index ec56a9079b2a..9129733e39fd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -25,7 +25,7 @@ source=('ocl::git+https://github.com/KhronosGroup/OpenCL-ICD-Loader.git'
 #         'https://patch-diff.githubusercontent.com/raw/KhronosGroup/OpenCL-ICD-Loader/pull/66.diff'
          )
 sha256sums=('SKIP'
-            'dd1fe65856e5f5e3c4a71473ecb99444f2f9388ce96a21a86926e6c8fb1a3790'
+            '8bb92b19cc37f44c36f17b1a2f498e85c7fc2b7d612b1089ddefcea5104bc3dd'
 #             'c8001f51719e0d12d2f9c7f1c760a35d0920e81d05f119da813e0fb2be07f10a'
             )