Hello community, here is the log from the commit of package blender for openSUSE:Factory checked in at 2016-06-07 23:50:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/blender (Old) and /work/SRC/openSUSE:Factory/.blender.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "blender" Changes: -------- --- /work/SRC/openSUSE:Factory/blender/blender.changes 2016-04-28 16:57:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.blender.new/blender.changes 2016-06-07 23:50:03.000000000 +0200 @@ -1,0 +2,15 @@ +Mon Jun 6 14:19:07 UTC 2016 - [email protected] + +- Moved %{_datadir}/%{name}/%{_version}/datafiles/ back to main + package after it somehow ended up in the language package. See + boo#983064. +- Added build requirements to bring package in line with the + official blender build. + +------------------------------------------------------------------- +Thu Apr 21 12:48:30 UTC 2016 - [email protected] + +- Added debugbuild macro to the spec file to enable debugging. + See boo#976293. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blender.spec ++++++ --- /var/tmp/diff_new_pack.LFDnMn/_old 2016-06-07 23:50:05.000000000 +0200 +++ /var/tmp/diff_new_pack.LFDnMn/_new 2016-06-07 23:50:05.000000000 +0200 @@ -22,6 +22,8 @@ %define collada 1 %define wplayer 1 %define documentation 0 +# Set this to 1 for fixing bugs. +%define debugbuild 0 # blender has versions like x.xxy which have x.xx (notice the missing # trailing y) in the directory path. This makes this additional variable # necessary. @@ -61,6 +63,7 @@ # libquicktime-devel BuildRequires: OpenEXR-devel BuildRequires: SDL2-devel +BuildRequires: binutils-gold BuildRequires: boost-devel BuildRequires: cmake BuildRequires: desktop-file-utils @@ -86,12 +89,18 @@ BuildRequires: libtiff-devel BuildRequires: libtool BuildRequires: libvorbis-devel +BuildRequires: llvm-devel BuildRequires: lzo-devel BuildRequires: openal-soft-devel BuildRequires: openssl-devel BuildRequires: pcre-devel BuildRequires: perl-Text-Iconv BuildRequires: pkg-config +BuildRequires: pkgconfig(libopenjpeg) +%if 0%{?debugbuild} == 1 +BuildRequires: pkgconfig(valgrind) +%endif +BuildRequires: pkgconfig(jemalloc) # Needed since blender 2.71. Otherwise it won't build BuildRequires: python3-numpy-devel BuildRequires: pkgconfig(python3) >= 3.5 @@ -215,16 +224,29 @@ export psver=$(pkg-config python3 --modversion) export pver=$(pkg-config python3 --modversion)$(python3-config --abiflags) mkdir -p Build && pushd Build - +#-fsanitize=address # 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 \ + -DCMAKE_C_FLAGS_DEBUG:STRING="-fsanitize=address -ggdb" \ + -DCMAKE_CXX_FLAGS_DEBUG:STRING="-fsanitize=address -ggdb" \ + -DWITH_MEM_VALGRIND:BOOL=ON \ + -DWITH_ASSERT_ABORT:BOOL=ON \ +%endif + -DWITH_MEM_JEMALLOC:BOOL=ON \ + -DWITH_BUILDINFO:BOOL=ON \ + -DWITH_LLVM:BOOL=ON \ -DWITH_FFTW3:BOOL=on \ -DWITH_JACK:BOOL=on \ + -DWITH_JACK_DYNLOAD:BOOL=on \ -DWITH_CODEC_SNDFILE:BOOL=on \ - -DWITH_IMAGE_OPENJPEG:BOOL=off \ + -DWITH_IMAGE_OPENJPEG:BOOL=on \ + -DWITH_SYSTEM_OPENJPEG:BOOL=on \ + -DWITH_LIBMV_SCHUR_SPECIALIZATIONS:BOOL=on \ %if %{with ffmpeg} -DWITH_CODEC_FFMPEG:BOOL=on \ %endif @@ -255,6 +277,7 @@ -DWITH_INSTALL_PORTABLE:BOOL=OFF \ -DWITH_SYSTEM_GLEW:BOOL=ON \ -DWITH_SDL:BOOL=ON \ + -DWITH_SDL_DYNLOAD:BOOL=on \ %ifnarch x86_64 -DSUPPORT_SSE2_BUILD=false \ -DWITH_RAYOPTIMIZATION:BOOL=OFF \ @@ -362,6 +385,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/blender.desktop desktop-file-validate %{buildroot}%{_datadir}/applications/x-blend.desktop %endif +find . -name blender-softwaregl -print -exec cp -v {} %{buildroot}%{_bindir}/ \; %post update-desktop-database >/dev/null 2>&1 ||: @@ -381,7 +405,7 @@ %files lang -f %{name}.lang %defattr (-, root, root) -%{_datadir}/%{name}/%{_version}/datafiles/ +%{_datadir}/%{name}/%{_version}/datafiles/locale/ %files %defattr (-, root, root) @@ -389,6 +413,8 @@ %{_mandir}/man1/* %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/%{_version} +%dir %{_datadir}/%{name}/%{_version}/datafiles +%{_datadir}/%{name}/%{_version}/datafiles/colormanagement/ %{_datadir}/%{name}/%{_version}/scripts/ %{_datadir}/applications/blender.desktop %{_datadir}/applications/x-blend.desktop
