Commit 5d22f435 authored by K900's avatar K900
Browse files

orca-slicer: pick patch to remove unused ilmbase dependency

parent f67c55ef

pkgs/by-name/or/orca-slicer/package.nix

+3 −2
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
  gtest,

  gtk3,

  hicolor-icon-theme,

  ilmbase,

  libsecret,

  libpng,

  mpfr,
@@ -111,7 +110,6 @@ stdenv.mkDerivation (finalAttrs: { 
    gst_all_1.gst-plugins-good

    gtk3

    hicolor-icon-theme

    ilmbase

    libsecret

    libpng

    mpfr
@@ -141,6 +139,9 @@ stdenv.mkDerivation (finalAttrs: { 
      url = "https://github.com/SoftFever/OrcaSlicer/commit/d10a06ae11089cd1f63705e87f558e9392f7a167.patch";

      hash = "sha256-t4own5AwPsLYBsGA15id5IH1ngM0NSuWdFsrxMRXmTk=";

    })



    # Pick https://github.com/prusa3d/PrusaSlicer/pull/14207 to remove unused and insecure ilmbase dependency

    ./patches/no-ilmbase.patch

  ];



  doCheck = true;

pkgs/by-name/or/orca-slicer/patches/no-ilmbase.patch

0 → 100644
+38 −0
Original line number Diff line number Diff line 
diff --git a/cmake/modules/FindOpenVDB.cmake b/cmake/modules/FindOpenVDB.cmake

index 4fde5fa4a75..b62813fa663 100644

--- a/cmake/modules/FindOpenVDB.cmake

+++ b/cmake/modules/FindOpenVDB.cmake

@@ -347,25 +347,6 @@ macro(just_fail msg)

   return()

 endmacro()

 

-find_package(IlmBase QUIET)

-if(NOT IlmBase_FOUND)

-  pkg_check_modules(IlmBase QUIET IlmBase)

-endif()

-if (IlmBase_FOUND AND NOT TARGET IlmBase::Half)

-  message(STATUS "Falling back to IlmBase found by pkg-config...")

-

-  find_library(IlmHalf_LIBRARY NAMES Half)

-  if(IlmHalf_LIBRARY-NOTFOUND OR NOT IlmBase_INCLUDE_DIRS)

-    just_fail("IlmBase::Half can not be found!")

-  endif()

-  

-  add_library(IlmBase::Half UNKNOWN IMPORTED)

-  set_target_properties(IlmBase::Half PROPERTIES

-    IMPORTED_LOCATION "${IlmHalf_LIBRARY}"

-    INTERFACE_INCLUDE_DIRECTORIES "${IlmBase_INCLUDE_DIRS}")

-elseif(NOT IlmBase_FOUND)

-  just_fail("IlmBase::Half can not be found!")

-endif()

 find_package(TBB ${_quiet} ${_required} COMPONENTS tbb)

 find_package(ZLIB ${_quiet} ${_required})

 find_package(Boost ${_quiet} ${_required} COMPONENTS iostreams system )

@@ -471,7 +452,6 @@ endif()

 set(_OPENVDB_VISIBLE_DEPENDENCIES

   Boost::iostreams

   Boost::system

-  IlmBase::Half

 )

 

 set(_OPENVDB_DEFINITIONS)