diff --git a/.gitignore b/.gitignore index 2d8428d..e66c291 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ /util_sseb.patch /tree_hpp.patch /blender-2.79b.tar.gz +/blender-2.80.tar.gz diff --git a/blender.spec b/blender.spec index 5817858..a9e5da4 100644 --- a/blender.spec +++ b/blender.spec @@ -1,4 +1,4 @@ -%global blender_api 2.79b +%global blender_api 2.80 # 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') @@ -17,12 +17,12 @@ # Enable this or rebuild the package with "--with=openvdb" to enable OpenVDB # support. -# %%global _with_openvdb 1 +%global _with_openvdb 1 Name: blender Epoch: 1 Version: %{blender_api} -Release: 18%{?dist} +Release: 2%{?dist} Summary: 3D modeling, animation, rendering and post-production License: GPLv2 @@ -34,36 +34,36 @@ Source5: %{name}.xml Source6: %{name}.appdata.xml Source10: macros.%{name} -Patch0: %{name}-2.79-droid.patch -Patch1: %{name}-2.79-thumbnailer.patch -Patch2: %{name}-2.79-scripts.patch -Patch3: %{name}-2.79-locale.patch -Patch4: %{name}-2.79-manpages.patch -Patch5: %{name}-2.79-unversioned-system-path.patch -Patch6: %{name}-2.79-openvdb3-abi.patch +Patch0: %{name}-2.80-droid.patch +#Patch1: %%{name}-2.79-thumbnailer.patch +Patch2: %{name}-2.80-scripts.patch +#Patch3: %%{name}-2.79-locale.patch +#Patch4: %%{name}-2.79-manpages.patch +#Patch5: %%{name}-2.79-unversioned-system-path.patch +#Patch6: %%{name}-2.79-openvdb3-abi.patch # Backported patch for openjpeg2 support from # https://lists.blender.org/pipermail/bf-blender-cvs/2016-July/088691.html # but without patch-updating the bundled openjpeg2 version -Patch7: blender-2.79-openjpeg2.patch -Patch8: util_sseb.patch -Patch9: tree_hpp.patch +#Patch7: blender-2.79-openjpeg2.patch +#Patch8: util_sseb.patch +#Patch9: tree_hpp.patch # Backported from https://developer.blender.org/rB1db47a2ccd1e68994bf8140eba6cc2a26a2bc91f -Patch10: %{name}-2.79-python37.patch +#Patch10: %%{name}-2.79-python37.patch # Patch mostly from upstream, for more details see: # https://developer.blender.org/rB66d8bfb85c61aafe3bad2edf0e7b4d9d694ee2e7 # https://github.com/OpenImageIO/oiio/wiki/OIIO-2.0-Porting-Guide -Patch11: blender-oiio2.patch +#Patch11: blender-oiio2.patch # Commit to make OpenGL_GL_PREFERENCES=GLVND work # https://developer.blender.org/rB0658d047a94a86060f039790898a80a7adb0dcd9 -Patch12: blender-cmake_opengl.patch +# Patch12: blender-cmake_opengl.patch # Patch to build with GCC9 -Patch13: 0001-Fix-for-GCC9-new-OpenMP-data-sharing.patch +#Patch13: 0001-Fix-for-GCC9-new-OpenMP-data-sharing.patch # Development stuff BuildRequires: boost-devel +BuildRequires: blosc-devel BuildRequires: cmake BuildRequires: desktop-file-utils -BuildRequires: expat-devel BuildRequires: gcc-c++ BuildRequires: gettext BuildRequires: git @@ -73,6 +73,7 @@ BuildRequires: libspnav-devel BuildRequires: libxml2-devel BuildRequires: openssl-devel BuildRequires: pcre-devel +BuildRequires: pkgconfig(expat) BuildRequires: pugixml-devel BuildRequires: python3-devel >= 3.5 BuildRequires: python3-numpy @@ -81,11 +82,12 @@ BuildRequires: subversion-devel # Compression stuff BuildRequires: lzo-devel +BuildRequires: pkgconfig(zlib) BuildRequires: xz-devel -BuildRequires: zlib-devel -BuildRequires: minizip-compat-devel +#BuildRequires: minizip-compat-devel # 3D modeling stuff +BuildRequires: embree-devel BuildRequires: fftw-devel BuildRequires: ftgl-devel BuildRequires: glew-devel @@ -107,6 +109,7 @@ BuildRequires: libjpeg-turbo-devel BuildRequires: libpng-devel BuildRequires: libtheora-devel BuildRequires: libtiff-devel +BuildRequires: libwebp-devel BuildRequires: OpenColorIO-devel BuildRequires: OpenEXR-devel BuildRequires: OpenImageIO-devel @@ -127,7 +130,7 @@ BuildRequires: libvorbis-devel # Typography stuff BuildRequires: fontpackages-devel -BuildRequires: freetype-devel +BuildRequires: pkgconfig(freetype2) # Appstream stuff BuildRequires: libappstream-glib @@ -146,13 +149,13 @@ animation, rendering and post-production to interactive creation and playback. Professionals and novices can easily and inexpensively publish stand-alone, secure, multi-platform content to the web, CD-ROMs, and other media. -%package -n blenderplayer -Summary: Standalone Blender player -Provides: %{name}(ABI) = %{blender_api} +#%%package -n blenderplayer +#Summary: Standalone Blender player +#Provides: %%{name}(ABI) = %%{blender_api} -%description -n blenderplayer -This package contains a stand alone release of the Blender player. You will need -this package to play games which are based on the Blender Game Engine. +#%description -n blenderplayer +#This package contains a stand alone release of the Blender player. You will need +#this package to play games which are based on the Blender Game Engine. %package rpm-macros Summary: RPM macros to build third-party blender addons packages @@ -208,8 +211,8 @@ export CXXFLAGS="$CXXFLAGS -mno-altivec" -DWITH_CXX_GUARDEDALLOC=OFF \ -DWITH_CYCLES=%{cyclesflag} \ -DWITH_DOC_MANPAGE=ON \ + -DWITH_EMBREE=ON \ -DWITH_FFTW3=ON \ - -DWITH_GAMEENGINE=ON \ -DWITH_IMAGE_OPENJPEG=ON \ -DWITH_INPUT_NDOF=ON \ -DWITH_INSTALL_PORTABLE=OFF \ @@ -225,12 +228,10 @@ export CXXFLAGS="$CXXFLAGS -mno-altivec" -DWITH_PYTHON_INSTALL_REQUESTS=OFF \ -DWITH_PYTHON_SAFETY=ON \ -DWITH_SDL=ON \ - -DWITH_SYSTEM_LZO=ON \ - -DWITH_SYSTEM_OPENJPEG=ON + -DWITH_SYSTEM_LZO=ON -#make VERBOSE=1 # %%{?_smp_mflags} %make_build -popd +popd %install pushd cmake-make @@ -293,19 +294,20 @@ fi %license release/text/copyright.txt %doc release/text/readme.html %{_bindir}/%{name} +%{_bindir}/%{name}-thumbnailer.py %{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/applications/%{name}.desktop %{_datadir}/%{name}/ -%{_datadir}/icons/hicolor/*/apps/%{name}.* +%{_datadir}/icons/hicolor/*/apps/%{name}*.* %{_datadir}/mime/packages/%{name}.xml %{_mandir}/man1/%{name}.* -%files -n %{name}player -%license COPYING -%license doc/license/*-license.txt -%license release/text/copyright.txt -%{_bindir}/%{name}player -%{_mandir}/man1/%{name}player.* +#%%files -n %%{name}player +#%%license COPYING +#%%license doc/license/*-license.txt +#%%license release/text/copyright.txt +#%%{_bindir}/%%{name}player +#%%{_mandir}/man1/%%{name}player.* %files rpm-macros %{macrosdir}/macros.%{name} @@ -316,6 +318,14 @@ fi %{_fontbasedir}/%{name}/ %changelog +* Tue Jul 30 2019 Luya Tshimbalanga - 1:2.80-2 +- Enable embree, webp and bzip support +- Remove game engine support dropped from upstream +- Drop blenderplayer standalone package + +* Tue Jul 30 2019 Luya Tshimbalanga - 1:2.80-1 +- Update to 2.80 + * Wed Jul 24 2019 Fedora Release Engineering - 1:2.79b-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 38b104a..0094357 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -SHA512 (blender-2.79b.tar.gz) = 2db21ace446168dd683cdb5aad9dec001f8888ae4e9603a04ddb44fb78489ded827deb07e83712b0f1118a0e7bf66f2a5d935dc4ebb3a6703d72672ff414367f -SHA512 (util_sseb.patch) = 429ffb6d36efb04c02d506858fc2691ea927ca486d950313dcb0c94d535a66409a14863807e69adc657dafbe243d0aad15cfaadf9f27bdc7c7759211da3fb8a8 -SHA512 (tree_hpp.patch) = 6c0a619fe8fbc215a9a7c9d4b9c6fc5ec355c37212ec41b05b50787465354bbc7200e76eaafba46a2253196391838190d3de3b2be132095d2162142940e87924 +SHA512 (blender-2.80.tar.gz) = b70bbfc81b56ac9570e057e259681029416caf5c7279513d9b8d9f47507348c9ca90e2972b9dc77da85aa242afe07bb8dff2eee94ea4582cc5209dfdce38310e