From ba7734fe2aab560021fa1dd5a3a9a05d374f7cfe Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Tue, 5 Apr 2022 10:11:18 +0200 Subject: [PATCH] - up to 3.1.0 --- blender.spec | 20 +++--- oiio-2.3.patch | 29 -------- openexr3.patch | 192 ------------------------------------------------- 3 files changed, 8 insertions(+), 233 deletions(-) delete mode 100644 oiio-2.3.patch delete mode 100644 openexr3.patch diff --git a/blender.spec b/blender.spec index b08f029..47e7a31 100644 --- a/blender.spec +++ b/blender.spec @@ -4,17 +4,15 @@ Summary: 3D modeling, rendering, animation and game creation package Summary(pl.UTF-8): Pakiet do tworzenia animacji 3D oraz gier Name: blender -Version: 3.0.1 -Release: 3 +Version: 3.1.0 +Release: 1 License: GPL Group: X11/Applications/Graphics -Source0: http://download.blender.org/source/%{name}-%{version}.tar.xz -# Source0-md5: 41cccf2fe68b9b307204e9b9b2278b0c +Source0: https://download.blender.org/source/%{name}-%{version}.tar.xz +# Source0-md5: 483e16f010cc8c2363ba05b716fde3d0 Patch0: %{name}-2.76-droid.patch Patch1: format-security.patch -Patch2: oiio-2.3.patch -Patch3: openexr3.patch -URL: http://www.blender.org/ +URL: https://www.blender.org/ BuildRequires: OpenAL-devel BuildRequires: OpenColorIO-devel BuildRequires: OpenEXR-devel @@ -46,8 +44,8 @@ BuildRequires: libvorbis-devel BuildRequires: openjpeg2-devel BuildRequires: openssl-devel >= 0.9.7d BuildRequires: pugixml-devel -BuildRequires: python3 -BuildRequires: python3-devel +BuildRequires: python3 >= 1:3.10 +BuildRequires: python3-devel >= 1:3.10 BuildRequires: python3-numpy-devel BuildRequires: rpm-pythonprov BuildRequires: rpmbuild(macros) >= 1.385 @@ -57,7 +55,7 @@ BuildRequires: zlib-devel Requires(post,postun): desktop-file-utils Requires: OpenGL Requires: freetype -Requires: python3-modules +Requires: python3-modules >= 1:3.10 ExclusiveArch: %{x8664} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -76,8 +74,6 @@ Blender to darmowy i w pełni funkcjonalny pakiet do tworzenia animacji %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 %{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+python(\s|$),#!%{__python3}\1,' -e '1s,#!\s*/usr/bin/env\s+python3(\s|$),#!%{__python3}\1,' \ release/scripts/addons/io_curve_svg/svg_util_test.py \ diff --git a/oiio-2.3.patch b/oiio-2.3.patch deleted file mode 100644 index 87175b7..0000000 --- a/oiio-2.3.patch +++ /dev/null @@ -1,29 +0,0 @@ -Index: blender-2.93.4/build_files/cmake/Modules/FindOpenImageIO.cmake -=================================================================== ---- blender-2.93.4.orig/build_files/cmake/Modules/FindOpenImageIO.cmake -+++ blender-2.93.4/build_files/cmake/Modules/FindOpenImageIO.cmake -@@ -48,6 +48,15 @@ FIND_LIBRARY(OPENIMAGEIO_LIBRARY - lib64 lib - ) - -+FIND_LIBRARY(OPENIMAGEIO_UTIL_LIBRARY -+ NAMES -+ OpenImageIO_Util -+ HINTS -+ ${_openimageio_SEARCH_DIRS} -+ PATH_SUFFIXES -+ lib64 lib -+ ) -+ - FIND_FILE(OPENIMAGEIO_IDIFF - NAMES - idiff -@@ -64,7 +73,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenIm - OPENIMAGEIO_LIBRARY OPENIMAGEIO_INCLUDE_DIR) - - IF(OPENIMAGEIO_FOUND) -- SET(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARY}) -+ SET(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARY} ${OPENIMAGEIO_UTIL_LIBRARY}) - SET(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO_INCLUDE_DIR}) - IF(EXISTS ${OPENIMAGEIO_INCLUDE_DIR}/OpenImageIO/pugixml.hpp) - SET(OPENIMAGEIO_PUGIXML_FOUND TRUE) diff --git a/openexr3.patch b/openexr3.patch deleted file mode 100644 index 56aef7e..0000000 --- a/openexr3.patch +++ /dev/null @@ -1,192 +0,0 @@ -Index: blender-2.93.3/source/blender/imbuf/intern/openexr/openexr_api.cpp -=================================================================== ---- blender-2.93.3.orig/source/blender/imbuf/intern/openexr/openexr_api.cpp -+++ blender-2.93.3/source/blender/imbuf/intern/openexr/openexr_api.cpp -@@ -32,30 +32,31 @@ - #include - #include - --#include -+#include - #include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include - - /* multiview/multipart */ --#include --#include --#include --#include --#include --#include --#include --#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include - - #include "DNA_scene_types.h" /* For OpenEXR compression constants */ - -@@ -131,12 +132,12 @@ class IMemStream : public Imf::IStream { - return false; - } - -- Int64 tellg() override -+ uint64_t tellg() override - { - return _exrpos; - } - -- void seekg(Int64 pos) override -+ void seekg(uint64_t pos) override - { - _exrpos = pos; - } -@@ -146,8 +147,8 @@ class IMemStream : public Imf::IStream { - } - - private: -- Int64 _exrpos; -- Int64 _exrsize; -+ uint64_t _exrpos; -+ uint64_t _exrsize; - unsigned char *_exrbuf; - }; - -@@ -182,12 +183,12 @@ class IFileStream : public Imf::IStream - return check_error(); - } - -- Int64 tellg() override -+ uint64_t tellg() override - { - return std::streamoff(ifs.tellg()); - } - -- void seekg(Int64 pos) override -+ void seekg(uint64_t pos) override - { - ifs.seekg(pos); - check_error(); -@@ -231,19 +232,19 @@ class OMemStream : public OStream { - ibuf->encodedsize += n; - } - -- Int64 tellp() override -+ uint64_t tellp() override - { - return offset; - } - -- void seekp(Int64 pos) override -+ void seekp(uint64_t pos) override - { - offset = pos; - ensure_size(offset); - } - - private: -- void ensure_size(Int64 size) -+ void ensure_size(uint64_t size) - { - /* if buffer is too small increase it. */ - while (size > ibuf->encodedbuffersize) { -@@ -254,7 +255,7 @@ class OMemStream : public OStream { - } - - ImBuf *ibuf; -- Int64 offset; -+ uint64_t offset; - }; - - /* File Output Stream */ -@@ -284,12 +285,12 @@ class OFileStream : public OStream { - check_error(); - } - -- Int64 tellp() override -+ uint64_t tellp() override - { - return std::streamoff(ofs.tellp()); - } - -- void seekp(Int64 pos) override -+ void seekp(uint64_t pos) override - { - ofs.seekp(pos); - check_error(); -Index: blender-2.93.3/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 @@ - # see accompanying file BSD-3-Clause-license.txt for details. - #============================================================================= - -+ - # If OPENEXR_ROOT_DIR was defined in the environment, use it. - IF(NOT OPENEXR_ROOT_DIR AND NOT $ENV{OPENEXR_ROOT_DIR} STREQUAL "") - SET(OPENEXR_ROOT_DIR $ENV{OPENEXR_ROOT_DIR}) -@@ -33,6 +34,16 @@ ENDIF() - # 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") - -+find_package(Imath CONFIG QUIET) -+if(TARGET Imath::Imath) -+SET(_openexr_FIND_COMPONENTS -+ Imath -+ Iex -+ OpenEXR -+ IlmThread -+) -+ -+else() - SET(_openexr_FIND_COMPONENTS - Half - Iex -@@ -40,6 +51,7 @@ SET(_openexr_FIND_COMPONENTS - IlmThread - Imath - ) -+endif() - - SET(_openexr_SEARCH_DIRS - ${OPENEXR_ROOT_DIR} -@@ -121,6 +133,9 @@ IF(OPENEXR_FOUND) - SET(OPENEXR_LIBRARIES ${_openexr_LIBRARIES}) - # Both include paths are needed because of dummy OSL headers mixing #include and #include :( - SET(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR_INCLUDE_DIR}/OpenEXR) -+ if(TARGET Imath::Imath) -+ list(APPEND OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR}/Imath) -+ endif() - ENDIF() - - MARK_AS_ADVANCED( -- 2.44.0