The package rpms/blender.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/blender.git/commit/?id=db6e1edb71....
Change:
+%ifnarch x86_64
Thanks.
Full change:
============
commit aaef6b8b0c3b0d86b4893f808f04e679bfc53479
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Wed Jan 20 23:34:20 2021 -0800
Update to 2.91.2 (#1918303)
diff --git a/sources b/sources
index 954d150..b8295b7 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-SHA512 (blender-2.91.0.tar.xz) =
a4b6cb09765d735274fb4a61ac301cbd6ee16f09ab77b19a6e283454b9b8a8c76f1b181501dc285b288130da9e283d3343b948b2855eea00bcb9e114636d55aa
-=======
SHA512 (blender-2.91.2.tar.xz) =
9a3bae01bd09b1d665af4882f53e8a88d85ff44678233c90788a7801ce0d551a3cc1f71026b71ea1c77d7eaedf7ab6fc8709104c22b564f4fc6cc0d5b3b76f5e
->>>>>>> master
commit d1a17ee7dd275e85a1d84a4b946d8a51c746c9a5
Merge: 1e4d0a9 8cfb5e1
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Wed Jan 20 23:33:32 2021 -0800
Update to 2.91.2 (#1918303)
diff --cc .gitignore
index d753b02,5f9a789..1c7e6f9
--- a/.gitignore
+++ b/.gitignore
@@@ -64,3 -64,4 +64,7 @@@
/blender-embree-library.diff
/blender-2.90.1.tar.xz
/blender-2.91.0.tar.xz
++<<<<<<< HEAD
++=======
+ /blender-2.91.2.tar.xz
++>>>>>>> master
diff --cc blender.spec
index f027b5e,d7418aa..75defce
--- a/blender.spec
+++ b/blender.spec
@@@ -99,9 -95,6 +95,7 @@@ BuildRequires: cmake(embree
%endif
BuildRequires: opensubdiv-devel
%if %{with openshading}
- <<<<<<< HEAD
+BuildRequires: cmake(OSL)
- =======
# Use oslc compiler
BuildRequires: openshadinglanguage
BuildRequires: pkgconfig(oslcomp)
diff --cc sources
index dbfb416,b8295b7..954d150
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
+SHA512 (blender-2.91.0.tar.xz) =
a4b6cb09765d735274fb4a61ac301cbd6ee16f09ab77b19a6e283454b9b8a8c76f1b181501dc285b288130da9e283d3343b948b2855eea00bcb9e114636d55aa
++=======
+ SHA512 (blender-2.91.2.tar.xz) =
9a3bae01bd09b1d665af4882f53e8a88d85ff44678233c90788a7801ce0d551a3cc1f71026b71ea1c77d7eaedf7ab6fc8709104c22b564f4fc6cc0d5b3b76f5e
++>>>>>>> master
commit 8cfb5e12e0bd57a328a8e3bd04fd1460e10180fe
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Wed Jan 20 23:29:47 2021 -0800
Update to 2.91.2 (#1918303)
diff --git a/.gitignore b/.gitignore
index d753b02..5f9a789 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,3 +64,4 @@
/blender-embree-library.diff
/blender-2.90.1.tar.xz
/blender-2.91.0.tar.xz
+/blender-2.91.2.tar.xz
diff --git a/blender-fonts.metainfo.xml b/blender-fonts.metainfo.xml
deleted file mode 100644
index 1568824..0000000
--- a/blender-fonts.metainfo.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2016 Luya Tshimbalanga <luya(a)fedoraproject.org> -->
-<component type="font">
- <id>blender-fonts</id>
- <metadata_license> CC0-1.0</metadata_license>
- <name>Blender fonts</name>
- <summary>International blender mono space font</summary>
- <description>
- <p>A set of international blender mono space font to cover several
characters.</p>
- <p>These fonts are mainly used for the interface of Blender 3D.</p>
- </description>
- <url type="homepage">https://www.blender.org</url>
- <updatecontact>luya(a)fedoraproject.org</updatecontact>
-</component>
diff --git a/blender.spec b/blender.spec
index 5d94eda..d7418aa 100644
--- a/blender.spec
+++ b/blender.spec
@@ -25,8 +25,8 @@
Name: blender
Epoch: 1
-Version: %{blender_api}.0
-Release: 7%{?dist}
+Version: %{blender_api}.2
+Release: 1%{?dist}
Summary: 3D modeling, animation, rendering and post-production
@@ -242,6 +242,7 @@ sed -i 's|${CMAKE_CXX_FLAGS} -std=c++17|${CMAKE_CXX_FLAGS}
-std=c++17|' CMakeLis
-DWITH_DOC_MANPAGE=ON \
%if %{with wayland}
-DWITH_GHOST_WAYLAND=ON \
+ -DWITH_GL_EGL=ON \
%endif
-DWITH_INSTALL_PORTABLE=OFF \
-DWITH_OPENSUBDIV=ON \
@@ -306,6 +307,9 @@ appstream-util validate-relax --nonet
%{buildroot}%{_metainfodir}/%{name}.appdat
%{macrosdir}/macros.%{name}
%changelog
+* Wed Jan 20 2021 Fedora Release Monitoring <release-monitoring(a)fedoraproject.org>
- 1:2.91.2-1
+- Update to 2.91.2 (#1918303)
+
* Mon Jan 18 2021 Mamoru TASAKA <luya(a)fedoraproject.org> - 1:2.91.0-7
- Backport eigen3 log1p fix for now
diff --git a/sources b/sources
index dbfb416..b8295b7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (blender-2.91.0.tar.xz) =
a4b6cb09765d735274fb4a61ac301cbd6ee16f09ab77b19a6e283454b9b8a8c76f1b181501dc285b288130da9e283d3343b948b2855eea00bcb9e114636d55aa
+SHA512 (blender-2.91.2.tar.xz) =
9a3bae01bd09b1d665af4882f53e8a88d85ff44678233c90788a7801ce0d551a3cc1f71026b71ea1c77d7eaedf7ab6fc8709104c22b564f4fc6cc0d5b3b76f5e
commit abc54e5e69a3b704d6cbdb7f6bb96a85f1b6c178
Author: Mamoru TASAKA <mtasaka(a)fedoraproject.org>
Date: Tue Jan 19 11:19:10 2021 +0900
Backport eigen3 log1p fix for now
diff --git a/blender-2.91-eigen3-log1p-ifelse.patch
b/blender-2.91-eigen3-log1p-ifelse.patch
new file mode 100644
index 0000000..8374031
--- /dev/null
+++ b/blender-2.91-eigen3-log1p-ifelse.patch
@@ -0,0 +1,13 @@
+--- blender-2.91.0/extern/Eigen3/Eigen/src/Core/MathFunctions.h.ifelse 2020-02-17
19:00:06.000000000 +0900
++++ blender-2.91.0/extern/Eigen3/Eigen/src/Core/MathFunctions.h 2021-01-18
23:04:43.551976542 +0900
+@@ -482,8 +482,9 @@ struct log1p_impl {
+ EIGEN_STATIC_ASSERT_NON_INTEGER(Scalar)
+ #if EIGEN_HAS_CXX11_MATH
+ using std::log1p;
+- #endif
++ #else
+ using std_fallback::log1p;
++ #endif
+ return log1p(x);
+ }
+ };
diff --git a/blender.spec b/blender.spec
index ae3aa12..5d94eda 100644
--- a/blender.spec
+++ b/blender.spec
@@ -38,6 +38,10 @@ Source1: %{name}.thumbnailer
Source2: %{name}.xml
Source3: macros.%{name}
+# Extracted from
+#
https://gitlab.com/libeigen/eigen/-/commit/d55d392e7b1136655b4223bea8e99c...
+Patch0: blender-2.91-eigen3-log1p-ifelse.patch
+
# Development stuff
BuildRequires: boost-devel
#BuildRequires: cmake(clang)
@@ -302,6 +306,9 @@ appstream-util validate-relax --nonet
%{buildroot}%{_metainfodir}/%{name}.appdat
%{macrosdir}/macros.%{name}
%changelog
+* Mon Jan 18 2021 Mamoru TASAKA <luya(a)fedoraproject.org> - 1:2.91.0-7
+- Backport eigen3 log1p fix for now
+
* Mon Jan 18 2021 Nicolas Chauvet <kwizart(a)gmail.com> - 1:2.91.0-7
- Drop blender font patch
commit 9d7f660af64323787b5a9b214e320cac01fde395
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Jan 18 15:24:05 2021 +0100
Switch to git-core
diff --git a/blender.spec b/blender.spec
index 42b86bb..ae3aa12 100644
--- a/blender.spec
+++ b/blender.spec
@@ -45,7 +45,7 @@ BuildRequires: cmake
BuildRequires: desktop-file-utils
BuildRequires: gcc-c++
BuildRequires: gettext
-BuildRequires: git
+BuildRequires: git-core
BuildRequires: libtool
BuildRequires: libspnav-devel
BuildRequires: llvm-devel
commit 3c23e8fa0ee07cfd6186f0e7509b4ebd32c06911
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Jan 18 15:01:09 2021 +0100
Update changelog
diff --git a/blender.spec b/blender.spec
index eebbf32..42b86bb 100644
--- a/blender.spec
+++ b/blender.spec
@@ -26,7 +26,7 @@
Name: blender
Epoch: 1
Version: %{blender_api}.0
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: 3D modeling, animation, rendering and post-production
@@ -302,6 +302,9 @@ appstream-util validate-relax --nonet
%{buildroot}%{_metainfodir}/%{name}.appdat
%{macrosdir}/macros.%{name}
%changelog
+* Mon Jan 18 2021 Nicolas Chauvet <kwizart(a)gmail.com> - 1:2.91.0-7
+- Drop blender font patch
+
* Mon Jan 18 2021 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.91.0-6
- Obsolete subpackage blender-fonts(#1917244)
commit 949da9f3a738620ea91b4381136042f218c83075
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Jan 18 14:59:18 2021 +0100
Drop old blender font patch - ref rhbz#1889049
diff --git a/blender-2.90-droid.patch b/blender-2.90-droid.patch
deleted file mode 100644
index 7bd38ff..0000000
--- a/blender-2.90-droid.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ru blender-2.90.0.orig/source/blender/blenfont/intern/blf_font_default.c
blender-2.90.0/source/blender/blenfont/intern/blf_font_default.c
---- blender-2.90.0.orig/source/blender/blenfont/intern/blf_font_default.c 2020-08-31
04:59:45.000000000 -0700
-+++ blender-2.90.0/source/blender/blenfont/intern/blf_font_default.c 2020-09-04
21:01:00.797111420 -0700
-@@ -33,7 +33,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 = "/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 -ru blender-2.90.0.orig/source/creator/CMakeLists.txt
blender-2.90.0/source/creator/CMakeLists.txt
---- blender-2.90.0.orig/source/creator/CMakeLists.txt 2020-08-31 05:03:18.000000000
-0700
-+++ blender-2.90.0/source/creator/CMakeLists.txt 2020-09-04 21:02:46.191496948 -0700
-@@ -388,8 +388,8 @@
- # fonts
- install(
- DIRECTORY
-- ${CMAKE_SOURCE_DIR}/release/datafiles/fonts
-- DESTINATION ${TARGETDIR_VER}/datafiles
-+ ${CMAKE_SOURCE_DIR}/release/datafiles/fonts/
-+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/fonts/blender
- )
-
- # localization
diff --git a/blender.spec b/blender.spec
index f7342d0..eebbf32 100644
--- a/blender.spec
+++ b/blender.spec
@@ -38,9 +38,6 @@ Source1: %{name}.thumbnailer
Source2: %{name}.xml
Source3: macros.%{name}
-# Patch to separate built-in fonts to the fonts directory
-#Patch0: %%{name}-2.90-droid.patch
-
# Development stuff
BuildRequires: boost-devel
#BuildRequires: cmake(clang)
@@ -161,8 +158,6 @@ BuildRequires: libappstream-glib
Requires: google-droid-sans-fonts
Requires: hicolor-icon-theme
-Requires: %{name}-fonts = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: fontpackages-filesystem
Requires: python3dist(requests)
Requires: python3dist(numpy)
Provides: blender(ABI) = %{blender_api}
@@ -171,7 +166,7 @@ Provides: blender(ABI) = %{blender_api}
Obsoletes: blenderplayer < 1:2.80-1
Provides: blenderplayer = 1:2.80-1
-# Obsoletes separate Blender Fonts
+# Obsoletes separate Blender Fonts - rhbz#1889049
Obsoletes: blender-fonts < 1:2.91.0-5
# Starting from 2.90, Blender support only 64-bits architectures
commit 97a1573ddddac46246f1e519e8d64b87c8e25bf3
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Mon Jan 18 01:56:48 2021 -0800
Obsolete subpackage blender-fonts(#1917244)
diff --git a/blender.spec b/blender.spec
index dd411bf..f7342d0 100644
--- a/blender.spec
+++ b/blender.spec
@@ -26,7 +26,7 @@
Name: blender
Epoch: 1
Version: %{blender_api}.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: 3D modeling, animation, rendering and post-production
@@ -171,6 +171,9 @@ Provides: blender(ABI) = %{blender_api}
Obsoletes: blenderplayer < 1:2.80-1
Provides: blenderplayer = 1:2.80-1
+# Obsoletes separate Blender Fonts
+Obsoletes: blender-fonts < 1:2.91.0-5
+
# Starting from 2.90, Blender support only 64-bits architectures
ExclusiveArch: x86_64 aarch64 ppc64le
# s390x is excluded due
https://bugzilla.redhat.com/show_bug.cgi?id=1874398
@@ -304,7 +307,10 @@ appstream-util validate-relax --nonet
%{buildroot}%{_metainfodir}/%{name}.appdat
%{macrosdir}/macros.%{name}
%changelog
-* Sun Jan 10 2021 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.90.1-5
+* Mon Jan 18 2021 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.91.0-6
+- Obsolete subpackage blender-fonts(#1917244)
+
+* Sun Jan 10 2021 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.91.0-5
- Rebuild for OpenEXR 2.5.4
- Drop patch for fonts path (#1889049)
commit db6e1edb71bf5a04583a29dc1049e95d1dd35619
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Sat Jan 16 14:08:51 2021 -0800
Rebuild for OpenEXR 2.5.4
Drop patch for fonts path (#1889049)
diff --git a/blender.spec b/blender.spec
index 47fd35d..dd411bf 100644
--- a/blender.spec
+++ b/blender.spec
@@ -2,18 +2,10 @@
%undefine __cmake_in_source_build
%global blender_api 2.91
-
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo
$d)
-%ifarch %{ix86} x86_64
-%global cyclesflag ON
-%else
-%global cyclesflag OFF
-%endif
-
%bcond_with ffmpeg
%bcond_with openshading
-%bcond_with usd
%bcond_with wayland
# Only available on x86_64
@@ -21,16 +13,20 @@
%bcond_without embree
%bcond_without hidapi
%bcond_without oidn
+%bcond_without usd
+%global cyclesflag ON
%else
%bcond_with embree
%bcond_with hidapi
%bcond_with oidn
+%bcond_with usd
+%global cyclesflag OFF
%endif
Name: blender
Epoch: 1
Version: %{blender_api}.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: 3D modeling, animation, rendering and post-production
@@ -39,24 +35,15 @@ URL:
http://www.blender.org
Source0:
http://download.%{name}.org/source/%{name}-%{version}.tar.xz
Source1: %{name}.thumbnailer
-Source2: %{name}-fonts.metainfo.xml
-Source3: %{name}.xml
-Source4: macros.%{name}
+Source2: %{name}.xml
+Source3: macros.%{name}
# Patch to separate built-in fonts to the fonts directory
-Patch0: %{name}-2.90-droid.patch
-
-# Use EMBREE_LIBRARY otherwise build fails
-# based from Arch Linux patch
-#
https://github.com/archlinux/svntogit-community/blob/packages/blender/tru...
-#Patch1: %%{name}-embree-library.diff
-
-# Fix T82520: error building freestyle with Python3.8
-#
https://developer.blender.org/rBe118426e4695a97d67e65d69677f3c4e2db50a56
-#Patch2: %%{name}-freestyle-python-fix.patch
+#Patch0: %%{name}-2.90-droid.patch
# Development stuff
BuildRequires: boost-devel
+#BuildRequires: cmake(clang)
BuildRequires: cmake
BuildRequires: desktop-file-utils
BuildRequires: gcc-c++
@@ -110,7 +97,6 @@ BuildRequires: opensubdiv-devel
# Use oslc compiler
BuildRequires: openshadinglanguage
BuildRequires: pkgconfig(oslcomp)
-BuildRequires: pkgconfig(oslquery)
%endif
%if %{with oidn}
BuildRequires: cmake(OpenImageDenoise)
@@ -189,7 +175,6 @@ Provides: blenderplayer = 1:2.80-1
ExclusiveArch: x86_64 aarch64 ppc64le
# s390x is excluded due
https://bugzilla.redhat.com/show_bug.cgi?id=1874398
-
%description
Blender is the essential software solution you need for 3D, from modeling,
animation, rendering and post-production to interactive creation and playback.
@@ -205,17 +190,6 @@ BuildArch: noarch
This package provides rpm macros to support the creation of third-party addon
packages to extend Blender.
-%package fonts
-Summary: International Blender mono space font
-License: ASL 2.0 and GPLv3 and Bitstream Vera and Public Domain
-BuildArch: noarch
-Obsoletes: fonts-%{name} < 1:2.78-3
-Provides: fonts-%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description fonts
-This package contains an international Blender mono space font which is a
-composition of several mono space fonts to cover several character sets.
-
%prep
%autosetup -p1
@@ -230,11 +204,11 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" .
# Use c++17 in order to fix build errors when including headers
# from the latest version of openvdb.
# Upstream issue:
https://github.com/AcademySoftwareFoundation/openvdb/issues/795
-sed -i 's|${CMAKE_CXX_FLAGS} -std=c++11|${CMAKE_CXX_FLAGS} -std=c++17|'
CMakeLists.txt
+sed -i 's|${CMAKE_CXX_FLAGS} -std=c++17|${CMAKE_CXX_FLAGS} -std=c++17|'
CMakeLists.txt
%build
%cmake . \
-%ifnarch %{ix86} x86_64
+%ifnarch x86_64
-DWITH_RAYOPTIMIZATION=OFF \
%endif
%if %{with ffmpeg}
@@ -262,7 +236,7 @@ sed -i 's|${CMAKE_CXX_FLAGS} -std=c++11|${CMAKE_CXX_FLAGS}
-std=c++17|' CMakeLis
-DPYTHON_VERSION=%{python3_version} \
-DWITH_ALEMBIC=ON \
-DWITH_CYCLES=%{cyclesflag} \
- -DWITH_CYCLES_EMBREE=OFF \
+ -DWITH_CYCLES_EMBREE=%{cyclesflag} \
-DWITH_DOC_MANPAGE=ON \
%if %{with wayland}
-DWITH_GHOST_WAYLAND=ON \
@@ -273,7 +247,10 @@ sed -i 's|${CMAKE_CXX_FLAGS} -std=c++11|${CMAKE_CXX_FLAGS}
-std=c++17|' CMakeLis
-DWITH_OPENVDB_BLOSC=ON \
-DWITH_PYTHON_INSTALL=OFF \
-DWITH_PYTHON_INSTALL_REQUESTS=OFF \
+ -DWITH_SYSTEM_GLEW=ON \
+%if %{with usd}
-DWITH_USD=OFF
+%endif
%cmake_build
@@ -284,19 +261,18 @@ sed -i 's|${CMAKE_CXX_FLAGS} -std=c++11|${CMAKE_CXX_FLAGS}
-std=c++17|' CMakeLis
install -p -D -m 644 %{SOURCE1} %{buildroot}%{_datadir}/thumbnailers/%{name}.thumbnailer
# Mime support
-install -p -D -m 644 %{SOURCE3} %{buildroot}%{_datadir}/mime/packages/%{name}.xml
+install -p -D -m 644 %{SOURCE2} %{buildroot}%{_datadir}/mime/packages/%{name}.xml
# Deal with docs in the files section
rm -rf %{buildroot}%{_docdir}/%{name}/*
# rpm macros
mkdir -p %{buildroot}%{macrosdir}
-sed -e 's/@VERSION@/%{blender_api}/g' %{SOURCE4} >
%{buildroot}%{macrosdir}/macros.%{name}
+sed -e 's/@VERSION@/%{blender_api}/g' %{SOURCE3} >
%{buildroot}%{macrosdir}/macros.%{name}
# AppData
install -p -m 644 -D release/freedesktop/org.%{name}.Blender.appdata.xml \
%{buildroot}%{_metainfodir}/%{name}.appdata.xml
-install -p -m 644 -D %{SOURCE2} %{buildroot}%{_metainfodir}/%{name}-fonts.metainfo.xml
# Localization
%find_lang %{name}
@@ -308,7 +284,6 @@ find %{buildroot}%{_datadir}/%{name}/%{blender_api}/scripts -name
"*.py" -exec c
%check
desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdata.xml
-appstream-util validate-relax --nonet
%{buildroot}%{_metainfodir}/%{name}-fonts.metainfo.xml
%files -f %{name}.lang
%license COPYING
@@ -328,14 +303,11 @@ appstream-util validate-relax --nonet
%{buildroot}%{_metainfodir}/%{name}-fonts.
%files rpm-macros
%{macrosdir}/macros.%{name}
-%files fonts
-%license release/license/bfont.ttf.txt
-%license release/license/bmonofont-i18n.ttf.txt
-%license release/license/droidsans.ttf.txt
-%{_fontbasedir}/%{name}/
-%{_metainfodir}/%{name}-fonts.metainfo.xml
-
%changelog
+* Sun Jan 10 2021 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.90.1-5
+- Rebuild for OpenEXR 2.5.4
+- Drop patch for fonts path (#1889049)
+
* Mon Jan 04 2021 Miro Hrončok <mhroncok(a)redhat.com> - 1:2.91.0-4
- Rebuild for new libopenvdb
- Fixes: rhbz#1912498
commit 09f62e71a413afceb8acb2e08495030e75677002
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Mon Jan 4 16:36:06 2021 +0100
Rebuild for new libopenvdb
diff --git a/blender.spec b/blender.spec
index 97b793f..47fd35d 100644
--- a/blender.spec
+++ b/blender.spec
@@ -30,7 +30,7 @@
Name: blender
Epoch: 1
Version: %{blender_api}.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: 3D modeling, animation, rendering and post-production
@@ -336,6 +336,10 @@ appstream-util validate-relax --nonet
%{buildroot}%{_metainfodir}/%{name}-fonts.
%{_metainfodir}/%{name}-fonts.metainfo.xml
%changelog
+* Mon Jan 04 2021 Miro Hrončok <mhroncok(a)redhat.com> - 1:2.91.0-4
+- Rebuild for new libopenvdb
+- Fixes: rhbz#1912498
+
* Fri Jan 01 2021 Richard Shaw <hobbes1069(a)gmail.com> - 1:2.91.0-3
- Rebuild for OpenEXR 2.5.3.
commit aab485d8e3bfd1ace586a3ddb992eb1c78f72766
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Fri Jan 1 16:17:23 2021 -0600
Rebuild for OpenEXR 2.5.3.
diff --git a/blender.spec b/blender.spec
index 19d9faf..97b793f 100644
--- a/blender.spec
+++ b/blender.spec
@@ -30,7 +30,7 @@
Name: blender
Epoch: 1
Version: %{blender_api}.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: 3D modeling, animation, rendering and post-production
@@ -336,6 +336,9 @@ appstream-util validate-relax --nonet
%{buildroot}%{_metainfodir}/%{name}-fonts.
%{_metainfodir}/%{name}-fonts.metainfo.xml
%changelog
+* Fri Jan 01 2021 Richard Shaw <hobbes1069(a)gmail.com> - 1:2.91.0-3
+- Rebuild for OpenEXR 2.5.3.
+
* Fri Nov 27 2020 Fedora Release Monitoring <release-monitoring(a)fedoraproject.org>
- 1:2.91.0-2
- Rebuild for embree 3.12.1
commit bd1d62a02df4ad9ccd3e9872c3420bae51d5d1c0
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Sat Nov 28 00:12:23 2020 -0800
Rebuild for embree 3.12.1
diff --git a/blender.spec b/blender.spec
index 75d11e6..19d9faf 100644
--- a/blender.spec
+++ b/blender.spec
@@ -30,7 +30,7 @@
Name: blender
Epoch: 1
Version: %{blender_api}.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: 3D modeling, animation, rendering and post-production
@@ -336,6 +336,9 @@ appstream-util validate-relax --nonet
%{buildroot}%{_metainfodir}/%{name}-fonts.
%{_metainfodir}/%{name}-fonts.metainfo.xml
%changelog
+* Fri Nov 27 2020 Fedora Release Monitoring <release-monitoring(a)fedoraproject.org>
- 1:2.91.0-2
+- Rebuild for embree 3.12.1
+
* Wed Nov 25 2020 Fedora Release Monitoring <release-monitoring(a)fedoraproject.org>
- 1:2.91.0-1
- Update to 2.91.0 (#1901446)
commit 71c66784ddf88e428ee76b0ccc4b9893a6332710
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Thu Nov 26 01:41:18 2020 -0800
Update to 2.91.0 (#1901446)
diff --git a/.gitignore b/.gitignore
index edc4e82..d753b02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,3 +63,4 @@
/blender-2.90-droid.patch
/blender-embree-library.diff
/blender-2.90.1.tar.xz
+/blender-2.91.0.tar.xz
diff --git a/blender.spec b/blender.spec
index 4dd9161..75d11e6 100644
--- a/blender.spec
+++ b/blender.spec
@@ -1,7 +1,7 @@
# Force out of source build
%undefine __cmake_in_source_build
-%global blender_api 2.90
+%global blender_api 2.91
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo
$d)
@@ -27,29 +27,33 @@
%bcond_with oidn
%endif
-Name: blender
-Epoch: 1
-Version: %{blender_api}.1
-Release: 3%{?dist}
+Name: blender
+Epoch: 1
+Version: %{blender_api}.0
+Release: 1%{?dist}
-Summary: 3D modeling, animation, rendering and post-production
-License: GPLv2
-URL:
http://www.blender.org
+Summary: 3D modeling, animation, rendering and post-production
+License: GPLv2
+URL:
http://www.blender.org
-Source0:
http://download.%{name}.org/source/%{name}-%{version}.tar.xz
-Source1: %{name}.thumbnailer
-Source2: %{name}-fonts.metainfo.xml
-Source3: %{name}.xml
-Source4: macros.%{name}
+Source0:
http://download.%{name}.org/source/%{name}-%{version}.tar.xz
+Source1: %{name}.thumbnailer
+Source2: %{name}-fonts.metainfo.xml
+Source3: %{name}.xml
+Source4: macros.%{name}
# Patch to separate built-in fonts to the fonts directory
-Patch0: %{name}-2.90-droid.patch
+Patch0: %{name}-2.90-droid.patch
# Use EMBREE_LIBRARY otherwise build fails
# based from Arch Linux patch
#
https://github.com/archlinux/svntogit-community/blob/packages/blender/tru...
-Patch1: %{name}-embree-library.diff
+#Patch1: %%{name}-embree-library.diff
+
+# Fix T82520: error building freestyle with Python3.8
+#
https://developer.blender.org/rBe118426e4695a97d67e65d69677f3c4e2db50a56
+#Patch2: %%{name}-freestyle-python-fix.patch
# Development stuff
BuildRequires: boost-devel
@@ -76,7 +80,7 @@ BuildRequires: pkgconfig(pugixml)
%else
BuildRequires: pugixml-devel
%endif
-BuildRequires: pkgconfig(python3) >= 3.5
+BuildRequires: pkgconfig(python3) >= 3.7
%if %{with wayland}
BuildRequires: pkgconfig(wayland-client)
BuildRequires: pkgconfig(xkbcommon)
@@ -103,9 +107,10 @@ BuildRequires: cmake(embree)
%endif
BuildRequires: opensubdiv-devel
%if %{with openshading}
-BuildRequires: cmake(OSL)
# Use oslc compiler
BuildRequires: openshadinglanguage
+BuildRequires: pkgconfig(oslcomp)
+BuildRequires: pkgconfig(oslquery)
%endif
%if %{with oidn}
BuildRequires: cmake(OpenImageDenoise)
@@ -122,6 +127,7 @@ BuildRequires: pkgconfig(freeglut)
%endif
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(glu)
+BuildRequires: pkgconfig(openxr)
BuildRequires: pkgconfig(xi)
BuildRequires: pkgconfig(xrender)
BuildRequires: pkgconfig(ode)
@@ -147,6 +153,7 @@ BuildRequires: pkgconfig(OpenEXR)
BuildRequires: pkgconfig(OpenImageIO)
BuildRequires: pkgconfig(libopenjp2)
BuildRequires: pkgconfig(tbb)
+BuildRequires: potrace-devel
# Audio stuff
BuildRequires: pkgconfig(ao)
@@ -235,12 +242,9 @@ sed -i 's|${CMAKE_CXX_FLAGS} -std=c++11|${CMAKE_CXX_FLAGS}
-std=c++17|' CMakeLis
%else
-DWITH_CODEC_FFMPEG=OFF \
%endif
-%if %{with embree}
- -DEMBREE_LIBRARY=%{_libdir} \
- -DEMBREE_INCLUDE_DIR=%{_includedir} \
-%endif
- -DWITH_CYCLES_EMBREE=OFF \
%if %{with openshading}
+ -D_osl_LIBRARIES=%{_libdir} \
+ -DOSL_INCLUDE_DIR=%{_includedir} \
-DOSL_COMPILER=%{_bindir}/oslc \
%endif
%if %{with oidn}
@@ -258,6 +262,7 @@ sed -i 's|${CMAKE_CXX_FLAGS} -std=c++11|${CMAKE_CXX_FLAGS}
-std=c++17|' CMakeLis
-DPYTHON_VERSION=%{python3_version} \
-DWITH_ALEMBIC=ON \
-DWITH_CYCLES=%{cyclesflag} \
+ -DWITH_CYCLES_EMBREE=OFF \
-DWITH_DOC_MANPAGE=ON \
%if %{with wayland}
-DWITH_GHOST_WAYLAND=ON \
@@ -324,14 +329,19 @@ appstream-util validate-relax --nonet
%{buildroot}%{_metainfodir}/%{name}-fonts.
%{macrosdir}/macros.%{name}
%files fonts
-%license release/datafiles/LICENSE-*.ttf.txt
+%license release/license/bfont.ttf.txt
+%license release/license/bmonofont-i18n.ttf.txt
+%license release/license/droidsans.ttf.txt
%{_fontbasedir}/%{name}/
%{_metainfodir}/%{name}-fonts.metainfo.xml
%changelog
+* Wed Nov 25 2020 Fedora Release Monitoring <release-monitoring(a)fedoraproject.org>
- 1:2.91.0-1
+- Update to 2.91.0 (#1901446)
+
* Mon Oct 26 2020 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.90.1-3
- Add hdapi, lame and vpx (webm) dependencies
-- Disable python safety (#1872980)
+- Upstream atch fixing python3 support script (#1872980)
- Use c++17
* Sat Oct 03 2020 Richard Shaw <hobbes1069(a)gmail.com> - 1:2.90.1-2
diff --git a/sources b/sources
index fe7e132..dbfb416 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (blender-2.90.1.tar.xz) =
e7d6f8df598f2a2a99f64716331ec4e981a5a49c76b307caf7856480c778455cfc4bbb56fbedc8b22d1e10951ebaeb6844d1ead9476847bf2824dddf5b135992
+SHA512 (blender-2.91.0.tar.xz) =
a4b6cb09765d735274fb4a61ac301cbd6ee16f09ab77b19a6e283454b9b8a8c76f1b181501dc285b288130da9e283d3343b948b2855eea00bcb9e114636d55aa
commit 251c1330020511edd3bb90ced00991b7413b0091
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Sat Oct 31 11:45:53 2020 -0700
Add hdapi, lame and vpx (webm) dependencies
Disable python safety (#1872980)
Use c++17
diff --git a/blender.spec b/blender.spec
index 7ab0439..4dd9161 100644
--- a/blender.spec
+++ b/blender.spec
@@ -13,21 +13,24 @@
%bcond_with ffmpeg
%bcond_with openshading
+%bcond_with usd
%bcond_with wayland
# Only available on x86_64
%ifarch x86_64
%bcond_without embree
+%bcond_without hidapi
%bcond_without oidn
%else
%bcond_with embree
+%bcond_with hidapi
%bcond_with oidn
%endif
Name: blender
Epoch: 1
Version: %{blender_api}.1
-Release: 1%{?dist}
+Release: 3%{?dist}
Summary: 3D modeling, animation, rendering and post-production
@@ -60,6 +63,10 @@ BuildRequires: libspnav-devel
BuildRequires: llvm-devel
BuildRequires: pkgconfig(blosc)
BuildRequires: pkgconfig(expat)
+BuildRequires: pkgconfig(gmp)
+%if %{with hidapi}
+BuildRequires: pkgconfig(hidapi-hidraw)
+%endif
BuildRequires: pkgconfig(jemalloc)
BuildRequires: pkgconfig(libpcre)
BuildRequires: pkgconfig(libxml-2.0)
@@ -75,6 +82,7 @@ BuildRequires: pkgconfig(wayland-client)
BuildRequires: pkgconfig(xkbcommon)
%endif
BuildRequires: pkgconfig(xxf86vm)
+BuildRequires: python3dist(idna)
BuildRequires: python3dist(numpy)
BuildRequires: python3dist(requests)
BuildRequires: subversion-devel
@@ -96,6 +104,8 @@ BuildRequires: cmake(embree)
BuildRequires: opensubdiv-devel
%if %{with openshading}
BuildRequires: cmake(OSL)
+# Use oslc compiler
+BuildRequires: openshadinglanguage
%endif
%if %{with oidn}
BuildRequires: cmake(OpenImageDenoise)
@@ -123,11 +133,14 @@ BuildRequires: cmake(Alembic)
%if %{with ffmpeg}
BuildRequires: ffmpeg-devel
%endif
+BuildRequires: lame-devel
+BuildRequires: libspnav-devel
BuildRequires: openvdb-devel
BuildRequires: pkgconfig(libjpeg)
BuildRequires: pkgconfig(libpng)
BuildRequires: pkgconfig(theora)
BuildRequires: pkgconfig(libtiff-4)
+BuildRequires: pkgconfig(vpx)
BuildRequires: pkgconfig(libwebp)
BuildRequires: pkgconfig(OpenColorIO)
BuildRequires: pkgconfig(OpenEXR)
@@ -137,6 +150,7 @@ BuildRequires: pkgconfig(tbb)
# Audio stuff
BuildRequires: pkgconfig(ao)
+BuildRequires: pkgconfig(flac)
BuildRequires: pkgconfig(freealut)
BuildRequires: pkgconfig(jack)
BuildRequires: pkgconfig(ogg)
@@ -148,7 +162,7 @@ BuildRequires: pkgconfig(vorbis)
# Typography stuff
BuildRequires: fontpackages-devel
BuildRequires: pkgconfig(freetype2)
-
+BuildRequires: pkgconfig(tinyxml)
# Appstream stuff
BuildRequires: libappstream-glib
@@ -206,10 +220,10 @@ rm -f build_files/cmake/Modules/FindOpenJPEG.cmake
# Fix all Python shebangs recursively in .
pathfix.py -pni "%{__python3} %{py3_shbang_opts}" .
-# Use c++14 in order to fix build errors when including headers
+# Use c++17 in order to fix build errors when including headers
# from the latest version of openvdb.
# Upstream issue:
https://github.com/AcademySoftwareFoundation/openvdb/issues/795
-sed -i 's|${CMAKE_CXX_FLAGS} -std=c++11|${CMAKE_CXX_FLAGS} -std=c++14|'
CMakeLists.txt
+sed -i 's|${CMAKE_CXX_FLAGS} -std=c++11|${CMAKE_CXX_FLAGS} -std=c++17|'
CMakeLists.txt
%build
%cmake . \
@@ -227,7 +241,7 @@ sed -i 's|${CMAKE_CXX_FLAGS} -std=c++11|${CMAKE_CXX_FLAGS}
-std=c++14|' CMakeLis
%endif
-DWITH_CYCLES_EMBREE=OFF \
%if %{with openshading}
- -DOSL_COMPILER=g++ \
+ -DOSL_COMPILER=%{_bindir}/oslc \
%endif
%if %{with oidn}
-DOPENIMAGEDENOISE_LIBRARY=%{_libdir} \
@@ -252,10 +266,9 @@ sed -i 's|${CMAKE_CXX_FLAGS} -std=c++11|${CMAKE_CXX_FLAGS}
-std=c++14|' CMakeLis
-DWITH_OPENSUBDIV=ON \
-DWITH_OPENVDB=ON \
-DWITH_OPENVDB_BLOSC=ON \
- -DWITH_PYTHON=ON \
-DWITH_PYTHON_INSTALL=OFF \
-DWITH_PYTHON_INSTALL_REQUESTS=OFF \
- -DWITH_PYTHON_SAFETY=ON
+ -DWITH_USD=OFF
%cmake_build
@@ -316,6 +329,14 @@ appstream-util validate-relax --nonet
%{buildroot}%{_metainfodir}/%{name}-fonts.
%{_metainfodir}/%{name}-fonts.metainfo.xml
%changelog
+* Mon Oct 26 2020 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.90.1-3
+- Add hdapi, lame and vpx (webm) dependencies
+- Disable python safety (#1872980)
+- Use c++17
+
+* Sat Oct 03 2020 Richard Shaw <hobbes1069(a)gmail.com> - 1:2.90.1-2
+- Rebuild for OpenImageIO 2.2.
+
* Wed Sep 23 2020 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.90.1-1
- Update to 2.90.1 (#1881831)