- updated to 3.3.10 (LTS); build with OpenXR support

diff --git a/blender-2.76-droid.patch b/blender-2.76-droid.patch
index 2c8b6c8e4c10bb5509a464c12ef8918aff716c76..971c0afd1319e23f01fe26dd9dda18ae2aea43cd 100644 (file)
--- a/blender-2.76-droid.patch
+++ b/blender-2.76-droid.patch
@@ -1,10 +1,10 @@
---- blender-2.83.12/source/blender/blenfont/intern/blf_font_default.c~ 2021-01-15 15:25:53.000000000 +0100
-+++ blender-2.83.12/source/blender/blenfont/intern/blf_font_default.c  2021-03-06 19:32:29.170479890 +0100
-@@ -33,7 +33,7 @@
+--- blender-3.3.10/source/blender/blenfont/intern/blf_font_default.c.orig      2023-08-29 21:13:45.888397875 +0200
++++ blender-3.3.10/source/blender/blenfont/intern/blf_font_default.c   2023-08-29 21:25:10.372376410 +0200
+@@ -18,7 +18,7 @@
  
  static int blf_load_font_default(const char *filename, const bool unique)
  {
--  const char *dir = BKE_appdir_folder_id(BLENDER_DATAFILES, "fonts");
+-  const char *dir = BKE_appdir_folder_id(BLENDER_DATAFILES, BLF_DATAFILES_FONTS_DIR);
 +  const char *dir = "/usr/share/fonts/blender";
    if (dir == NULL) {
      fprintf(stderr,

diff --git a/blender.spec b/blender.spec
index a87bf3116e274b165988835bb16c8f7ed0ef19e8..a87dfeb94ad850b8fe25a485b942a16704f30099 100644 (file)
--- a/blender.spec
+++ b/blender.spec
@@ -16,15 +16,14 @@
 Summary:       3D modeling, rendering, animation and game creation package
 Summary(pl.UTF-8):     Pakiet do tworzenia animacji 3D oraz gier
 Name:          blender
-Version:       3.2.2
+Version:       3.3.10
 Release:       1
 License:       GPL v2+
 Group:         X11/Applications/Graphics
 Source0:       https://download.blender.org/source/%{name}-%{version}.tar.xz
-# Source0-md5: 245de23f60dddc2b7be09142bcd3fbbf
+# Source0-md5: a190dbfc5dfd490d737ee64ba68ce79c
 Patch0:                %{name}-2.76-droid.patch
 Patch1:                format-security.patch
-Patch2:                boost1.81.patch
 Patch3:                gcc13.patch
 URL:           https://www.blender.org/
 BuildRequires: OpenAL-devel
@@ -34,6 +33,7 @@ BuildRequires:        OpenEXR-devel
 BuildRequires: OpenGL-devel
 BuildRequires: OpenGL-GLU-devel
 BuildRequires: OpenImageIO-devel
+BuildRequires: OpenXR-devel
 BuildRequires: SDL2-devel
 BuildRequires: boost-devel
 BuildRequires: cmake >= 3.10
@@ -102,17 +102,19 @@ 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 \
-      release/scripts/addons/io_scene_fbx/fbx2json.py \
-      release/scripts/addons/io_scene_fbx/json2fbx.py \
-      release/scripts/addons/sun_position/geo.py \
-      release/scripts/modules/bl_i18n_utils/merge_po.py \
-      release/scripts/modules/bl_i18n_utils/utils_rtl.py \
-      release/scripts/modules/blend_render_info.py
+# not executable
+%{__sed} -i -e '/^#!\/usr\/bin\/env python/d' release/scripts/addons/sun_position/geo.py
+
+# /usr/bin/env python3
+%{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' \
+       release/scripts/addons/io_curve_svg/svg_util_test.py \
+       release/scripts/addons/io_scene_fbx/fbx2json.py \
+       release/scripts/addons/io_scene_fbx/json2fbx.py \
+       release/scripts/modules/bl_i18n_utils/merge_po.py \
+       release/scripts/modules/bl_i18n_utils/utils_rtl.py \
+       release/scripts/modules/blend_render_info.py
 
 %build
 install -d build
@@ -176,7 +178,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/blender
 %attr(755,root,root) %{_bindir}/blender-thumbnailer
 %attr(755,root,root) %{_datadir}/%{name}
-%{_desktopdir}/*.desktop
+%{_desktopdir}/blender.desktop
 %{_iconsdir}/hicolor/scalable/apps/blender.svg
 %{_iconsdir}/hicolor/symbolic/apps/blender-symbolic.svg
-%{_mandir}/man1/*
+%{_mandir}/man1/blender.1*

diff --git a/boost1.81.patch b/boost1.81.patch
deleted file mode 100644 (file)
index 914047a..0000000
--- a/boost1.81.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 79837c5ed4b57925bf6c6bb9e7c2248f6f52bbb0 Mon Sep 17 00:00:00 2001
-From: Sebastian Parborg <darkdefende@gmail.com>
-Date: Wed, 4 Jan 2023 15:23:26 +0100
-Subject: [PATCH] Fix building with boost >= 1.81
-
-In boost 1.81 they no longer implicitly include <iostream> anymore.
----
- intern/locale/boost_locale_wrapper.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/intern/locale/boost_locale_wrapper.cpp b/intern/locale/boost_locale_wrapper.cpp
-index fb0e194352a7..80e8d89799a8 100644
---- a/intern/locale/boost_locale_wrapper.cpp
-+++ b/intern/locale/boost_locale_wrapper.cpp
-@@ -6,6 +6,7 @@
-  */
- 
- #include <boost/locale.hpp>
-+#include <iostream>
- #include <stdio.h>
- 
- #include "boost_locale_wrapper.h"

diff --git a/gcc13.patch b/gcc13.patch
index cecf2ab3ecf059508409c6a36ea9b5b0fcac19ae..8beddd35c50206dba1da4a69a42de71c17366b77 100644 (file)
--- a/gcc13.patch
+++ b/gcc13.patch
@@ -8,3 +8,14 @@
  #include <fstream>
  #include <unordered_map>
  
+--- blender-3.3.10/intern/cycles/util/thread.cpp.orig  2023-05-15 15:48:42.000000000 +0200
++++ blender-3.3.10/intern/cycles/util/thread.cpp       2023-08-29 22:31:01.238670508 +0200
+@@ -6,6 +6,8 @@
+ #include "util/system.h"
+ #include "util/windows.h"
+ 
++#include <system_error>
++
+ CCL_NAMESPACE_BEGIN
+ 
+ thread::thread(function<void()> run_cb) : run_cb_(run_cb), joined_(false)