diff --git a/.gitignore b/.gitignore
index d0caf70..fc308b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,4 @@
/blender-2.79b.tar.gz
/blender-2.80.tar.gz
/blender-2.80-fix_compatibility_python-3.8.patch
+/blender-2.81.tar.xz
diff --git a/blender-2.80-droid.patch b/blender-2.80-droid.patch
deleted file mode 100644
index 5173380..0000000
--- a/blender-2.80-droid.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- blender-2.80.old/source/blender/blenfont/intern/blf_font_i18n.c 2019-07-24 00:41:39.000000000 -0700
-+++ blender-2.80/source/blender/blenfont/intern/blf_font_i18n.c 2019-07-31 19:55:46.069808055 -0700
-@@ -50,7 +50,7 @@
-
- static void fontbuf_load(struct FontBuf *fb)
- {
-- const char *fontpath = BKE_appdir_folder_id(BLENDER_DATAFILES, "fonts");
-+ const char *fontpath = "/usr/share/fonts/blender";
- if (fontpath) {
- char unifont_path[1024];
- BLI_snprintf(unifont_path, sizeof(unifont_path), "%s/%s", fontpath, fb->filename);
---- blender-2.80.old/source/creator/CMakeLists.txt 2019-07-24 00:41:39.000000000 -0700
-+++ blender-2.80/source/creator/CMakeLists.txt 2019-08-05 17:38:34.223948608 -0700
-@@ -393,9 +393,8 @@
- # localization
- if(WITH_INTERNATIONAL)
- install(
-- DIRECTORY
-- ${CMAKE_SOURCE_DIR}/release/datafiles/fonts
-- DESTINATION ${TARGETDIR_VER}/datafiles
-+ DIRECTORY ${CMAKE_SOURCE_DIR}/release/datafiles/fonts/
-+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/fonts/blender
- )
-
- set(_locale_dir "${CMAKE_SOURCE_DIR}/release/datafiles/locale")
diff --git a/blender-fonts.metainfo.xml b/blender-fonts.metainfo.xml
index 5a508d5..1568824 100644
--- a/blender-fonts.metainfo.xml
+++ b/blender-fonts.metainfo.xml
@@ -9,6 +9,6 @@
A set of international blender mono space font to cover several characters.
These fonts are mainly used for the interface of Blender 3D.
- http://www.blender.org
+ https://www.blender.org
luya@fedoraproject.org
diff --git a/blender.spec b/blender.spec
index 566deb6..fe2e124 100644
--- a/blender.spec
+++ b/blender.spec
@@ -1,4 +1,4 @@
-%global blender_api 2.80
+%global blender_api 2.81
# Turn off the brp-python-bytecompile script
%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
@@ -18,24 +18,23 @@
Name: blender
Epoch: 1
Version: %{blender_api}
-Release: 13%{?dist}
+Release: 1%{?dist}
Summary: 3D modeling, animation, rendering and post-production
License: GPLv2
URL: http://www.blender.org
-Source0: http://download.%{name}.org/source/%{name}-%{version}.tar.gz
+Source0: http://download.%{name}.org/source/%{name}-%{version}.tar.xz
Source1: %{name}.thumbnailer
Source2: %{name}-fonts.metainfo.xml
Source5: %{name}.xml
Source10: macros.%{name}
-Patch0: %{name}-2.80-droid.patch
-# https://sources.debian.org/patches/blender/2.80+dfsg-2/0006-add_ppc64el-s390x_support.patch/
-Patch1: %{name}-2.80-add_ppc64el-s390x_support.patch
-# Python 3.8 Compatibility fix (thank you Marcel Plch)
-# https://developer.blender.org/D6038?id=18922
-Patch2: %{name}-2.80-fix_compatibility_python-3.8.patch
+Patch0: %{name}-%{version}-droid.patch
+# Add missing ppc64le support
+Patch1: %{name}-2.81-add_ppc64le_support.patch
+# Appdata has open li tag, remove it
+Patch2: %{name}-2.81-appdata-fix-tags.patch
# Development stuff
BuildRequires: boost-devel
@@ -66,6 +65,7 @@ BuildRequires: zlib-devel
# 3D modeling stuff
%ifarch x86_64
BuildRequires: embree-devel
+BuildRequires: oidn-devel
%endif
BuildRequires: fftw-devel
BuildRequires: ftgl-devel
@@ -74,6 +74,7 @@ BuildRequires: freeglut-devel
BuildRequires: libGL-devel
BuildRequires: libGLU-devel
BuildRequires: libXi-devel
+BuildRequires: libXrender-devel
BuildRequires: openCOLLADA-devel >= svn825
BuildRequires: ode-devel
BuildRequires: opensubdiv-devel
@@ -105,6 +106,7 @@ BuildRequires: libogg-devel
BuildRequires: libsamplerate-devel
BuildRequires: libsndfile-devel
BuildRequires: libvorbis-devel
+BuildRequires: opus-devel
# Typography stuff
BuildRequires: fontpackages-devel
@@ -124,6 +126,9 @@ Requires: python3-numpy
Requires: python3-requests
Provides: blender(ABI) = %{blender_api}
+# Temporarily exclude ppc64le and aach64 due to failure to build
+ExcludeArch: ppc64le aarch64
+
%description
Blender is the essential software solution you need for 3D, from modeling,
animation, rendering and post-production to interactive creation and playback.
@@ -166,6 +171,7 @@ composition of several mono space fonts to cover several character sets.
# proof)
rm -f build_files/cmake/Modules/FindOpenJPEG.cmake
+
mkdir cmake-make
%build
@@ -174,6 +180,7 @@ pushd cmake-make
%cmake .. \
%ifnarch %{ix86} x86_64
-DWITH_RAYOPTIMIZATION=OFF \
+ -DWITH_OIDN=ON \
%endif
-DBOOST_ROOT=%{_prefix} \
-DBUILD_SHARED_LIBS=OFF \
@@ -204,7 +211,8 @@ pushd cmake-make
-DWITH_PYTHON_INSTALL_REQUESTS=OFF \
-DWITH_PYTHON_SAFETY=ON \
-DWITH_SDL=ON \
- -DWITH_SYSTEM_LZO=ON
+ -DWITH_SYSTEM_LZO=ON \
+ -DWITH_X11_XF86VMODE=OFF
%make_build
popd
@@ -234,10 +242,15 @@ sed -e 's/@VERSION@/%{blender_api}/g' %{SOURCE10} > %{buildroot}%{macrosdir}/mac
%if 0%{?fedora} || 0%{?rhel} >= 8
# AppData
+mkdir - %{buildroot}%{_metainfodir}
+
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
+
+
+
%endif
# Localization
@@ -314,6 +327,12 @@ fi
%endif
%changelog
+* Thu Nov 21 2019 Luya Tshimbalanga - 1:2.81-1
+- Update to 2.81
+- Drop upstream patch
+- Enable oidn support for x86_64 architecture
+- Patch on appdata fixing tags
+
* Sun Nov 03 2019 Luya Tshimbalanga - 1:2.80-13
- Rebuilt for alembic 1.7.12
diff --git a/blender.xml b/blender.xml
index 7cee114..131b020 100644
--- a/blender.xml
+++ b/blender.xml
@@ -1,5 +1,5 @@
-
+
Blender Scene
diff --git a/sources b/sources
index c03067b..4fbebe3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (blender-2.80.tar.gz) = b70bbfc81b56ac9570e057e259681029416caf5c7279513d9b8d9f47507348c9ca90e2972b9dc77da85aa242afe07bb8dff2eee94ea4582cc5209dfdce38310e
-SHA512 (blender-2.80-fix_compatibility_python-3.8.patch) = d95456d26bcf0b28776d4b36a20a210235b11b2ee32b6f051c88d08199792484811573b55f1850f3c1cda816d491ef332de1fe81421b761a7b4be515df726b4e
+SHA512 (blender-2.81.tar.xz) = b7eed47afc4bdb87e9e8a579565935ae8489459197fb9b5978285cfe255ea4fc4151a1178526857921f3b2d54cf63b68dda66586565340f7bfd4274b82e7e9ff