treewide: fix (some of) the ilmbase fallout (#505471)

This commit is contained in:
K900
2026-03-31 22:26:26 +00:00
committed by GitHub
10 changed files with 124 additions and 13 deletions
-2
View File
@@ -33,7 +33,6 @@
exiftool,
mimalloc,
openexr,
ilmbase,
opencolorio,
color-transformation-language,
}:
@@ -92,7 +91,6 @@ stdenv.mkDerivation (finalAttrs: {
libcanberra-gtk3
mimalloc
openexr
ilmbase
opencolorio
color-transformation-language
];
+2 -2
View File
@@ -25,12 +25,12 @@
gtest,
gtk3,
hicolor-icon-theme,
ilmbase,
libpng,
mpfr,
nlopt,
opencascade-occt_7_6,
openvdb,
openexr,
opencv,
pcre,
systemd,
@@ -94,11 +94,11 @@ stdenv.mkDerivation (finalAttrs: {
gst_all_1.gst-plugins-good
gtk3
hicolor-icon-theme
ilmbase
libpng
mpfr
nlopt
opencascade-occt_7_6
openexr
openvdb
pcre
onetbb
@@ -3,7 +3,6 @@
stdenv,
fetchFromGitHub,
cmake,
ilmbase,
openexr,
libtiff,
aces-container,
@@ -22,7 +21,6 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
cmake
ilmbase
openexr
libtiff
aces-container
+1 -3
View File
@@ -27,7 +27,6 @@
graphicsmagick,
gtk3,
icu,
ilmbase,
isocodes,
jasper,
json-glib,
@@ -114,7 +113,6 @@ stdenv.mkDerivation rec {
graphicsmagick
gtk3
icu
ilmbase
isocodes
jasper
json-glib
@@ -122,7 +120,7 @@ stdenv.mkDerivation rec {
lensfun
lerc
libaom
#libavif # TODO re-enable once cmake files are fixed (#425306)
libavif
libdatrie
libepoxy
libexif
+3 -2
View File
@@ -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;
@@ -0,0 +1,38 @@
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)
@@ -0,0 +1,38 @@
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)
+2 -2
View File
@@ -19,7 +19,6 @@
gmp,
gtk3,
hicolor-icon-theme,
ilmbase,
libpng,
mpfr,
nanosvg,
@@ -78,6 +77,8 @@ clangStdenv.mkDerivation (finalAttrs: {
# https://github.com/NixOS/nixpkgs/issues/415703
# https://gitlab.archlinux.org/archlinux/packaging/packages/prusa-slicer/-/merge_requests/5
./allow_wayland.patch
# Pick https://github.com/prusa3d/PrusaSlicer/pull/14207 to remove unused and insecure ilmbase dependency
./no-ilmbase.patch
];
# (not applicable to super-slicer fork)
@@ -119,7 +120,6 @@ clangStdenv.mkDerivation (finalAttrs: {
gmp
gtk3
hicolor-icon-theme
ilmbase
libpng
mpfr
nanosvg-fltk
@@ -0,0 +1,38 @@
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)
+2
View File
@@ -21,6 +21,8 @@ let
})
./super-slicer-use-boost186.patch
./super-slicer-fix-cereal-1.3.1.patch
# Pick https://github.com/prusa3d/PrusaSlicer/pull/14207 to remove unused and insecure ilmbase dependency
./no-ilmbase.patch
];
wxwidgets_3_1-prusa = wxwidgets_3_1.overrideAttrs (old: {