diff options
| author |   Jonathan Scruggs <dracwyrm@gentoo.org> | 2018-08-16 15:15:07 +0100 |
|---|---|---|
| committer | Jonathan Scruggs <dracwyrm@gentoo.org> | 2018-08-16 15:15:07 +0100 |
| commit | b58e0ed989f4fcc06d535692214584bf79247ec2 (patch) | |
| tree | 2d96c586409a3accc035ed73e504b371e737ed71 /media-gfx/blender | |
| parent | www-client/firefox-bin: amd64 & x86 stable (diff) | |
| download | gentoo-b58e0ed989f4fcc06d535692214584bf79247ec2.tar.gz gentoo-b58e0ed989f4fcc06d535692214584bf79247ec2.tar.bz2 gentoo-b58e0ed989f4fcc06d535692214584bf79247ec2.zip | |
media-gfx/blender: add ffmpeg 4 compatibility patch
Package-Manager: Portage-2.3.44, Repoman-2.3.10
Diffstat (limited to 'media-gfx/blender')
| -rw-r--r-- | media-gfx/blender/blender-2.79b.ebuild | 1 | ||||
| -rw-r--r-- | media-gfx/blender/files/blender-2.79b-ffmpeg-4-compat.patch | 62 |
2 files changed, 63 insertions, 0 deletions
diff --git a/media-gfx/blender/blender-2.79b.ebuild b/media-gfx/blender/blender-2.79b.ebuild index 4dc6dd61ee64..be1c95be0e8a 100644 --- a/media-gfx/blender/blender-2.79b.ebuild +++ b/media-gfx/blender/blender-2.79b.ebuild @@ -97,6 +97,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${PN}-fix-install-rules.patch" "${FILESDIR}/${P}-gcc-8.patch" + "${FILESDIR}/${P}-ffmpeg-4-compat.patch" ) blender_check_requirements() { diff --git a/media-gfx/blender/files/blender-2.79b-ffmpeg-4-compat.patch b/media-gfx/blender/files/blender-2.79b-ffmpeg-4-compat.patch new file mode 100644 index 000000000000..4ad05aafb15d --- /dev/null +++ b/media-gfx/blender/files/blender-2.79b-ffmpeg-4-compat.patch @@ -0,0 +1,62 @@ +diff -urN a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h +--- a/intern/ffmpeg/ffmpeg_compat.h 2018-03-23 15:22:25.000000000 +0000 ++++ b/intern/ffmpeg/ffmpeg_compat.h 2018-08-16 14:39:23.484489828 +0100 +@@ -109,6 +109,45 @@ + + #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 -urN a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c +--- a/source/blender/blenkernel/intern/writeffmpeg.c 2018-03-23 15:22:25.000000000 +0000 ++++ b/source/blender/blenkernel/intern/writeffmpeg.c 2018-08-16 14:39:21.702484751 +0100 +@@ -605,7 +605,8 @@ + 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) |