diff --git a/.gitignore b/.gitignore index b75f4a9..6b37268 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,4 @@ /blender-2.81a-add_ppc64le_support.patch /blender-2.81a-appdata-fix-tags.patch /blender-2.81a-droid.patch +/blender-2.82.tar.xz diff --git a/blender-2.80-add_ppc64el-s390x_support.patch b/blender-2.80-add_ppc64el-s390x_support.patch deleted file mode 100644 index 0009f74..0000000 --- a/blender-2.80-add_ppc64el-s390x_support.patch +++ /dev/null @@ -1,52 +0,0 @@ -From: Sergey Sharybin -Date: Mon, 5 Aug 2019 20:30:45 +0200 -Subject: add_ppc64el-s390x_support - ---- - intern/numaapi/source/build_config.h | 26 ++++++++++++++++++++++++++ - 1 file changed, 26 insertions(+) - -diff --git a/intern/numaapi/source/build_config.h b/intern/numaapi/source/build_config.h -index 444adcc..488238c 100644 ---- a/intern/numaapi/source/build_config.h -+++ b/intern/numaapi/source/build_config.h -@@ -307,6 +307,26 @@ - # define ARCH_CPU_32_BITS 1 - # define ARCH_CPU_BIG_ENDIAN 1 - # endif -+#elif (defined(__PPC64__) || defined(__PPC__)) && defined(__BIG_ENDIAN__) -+# define ARCH_CPU_PPC64_FAMILY 1 -+# define ARCH_CPU_PPC64 1 -+# define ARCH_CPU_64_BITS 1 -+# define ARCH_CPU_BIG_ENDIAN 1 -+#elif defined(__PPC64__) -+# define ARCH_CPU_PPC64_FAMILY 1 -+# define ARCH_CPU_PPC64 1 -+# define ARCH_CPU_64_BITS 1 -+# define ARCH_CPU_LITTLE_ENDIAN 1 -+#elif defined(__s390x__) -+# define ARCH_CPU_S390_FAMILY 1 -+# define ARCH_CPU_S390X 1 -+# define ARCH_CPU_64_BITS 1 -+# define ARCH_CPU_BIG_ENDIAN 1 -+#elif defined(__s390__) -+# define ARCH_CPU_S390_FAMILY 1 -+# define ARCH_CPU_S390 1 -+# define ARCH_CPU_31_BITS 1 -+# define ARCH_CPU_BIG_ENDIAN 1 - #else - # error Please add support for your architecture in build_config.h - #endif -@@ -337,6 +357,12 @@ - #if !defined(ARCH_CPU_MIPS64_FAMILY) - # define ARCH_CPU_MIPS64_FAMILY 0 - #endif -+#if !defined(ARCH_CPU_PPC64_FAMILY) -+# define ARCH_CPU_PPC64_FAMILY 0 -+#endif -+#if !defined(ARCH_CPU_S390_FAMILY) -+# define ARCH_CPU_S390_FAMILY 0 -+#endif - - //////////////////////////////////////////////////////////////////////////////// - // Sizes of platform-dependent types. diff --git a/blender.spec b/blender.spec index 253b351..872a8c8 100644 --- a/blender.spec +++ b/blender.spec @@ -1,4 +1,4 @@ -%global blender_api 2.81 +%global blender_api 2.82 # 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') @@ -11,14 +11,14 @@ %global cyclesflag OFF %endif -# Enable this or rebuild the package with "--with=ffmpeg" to enable FFmpeg +# Disable this or rebuild the package with "--without=ffmpeg" to disable FFmpeg # support. -# %%global _with_ffmpeg 1 +%global _without_ffmpeg 1 Name: blender Epoch: 1 -Version: %{blender_api}a -Release: 4%{?dist} +Version: %{blender_api} +Release: 1%{?dist} Summary: 3D modeling, animation, rendering and post-production License: GPLv2 @@ -30,23 +30,18 @@ Source2: %{name}-fonts.metainfo.xml Source5: %{name}.xml Source10: macros.%{name} -Patch0: %{name}-%{version}-droid.patch -# Add missing ppc64le support -Patch1: %{name}-%{version}-add_ppc64le_support.patch -# Appdata has open li tag, remove it -Patch2: %{name}-%{version}-appdata-fix-tags.patch -# Fix python 3.8 compatiblity -Patch3: %{name}-2.80-fix_compatibility_python-3.8.patch +Patch0: %{name}-2.81a-droid.patch # Development stuff BuildRequires: boost-devel -BuildRequires: cmake +BuildRequires: cmake3 BuildRequires: desktop-file-utils BuildRequires: gcc-c++ BuildRequires: gettext BuildRequires: git BuildRequires: libtool BuildRequires: libspnav-devel +#BuildRequires: meson BuildRequires: pkgconfig(blosc) BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(jemalloc) @@ -63,7 +58,7 @@ BuildRequires: subversion-devel # Compression stuff BuildRequires: lzo-devel BuildRequires: pkgconfig(liblzma) -BuildRequires: pkgconfig(zlib) +BuildRequires: pkgconfig(zlib) # 3D modeling stuff %ifarch x86_64 @@ -95,10 +90,10 @@ BuildRequires: alembic-devel BuildRequires: ffmpeg-devel } BuildRequires: openvdb-devel -BuildRequires: pkgconfig(libjpeg) -BuildRequires: pkgconfig(libpng) +BuildRequires: pkgconfig(libjpeg) +BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(theora) -BuildRequires: pkgconfig(libtiff-4) +BuildRequires: pkgconfig(libtiff-4) BuildRequires: pkgconfig(libwebp) BuildRequires: pkgconfig(OpenColorIO) BuildRequires: pkgconfig(OpenEXR) @@ -128,6 +123,7 @@ BuildRequires: libappstream-glib %endif Requires: google-droid-sans-fonts +Requires: hicolor-icon-theme Requires: %{name}-fonts = %{?epoch:%{epoch}:}%{version}-%{release} Requires: fontpackages-filesystem Requires: python3-numpy @@ -135,7 +131,7 @@ Requires: python3-requests Provides: blender(ABI) = %{blender_api} # Temporarily exclude arnv7hl and ppc64le due to failure to build -ExcludeArch: ppc64le armv7hl +# ExcludeArch: ppc64le armv7hl %description Blender is the essential software solution you need for 3D, from modeling, @@ -179,6 +175,8 @@ composition of several mono space fonts to cover several character sets. # proof) rm -f build_files/cmake/Modules/FindOpenJPEG.cmake +# Fix all Python shebangs recursively in . +pathfix.py -pni "%{__python3} %{py3_shbang_opts}" . mkdir cmake-make @@ -194,27 +192,10 @@ pushd cmake-make -DCMAKE_SKIP_RPATH=ON \ -DPYTHON_VERSION=%{python3_version} \ -DOpenGL_GL_PREFERENCE=GLVND \ - -DWITH_ALEMBIC=ON \ - -DWITH_BUILDINFO=ON \ - %{?_with_ffmpeg:-DWITH_CODEC_FFMPEG=ON} \ - -DWITH_CODEC_SNDFILE=ON \ - -DWITH_CXX_GUARDEDALLOC=OFF \ + %{?_without_ffmpeg:-DWITH_CODEC_FFMPEG=OFF} \ -DWITH_CYCLES=%{cyclesflag} \ -DWITH_DOC_MANPAGE=ON \ - -DWITH_FFTW3=ON \ - -DWITH_INPUT_NDOF=ON \ -DWITH_INSTALL_PORTABLE=OFF \ - -DWITH_JACK=ON \ - -DWITH_MEM_JEMALLOC=ON \ - -DWITH_MOD_OCEANSIM=ON \ - -DWITH_OPENCOLLADA=ON \ - -DWITH_OPENCOLORIO=ON \ - -DWITH_IMAGE_OPENEXR=ON \ - -DWITH_OPENIMAGEDENOISE=ON \ - -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 \ @@ -224,6 +205,7 @@ pushd cmake-make %make_build popd + %install pushd cmake-make %make_install @@ -273,8 +255,10 @@ find %{buildroot}%{_datadir}/%{name}/%{blender_api}/scripts -name "*.py" -exec c %if 0%{?fedora} || 0%{?rhel} >= 8 %check -appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/%{name}.appdata.xml -appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/%{name}-fonts.metainfo.xml +# temporarily disable --nonet causing to segmentation fault +# https://github.com/hughsie/appstream-glib/issues/337 +# appstream-util validate-relax %%{buildroot}%%{_metainfodir}/%%{name}.appdata.xml +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}-fonts.metainfo.xml %endif @@ -334,6 +318,17 @@ fi %endif %changelog +* Thu Feb 13 2020 Luya Tshimbalanga - 1:2.82-1 +- Update to 2.82 (#1802530) +- Drop custom cmake parameters set by default on upstream +- Disable default upstream ffmpeg support due to patents issue +- Temporarily disable appstream validation ( +* Tue Jan 28 2020 Fedora Release Engineering - 1:2.81a-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Jan 27 2020 Richard Shaw - 1:2.81a-5 +- Rebuild for OpenImageIO 2.1.10.1. + * Fri Jan 24 2020 Luya Tshimbalanga - 1:2.81a-4 - Use pkgconfig for many build requirements as possible - Replace pkgconfig(freeglut) by pkgconfig(glut) for Fedora 32 and above diff --git a/sources b/sources index e183935..5016100 100644 --- a/sources +++ b/sources @@ -1,5 +1,2 @@ -SHA512 (blender-2.81a.tar.xz) = 68e36497219bbcb895cbde7dfdf182417dc7d1922c232f9cabfc7cd42576d90a8caa02d253a55edfb140f42a5a81e3de4ae5c3bec40cc2ce7316631415d1a2d6 -SHA512 (blender-2.81a-add_ppc64le_support.patch) = 2fa8eeff18788634ce7b31b08a0b1bd49a5f5eb1779a827968c764701339c55e8231c8611b64691502df726489aa0739d39265cbf851492787f8d90a2e5d33ff -SHA512 (blender-2.81a-appdata-fix-tags.patch) = 3afb442cdeb7570a3ffb2ef02e9c3990909132c527fea31960bb094f0dd8bf3f6338ae58074d7bf00a553cf61b28d6e7c6be960135e084baeeed5b032810bab7 +SHA512 (blender-2.82.tar.xz) = 4c96d3982ede3965212d6e67f1367d8eb15c835e922eb3c31fd961c306bb7b86079dc256bed69a197f1f316eda7ed40843721554a73c38d154b7d24a2e5112bc SHA512 (blender-2.81a-droid.patch) = 2a00aef26efb27ecc80d56e95aca2fab2c53b675173fba38f2a648e0595fa1e341bdaf3a53df8bfe16a5c7ca4867cdc72468335f175a0ec112b5e98664b67183 -SHA512 (blender-2.80-fix_compatibility_python-3.8.patch) = d95456d26bcf0b28776d4b36a20a210235b11b2ee32b6f051c88d08199792484811573b55f1850f3c1cda816d491ef332de1fe81421b761a7b4be515df726b4e