New snapshot wrt #389315 by Rodrigo Severo

(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)

3 files changed, 111 insertions, 1 deletions

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/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