Commit 1901448c authored by emaryn's avatar emaryn Committed by emaryn
Browse files

ncnn: 20241226 -> 20250503 

Diff: https://github.com/Tencent/ncnn/compare/20241226...20250503
parent eb651797

pkgs/by-name/nc/ncnn/cmakelists.patch

+4 −4
Original line number Diff line number Diff line
@@ -2,17 +2,17 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt 
index 785e2cd..459024d 100644

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -589,7 +589,8 @@ endif()

 if(NCNN_VULKAN)

     if(NCNN_SYSTEM_GLSLANG)

@@ -762,7 +762,8 @@

         find_package(Threads)

         find_package(SPIRV-Tools QUIET)

         find_package(SPIRV-Tools-opt QUIET)

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

@@ -774,7 +775,6 @@

                 set(NCNN_SYSTEM_GLSLANG OFF)

             else()

                 include("${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake")

pkgs/by-name/nc/ncnn/package.nix

+12 −13
Original line number Diff line number Diff line
@@ -10,20 +10,18 @@ 
  protobuf,

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "ncnn";

  version = "20241226";

  version = "20250503";



  src = fetchFromGitHub {

    owner = "Tencent";

    repo = "ncnn";

    rev = version;

    hash = "sha256-XmIuXR/uxJbXaB0G+tS9I47Pke20qj8jI1vqnDDgrpE=";

    tag = finalAttrs.version;

    hash = "sha256-7wktoeei16QaPdcxVVS25sZYPhTQMEq9PjaHBwm5Eas=";

  };



  patches = [

    ./cmakelists.patch

  ];

  patches = [ ./cmakelists.patch ];



  cmakeFlags =

    [
@@ -40,6 +38,7 @@ stdenv.mkDerivation rec { 
    ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DVulkan_LIBRARY=-lvulkan" ];



  nativeBuildInputs = [ cmake ];



  buildInputs = [

    vulkan-headers

    vulkan-loader
@@ -48,11 +47,11 @@ stdenv.mkDerivation rec { 
    protobuf

  ];



  meta = with lib; {

    description = "ncnn is a high-performance neural network inference framework optimized for the mobile platform";

  meta = {

    description = "Neural network inference framework";

    homepage = "https://github.com/Tencent/ncnn";

    license = licenses.bsd3;

    maintainers = with maintainers; [ tilcreator ];

    platforms = platforms.all;

    license = lib.licenses.bsd3;

    maintainers = with lib.maintainers; [ tilcreator ];

    platforms = lib.platforms.all;

  };

}
 
})