gentoo resync : 22.04.2018

3 files changed, 90 insertions, 2 deletions

diff --git a/media-video/cinelerra/Manifest b/media-video/cinelerra/Manifest
index 403003b733a5..51f38d5e0d04 100644
--- a/media-video/cinelerra/Manifest
+++ b/media-video/cinelerra/Manifest
@@ -1,4 +1,5 @@
+AUX ffmpeg4.patch 3163 BLAKE2B 2c7ce91de448b09d34da82d5bef7f23804d37932ad80d2717162e56141f189a2beb12cd6baf2a82712747fd547268e08c2661ce99531ba7553ba351e34a1ba65 SHA512 abaa0d7d63dc3e8ac931ebadd2d9f0057a24ca829c582b5f9e00e2d5fe1d8c9c5f92f3e7d5f8c2422bb1c4a8f6221baaa0679296ac8945ade71bb1a2e9b60262
 DIST CinelerraCV-2.3.tar.xz 25705608 BLAKE2B 70efe03d8c928faca0b60f76b83d7147a7ef68ebee06e7afcb589fd24d73ecbe96e16a375c38f5c89cf337593c824cc22dd6301790ac988946671cb12ba901e6 SHA512 908dc097af8507e3b60b4787e0350500b8ba8c4340bbbdbf3716e61d74074e5f0617500b94ed1d450e030f88f3821f948cfa37c247ec2c2571fd76974374868e
 DIST cinelerra-2.3-patchset.tar.xz 10056 BLAKE2B c50d65a991a2643267f4c9aff11fb8caf09ba1fae0abe89125207312e8129b28f5ca86846b30a94a90b6958704c1733635b0987752a4d2ec442ea185bf870d89 SHA512 9825729ed15e106b1ec2ca58da4d587597d58a6b62f4440e08e984660821fa0e3cc3dcded5da0a5daae16edf1564a45a32490f50e51d77795ce47e4a5ba39122
-EBUILD cinelerra-2.3.ebuild 3175 BLAKE2B e2ca4361cc086678675ae927822f6b14cf441dc530fd7a0f3d7f95b1594b86aa40ff172be33971b1524f66c665a25ff58a6144f131477a54ec011b92b374e28a SHA512 e3a5d83fc96eee3be189b93718738aadd1aa7ad9f258a0fbb280ae7e8905e621238eb732b4a38bde1f87fc5c219a1fe361333125cc066d80b43abdaf0b1b122a
+EBUILD cinelerra-2.3.ebuild 3267 BLAKE2B 93a45017f07ffb7ad462abebe26331d686e35326c862102c8135011785fda3e3ac61dc239d6c8fd07fc997c04e3a947fbb21b1f6dbdfc0893827456612c1bbe4 SHA512 01dc12224afb8bcbade13958dae3fbbec9ace563f3c8a7a5cbad0274e901a5261f052585815edec8caee1d786207cdc58af823bfde7f2f75dd8f4d5b641647ea
 MISC metadata.xml 259 BLAKE2B d0ebadef8dc30ed8fcc89ae38ab6a5d4af940b2cd75dea1494d96c37557532dea21ef0e014d09e32ae49eca64fe3d6bd56494fb7460ad69b70f40dd4b7ebc8b0 SHA512 c81aea0e68817fa210dc6f66313aee75246139e50d6324338707f11bca2173c64e88ce8440794c85eb64194ff97cf6c6760a06b4822a121e40629bdc3a04e1fd
diff --git a/media-video/cinelerra/cinelerra-2.3.ebuild b/media-video/cinelerra/cinelerra-2.3.ebuild
index 9bb4a4e74fda..f3c12f6b4513 100644
--- a/media-video/cinelerra/cinelerra-2.3.ebuild
+++ b/media-video/cinelerra/cinelerra-2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -77,6 +77,10 @@ src_prepare() {
 		epatch "${WORKDIR}"/${P}-patchset/${PN}-ffmpeg29.patch
 	fi
 
+	if has_version '>=media-video/ffmpeg-3.5' ; then
+		epatch "${FILESDIR}/ffmpeg4.patch"
+	fi
+
 	eautoreconf
 }
 
diff --git a/media-video/cinelerra/files/ffmpeg4.patch b/media-video/cinelerra/files/ffmpeg4.patch
new file mode 100644
index 000000000000..982073e138bc
--- /dev/null
+++ b/media-video/cinelerra/files/ffmpeg4.patch
@@ -0,0 +1,83 @@
+Index: CinelerraCV-2.3/quicktime/mpeg4.c
+===================================================================
+--- CinelerraCV-2.3.orig/quicktime/mpeg4.c
++++ CinelerraCV-2.3/quicktime/mpeg4.c
+@@ -625,7 +625,6 @@ static int encode(quicktime_t *file, uns
+ // ffmpeg section
+ 		{
+ 			AVDictionary ** opts = NULL;
+-			static char *video_rc_eq="tex^qComp";
+ 			codec->encode_initialized[current_field] = 1;
+ 			if(!ffmpeg_initialized)
+ 			{
+@@ -650,7 +649,6 @@ static int encode(quicktime_t *file, uns
+ 			context->pix_fmt = AV_PIX_FMT_YUV420P;
+ 			context->bit_rate = codec->bitrate / codec->total_fields;
+ 			context->bit_rate_tolerance = codec->bitrate_tolerance;
+-			context->rc_eq = video_rc_eq;
+         	context->rc_max_rate = 0;
+         	context->rc_min_rate = 0;
+         	context->rc_buffer_size = 0;
+@@ -658,8 +656,6 @@ static int encode(quicktime_t *file, uns
+ 				(!codec->fix_bitrate ? codec->quantizer : 2);
+ 			context->qmax = 
+ 				(!codec->fix_bitrate ? codec->quantizer : 31);
+-			context->lmin = 2 * FF_QP2LAMBDA;
+-			context->lmax = 31 * FF_QP2LAMBDA;
+ 			context->mb_lmin = 2 * FF_QP2LAMBDA;
+ 			context->mb_lmax = 31 * FF_QP2LAMBDA;
+ 			context->max_qdiff = 3;
+@@ -680,8 +676,6 @@ static int encode(quicktime_t *file, uns
+ 			context->frame_skip_cmp = FF_CMP_DCTMAX;
+ 			context->ildct_cmp = FF_CMP_VSAD;
+ 			context->intra_dc_precision = 0;
+-        	context->intra_quant_bias = FF_DEFAULT_QUANT_BIAS;
+-        	context->inter_quant_bias = FF_DEFAULT_QUANT_BIAS;
+         	context->i_quant_factor = -0.8;
+         	context->i_quant_offset = 0.0;
+ 			context->mb_decision = FF_MB_DECISION_SIMPLE;
+@@ -689,18 +683,14 @@ static int encode(quicktime_t *file, uns
+ 			context->me_sub_cmp = FF_CMP_SAD;
+ 			context->me_cmp = FF_CMP_SAD;
+ 			context->me_pre_cmp = FF_CMP_SAD;
+-			context->me_method = ME_EPZS;
+ 			context->me_subpel_quality = 8;
+ 			context->me_penalty_compensation = 256;
+ 			context->me_range = 0;
+-			context->me_threshold = 0;
+-			context->mb_threshold = 0;
+ 			context->nsse_weight= 8;
+         	context->profile= FF_PROFILE_UNKNOWN;
+-			context->rc_buffer_aggressivity = 1.0;
+         	context->level= FF_LEVEL_UNKNOWN;
+ 			av_dict_set(opts, "umv", "1", 0);
+-			context->flags |= CODEC_FLAG_AC_PRED;
++			context->flags |= AV_CODEC_FLAG_AC_PRED;
+ 
+ // All the forbidden settings can be extracted from libavcodec/mpegvideo.c of ffmpeg...
+  			
+@@ -709,7 +699,7 @@ static int encode(quicktime_t *file, uns
+ 			   codec->ffmpeg_id == AV_CODEC_ID_H263 ||
+ 			   codec->ffmpeg_id == AV_CODEC_ID_H263P ||
+ 			   codec->ffmpeg_id == AV_CODEC_ID_FLV1)
+-				context->flags |= CODEC_FLAG_4MV;
++				context->flags |= AV_CODEC_FLAG_4MV;
+ // Not compatible with Win
+ //			context->flags |= CODEC_FLAG_QPEL;
+ 
+@@ -723,12 +713,12 @@ static int encode(quicktime_t *file, uns
+ 			}
+ 
+ 			if(!codec->fix_bitrate)
+-				context->flags |= CODEC_FLAG_QSCALE;
++				context->flags |= AV_CODEC_FLAG_QSCALE;
+ 
+ 			if(codec->interlaced)
+ 			{
+-				context->flags |= CODEC_FLAG_INTERLACED_DCT;
+-				context->flags |= CODEC_FLAG_INTERLACED_ME;
++				context->flags |= AV_CODEC_FLAG_INTERLACED_DCT;
++				context->flags |= AV_CODEC_FLAG_INTERLACED_ME;
+ 			}
+ 
+