Hello community, here is the log from the commit of package blender for openSUSE:Factory checked in at 2019-02-17 12:20:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/blender (Old) and /work/SRC/openSUSE:Factory/.blender.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "blender" Sun Feb 17 12:20:52 2019 rev:112 rq:676330 version:2.79b Changes: -------- --- /work/SRC/openSUSE:Factory/blender/blender.changes 2019-02-13 10:07:38.865526930 +0100 +++ /work/SRC/openSUSE:Factory/.blender.new.28833/blender.changes 2019-02-17 12:20:53.432207994 +0100 @@ -1,0 +2,8 @@ +Thu Feb 14 17:34:40 UTC 2019 - bjorn....@gmail.com + +- Add 0008-fix_building_with_latest_versions_of_FFmpeg.patch: Fix + build with current ffmpeg v4. +- Following the above patch, no longer force ffmpeg-3 versions of + pkgconfig(libav*). + +------------------------------------------------------------------- New: ---- 0008-fix_building_with_latest_versions_of_FFmpeg.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blender.spec ++++++ --- /var/tmp/diff_new_pack.xMdSNA/_old 2019-02-17 12:20:54.560207684 +0100 +++ /var/tmp/diff_new_pack.xMdSNA/_new 2019-02-17 12:20:54.560207684 +0100 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -52,6 +52,8 @@ #Patch2 blender-2.78c-openvdb3-abi.patch # PATCH-FIX-UPSTREAM from commit 1db47a2ccd1e68994bf8140eba6cc2a26a2bc91f fixes boo#1124964 Patch3: 0001-Fix-PyRNA-class-registration-w-Python-3.7.patch +# PATCH-FIX-UPSTREAM 0008-fix_building_with_latest_versions_of_FFmpeg.patch -- Fix build with current ffmpeg v4 +Patch4: 0008-fix_building_with_latest_versions_of_FFmpeg.patch # libquicktime-devel #!BuildIgnore: libGLwM1 BuildRequires: OpenEXR-devel @@ -120,11 +122,11 @@ Requires: python3-numpy Requires: python3-requests 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 +BuildRequires: pkgconfig(libavcodec) +BuildRequires: pkgconfig(libavdevice) +BuildRequires: pkgconfig(libavformat) +BuildRequires: pkgconfig(libavutil) +BuildRequires: pkgconfig(libswscale) %if %{with collada} BuildRequires: openCOLLADA-devel %endif @@ -188,6 +190,7 @@ %patch0 -p1 %patch1 -p1 %patch3 -p1 +%patch4 -p1 rm -rf extern/glew rm -rf extern/libopenjpeg ++++++ 0008-fix_building_with_latest_versions_of_FFmpeg.patch ++++++ From: Bastien Montagne <montagn...@wanadoo.fr> Date: Tue, 8 May 2018 16:00:52 +0200 Subject: fix_building_with_latest_versions_of_FFmpeg Some years-old deprecated stuff has now been removed. Correct solution is probably to use valid defines etc. in own code, but this is more FFMEPG maintainer task (since it also may change how old FFMPEG we do support...). --- intern/ffmpeg/ffmpeg_compat.h | 39 ++++++++++++++++++++++++++ source/blender/blenkernel/intern/writeffmpeg.c | 3 +- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h index 9c06c8a..f7f437c 100644 --- a/intern/ffmpeg/ffmpeg_compat.h +++ b/intern/ffmpeg/ffmpeg_compat.h @@ -109,6 +109,45 @@ int av_sample_fmt_is_planar(enum AVSampleFormat sample_fmt) #endif +/* XXX TODO Probably fix to correct modern flags in code? Not sure how old FFMPEG we want to support though, + * so for now this will do. */ + +#ifndef FF_MIN_BUFFER_SIZE +# ifdef AV_INPUT_BUFFER_MIN_SIZE +# define FF_MIN_BUFFER_SIZE AV_INPUT_BUFFER_MIN_SIZE +# endif +#endif + +#ifndef FF_INPUT_BUFFER_PADDING_SIZE +# ifdef AV_INPUT_BUFFER_PADDING_SIZE +# define FF_INPUT_BUFFER_PADDING_SIZE AV_INPUT_BUFFER_PADDING_SIZE +# endif +#endif + +#ifndef CODEC_FLAG_GLOBAL_HEADER +# ifdef AV_CODEC_FLAG_GLOBAL_HEADER +# define CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER +# endif +#endif + +#ifndef CODEC_FLAG_GLOBAL_HEADER +# ifdef AV_CODEC_FLAG_GLOBAL_HEADER +# define CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER +# endif +#endif + +#ifndef CODEC_FLAG_INTERLACED_DCT +# ifdef AV_CODEC_FLAG_INTERLACED_DCT +# define CODEC_FLAG_INTERLACED_DCT AV_CODEC_FLAG_INTERLACED_DCT +# endif +#endif + +#ifndef CODEC_FLAG_INTERLACED_ME +# ifdef AV_CODEC_FLAG_INTERLACED_ME +# define CODEC_FLAG_INTERLACED_ME AV_CODEC_FLAG_INTERLACED_ME +# endif +#endif + /* FFmpeg upstream 1.0 is the first who added AV_ prefix. */ #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 59, 100) # define AV_CODEC_ID_NONE CODEC_ID_NONE diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c index a19e414..04d508a 100644 --- a/source/blender/blenkernel/intern/writeffmpeg.c +++ b/source/blender/blenkernel/intern/writeffmpeg.c @@ -605,7 +605,8 @@ static AVStream *alloc_video_stream(FFMpegContext *context, RenderData *rd, int c->rc_buffer_aggressivity = 1.0; #endif - c->me_method = ME_EPZS; + /* Deprecated and not doing anything since July 2015, deleted in recent ffmpeg */ + //c->me_method = ME_EPZS; codec = avcodec_find_encoder(c->codec_id); if (!codec)
