swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 04:19:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #284998 from wineee/ncnn

Browse source 
ncnn: 20231027 -> 20240102 and fix build
This commit is contained in:
Mario Rodas 2024-01-30 18:58:23 -05:00 committed by GitHub
parent 67f04d2670 74e0cd35f6
commit 7515686d59
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,18 +1,27 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c453d23e..66b4aa24 100644
index 785e2cd..459024d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -560,6 +560,8 @@ if(NCNN_VULKAN)
message(WARNING "GLSLANG_TARGET_DIR must be defined! NCNN_SYSTEM_GLSLANG will be turned off.")
@@ -589,7 +589,8 @@ endif()
if(NCNN_VULKAN)
if(NCNN_SYSTEM_GLSLANG)
find_package(Threads)
- find_package(glslang QUIET)
+ find_package(SPIRV-Tools-opt REQUIRED)
+ find_package(glslang REQUIRED)
if(glslang_FOUND)
add_library(glslang ALIAS glslang::glslang)
add_library(SPIRV ALIAS glslang::SPIRV)
@@ -601,7 +602,6 @@ if(NCNN_VULKAN)
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")
- include("${GLSLANG_TARGET_DIR}/OGLCompilerTargets.cmake")
if(EXISTS "${GLSLANG_TARGET_DIR}/HLSLTargets.cmake")
# hlsl support can be optional
include("${GLSLANG_TARGET_DIR}/HLSLTargets.cmake")
diff --git a/src/ncnn.pc.in b/src/ncnn.pc.in
index b580fcee..be2becd0 100644
index b580fce..be2becd 100644
--- a/src/ncnn.pc.in
+++ b/src/ncnn.pc.in
@@ -1,6 +1,6 @@

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

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "ncnn";
version = "20231027";
version = "20240102";
src = fetchFromGitHub {
owner = "Tencent";
repo = pname;
rev = version;
sha256 = "sha256-ak/5QTOptg5M2I+3olnrBK6JZ01haIE6oh+sagEboAc=";
hash = "sha256-kk70oLY+2QJOkyYq10whLRMxBuibQMWMOBA9dcbKf/I=";
};
patches = [
@ -33,8 +33,6 @@ stdenv.mkDerivation rec {
"-DNCNN_BUILD_TOOLS=0"
"-DNCNN_SYSTEM_GLSLANG=1"
"-DNCNN_PYTHON=0" # Should be an attribute
"-DGLSLANG_TARGET_DIR=${glslang}/lib/cmake"
];
nativeBuildInputs = [ cmake ];