From db6e1edb71bf5a04583a29dc1049e95d1dd35619 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Jan 16 2021 22:08:51 +0000 Subject: 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/trunk/embree.patch -#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 - 1:2.90.1-5 +- Rebuild for OpenEXR 2.5.4 +- Drop patch for fonts path (#1889049) + * Mon Jan 04 2021 Miro Hrončok - 1:2.91.0-4 - Rebuild for new libopenvdb - Fixes: rhbz#1912498