Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

blender-3.0.1

Browse Source
This commit is contained in:
Rmys
2022-05-23 22:51:35 +03:00
committed by GitHub
parent c568938e1d
commit 1db42ccb4c
1 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
multimedia/editor/blender/files/blender-openexr.patch
+27 -29
View File
@@ -1,11 +1,11 @@
Index: blender-2.93.3/source/blender/imbuf/intern/openexr/openexr_api.cpp https://src.fedoraproject.org/rpms/blender/blob/rawhide/f/blender-openexr.patch
===================================================================
--- blender-2.93.3.orig/source/blender/imbuf/intern/openexr/openexr_api.cpp --- a/source/blender/imbuf/intern/openexr/openexr_api.cpp
+++ blender-2.93.3/source/blender/imbuf/intern/openexr/openexr_api.cpp +++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp
@@ -32,30 +32,31 @@ @@ -32,30 +32,31 @@
#include <stdexcept> #include <stdexcept>
#include <string> #include <string>
-#include <Iex.h> -#include <Iex.h>
+#include <OpenEXR/Iex.h> +#include <OpenEXR/Iex.h>
#include <ImathBox.h> #include <ImathBox.h>
@@ -34,7 +34,7 @@ Index: blender-2.93.3/source/blender/imbuf/intern/openexr/openexr_api.cpp
+#include <OpenEXR/ImfStringAttribute.h> +#include <OpenEXR/ImfStringAttribute.h>
+#include <OpenEXR/ImfVersion.h> +#include <OpenEXR/ImfVersion.h>
+#include <Imath/half.h> +#include <Imath/half.h>
/* multiview/multipart */ /* multiview/multipart */
-#include <ImfInputPart.h> -#include <ImfInputPart.h>
-#include <ImfMultiPartInputFile.h> -#include <ImfMultiPartInputFile.h>
@@ -52,19 +52,19 @@ Index: blender-2.93.3/source/blender/imbuf/intern/openexr/openexr_api.cpp
+#include <OpenEXR/ImfPartHelper.h> +#include <OpenEXR/ImfPartHelper.h>
+#include <OpenEXR/ImfPartType.h> +#include <OpenEXR/ImfPartType.h>
+#include <OpenEXR/ImfTiledOutputPart.h> +#include <OpenEXR/ImfTiledOutputPart.h>
#include "DNA_scene_types.h" /* For OpenEXR compression constants */ #include "DNA_scene_types.h" /* For OpenEXR compression constants */
@@ -131,12 +132,12 @@ class IMemStream : public Imf::IStream { @@ -131,12 +132,12 @@ class IMemStream : public Imf::IStream {
return false; return false;
} }
- Int64 tellg() override - Int64 tellg() override
+ uint64_t tellg() override + uint64_t tellg() override
{ {
return _exrpos; return _exrpos;
} }
- void seekg(Int64 pos) override - void seekg(Int64 pos) override
+ void seekg(uint64_t pos) override + void seekg(uint64_t pos) override
{ {
@@ -72,7 +72,7 @@ Index: blender-2.93.3/source/blender/imbuf/intern/openexr/openexr_api.cpp
} }
@@ -146,8 +147,8 @@ class IMemStream : public Imf::IStream { @@ -146,8 +147,8 @@ class IMemStream : public Imf::IStream {
} }
private: private:
- Int64 _exrpos; - Int64 _exrpos;
- Int64 _exrsize; - Int64 _exrsize;
@@ -80,17 +80,17 @@ Index: blender-2.93.3/source/blender/imbuf/intern/openexr/openexr_api.cpp
+ uint64_t _exrsize; + uint64_t _exrsize;
unsigned char *_exrbuf; unsigned char *_exrbuf;
}; };
@@ -182,12 +183,12 @@ class IFileStream : public Imf::IStream @@ -182,12 +183,12 @@ class IFileStream : public Imf::IStream
return check_error(); return check_error();
} }
- Int64 tellg() override - Int64 tellg() override
+ uint64_t tellg() override + uint64_t tellg() override
{ {
return std::streamoff(ifs.tellg()); return std::streamoff(ifs.tellg());
} }
- void seekg(Int64 pos) override - void seekg(Int64 pos) override
+ void seekg(uint64_t pos) override + void seekg(uint64_t pos) override
{ {
@@ -99,20 +99,20 @@ Index: blender-2.93.3/source/blender/imbuf/intern/openexr/openexr_api.cpp
@@ -231,19 +232,19 @@ class OMemStream : public OStream { @@ -231,19 +232,19 @@ class OMemStream : public OStream {
ibuf->encodedsize += n; ibuf->encodedsize += n;
} }
- Int64 tellp() override - Int64 tellp() override
+ uint64_t tellp() override + uint64_t tellp() override
{ {
return offset; return offset;
} }
- void seekp(Int64 pos) override - void seekp(Int64 pos) override
+ void seekp(uint64_t pos) override + void seekp(uint64_t pos) override
{ {
offset = pos; offset = pos;
ensure_size(offset); ensure_size(offset);
} }
private: private:
- void ensure_size(Int64 size) - void ensure_size(Int64 size)
+ void ensure_size(uint64_t size) + void ensure_size(uint64_t size)
@@ -121,36 +121,34 @@ Index: blender-2.93.3/source/blender/imbuf/intern/openexr/openexr_api.cpp
while (size > ibuf->encodedbuffersize) { while (size > ibuf->encodedbuffersize) {
@@ -254,7 +255,7 @@ class OMemStream : public OStream { @@ -254,7 +255,7 @@ class OMemStream : public OStream {
} }
ImBuf *ibuf; ImBuf *ibuf;
- Int64 offset; - Int64 offset;
+ uint64_t offset; + uint64_t offset;
}; };
/* File Output Stream */ /* File Output Stream */
@@ -284,12 +285,12 @@ class OFileStream : public OStream { @@ -284,12 +285,12 @@ class OFileStream : public OStream {
check_error(); check_error();
} }
- Int64 tellp() override - Int64 tellp() override
+ uint64_t tellp() override + uint64_t tellp() override
{ {
return std::streamoff(ofs.tellp()); return std::streamoff(ofs.tellp());
} }
- void seekp(Int64 pos) override - void seekp(Int64 pos) override
+ void seekp(uint64_t pos) override + void seekp(uint64_t pos) override
{ {
ofs.seekp(pos); ofs.seekp(pos);
check_error(); check_error();
Index: blender-2.93.3/build_files/cmake/Modules/FindOpenEXR.cmake --- a/build_files/cmake/Modules/FindOpenEXR.cmake
=================================================================== +++ b/build_files/cmake/Modules/FindOpenEXR.cmake
--- blender-2.93.3.orig/build_files/cmake/Modules/FindOpenEXR.cmake
+++ blender-2.93.3/build_files/cmake/Modules/FindOpenEXR.cmake
@@ -25,6 +25,7 @@ @@ -25,6 +25,7 @@
# see accompanying file BSD-3-Clause-license.txt for details. # see accompanying file BSD-3-Clause-license.txt for details.
#============================================================================= #=============================================================================
+ +
# If OPENEXR_ROOT_DIR was defined in the environment, use it. # If OPENEXR_ROOT_DIR was defined in the environment, use it.
IF(NOT OPENEXR_ROOT_DIR AND NOT $ENV{OPENEXR_ROOT_DIR} STREQUAL "") IF(NOT OPENEXR_ROOT_DIR AND NOT $ENV{OPENEXR_ROOT_DIR} STREQUAL "")
@@ -158,7 +156,7 @@ Index: blender-2.93.3/build_files/cmake/Modules/FindOpenEXR.cmake
@@ -33,6 +34,16 @@ ENDIF() @@ -33,6 +34,16 @@ ENDIF()
# Old versions (before 2.0?) do not have any version string, just assuming this should be fine though. # Old versions (before 2.0?) do not have any version string, just assuming this should be fine though.
SET(_openexr_libs_ver_init "2.0") SET(_openexr_libs_ver_init "2.0")
+find_package(Imath CONFIG QUIET) +find_package(Imath CONFIG QUIET)
+if(TARGET Imath::Imath) +if(TARGET Imath::Imath)
+SET(_openexr_FIND_COMPONENTS +SET(_openexr_FIND_COMPONENTS
@@ -177,7 +175,7 @@ Index: blender-2.93.3/build_files/cmake/Modules/FindOpenEXR.cmake
Imath Imath
) )
+endif() +endif()
SET(_openexr_SEARCH_DIRS SET(_openexr_SEARCH_DIRS
${OPENEXR_ROOT_DIR} ${OPENEXR_ROOT_DIR}
@@ -121,6 +133,9 @@ IF(OPENEXR_FOUND) @@ -121,6 +133,9 @@ IF(OPENEXR_FOUND)
@@ -188,5 +186,5 @@ Index: blender-2.93.3/build_files/cmake/Modules/FindOpenEXR.cmake
+ list(APPEND OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR}/Imath) + list(APPEND OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR}/Imath)
+ endif() + endif()
ENDIF() ENDIF()
MARK_AS_ADVANCED( MARK_AS_ADVANCED(