wip remove openexr 2

pkgs/applications/video/olive-editor/default.nix

@@ -12,7 +12,7 @@
   cmake,
   wrapQtAppsHook,
   openimageio,
-  openexr_3,
+  openexr,
   portaudio,
   imath,
   qtwayland,
@@ -78,7 +78,7 @@ stdenv.mkDerivation {
     opencolorio
     openimageio'
     imath
-    openexr_3
+    openexr
     portaudio
     qtwayland
     qtmultimedia

pkgs/by-name/an/ansel/package.nix

@@ -15,7 +15,7 @@
   libxml2,
   cmake,
   exiftool,
-  openexr_3,
+  openexr,
   glib,
   python3Packages,
   perlPackages,
@@ -147,7 +147,7 @@ stdenv.mkDerivation {
     libxkbcommon
     libxslt
     libXtst
-    openexr_3
+    openexr
     openjpeg
     osm-gps-map
     pcre

pkgs/by-name/ar/art/package.nix

@@ -32,7 +32,7 @@
   exiv2,
   exiftool,
   mimalloc,
-  openexr_3,
+  openexr,
   ilmbase,
   opencolorio,
   color-transformation-language,
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
     exiftool
     libcanberra-gtk3
     mimalloc
-    openexr_3
+    openexr
     ilmbase
     opencolorio
     color-transformation-language

pkgs/by-name/co/color-transformation-language/package.nix

@@ -4,7 +4,7 @@
   fetchFromGitHub,
   cmake,
   ilmbase,
-  openexr_3,
+  openexr,
   libtiff,
   aces-container,
 }:
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     ilmbase
-    openexr_3
+    openexr
     libtiff
     aces-container
   ];

pkgs/by-name/da/darktable/package.nix

@@ -28,7 +28,7 @@
   librsvg,
   libtiff,
   libjxl,
-  openexr_3,
+  openexr,
   osm-gps-map,
   pkg-config,
   sqlite,
@@ -94,7 +94,7 @@ stdenv.mkDerivation rec {
       librsvg
       libtiff
       libjxl
-      openexr_3
+      openexr
       sqlite
       libxslt
       libsoup_2_4

pkgs/by-name/li/libjxl/package.nix

@@ -12,7 +12,7 @@
   libpng,
   libwebp,
   gdk-pixbuf,
-  openexr_3,
+  openexr,
   pkg-config,
   makeWrapper,
   zlib,
@@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
     libpng
     libwebp
     gdk-pixbuf
-    openexr_3
+    openexr
     zlib
   ];
 

pkgs/by-name/sw/swayimg/package.nix

@@ -21,7 +21,7 @@
   libjxl,
   libexif,
   libavif,
-  openexr_3,
+  openexr,
   bash-completion,
   testers,
   nix-update-script,
@@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
     libjxl
     libexif
     libavif
-    openexr_3
+    openexr
   ];
 
   passthru = {

pkgs/development/libraries/gdal/default.nix

@@ -60,7 +60,7 @@
   libxml2,
   lz4,
   netcdf,
-  openexr_3,
+  openexr,
   openjpeg,
   openssl,
   pcre2,
@@ -167,7 +167,7 @@ stdenv.mkDerivation (finalAttrs: {
       nonDarwinDeps = lib.optionals (!stdenv.hostPlatform.isDarwin) (
         [
           # tests for formats enabled by these packages fail on macos
-          openexr_3
+          openexr
           xercesc
         ]
         ++ arrowDeps

pkgs/development/libraries/gstreamer/bad/default.nix

@@ -59,7 +59,7 @@
 , libusb1
 , neon
 , openal
-, openexr_3
+, openexr
 , openh264Support ? lib.meta.availableOn stdenv.hostPlatform openh264
 , openh264
 , libopenmpt
@@ -176,7 +176,7 @@ stdenv.mkDerivation rec {
     libusb1
     neon
     openal
-    openexr_3
+    openexr
     rtmpdump
     pango
     soundtouch

pkgs/development/libraries/opencolorio/default.nix

@@ -21,7 +21,7 @@
   # Build apps
   buildApps ? true, # Utility applications
   lcms2,
-  openexr_3,
+  openexr,
 }:
 
 stdenv.mkDerivation rec {
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
     ]
     ++ lib.optionals buildApps [
       lcms2
-      openexr_3
+      openexr
     ];
 
   cmakeFlags =

pkgs/development/libraries/openexr/default.nix

@@ -1,78 +1,62 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  zlib,
-  ilmbase,
-  fetchpatch,
-  cmake,
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, imath
+, libdeflate
+, pkg-config
+, libjxl
+, pkgsCross
 }:
 
 stdenv.mkDerivation rec {
   pname = "openexr";
-  version = "2.5.10";
-
-  outputs = [
-    "bin"
-    "dev"
-    "out"
-    "doc"
-  ];
+  version = "3.2.4";
 
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "openexr";
     rev = "v${version}";
-    hash = "sha256-xdC+T79ZQBx/XhuIXtP93Roj0N9lF+E65ReEKQ4kIsg=";
+    hash = "sha256-mVUxxYe6teiJ18PQ9703/kjBpJ9+a7vcDme+NwtQQQM=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "CVE-2021-45942.patch";
-      url = "https://github.com/AcademySoftwareFoundation/openexr/commit/11cad77da87c4fa2aab7d58dd5339e254db7937e.patch";
-      stripLen = 4;
-      extraPrefix = "OpenEXR/IlmImf/";
-      sha256 = "1wa2jn6sa0n3phaqvklnlbgk1bz60y756ad4jk4d757pzpnannsy";
-    })
-    (fetchpatch {
-      name = "CVE-2021-3933.patch";
-      url = "https://github.com/AcademySoftwareFoundation/openexr/commit/5db6f7aee79e3e75e8c3780b18b28699614dd08e.patch";
-      stripLen = 4;
-      extraPrefix = "OpenEXR/IlmImf/";
-      sha256 = "sha256-DrpldpNgN5pWKzIuuPIrynGX3EpP8YhJlu+lLfNFGxQ=";
-    })
+  outputs = [ "bin" "dev" "out" "doc" ];
 
-    # GCC 13 fixes
-    ./gcc-13.patch
-  ];
+  patches =
+    # Disable broken test on musl libc
+    # https://github.com/AcademySoftwareFoundation/openexr/issues/1556
+    lib.optional stdenv.hostPlatform.isMusl ./disable-iex-test.patch
+  ;
 
+  # tests are determined to use /var/tmp on unix
   postPatch = ''
-    # tests are determined to use /var/tmp on unix
-    find . -name tmpDir.h | while read -r f ; do
+    cat <(find . -name tmpDir.h) <(echo src/test/OpenEXRCoreTest/main.cpp) | while read -r f ; do
       substituteInPlace $f --replace '/var/tmp' "$TMPDIR"
     done
-    # On slower machines this test can take more than the default 1500 seconds
-    echo 'set_tests_properties(OpenEXR.IlmImf PROPERTIES TIMEOUT 3000)' >> OpenEXR/IlmImfTest/CMakeLists.txt
   '';
 
-  cmakeFlags = [
-    "-DCMAKE_CTEST_ARGUMENTS=--timeout;3600"
-  ] ++ lib.optional stdenv.hostPlatform.isStatic "-DCMAKE_SKIP_RPATH=ON";
+  cmakeFlags = lib.optional stdenv.hostPlatform.isStatic "-DCMAKE_SKIP_RPATH=ON";
+
+  nativeBuildInputs = [ cmake pkg-config ];
+  propagatedBuildInputs = [ imath libdeflate ];
 
-  nativeBuildInputs = [ cmake ];
-  propagatedBuildInputs = [
-    ilmbase
-    zlib
-  ];
+  # Without 'sse' enforcement tests fail on i686 as due to excessive precision as:
+  #   error reading back channel B pixel 21,-76 got -nan expected -nan
+  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isi686 "-msse2 -mfpmath=sse";
 
   # https://github.com/AcademySoftwareFoundation/openexr/issues/1400
-  # https://github.com/AcademySoftwareFoundation/openexr/issues/1281
-  doCheck = !stdenv.hostPlatform.isAarch32 && !stdenv.hostPlatform.isi686;
+  doCheck = !stdenv.hostPlatform.isAarch32;
+
+  passthru.tests = {
+    inherit libjxl;
+    musl = pkgsCross.musl64.openexr;
+  };
 
   meta = with lib; {
     description = "High dynamic-range (HDR) image file format";
-    homepage = "https://www.openexr.com/";
+    homepage = "https://www.openexr.com";
     license = licenses.bsd3;
+    maintainers = with maintainers; [ paperdigits ];
     platforms = platforms.all;
   };
 }

pkgs/development/libraries/openscenegraph/default.nix

@@ -25,7 +25,7 @@
   jpegSupport ? true,
   libjpeg,
   exrSupport ? false,
-  openexr_3,
+  openexr,
   gifSupport ? true,
   giflib,
   pngSupport ? true,
@@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
       zlib
     ]
     ++ lib.optional jpegSupport libjpeg
-    ++ lib.optional exrSupport openexr_3
+    ++ lib.optional exrSupport openexr
     ++ lib.optional gifSupport giflib
     ++ lib.optional pngSupport libpng
     ++ lib.optional tiffSupport libtiff