Hello community, here is the log from the commit of package blender for openSUSE:Factory checked in at 2019-02-01 11:44:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/blender (Old) and /work/SRC/openSUSE:Factory/.blender.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "blender" Fri Feb 1 11:44:40 2019 rev:110 rq:669099 version:2.79b Changes: -------- --- /work/SRC/openSUSE:Factory/blender/blender.changes 2019-01-21 10:49:01.840116210 +0100 +++ /work/SRC/openSUSE:Factory/.blender.new.28833/blender.changes 2019-02-01 11:44:42.084598335 +0100 @@ -1,0 +2,15 @@ +Mon Jan 28 10:25:59 UTC 2019 - Jan Engelhardt <[email protected]> + +- Properly accessing the RPM source directory makes + quilt work again. + +------------------------------------------------------------------- +Thu Jan 10 16:55:57 UTC 2019 - Stefan Brüns <[email protected]> + +- Cleanup spec file + * Replace gtk-update-icon-cache with icon_theme_cache_post{,un} macros + * Use bcond_with/bcond_without + * Drop obsolete blender-2.78-C++11-build-fix.patch + * Remove BuildRequires for some unused boost-devel subpackages + +------------------------------------------------------------------- Old: ---- blender-2.78-C++11-build-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blender.spec ++++++ --- /var/tmp/diff_new_pack.jAiWFr/_old 2019-02-01 11:44:44.292596067 +0100 +++ /var/tmp/diff_new_pack.jAiWFr/_new 2019-02-01 11:44:44.292596067 +0100 @@ -16,13 +16,12 @@ # -# NOTE:Audaspace will become a separate library as of blender 2.8 set audaspace to 1 when this verion is available. -# NOTE:Adaspace is already in factory. -%define audaspace 1 -%define collada 1 -%define wplayer 1 -%define openvdb 0 -%define osl 1 +%bcond_without system-audaspace +%bcond_without collada +%bcond_without wplayer +%bcond_with openvdb +%bcond_without osl + # Set this to 1 for fixing bugs. %define debugbuild 0 # Find the version of python3 that blender is going to build against. @@ -51,41 +50,31 @@ Patch1: 0001-Cycles-Fix-bad-register-cast-in-sseb.patch # The openvdb package is WIP #Patch2 blender-2.78c-openvdb3-abi.patch -Patch3: blender-2.78-C++11-build-fix.patch # libquicktime-devel #!BuildIgnore: libGLwM1 BuildRequires: OpenEXR-devel BuildRequires: SDL2-devel BuildRequires: binutils-gold -BuildRequires: distribution-release -%if 0%{?suse_version} > 1325 -BuildRequires: gcc-c++ -BuildRequires: libboost_atomic-devel -BuildRequires: libboost_chrono-devel -BuildRequires: libboost_date_time-devel -BuildRequires: libboost_filesystem-devel -BuildRequires: libboost_headers-devel -BuildRequires: libboost_locale-devel -BuildRequires: libboost_regex-devel -BuildRequires: libboost_system-devel -BuildRequires: libboost_thread-devel -%else -BuildRequires: boost-devel -BuildRequires: gcc7 -BuildRequires: gcc7-c++ -#!buildignore: libgcc_s1 -%endif BuildRequires: cmake BuildRequires: desktop-file-utils +BuildRequires: distribution-release BuildRequires: fdupes BuildRequires: fftw3-devel +BuildRequires: gcc-c++ BuildRequires: gettext-tools BuildRequires: graphviz BuildRequires: help2man BuildRequires: hicolor-icon-theme BuildRequires: jack-audio-connection-kit-devel +BuildRequires: libboost_date_time-devel +BuildRequires: libboost_filesystem-devel +BuildRequires: libboost_locale-devel +BuildRequires: libboost_regex-devel +BuildRequires: libboost_thread-devel +BuildRequires: libboost_wave-devel BuildRequires: libjpeg-devel -%if %{openvdb} == 1 +%if %{with openvdb} +BuildRequires: libboost_serialization-devel BuildRequires: openvdb-devel %endif BuildRequires: libpng-devel @@ -105,12 +94,8 @@ %if 0%{?is_opensuse} == 1 BuildRequires: pkgconfig(jemalloc) %endif -# Needed since blender 2.71. Otherwise it won't build BuildRequires: python3-numpy-devel -BuildRequires: pkgconfig(python3) >= 3.5 -%if 0%{?suse_version} > 1320 BuildRequires: python3-requests -%endif BuildRequires: shared-mime-info BuildRequires: update-desktop-files BuildRequires: xz @@ -121,6 +106,7 @@ BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(glw) BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(python3) >= 3.5 BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xfixes) BuildRequires: pkgconfig(xi) @@ -130,32 +116,32 @@ Requires: python3-base >= %{py3version} # See bnc#713346 Requires: python3-numpy -Requires: python3-xml -%if 0%{?suse_version} > 1320 Requires: python3-requests -%endif +Requires: python3-xml BuildRequires: pkgconfig(libavcodec) = 57.107.100 BuildRequires: pkgconfig(libavdevice) = 57.10.100 BuildRequires: pkgconfig(libavformat) = 57.83.100 BuildRequires: pkgconfig(libavutil) = 55.78.100 BuildRequires: pkgconfig(libswscale) = 4.8.100 -%if 0%{?collada} == 1 +%if %{with collada} BuildRequires: openCOLLADA-devel %endif -%if 0%{?audaspace} == 1 +%if %{with system-audaspace} BuildRequires: pkgconfig(audaspace) >= 1.3 Requires: audaspace-plugins %endif BuildRequires: OpenColorIO-devel BuildRequires: OpenImageIO-devel -%if 0%{?osl} == 1 +%if %{with osl} BuildRequires: OpenShadingLanguage-devel %endif -BuildRequires: llvm5-devel +BuildRequires: llvm-devel BuildRequires: cmake(pugixml) %ifarch x86_64 Requires: %{name}-cycles-devel = %{version} %endif +Requires(post): hicolor-icon-theme +Requires(postun): hicolor-icon-theme %description Blender is a 3D modelling and rendering package. It is the in-house @@ -192,22 +178,18 @@ %lang_package %prep -%if 1 == 1 -pushd ../SOURCES +pushd "%{_sourcedir}" md5sum -c %{SOURCE1} popd -%endif + %setup -q %patch0 -p1 %patch1 -p1 -#%%patch2 -p1 -%patch3 -oslinfo --version rm -rf extern/glew rm -rf extern/libopenjpeg echo %{_version} -for i in `grep -rl "/usr/bin/env python3"`;do sed -i '1s/^#!.*/#!\/usr\/bin\/python3/' ${i} ;done +for i in `grep -rl "/usr/bin/env python3"`;do sed -i '1s@^#!.*@#!/usr/bin/python3@' ${i} ;done %build # sse options only on supported archs @@ -217,12 +199,13 @@ # Find python3 version and abiflags export psver=$(pkg-config python3 --modversion) export pver=$(pkg-config python3 --modversion)$(python3-config --abiflags) -mkdir -p Build && pushd Build -#-fsanitize=address +mkdir -p build && pushd build + # FIXME: This comes from a stupid osc spec formatter # blender's flags are complex enough already without %%cmake macro spamming the build log. # It also puts _smp_mflags where it shouldn't, I had to write make -j1 to stop it. # NOTE: Don't use cmake macro. +# cmake ../ -DBUILD_SHARED_LIBS:BOOL=off \ %if 0%{?debugbuild} == 1 -DCMAKE_BUILD_TYPE:STRING=Debug \ @@ -246,21 +229,21 @@ -DWITH_FFTW3:BOOL=on \ -DWITH_JACK:BOOL=on \ -DWITH_JACK_DYNLOAD:BOOL=on \ + -DWITH_CODEC_FFMPEG:BOOL=on \ -DWITH_CODEC_SNDFILE:BOOL=on \ -DWITH_IMAGE_OPENJPEG:BOOL=on \ -DWITH_SYSTEM_OPENJPEG:BOOL=on \ -DWITH_LIBMV_SCHUR_SPECIALIZATIONS:BOOL=on \ - -DWITH_CODEC_FFMPEG:BOOL=on \ -%if %{openvdb} == 1 +%if %{with openvdb} -DWITH_OPENVDB:BOOL=on \ -DWITH_OPENVDB_BLOSC:BOOL=on \ %endif - %if 0%{?collada} == 1 +%if %{with collada} -DWITH_OPENCOLLADA:BOOL=on \ %else -DWITH_OPENCOLLADA:BOOL=off \ %endif -%if 0%{?audaspace} == 1 +%if %{with system-audaspace} -DWITH_SYSTEM_AUDASPACE:BOOL=on \ %endif -DWITH_PYTHON:BOOL=on \ @@ -270,10 +253,9 @@ -DWITH_CYCLES:BOOL=OFF \ %else -DWITH_CYCLES:BOOL=ON \ -%if 0%{?osl} == 1 - -DWITH_LLVM:BOOL=ON \ - -DLLVM_LIBRARY:FILE=%{_libdir}/libLLVM.so \ +%if %{with osl} -DWITH_CYCLES_OSL:BOOL=ON \ + -DLLVM_LIBRARY:FILE=%{_libdir}/libLLVM.so \ %endif -DWITH_OPENIMAGEIO:BOOL=ON \ -DWITH_OPENCOLORIO:BOOL=ON \ @@ -292,7 +274,7 @@ %endif -DCMAKE_VERBOSE_MAKEFILE=on \ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ - -DCMAKE_EXE_LINKER_FLAGS:STRING="-pie -lboost_locale" \ + -DCMAKE_EXE_LINKER_FLAGS:STRING="-pie" \ -DPYTHON_VERSION=$psver \ -DPYTHON_LIBPATH=%{_libexecdir} \ -DPYTHON_LIBRARY=python$pver \ @@ -318,9 +300,8 @@ %install echo "release version = %{_version}" # make install -pushd Build -%make_install -popd +%cmake_install + # Remove folder, it's not supposed to be installed here. rm -rf %{buildroot}%{_datadir}/%{name}/%{_version}/datafiles/fonts rm -f %{buildroot}%{_datadir}/%{name}/%{_version}/scripts/addons/.gitignore @@ -354,10 +335,10 @@ %endif # Factory is now of the opinion that every /usr/bin file needs a man page, -%if %{wplayer} == 1 +%if %{with wplayer} +# Create man1 directory if it doesn't exist. +mkdir -p %{buildroot}%{_mandir}/man1 # Generate man page with help2man -# Create man1 directory if it doesn't exist. Added with v2.73 -[ -d %{buildroot}%{_mandir}/man1 ] || mkdir -p %{buildroot}%{_mandir}/man1 || : pushd %{buildroot}%{_mandir}/man1 cp -v %{buildroot}%{_bindir}/blenderplayer ./ help2man \ @@ -368,6 +349,7 @@ popd #cp -v %%{SOURCE5} %%{buildroot}%%{_mandir}/man1 %endif + %if 0%{?sles_version} %suse_update_desktop_file -i -n blender %else @@ -379,25 +361,17 @@ %post %mime_database_post %desktop_database_post -touch --no-create %{_datadir}/icons/hicolor >/dev/null 2>&1 ||: +%icon_theme_cache_post %postun %mime_database_postun %desktop_database_postun -if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor >/dev/null 2>&1 ||: - gtk-update-icon-cache %{_datadir}/icons/hicolor >/dev/null 2>&1 ||: -fi - -%posttrans -gtk-update-icon-cache %{_datadir}/icons/hicolor >/dev/null 2>&1 ||: +%icon_theme_cache_post %files lang -f %{name}.lang -%defattr (-, root, root) %{_datadir}/%{name}/%{_version}/datafiles/locale/ %files -%defattr (-, root, root) %{_bindir}/* %{_mandir}/man1/* %dir %{_datadir}/%{name}
