From f02d4541e6c5a129e68839dea7b02ba04913583a Mon Sep 17 00:00:00 2001
From: Samuli Suominen <ssuominen@gentoo.org>
Date: Fri, 23 Dec 2011 03:03:20 +0000
Subject: [PATCH] New snapshot wrt #389315 by Rodrigo Severo

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64
---
 media-video/cinelerra/ChangeLog               |  8 +-
 media-video/cinelerra/Manifest                | 17 ++--
 .../cinelerra/cinelerra-20111223.ebuild       | 90 +++++++++++++++++++
 .../cinelerra/files/cinelerra-entry.patch     | 14 +++
 4 files changed, 123 insertions(+), 6 deletions(-)
 create mode 100644 media-video/cinelerra/cinelerra-20111223.ebuild
 create mode 100644 media-video/cinelerra/files/cinelerra-entry.patch

diff --git a/media-video/cinelerra/ChangeLog b/media-video/cinelerra/ChangeLog
index 92743394f5fd..7936108a686d 100644
--- a/media-video/cinelerra/ChangeLog
+++ b/media-video/cinelerra/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/cinelerra
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.47 2011/04/27 18:08:01 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.48 2011/12/23 03:03:20 ssuominen Exp $
+
+*cinelerra-20111223 (23 Dec 2011)
+
+  23 Dec 2011; Samuli Suominen <ssuominen@gentoo.org>
+  +cinelerra-20111223.ebuild, +files/cinelerra-entry.patch:
+  New snapshot wrt #389315 by Rodrigo Severo
 
   27 Apr 2011; Alexis Ballier <aballier@gentoo.org> cinelerra-20101104.ebuild,
   +files/cinelerra-ffmpeg.patch, +files/cinelerra-v4l1_removal.patch:
diff --git a/media-video/cinelerra/Manifest b/media-video/cinelerra/Manifest
index 7a41cb93dff2..a45c930a298a 100644
--- a/media-video/cinelerra/Manifest
+++ b/media-video/cinelerra/Manifest
@@ -1,16 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX cinelerra-entry.patch 307 RMD160 824705fa04c61e976dc091617a016ac52f83569e SHA1 ffda8fe16c4ec213f027e019a720167d2fdc35b9 SHA256 58b95865a77fc2805e2e171f9380283b0d6f62130330029eb8afd866cb2c89d3
 AUX cinelerra-ffmpeg.patch 2472 RMD160 1f7587b753e158a5c8a902e6accdf46e4d2a47bb SHA1 9c324c8de25d86fbaee25e70d31f6513756c91e7 SHA256 d97aac356406258d064a28879c0550ef8e69eaffa247fdb2ebd44b6d858ed3a2
 AUX cinelerra-v4l1_removal.patch 3878 RMD160 d8a0a901286a5f60777272565b742e9cdd962397 SHA1 b279d440d48968cde0af134db8209ad07333093d SHA256 50f232fb034bb8aba496e2fb078cdb33d27bb09ba7cb33d99715e171811cff12
 DIST cinelerra-20101104.tar.xz 22336148 RMD160 143f0f90ce7a815fa99c9e311d21a2d229d619c8 SHA1 9d68107e5d5c009a630d1027cd0f73ff87505206 SHA256 9e708667b05d200779c41f63f678f74a0ff927b4945254e3e9a290a741b818fc
+DIST cinelerra-20111223.tar.xz 22543128 RMD160 670c2c054b3e0bd573dfc47682357c02bba5dec8 SHA1 bdd7637e656ce8108df645cd2315f6c144f203e4 SHA256 f125a6d2b16acedb379351eff1e91f8571f18993f13187959bc3cf8f8217053b
 EBUILD cinelerra-20101104.ebuild 2249 RMD160 9460943e7e1adb3a82e158bfac162bda919f60fc SHA1 049efb87ca032c56e45e7e396933c2014c8c0b6f SHA256 045f24d264847318882aa08db6686d23935b4a70c73a32798a2571b3bf33aa7d
-MISC ChangeLog 11497 RMD160 43a1d40d4a85310ad2825b18cc11a4e18d644948 SHA1 faa453ab97f42b16f8affb8e16b4121e81d5e4f9 SHA256 0993f077b3c4a1b9af55bad6d744506c949a765cf7f7b145e8d179af4b676883
+EBUILD cinelerra-20111223.ebuild 2191 RMD160 8e5492b01094349c5d1a7d5865fa37603c5fbe06 SHA1 40a9540253976dd3a1efba9afee134fbe97e8bd9 SHA256 5c11139273de0ed1f7041c14569725ec25353826eb6802acc6a7ce16aa723cd4
+MISC ChangeLog 11693 RMD160 6ff6e717b0b0b301a79037ea3a2f241cfb75e8a7 SHA1 4d28ed2a01fd81d954a5fde1ff04227cc5f27207 SHA256 4260f6fd151d0e10ff7c3c9fdb5107ef8ec16570d47446e7aebd99f0955a1a9d
 MISC metadata.xml 159 RMD160 21717801992314b5fc85dfeb6da77bf71fc54c7e SHA1 26b6ea95dc60c40d9b482830ce7e7c54233a7698 SHA256 38df217d3a650829cd34e6c74bd2710a01751ccd5511b5be296e3f48dd4d81cb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk24W4cACgkQvFcC4BYPU0oDtgCfdzb8BvZCl1Nqa7AyEmYXWT8Z
-mK0AoJveSP2n4cTCdBGyyv51orU3J/mu
-=C2Kx
+iQEcBAEBAgAGBQJO8+9BAAoJEEdUh39IaPFNsaEH/RD9zMAMGVemXsUUIC6KPkNA
+L5ZUVAPAVm4LarBHpE0RjVSy0tarRqdkKTs+D5Su89uSQ8az+m7JTmx8ef/gyQFn
+oVkzaALLx+2r4KycqgaVZO/Rrtw5OqqX8otR53rS2ZngguBWDQgFFOf5fqBNJspA
+36zNm56XoU4tHrpZN3X33XFWUtqroADdx5n3a5KQV4EVaeJi2O8eyFRnWlyU/7f3
+wZU6J52GdWOnfTy2eX59Vi7by/giN8rKtfmHZLYyRdsCCIvj2EkaleKLpKy+QVhF
+pR3j4UQ91smvE2+PXn7Dj0UcOCKoaceVjUJbrl/+Re/unPMHAxbmk3hoK+YmJcE=
+=mZsI
 -----END PGP SIGNATURE-----
diff --git a/media-video/cinelerra/cinelerra-20111223.ebuild b/media-video/cinelerra/cinelerra-20111223.ebuild
new file mode 100644
index 000000000000..1c306d9978b5
--- /dev/null
+++ b/media-video/cinelerra/cinelerra-20111223.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/cinelerra-20111223.ebuild,v 1.1 2011/12/23 03:03:20 ssuominen Exp $
+
+EAPI=4
+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 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-1.2: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
+	virtual/jpeg
+	alsa? ( media-libs/alsa-lib )
+	ieee1394? (
+		media-libs/libiec61883
+		>=sys-libs/libraw1394-1.2.0
+		>=sys-libs/libavc1394-0.5.0
+		)
+	opengl? ( virtual/opengl )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	dev-util/pkgconfig
+	mmx? ( dev-lang/nasm )"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-entry.patch \
+		"${FILESDIR}"/${PN}-ffmpeg.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -D__STDC_CONSTANT_MACROS #321945
+
+	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
+}
+
+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
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/media-video/cinelerra/files/cinelerra-entry.patch b/media-video/cinelerra/files/cinelerra-entry.patch
new file mode 100644
index 000000000000..22987d895a6d
--- /dev/null
+++ b/media-video/cinelerra/files/cinelerra-entry.patch
@@ -0,0 +1,14 @@
+--- image/cinelerra.desktop
++++ image/cinelerra.desktop
+@@ -5,9 +5,8 @@
+ Name[fr]=Cinelerra
+ Name[es]=Cinelerra
+ Comment=Video Editor
+-Categories=Application;AudioVideo;Multimedia;
+-Encoding=UTF-8
++Categories=AudioVideo;
+ Exec=cinelerra
+-Icon=cinelerra.xpm
++Icon=cinelerra
+ Terminal=false
+ Type=Application
-- 
2.26.2