Hello community, here is the log from the commit of package blender for openSUSE:Factory checked in at 2015-12-21 12:05:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-12-16 17:44:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.blender.new/blender.changes 2015-12-21 12:05:05.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Dec 18 11:00:00 UTC 2015 - [email protected] + +- Use a build conditional for ffmpeg to enable it in Evergreen + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blender.spec ++++++ --- /var/tmp/diff_new_pack.dlimMY/_old 2015-12-21 12:05:07.000000000 +0100 +++ /var/tmp/diff_new_pack.dlimMY/_new 2015-12-21 12:05:07.000000000 +0100 @@ -23,6 +23,8 @@ %define wplayer 1 %define documentation 0 +%bcond_without ffmpeg + # Use rpmbuild -D 'BUILD_ORIG 1' to build original code. Name: blender @@ -107,13 +109,9 @@ BuildRequires: yasm-devel BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(libxml-2.0) -%if 0 == 1 -BuildRequires: libffmpeg-devel -%else -%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 +%if %{with ffmpeg} BuildRequires: ffmpeg-devel %endif -%endif %if 0%{?collada} == 1 BuildRequires: openCOLLADA-devel >= svn838 %endif @@ -198,7 +196,7 @@ -DWITH_JACK:BOOL=on \ -DWITH_CODEC_SNDFILE:BOOL=on \ -DWITH_IMAGE_OPENJPEG:BOOL=off \ -%if 0%{?suse_version} > 1320 || 0%{?BUILD_ORIG} == 1 || 0%{?suse_version} == 1315 +%if %{with ffmpeg} -DWITH_CODEC_FFMPEG:BOOL=on \ %endif %if 0%{?collada} == 1
