Unverified Commit 19d28743 authored by Mario Rodas's avatar Mario Rodas Committed by GitHub
Browse files

Merge pull request #264880 from marsam/update-ncnn 

ncnn: 20220729 -> 20231027
parents 2332b0d7 00770519

pkgs/development/libraries/ncnn/cmakelists.patch

+9 −9
Original line number Diff line number Diff line
@@ -2,10 +2,10 @@ 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)

 

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

pkgs/development/libraries/ncnn/default.nix

+3 −2
Original line number Diff line number Diff line
@@ -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;

  };

}