Create a new Cinelerra CV snapshot from git wrt #516850 by Michał Górny

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

6 files changed, 292 insertions, 9 deletions

diff --git a/media-video/cinelerra/ChangeLog b/media-video/cinelerra/ChangeLog
index 152361cc6231..f388ad975414 100644
--- a/media-video/cinelerra/ChangeLog
+++ b/media-video/cinelerra/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/cinelerra
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.68 2014/02/10 16:56:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.69 2014/07/10 17:59:35 ssuominen Exp $
+
+*cinelerra-20140710 (10 Jul 2014)
+
+  10 Jul 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +cinelerra-20140710.ebuild, +files/cinelerra-20140710-ffmpeg-0.11.patch,
+  +files/cinelerra-20140710-underlinking.patch,
+  +files/cinelerra-20140710-validate_desktop_entry.patch:
+  Create a new Cinelerra CV snapshot from git wrt #516850 by Michał Górny
 
   10 Feb 2014; Samuli Suominen <ssuominen@gentoo.org> cinelerra-20120707.ebuild:
   Missing virtual/glu dependency for USE="opengl" wrt #500904 by Michal Feix
diff --git a/media-video/cinelerra/Manifest b/media-video/cinelerra/Manifest
index 7eaf65b77cf4..4e5a7df4afb1 100644
--- a/media-video/cinelerra/Manifest
+++ b/media-video/cinelerra/Manifest
@@ -1,6 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX cinelerra-20140710-ffmpeg-0.11.patch 4029 SHA256 84f4b3da2687ff126f70e268e81fd99020b837a606c879e0acdf60d166791d3a SHA512 bd1a511d616c8c1661b05db4297dea7c57702658ecb1a18c8cb930a78f396f28f29e87275ec75e70140048caba454e577062c15efb1dcd49c1bf35f51b82cfa0 WHIRLPOOL 08f8050bdc9bf19e238a3cdd85277f8c06a3ce9e12376bc53e043d86e590694fcf59479762ec2fd8c7a2eee3fc910972a2ba4293120c6d94a6278f0decbf59fb
+AUX cinelerra-20140710-underlinking.patch 273 SHA256 3a236dfcd3eabc921156f29fa3d4d4a077f87f5b8773aef725a38b54309e443f SHA512 09db68fecaa8591b5ca1f90b654d30f436c2dcec82642c76303f1db2450bfe90ee0a880decb4fb148a05b24605eacaee566d082bf4ff256ed1a0c099479054ca WHIRLPOOL de3314bf5f6ea09c3aeda022921f78230fd1bca604a7d9cd0fe3bc1bd605abb5e5be1646d32b79b1091227abf254963d02aae6a8efe3ec337dd2bef1ab51e38b
+AUX cinelerra-20140710-validate_desktop_entry.patch 338 SHA256 b26b1f57f7895a3149f840cea1c3292f7ed08225db1a0759fc0cd06d2be92451 SHA512 a8b2d629c952187741671db1806b126a9abf05167fe6fa103053e35354301af168d0fa98146c9007216e6c551b0ed72d518cec543c6e0cdb49959de3b73d8d83 WHIRLPOOL 26a9fbed8dd70c9aaa3c539179abad56fd311b58b8fa5769d20e52d83c5ddd45ef756030c4de446e75608de14ce4dd8ff79f4984bb628aa015a75864719863b5
 AUX cinelerra-entry.patch 307 SHA256 58b95865a77fc2805e2e171f9380283b0d6f62130330029eb8afd866cb2c89d3 SHA512 af9cdbefc7dfaadbbda94a0d2bacef041ff32637e8b1c0cac7ffdf19b8d56686e98d6224d3ac1520461e8b384720304ea2f9a064b9cb1157c7d730e1ecb7d854 WHIRLPOOL c6b9bdb5536221b71c9f82310d46d449dc20742bd351fcb4e5372f5d823ddfacaa4b387b4d47b00bbb18ee8dc7365ef2feccaeecb2f8a36e114b738f5eb7d24a
 AUX cinelerra-ffmpeg-0.11.patch 5605 SHA256 f7b72f9e9ba4a84be0cba85db108a138b6b0f2ca1cd511028869c491b34a3525 SHA512 72fd5d276a6e934e328d778702baf217e77c264c55a641edd32cb12e833acc42ff89acc1f7ab37b66a4327c14aaae1ad7b6b70b49d4637b659346854dd50d358 WHIRLPOOL 1ef2cd8aacff3fae63be93bee1bc80aa7c1e82280f7f8e738ff5d3bdf42d8ebf2c3889da57aafd11d727c89688478d900d4f34c0d840827fca0f9fc97aecdcb3
 AUX cinelerra-ffmpeg.patch 2472 SHA256 d97aac356406258d064a28879c0550ef8e69eaffa247fdb2ebd44b6d858ed3a2 SHA512 59299661832f5631d9a07a0eab0685f897a39acf6c9e8a3f79730f9479c942775005f59abb29f40c9df7446882ccac332fd97bb6387807f41c35e67301022196 WHIRLPOOL 59eaafb82c666bfcf0796a12d4c3c28fa266564001f5bef59a632b08a8c70ac0558b6f52516f1210d527aff343bd59789f7e0498662aaa26ffa937b41ea01477
@@ -9,17 +12,19 @@ AUX cinelerra-libav9.patch 3760 SHA256 9a29f6f8f8ea23b9f856709f4e210ef7e25ea73ab
 AUX cinelerra-std_and_str_h.patch 1647 SHA256 9774bca0b28559f85bcc2beb9f2c690899d4b7b41cc7f627e8b7cfd6d5881f0c SHA512 b8f439b03ebe3fe13eab393a467bd5098631e2861412c067309963cbc95df6fdcd063236c9c71d1af9669a4902ff71ff55da989205fa65a2451ba1b18b3042a2 WHIRLPOOL f0d8fb2428f66cd53aac7f4e3839b2910fecf418d220ebce169864d7fdcf46bab306607bcd249b25ac393cdeb65dd185bef57b03734005cfb10a56fbd8031de2
 AUX cinelerra-underlinking.patch 287 SHA256 58aaec1cee53498c9fa16f1e565e4cc98a9cfcb93ca652c3c1919b0606bb802d SHA512 f29a4f770ea137a2609d2eb90a813b0e933800c57754a999d314c8278671d41d85e87b2d962386cf7505fd99a73522014ff6c3b086b2d7c7586c16d6b12150d8 WHIRLPOOL 55e2e1c25e3a4ed9152bc347faf41996baa36ce8159fdedcd3a47f144b045bb4b74a4a77be84501dbc18fe45db9e993e889f444224fa72ec4021de8d0e7d9fdf
 DIST cinelerra-20120707.tar.xz 22542220 SHA256 b909531fd1f5a11b85463ea06a62f703f2be67cbe79cd90c035d569a3019f5ad SHA512 af5ed92c223c1e0658ea3320aeefb568b94299ec14947e422f845b72bb271e7592142ac3d119daa9ce2a1b15e708d5ae2214a051f6d4ba67bd3ec733fc607171 WHIRLPOOL add200da410aafb3ad8bd6113061ba055a57978b4f9b717275b0c22375968e7aaa6c5c5a1d0f1ce2c4da3a630b9218fe2e5ae795b30bdfbfb532a3d793fd6065
+DIST cinelerra-20140710.tar.xz 24843336 SHA256 3a7c72e68c7fa8d20f0186bd9460453973e2ffdccc9e0fff1fd9114610361ff2 SHA512 ede8e3888c24022802b45909b8977ec449262f17bd488bf1fab9885b3cb76fa0a66f82e780e204bde2cd3e1da2952aec927d733f21b9883601f128478eeb81db WHIRLPOOL cf56e7f3531ff4f6e2d350bb5fc247f71106f60f016dc20fc7e73556cd05dd97c812b61709109210f76e30c67552e03f9927a52e92f6ce6d83227438cdc4314b
 EBUILD cinelerra-20120707.ebuild 2573 SHA256 c9fed1fa6237f7e9082fbbba4d82fb492bb4f18236480b0968076e7cc947c7fd SHA512 8142fa19e4c3679959346011a6ec67de29db671c917821fee170dd18bcaddc861014253f8bc5b5d3597381f5c65e7df956fcb5dae08514a2e0df3945be60cce6 WHIRLPOOL bcc58680da23f0f5541cc6285f7eb33d41fbe3f869ddc0af0daf98fc849c3f75027f1d64e4c7fc2b629de18d7995eceed5a09e0cb17ebc50e7c8a3f792863815
-MISC ChangeLog 14740 SHA256 012c85ef79a9076333d24bcaf9977a42e39fe1045eac81cad041177b55625cab SHA512 0f640ddec5816b586da8053468d1928541d6bb92809d78dad72c33453a20e9ded25fc44104cf09632dd2aad8e20c8fb4cbcc961c3d268adedc4a73b54c603847 WHIRLPOOL f5e6057180bdddaeb6a2c462d2429c730197813e7391e84f5e054e9e8563f99baeaf6c79b3e2e20ab74146cd48f32af305a07492800e6e76a149f21c4377d7d2
+EBUILD cinelerra-20140710.ebuild 2643 SHA256 adb24d44b9b0c90708db33a6ae3e83b8946343cd5ff8b65ed29fdc31ba3b2309 SHA512 56444ddde51d52dbf262327f68a744ed086e736c02ae7fa9e7bbba50da81a5b5fc6a66c49b2c35df4d7a2865d9e4737116f7279047867997f71b1df4a1327530 WHIRLPOOL 3d93c088fd6951ec6ea5bb4f781004936dffca692b38432d60c62b21c4ecc8617ccf383418630324d1ea3a69f2cae7c909c212562247ffefcb3f7ea771d3d8bc
+MISC ChangeLog 15087 SHA256 be1500ededf84a006663086c95ab0bb8e833161151ee92c417433df8ea70e5c2 SHA512 25dbda4757bac8b761ef213368ef9c5f6bf087c098207b248c2bb7cfe7bfe0226b2502e7a61356085a1b9fe7dc0d6e17ad410028f632a10c193332587045b786 WHIRLPOOL 98852bb857880c8bc361aaf7c7361690e92b873e37d19731f5d2de3187abbe1724e82e88db2d48d36317a687a29c4be914d2d85106f47918f1c52f2963160964
 MISC metadata.xml 159 SHA256 38df217d3a650829cd34e6c74bd2710a01751ccd5511b5be296e3f48dd4d81cb SHA512 63ef497824a91cae0ce7ca0b384ac72ac8564b9996f0f9e64a1ba2cbb943c90ebade5a8dc6345ba281d907b8c4ff0b5941bdda95e10e9c507846a9dabbc3cfcc WHIRLPOOL 22ad7e39360e181eab700c06170690a79057d328ae61793ff195104bdce14dab0dc6ff7ec8e10d8f177ee5f1aa9ea2362f579404cb3fc4fa961562c985e0ce12
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJS+QR1AAoJEEdUh39IaPFN/sMH+wWHPBBK7EkzUKxhTpi5us+E
-Vy7fbfdpYCqx5IbjMRq3/2VHvzEN2EIJhjQzeScyr/jviWmdAcMwpqrYWoPBdbI/
-NvMJf5EDxj9AJfZMcrmNMfjSgvIhqnPkEg9NNBKzlVMdrJ4gG4T8pFxO2HKSQSM0
-Hzeko0bXE+t9PEeNHPdYL8fhG7/6m/F3YqDddnS2ee1JYxVVzDiH/cC/psI926xB
-82sSb5e6JSQau88SC71C7GpZvKawEaDMDdphZwCAQ45XS3Ytpet7wa32SwYgZ1iq
-knFaFNEBtBZyashLc+mNZ3qPzgS4UkoX6cDQ/aDE9oeBX57O1hz1vx+6bT52o6c=
-=p/PA
+iQEcBAEBCAAGBQJTvtNeAAoJEEdUh39IaPFNvB0H/injr2T66yr3v61BacCAkaYS
+yIWPtKh21tIqDohHqBEkYWHCDL9fSDB6aZCwV/arBpbftXUn+CBRsEZPhTCUC92y
+SB6iznu8lNxHVX8/IVD29oFgKvcOi/H+Wl3H6DEXD1ngWQtnmzvvi/TCIyAe4zg5
+/auz9QBCxfE3EgBFZdD2jjvY4LTYvVdz3E/mdL9Sj3nLwEYlXNzH3aU5xw1iAimu
+zXxiGPjD2XK2iurQmk9mFNy6EbSjHxo79NUcK/gpPao8KtcoXDzj64BC5apLT6qo
+NN5Jd0oykj+AZi4SuVw4g28s1SnWQujXF0KdGisw5fxmuZC8qcziO7kNVMFcmwM=
+=VQ51
 -----END PGP SIGNATURE-----
diff --git a/media-video/cinelerra/cinelerra-20140710.ebuild b/media-video/cinelerra/cinelerra-20140710.ebuild
new file mode 100644
index 000000000000..e9117ebfc9e2
--- /dev/null
+++ b/media-video/cinelerra/cinelerra-20140710.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/cinelerra-20140710.ebuild,v 1.1 2014/07/10 17:59:35 ssuominen Exp $
+
+EAPI=5
+inherit autotools eutils multilib flag-o-matic
+
+DESCRIPTION="The most advanced non-linear video editor and compositor"
+HOMEPAGE="http://www.cinelerra.org/"
+SRC_URI="http://dev.gentoo.org/~ssuominen/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="3dnow alsa altivec css debug ieee1394 mmx opengl oss"
+
+RDEPEND="media-libs/a52dec:=
+	media-libs/faac:=
+	media-libs/faad2:=
+	>=media-libs/freetype-2
+	media-libs/libdv:=
+	>=media-libs/libogg-1.2:=
+	media-libs/libpng:0=
+	media-libs/libsndfile:=
+	>=media-libs/libtheora-1.1:=
+	>=media-libs/libvorbis-1.3:=
+	>=media-libs/openexr-1.5:=
+	media-libs/tiff:0=
+	media-libs/x264:=
+	media-sound/lame:=
+	>=media-video/mjpegtools-2
+	>=sci-libs/fftw-3
+	x11-libs/libX11:=
+	x11-libs/libXext:=
+	x11-libs/libXft:=
+	x11-libs/libXv:=
+	x11-libs/libXvMC:=
+	x11-libs/libXxf86vm:=
+	virtual/ffmpeg
+	|| ( media-video/ffmpeg:0 media-libs/libpostproc )
+	virtual/jpeg:0
+	alsa? ( media-libs/alsa-lib:= )
+	ieee1394? (
+		media-libs/libiec61883:=
+		>=sys-libs/libraw1394-1.2.0:=
+		>=sys-libs/libavc1394-0.5.0:=
+		)
+	opengl? (
+		virtual/glu
+		virtual/opengl
+		)"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	mmx? ( dev-lang/nasm )"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-validate_desktop_entry.patch \
+		"${FILESDIR}"/${PN}-ffmpeg.patch \
+		"${FILESDIR}"/${P}-underlinking.patch \
+		"${FILESDIR}"/${P}-ffmpeg-0.11.patch \
+		"${FILESDIR}"/${PN}-libav9.patch
+
+	if has_version '>=media-video/ffmpeg-2' ; then
+		epatch "${FILESDIR}"/${PN}-ffmpeg2.patch
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -D__STDC_CONSTANT_MACROS #321945
+	append-ldflags -Wl,-z,noexecstack #212959
+
+	local myconf
+	use debug && myconf='--enable-x-error-output'
+
+	econf \
+		$(use_enable oss) \
+		$(use_enable alsa) \
+		--disable-esd \
+		$(use_enable ieee1394 firewire) \
+		$(use_enable css) \
+		$(use_enable mmx) \
+		$(use_enable 3dnow) \
+		$(use_enable altivec) \
+		$(use_enable opengl) \
+		--with-plugindir=/usr/$(get_libdir)/${PN} \
+		--with-buildinfo=cust/"Gentoo - ${PV}" \
+		--with-external-ffmpeg \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dohtml -a png,html,texi,sdw -r doc/*
+
+	rm -rf "${D}"/usr/include
+	mv -vf "${D}"/usr/bin/mpeg3cat{,.hv} || die
+	mv -vf "${D}"/usr/bin/mpeg3dump{,.hv} || die
+	mv -vf "${D}"/usr/bin/mpeg3toc{,.hv} || die
+	dosym /usr/bin/mpeg2enc /usr/$(get_libdir)/${PN}/mpeg2enc.plugin
+
+	prune_libtool_files --all
+}
diff --git a/media-video/cinelerra/files/cinelerra-20140710-ffmpeg-0.11.patch b/media-video/cinelerra/files/cinelerra-20140710-ffmpeg-0.11.patch
new file mode 100644
index 000000000000..2aebd7008c3c
--- /dev/null
+++ b/media-video/cinelerra/files/cinelerra-20140710-ffmpeg-0.11.patch
@@ -0,0 +1,134 @@
+--- cinelerra/ffmpeg.C
++++ cinelerra/ffmpeg.C
+@@ -23,7 +23,6 @@
+ 
+ int FFMPEG::init(char *codec_string) {
+ 
+-	avcodec_init();
+ 	avcodec_register_all();
+ 
+ 	CodecID id = codec_id(codec_string);
+--- cinelerra/fileac3.C
++++ cinelerra/fileac3.C
+@@ -84,7 +84,6 @@
+ 
+ 	if(wr)
+ 	{
+-  		avcodec_init();
+ 		avcodec_register_all();
+ 		codec = avcodec_find_encoder(CODEC_ID_AC3);
+ 		if(!codec)
+--- configure.ac
++++ configure.ac
+@@ -497,7 +497,7 @@
+ AC_ARG_WITH([external-ffmpeg], AC_HELP_STRING([--with-external-ffmpeg], [use external ffmpeg library]))
+ 
+ if test "x$with_external_ffmpeg" = "xyes"; then
+-     PKG_CHECK_MODULES([FFMPEG_TEMP], [libavcodec libpostproc])
++     PKG_CHECK_MODULES([FFMPEG_TEMP], [libavcodec libpostproc libavutil])
+      FFMPEG_FOLDER=""
+      FFMPEG_EXTERNALTEXT="External ffmpeg"
+ 		   
+@@ -515,10 +515,10 @@
+      AC_MSG_RESULT($enable_ffmpeg_swscale)
+      if test x"$enable_ffmpeg_swscale" = xyes; then
+ 	     dnl AC_DEFINE(HAVE_SWSCALER)
+-	     PKG_CHECK_MODULES([FFMPEG], [libavcodec libpostproc libswscale])
++	     PKG_CHECK_MODULES([FFMPEG], [libavcodec libpostproc libswscale libavutil])
+ 	     FFMPEG_CFLAGS="$FFMPEG_CFLAGS -I/usr/include/libavcodec -I/usr/include/libswscale -DHAVE_SWSCALER"
+      else
+-	     PKG_CHECK_MODULES([FFMPEG], [libavcodec libpostproc])
++	     PKG_CHECK_MODULES([FFMPEG], [libavcodec libpostproc libavutil])
+      fi
+      FFMPEG_EXTERNALTEXT="External ffmpeg"
+ else
+--- quicktime/mpeg4.c
++++ quicktime/mpeg4.c
+@@ -624,12 +624,12 @@
+ 		else
+ // ffmpeg section
+ 		{
++			AVDictionary ** opts = NULL;
+ 			static char *video_rc_eq="tex^qComp";
+ 			codec->encode_initialized[current_field] = 1;
+ 			if(!ffmpeg_initialized)
+ 			{
+ 				ffmpeg_initialized = 1;
+-  				avcodec_init();
+ 				avcodec_register_all();
+ 			}
+ 
+@@ -673,8 +673,10 @@
+         	context->b_quant_offset = 1.25;
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+ 			context->error_resilience = FF_ER_CAREFUL;
+-#else
++#elif LIBAVCODEC_VERSION_INT < ((54<<16)+(0<<8)+0)
+ 			context->error_recognition = FF_ER_CAREFUL;
++#else
++			context->err_recognition |= AV_EF_CAREFUL;
+ #endif
+ 			context->error_concealment = 3;
+ 			context->frame_skip_cmp = FF_CMP_DCTMAX;
+@@ -699,7 +701,7 @@
+         	context->profile= FF_PROFILE_UNKNOWN;
+ 			context->rc_buffer_aggressivity = 1.0;
+         	context->level= FF_LEVEL_UNKNOWN;
+-			context->flags |= CODEC_FLAG_H263P_UMV;
++			av_dict_set(opts, "umv", "1", 0);
+ 			context->flags |= CODEC_FLAG_AC_PRED;
+ 
+ // All the forbidden settings can be extracted from libavcodec/mpegvideo.c of ffmpeg...
+@@ -717,10 +719,8 @@
+ 				(codec->ffmpeg_id == CODEC_ID_MPEG4 ||
+ 			         codec->ffmpeg_id == CODEC_ID_MPEG1VIDEO ||
+ 			         codec->ffmpeg_id == CODEC_ID_MPEG2VIDEO ||
+-			         codec->ffmpeg_id == CODEC_ID_H263P || 
+-			         codec->ffmpeg_id == CODEC_FLAG_H263P_SLICE_STRUCT))
++			         codec->ffmpeg_id == CODEC_ID_H263P ))
+ 			{
+-				avcodec_thread_init(context, file->cpus);
+ 				context->thread_count = file->cpus;
+ 			}
+ 
+@@ -740,7 +740,7 @@
+  * codec->fix_bitrate,
+  * codec->quantizer);
+  */
+-			avcodec_open(context, codec->encoder[current_field]);
++			avcodec_open2(context, codec->encoder[current_field], opts);
+ 
+    			avcodec_get_frame_defaults(&codec->picture[current_field]);
+ 
+--- quicktime/qtffmpeg.c
++++ quicktime/qtffmpeg.c
+@@ -54,7 +54,6 @@
+ 	if(!ffmpeg_initialized)
+ 	{
+ 		ffmpeg_initialized = 1;
+-  		avcodec_init();
+ 		avcodec_register_all();
+ 	}
+ 
+@@ -90,10 +89,8 @@
+ 				(ffmpeg_id == CODEC_ID_MPEG4 ||
+ 			         ffmpeg_id == CODEC_ID_MPEG1VIDEO ||
+ 			         ffmpeg_id == CODEC_ID_MPEG2VIDEO ||
+-			         ffmpeg_id == CODEC_ID_H263P || 
+-			         ffmpeg_id == CODEC_FLAG_H263P_SLICE_STRUCT))
++			         ffmpeg_id == CODEC_ID_H263P ))
+ 		{
+-			avcodec_thread_init(context, cpus);
+ 			context->thread_count = cpus;
+ 		}
+ 		if(avcodec_open(context, 
+--- quicktime/wma.c
++++ quicktime/wma.c
+@@ -67,7 +67,6 @@
+ 		if(!ffmpeg_initialized)
+ 		{
+ 			ffmpeg_initialized = 1;
+-			avcodec_init();
+ 			avcodec_register_all();
+ 		}
+ 
diff --git a/media-video/cinelerra/files/cinelerra-20140710-underlinking.patch b/media-video/cinelerra/files/cinelerra-20140710-underlinking.patch
new file mode 100644
index 000000000000..a7dc74f2d445
--- /dev/null
+++ b/media-video/cinelerra/files/cinelerra-20140710-underlinking.patch
@@ -0,0 +1,16 @@
+http://bugs.gentoo.org/367509
+
+pluginserver.C is using dlsym, dlopen, dlclose and dlerror
+
+--- cinelerra/Makefile.am
++++ cinelerra/Makefile.am
+@@ -692,7 +692,8 @@
+ 	$(LIBDV_LIBS) \
+ 	-luuid \
+ 	$(MJPEG_LIBS) \
+-	-lstdc++
++	-lstdc++ \
++	-ldl
+ 
+ EXTRA_DIST = gen-feather-h
+ 
diff --git a/media-video/cinelerra/files/cinelerra-20140710-validate_desktop_entry.patch b/media-video/cinelerra/files/cinelerra-20140710-validate_desktop_entry.patch
new file mode 100644
index 000000000000..006217586630
--- /dev/null
+++ b/media-video/cinelerra/files/cinelerra-20140710-validate_desktop_entry.patch
@@ -0,0 +1,14 @@
+--- image/cinelerra-cv.desktop
++++ image/cinelerra-cv.desktop
+@@ -5,9 +5,8 @@
+ Name[fr]=Cinelerra-CV
+ Name[es]=Cinelerra-CV
+ Comment=Video Editor
+-Categories=Application;AudioVideo;Multimedia;VideoEditing;
+-Encoding=UTF-8
++Categories=AudioVideo;
+ Exec=cinelerra
+-Icon=cinelerra-cv.xpm
++Icon=cinelerra-cv
+ Terminal=false
+ Type=Application