[packages/blender] - up to 4.4.0
baggins
baggins at pld-linux.org
Mon Mar 24 21:49:50 CET 2025
commit 98e24ec3d1f0ebdfe46c5e9a469fd4b1a3ba7add
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Mon Mar 24 22:42:21 2025 +0100
- up to 4.4.0
blender-2.76-droid.patch | 11 -------
blender-openvdb11.patch | 83 ------------------------------------------------
blender.spec | 31 +++++++-----------
format-security.patch | 10 ------
numpy2.patch | 11 +++++++
5 files changed, 22 insertions(+), 124 deletions(-)
---
diff --git a/blender.spec b/blender.spec
index 797eb7f..4a293da 100644
--- a/blender.spec
+++ b/blender.spec
@@ -16,23 +16,20 @@
Summary: 3D modeling, rendering, animation and game creation package
Summary(pl.UTF-8): Pakiet do tworzenia animacji 3D oraz gier
Name: blender
-# beware: don't use 3.3.17+, they have all the libs packaged (0.5GB compressed)
-Version: 3.6.12
-Release: 4
+Version: 4.4.0
+Release: 1
License: GPL v2+
Group: X11/Applications/Graphics
Source0: https://download.blender.org/source/%{name}-%{version}.tar.xz
-# Source0-md5: 8ab5d1389185b12a2f2bfdde171524e3
-Patch0: %{name}-2.76-droid.patch
-Patch1: format-security.patch
-Patch2: %{name}-openvdb11.patch
+# Source0-md5: 3119090d2744733970ec2345b1f3db94
+Patch0: numpy2.patch
URL: https://www.blender.org/
BuildRequires: OpenAL-devel
BuildRequires: OpenCOLLADA-devel
BuildRequires: OpenColorIO-devel >= 2.0.0
BuildRequires: OpenEXR-devel
-BuildRequires: OpenGL-devel
BuildRequires: OpenGL-GLU-devel
+BuildRequires: OpenGL-devel
BuildRequires: OpenImageIO-devel
BuildRequires: OpenXR-devel
BuildRequires: SDL2-devel
@@ -63,8 +60,8 @@ BuildRequires: libvorbis-devel
BuildRequires: libwebp-devel
BuildRequires: libxml2-devel >= 2.0
BuildRequires: openjpeg2-devel >= 2
-%{?with_openvdb:BuildRequires: openvdb-devel}
BuildRequires: openssl-devel >= 0.9.7d
+%{?with_openvdb:BuildRequires: openvdb-devel}
BuildRequires: pcre-devel
BuildRequires: pkgconfig
BuildRequires: potrace-devel
@@ -95,6 +92,10 @@ Requires: python3-modules >= 1:3.10
ExclusiveArch: %{x8664}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+# blender needs -march=x86-64-v2, let it pick
+%define filterout_c -march=x86-64 -mtune=generic
+%define filterout_cxx -march=x86-64 -mtune=generic
+
%description
Blender is a free and fully functional 3D modeling, rendering,
animation and game creation package for Unix, Windows and BeOS
@@ -107,17 +108,6 @@ Blender to darmowy i w pełni funkcjonalny pakiet do tworzenia animacji
%prep
%setup -q
%patch -P 0 -p1
-%patch -P 1 -p1
-%patch -P 2 -p1
-
-# /usr/bin/env python3
-%{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' \
- scripts/addons/io_curve_svg/svg_util_test.py \
- scripts/addons/io_scene_fbx/fbx2json.py \
- scripts/addons/io_scene_fbx/json2fbx.py \
- scripts/modules/bl_i18n_utils/merge_po.py \
- scripts/modules/bl_i18n_utils/utils_rtl.py \
- scripts/modules/blend_render_info.py
%build
install -d build
@@ -181,6 +171,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/blender-thumbnailer
%attr(755,root,root) %{_datadir}/%{name}
%{_desktopdir}/blender.desktop
+%{_datadir}/metainfo/org.blender.Blender.metainfo.xml
%{_iconsdir}/hicolor/scalable/apps/blender.svg
%{_iconsdir}/hicolor/symbolic/apps/blender-symbolic.svg
%{_mandir}/man1/blender.1*
diff --git a/blender-2.76-droid.patch b/blender-2.76-droid.patch
deleted file mode 100644
index 971c0af..0000000
--- a/blender-2.76-droid.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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, BLF_DATAFILES_FONTS_DIR);
-+ const char *dir = "/usr/share/fonts/blender";
- if (dir == NULL) {
- fprintf(stderr,
- "%s: 'fonts' data path not found for '%s', will not be able to display text\n",
diff --git a/blender-openvdb11.patch b/blender-openvdb11.patch
deleted file mode 100644
index adbc551..0000000
--- a/blender-openvdb11.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From bbb7e7a6d57f0b24d3b7374fb3747baf0d128d24 Mon Sep 17 00:00:00 2001
-From: Brecht Van Lommel <brecht at blender.org>
-Date: Sun, 10 Dec 2023 01:02:08 +0100
-Subject: [PATCH] Cycles: update to work with OpenVDB 11
-
-Ref #113157
----
- intern/cycles/scene/image_vdb.cpp | 49 ++++++++++++++++++++++++-------
- 1 file changed, 38 insertions(+), 11 deletions(-)
-
-diff --git a/intern/cycles/scene/image_vdb.cpp b/intern/cycles/scene/image_vdb.cpp
-index 478b88c6d540..d94a7973adc7 100644
---- a/intern/cycles/scene/image_vdb.cpp
-+++ b/intern/cycles/scene/image_vdb.cpp
-@@ -11,6 +11,7 @@
- # include <openvdb/tools/Dense.h>
- #endif
- #ifdef WITH_NANOVDB
-+# define NANOVDB_USE_OPENVDB
- # include <nanovdb/util/OpenToNanoVDB.h>
- #endif
-
-@@ -52,23 +53,49 @@ struct ToNanoOp {
- {
- if constexpr (!std::is_same_v<GridType, openvdb::MaskGrid>) {
- try {
-- FloatGridType floatgrid(*openvdb::gridConstPtrCast<GridType>(grid));
-+# if NANOVDB_MAJOR_VERSION_NUMBER > 32 || \
-+ (NANOVDB_MAJOR_VERSION_NUMBER == 32 && NANOVDB_MINOR_VERSION_NUMBER >= 6)
-+ /* OpenVDB 11. */
- if constexpr (std::is_same_v<FloatGridType, openvdb::FloatGrid>) {
-+ openvdb::FloatGrid floatgrid(*openvdb::gridConstPtrCast<GridType>(grid));
- if (precision == 0) {
-- nanogrid = nanovdb::openToNanoVDB<nanovdb::HostBuffer,
-- typename FloatGridType::TreeType,
-- nanovdb::FpN>(floatgrid);
-- return true;
-+ nanogrid = nanovdb::createNanoGrid<openvdb::FloatGrid, nanovdb::FpN>(floatgrid);
- }
- else if (precision == 16) {
-- nanogrid = nanovdb::openToNanoVDB<nanovdb::HostBuffer,
-- typename FloatGridType::TreeType,
-- nanovdb::Fp16>(floatgrid);
-- return true;
-+ nanogrid = nanovdb::createNanoGrid<openvdb::FloatGrid, nanovdb::Fp16>(floatgrid);
-+ }
-+ else {
-+ nanogrid = nanovdb::createNanoGrid<openvdb::FloatGrid, float>(floatgrid);
- }
- }
--
-- nanogrid = nanovdb::openToNanoVDB(floatgrid);
-+ else if constexpr (std::is_same_v<FloatGridType, openvdb::Vec3fGrid>) {
-+ openvdb::Vec3fGrid floatgrid(*openvdb::gridConstPtrCast<GridType>(grid));
-+ nanogrid = nanovdb::createNanoGrid<openvdb::Vec3fGrid, nanovdb::Vec3f>(
-+ floatgrid, nanovdb::StatsMode::Disable);
-+ }
-+# else
-+ /* OpenVDB 10. */
-+ if constexpr (std::is_same_v<FloatGridType, openvdb::FloatGrid>) {
-+ openvdb::FloatGrid floatgrid(*openvdb::gridConstPtrCast<GridType>(grid));
-+ if (precision == 0) {
-+ nanogrid =
-+ nanovdb::openToNanoVDB<nanovdb::HostBuffer, openvdb::FloatTree, nanovdb::FpN>(
-+ floatgrid);
-+ }
-+ else if (precision == 16) {
-+ nanogrid =
-+ nanovdb::openToNanoVDB<nanovdb::HostBuffer, openvdb::FloatTree, nanovdb::Fp16>(
-+ floatgrid);
-+ }
-+ else {
-+ nanogrid = nanovdb::openToNanoVDB(floatgrid);
-+ }
-+ }
-+ else if constexpr (std::is_same_v<FloatGridType, openvdb::Vec3fGrid>) {
-+ openvdb::Vec3fGrid floatgrid(*openvdb::gridConstPtrCast<GridType>(grid));
-+ nanogrid = nanovdb::openToNanoVDB(floatgrid);
-+ }
-+# endif
- }
- catch (const std::exception &e) {
- VLOG_WARNING << "Error converting OpenVDB to NanoVDB grid: " << e.what();
diff --git a/format-security.patch b/format-security.patch
deleted file mode 100644
index 37359ed..0000000
--- a/format-security.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- blender-3.6.11/CMakeLists.txt.orig 2024-04-22 06:14:39.886543221 +0200
-+++ blender-3.6.11/CMakeLists.txt 2024-04-22 06:21:54.802131251 +0200
-@@ -1534,7 +1534,6 @@ if(CMAKE_COMPILER_IS_GNUCC)
- add_check_c_compiler_flag(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_FUNCTION -Wno-unused-function)
- add_check_c_compiler_flag(C_REMOVE_STRICT_FLAGS C_WARN_NO_TYPE_LIMITS -Wno-type-limits)
- add_check_c_compiler_flag(C_REMOVE_STRICT_FLAGS C_WARN_NO_INT_IN_BOOL_CONTEXT -Wno-int-in-bool-context)
-- add_check_c_compiler_flag(C_REMOVE_STRICT_FLAGS C_WARN_NO_FORMAT -Wno-format)
- add_check_c_compiler_flag(C_REMOVE_STRICT_FLAGS C_WARN_NO_SWITCH -Wno-switch)
- add_check_c_compiler_flag(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_VARIABLE -Wno-unused-variable)
- add_check_c_compiler_flag(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_VARIABLE -Wno-uninitialized)
diff --git a/numpy2.patch b/numpy2.patch
new file mode 100644
index 0000000..5891828
--- /dev/null
+++ b/numpy2.patch
@@ -0,0 +1,11 @@
+--- blender-4.4.0/CMakeLists.txt~ 2025-03-06 03:05:07.000000000 +0100
++++ blender-4.4.0/CMakeLists.txt 2025-03-24 20:59:35.583315735 +0100
+@@ -2519,7 +2519,7 @@
+ # Always use numpy bundled in precompiled libs.
+ elseif((WITH_PYTHON_INSTALL AND WITH_PYTHON_INSTALL_NUMPY) OR WITH_PYTHON_NUMPY)
+ if(("${PYTHON_NUMPY_PATH}" STREQUAL "") OR (${PYTHON_NUMPY_PATH} MATCHES NOTFOUND))
+- find_python_package(numpy "core/include")
++ find_python_package(numpy "_core/include")
+ endif()
+ endif()
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/blender.git/commitdiff/98e24ec3d1f0ebdfe46c5e9a469fd4b1a3ba7add
More information about the pld-cvs-commit
mailing list