From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B1237138334 for ; Thu, 16 Aug 2018 14:15:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B3552E0894; Thu, 16 Aug 2018 14:15:34 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6FD1DE0894 for ; Thu, 16 Aug 2018 14:15:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 649A3335D3B for ; Thu, 16 Aug 2018 14:15:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EDC5E3A7 for ; Thu, 16 Aug 2018 14:15:28 +0000 (UTC) From: "Jonathan Scruggs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jonathan Scruggs" Message-ID: <1534428907.b58e0ed989f4fcc06d535692214584bf79247ec2.dracwyrm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/files/, media-gfx/blender/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/blender/blender-2.79b.ebuild media-gfx/blender/files/blender-2.79b-ffmpeg-4-compat.patch X-VCS-Directories: media-gfx/blender/ media-gfx/blender/files/ X-VCS-Committer: dracwyrm X-VCS-Committer-Name: Jonathan Scruggs X-VCS-Revision: b58e0ed989f4fcc06d535692214584bf79247ec2 X-VCS-Branch: master Date: Thu, 16 Aug 2018 14:15:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b09f87b9-ac67-4b6f-b599-e171887b46f8 X-Archives-Hash: 6c58536529b69e454c6952b743214522 commit: b58e0ed989f4fcc06d535692214584bf79247ec2 Author: Jonathan Scruggs gentoo org> AuthorDate: Thu Aug 16 14:15:07 2018 +0000 Commit: Jonathan Scruggs gentoo org> CommitDate: Thu Aug 16 14:15:07 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b58e0ed9 media-gfx/blender: add ffmpeg 4 compatibility patch Package-Manager: Portage-2.3.44, Repoman-2.3.10 media-gfx/blender/blender-2.79b.ebuild | 1 + .../files/blender-2.79b-ffmpeg-4-compat.patch | 62 ++++++++++++++++++++++ 2 files changed, 63 insertions(+) diff --git a/media-gfx/blender/blender-2.79b.ebuild b/media-gfx/blender/blender-2.79b.ebuild index 4dc6dd61ee6..be1c95be0e8 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 00000000000..4ad05aafb15 --- /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)