Merge pull request #83441 from lsix/update-khronos-ocl-icd-loader

khronos-ocl-icd-loader: 6c03f8b -> 2020.03.13
This commit is contained in:
Jörg Thalheim 2020-03-31 12:40:56 +01:00 committed by GitHub
commit 5112c97730
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 24 deletions

View file

@ -1,24 +1,24 @@
{ stdenv, fetchFromGitHub, opencl-clhpp, cmake, withTracing ? false }:
{ stdenv, fetchFromGitHub, opencl-headers, cmake, withTracing ? false }:
stdenv.mkDerivation rec {
name = "khronos-ocl-icd-loader-${version}";
version = "6c03f8b";
version = "2020.03.13";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "OpenCL-ICD-Loader";
rev = "6c03f8b58fafd9dd693eaac826749a5cfad515f8";
sha256 = "00icrlc00dpc87prbd2j1350igi9pbgkz27hc3rf73s5994yn86a";
rev = "v${version}";
sha256 = "0zk6fyfrklx8a848613rfcx0y4yn0dsxkxzzl9pgdh9i6qdfjj9k";
};
patches = stdenv.lib.lists.optional withTracing ./tracing.patch;
nativeBuildInputs = [ cmake ];
buildInputs = [ opencl-clhpp ];
buildInputs = [ opencl-headers ];
meta = with stdenv.lib; {
description = "Offical Khronos OpenCL ICD Loader";
homepage = https://github.com/KhronosGroup/OpenCL-ICD-Loader;
homepage = "https://github.com/KhronosGroup/OpenCL-ICD-Loader";
license = licenses.asl20;
platforms = platforms.linux;
maintainers = with maintainers; [ davidtwco ];

View file

@ -1,10 +1,10 @@
diff --git a/loader/icd.h b/loader/icd.h
index a1b6969..cf4e272 100644
index 34751e9..01a33fd 100644
--- a/loader/icd.h
+++ b/loader/icd.h
@@ -122,7 +122,7 @@ void khrIcdContextPropertiesGetPlatform(
@@ -123,7 +123,7 @@ void khrIcdContextPropertiesGetPlatform(
cl_platform_id *outPlatform);
// internal tracing macros
-#if 0
+#if 1

View file

@ -1,25 +1,25 @@
{ stdenv, fetchFromGitHub
, version # "12" for "1.2", "22" for "2.2" and so on
}:
stdenv.mkDerivation {
name = "opencl-headers-${version}-2017-07-18";
stdenv.mkDerivation rec {
name = "opencl-headers-${version}";
version = "2020.03.13";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "OpenCL-Headers";
rev = "f039db6764d52388658ef15c30b2237bbda49803";
sha256 = "0z04i330zr8czak2624q71aajdcq7ly8mb5bgala5m235qjpsrh7";
rev = "v${version}";
sha256 = "1d9ibiwicaj17757h9yyjc9i2hny8d8npn4spbjscins8972z3hw";
};
installPhase = ''
mkdir -p $out/include/CL
cp opencl${version}/CL/* $out/include/CL
cp CL/* $out/include/CL
'';
meta = with stdenv.lib; {
description = "Khronos OpenCL headers version ${version}";
homepage = https://www.khronos.org/registry/cl/;
homepage = "https://www.khronos.org/registry/cl/";
license = licenses.mit;
platforms = platforms.unix;
};

View file

@ -13712,10 +13712,7 @@ in
nvidia_x11 = linuxPackages.nvidia_x11.override { libsOnly = true; };
};
ocl-icd-oclhGen = oclh: callPackage ../development/libraries/ocl-icd { opencl-headers = oclh; };
ocl-icd-oclh_1_2 = ocl-icd-oclhGen opencl-headers_1_2;
ocl-icd-oclh_2_2 = ocl-icd-oclhGen opencl-headers_2_2;
ocl-icd = ocl-icd-oclh_2_2;
ocl-icd = callPackage ../development/libraries/ocl-icd { };
ode = callPackage ../development/libraries/ode { };
@ -13747,10 +13744,7 @@ in
opencascade = callPackage ../development/libraries/opencascade { };
opencascade-occt = callPackage ../development/libraries/opencascade-occt { };
opencl-headersGen = v: callPackage ../development/libraries/opencl-headers { version = v; };
opencl-headers_1_2 = opencl-headersGen "12";
opencl-headers_2_2 = opencl-headersGen "22";
opencl-headers = opencl-headers_2_2;
opencl-headers = callPackage ../development/libraries/opencl-headers { };
opencl-clhpp = callPackage ../development/libraries/opencl-clhpp { };