cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #264880 from marsam/update-ncnn

Browse source 
ncnn: 20220729 -> 20231027
This commit is contained in:
Mario Rodas 2023-11-19 19:19:58 -05:00 committed by GitHub
commit 19d28743d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/development/libraries/ncnn/cmakelists.patch
View file

@ -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

5
pkgs/development/libraries/ncnn/default.nix
View file

@ -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;
};
}