diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-02-13 12:25:07 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-02-13 12:25:07 +0100 |
commit | a5e1520e4538e29ecfbd4b168306f890566d7bfd (patch) | |
tree | 28099c268b5d4b1e33c2b29f0714c45f0b961382 /nixpkgs/pkgs/development/libraries/openexr | |
parent | 822f7c15c04567fbdc27020e862ea2b70cfbf8eb (diff) | |
parent | 3560d1c8269d0091b9aae10731b5e85274b7bbc1 (diff) | |
download | nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar.gz nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar.bz2 nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar.lz nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar.xz nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar.zst nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/pkgs/build-support/go/module.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/openexr')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/openexr/default.nix | 7 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/openexr/gcc-13.patch | 46 |
2 files changed, 22 insertions, 31 deletions
diff --git a/nixpkgs/pkgs/development/libraries/openexr/default.nix b/nixpkgs/pkgs/development/libraries/openexr/default.nix index 1a135fa6d4a8..6d45ca33e982 100644 --- a/nixpkgs/pkgs/development/libraries/openexr/default.nix +++ b/nixpkgs/pkgs/development/libraries/openexr/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "openexr"; - version = "2.5.8"; + version = "2.5.10"; outputs = [ "bin" "dev" "out" "doc" ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "AcademySoftwareFoundation"; repo = "openexr"; rev = "v${version}"; - sha256 = "sha256-N7XdDaDsYdx4TXvHplQDTvhHNUmW5rntdaTKua4C0es="; + hash = "sha256-xdC+T79ZQBx/XhuIXtP93Roj0N9lF+E65ReEKQ4kIsg="; }; patches = [ @@ -36,8 +36,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-DrpldpNgN5pWKzIuuPIrynGX3EpP8YhJlu+lLfNFGxQ="; }) - # Backport gcc-13 fix: - # https://github.com/AcademySoftwareFoundation/openexr/pull/1264 + # GCC 13 fixes ./gcc-13.patch ]; diff --git a/nixpkgs/pkgs/development/libraries/openexr/gcc-13.patch b/nixpkgs/pkgs/development/libraries/openexr/gcc-13.patch index d508b6028f76..6264a8df2433 100644 --- a/nixpkgs/pkgs/development/libraries/openexr/gcc-13.patch +++ b/nixpkgs/pkgs/development/libraries/openexr/gcc-13.patch @@ -1,33 +1,25 @@ -https://github.com/AcademySoftwareFoundation/openexr/pull/1264 -https://github.com/AcademySoftwareFoundation/openexr/commit/d0088a3c6943a9a53fc24e29885414d082d531fe.patch +From 8aa103fe6e815514990e59708468eabc36f7f332 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=A9clairevoyant?= + <848000+eclairevoyant@users.noreply.github.com> +Date: Fri, 5 Jan 2024 18:12:16 -0500 +Subject: [PATCH] gcc13 ---- a/OpenEXR/IlmImf/ImfDwaCompressor.cpp -+++ b/OpenEXR/IlmImf/ImfDwaCompressor.cpp -@@ -159,6 +159,7 @@ - #include <limits> - - #include <cstddef> -+#include <cstdint> - - - // Windows specific addition to prevent the indirect import of the redefined min/max macros ---- a/OpenEXR/IlmImf/ImfHuf.cpp -+++ b/OpenEXR/IlmImf/ImfHuf.cpp -@@ -53,6 +53,7 @@ - #include <cstring> - #include <cassert> +--- + OpenEXR/IlmImf/ImfTiledMisc.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/OpenEXR/IlmImf/ImfTiledMisc.cpp b/OpenEXR/IlmImf/ImfTiledMisc.cpp +index 06ea3144..749537d4 100644 +--- a/OpenEXR/IlmImf/ImfTiledMisc.cpp ++++ b/OpenEXR/IlmImf/ImfTiledMisc.cpp +@@ -46,6 +46,7 @@ + #include <ImfTileDescription.h> #include <algorithm> + #include <limits> +#include <cstdint> - - using namespace std; ---- a/OpenEXR/IlmImf/ImfMisc.cpp -+++ b/OpenEXR/IlmImf/ImfMisc.cpp -@@ -52,6 +52,7 @@ - #include <ImfConvert.h> - #include <ImfPartType.h> - #include <ImfTileDescription.h> -+#include <cstdint> #include "ImfNamespace.h" - OPENEXR_IMF_INTERNAL_NAMESPACE_SOURCE_ENTER +-- +2.42.0 + |