diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2023-11-01 04:20:00 +0000 |
|---|---|---|
| committer | Mario Rodas <marsam@users.noreply.github.com> | 2023-11-01 04:20:00 +0000 |
| commit | 007705190394e8b7844ac052645b0b60ac10b86c (patch) | |
| tree | 864df3b436f15d995768ac367181633599b23508 /pkgs/development/libraries/ncnn | |
| parent | 9ec80ed610eaaffd7bc1c72d4c24896214aa86ec (diff) | |
ncnn: 20220729 -> 20231027
Diffstat (limited to 'pkgs/development/libraries/ncnn')
| -rw-r--r-- | pkgs/development/libraries/ncnn/cmakelists.patch | 18 | ||||
| -rw-r--r-- | pkgs/development/libraries/ncnn/default.nix | 5 |
2 files changed, 12 insertions, 11 deletions
diff --git a/pkgs/development/libraries/ncnn/cmakelists.patch b/pkgs/development/libraries/ncnn/cmakelists.patch index 30f39a7a3f501..bdb3063acec4e 100644 --- a/pkgs/development/libraries/ncnn/cmakelists.patch +++ b/pkgs/development/libraries/ncnn/cmakelists.patch @@ -2,15 +2,15 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index c453d23e..66b4aa24 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -478,6 +478,8 @@ if(NCNN_VULKAN) - - find_package(Threads) - -+ include("${GLSLANG_TARGET_DIR}/SPIRV-Tools/SPIRV-ToolsTarget.cmake") -+ include("${GLSLANG_TARGET_DIR}/SPIRV-Tools-opt/SPIRV-Tools-optTargets.cmake") - include("${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake") - include("${GLSLANG_TARGET_DIR}/OGLCompilerTargets.cmake") - if(EXISTS "${GLSLANG_TARGET_DIR}/HLSLTargets.cmake") +@@ -560,6 +560,8 @@ if(NCNN_VULKAN) + message(WARNING "GLSLANG_TARGET_DIR must be defined! NCNN_SYSTEM_GLSLANG will be turned off.") + set(NCNN_SYSTEM_GLSLANG OFF) + else() ++ include("${GLSLANG_TARGET_DIR}/SPIRV-Tools/SPIRV-ToolsTarget.cmake") ++ include("${GLSLANG_TARGET_DIR}/SPIRV-Tools-opt/SPIRV-Tools-optTargets.cmake") + include("${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake") + include("${GLSLANG_TARGET_DIR}/OGLCompilerTargets.cmake") + if(EXISTS "${GLSLANG_TARGET_DIR}/HLSLTargets.cmake") diff --git a/src/ncnn.pc.in b/src/ncnn.pc.in index b580fcee..be2becd0 100644 --- a/src/ncnn.pc.in diff --git a/pkgs/development/libraries/ncnn/default.nix b/pkgs/development/libraries/ncnn/default.nix index 0b07fab8668cf..69967eae160d2 100644 --- a/pkgs/development/libraries/ncnn/default.nix +++ b/pkgs/development/libraries/ncnn/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "ncnn"; - version = "20220729"; + version = "20231027"; src = fetchFromGitHub { owner = "Tencent"; repo = pname; rev = version; - sha256 = "sha256-hZVeW3svuVpwQhQz67uqTPZ7B9pisLCwHhXB2zMLygo="; + sha256 = "sha256-ak/5QTOptg5M2I+3olnrBK6JZ01haIE6oh+sagEboAc="; }; patches = [ @@ -45,5 +45,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Tencent/ncnn"; license = licenses.bsd3; maintainers = with maintainers; [ tilcreator ]; + platforms = platforms.all; }; } |