move cinelerra-cvs to cinelerra

(Portage version: 2.2_rc1/cvs/Linux 2.6.25.8 i686)

6 files changed, 380 insertions, 0 deletions

diff --git a/media-video/cinelerra/ChangeLog b/media-video/cinelerra/ChangeLog
new file mode 100644
index 000000000000..36f3305a60c1
--- /dev/null
+++ b/media-video/cinelerra/ChangeLog
@@ -0,0 +1,235 @@
+# ChangeLog for media-video/cinelerra-cvs
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.28 2008/06/24 12:23:17 hanno Exp $
+
+*cinelerra-20080602 (24 Jun 2008)
+
+  24 Jun 2008; Hanno Boeck <hanno@gentoo.org>
+  +files/cinelerra-cvs-defaultx264tocqp.patch,
+  +files/cinelerra-libtool22.diff, +metadata.xml,
+  +cinelerra-20080602.ebuild:
+  Move from cinelerra-cvs to cinelerra.
+
+  23 Jun 2008; Hanno Boeck <hanno@gentoo.org>
+  +files/cinelerra-libtool22.diff, cinelerra-cvs-20080602.ebuild:
+  Fix build with libtool 2.2.
+
+  21 Jun 2008; Hanno Boeck <hanno@gentoo.org>
+  -files/cinelerra-cvs-gcc-4.3.patch, -files/cinelerra-compilewarnings.diff,
+  -files/cinelerra-cvs-ffmpegheaders.patch,
+  -files/cinelerra-cvs-swscaler.patch, -cinelerra-cvs-20080401.ebuild:
+  Remove upstream-applied patches and old ebuild.
+
+*cinelerra-cvs-20080602 (03 Jun 2008)
+
+  03 Jun 2008; Hanno Boeck <hanno@gentoo.org>
+  +cinelerra-cvs-20080602.ebuild:
+  Version bump, some patches got accepted upstream.
+
+  10 Apr 2008; Alexis Ballier <aballier@gentoo.org>
+  -cinelerra-cvs-20080301.ebuild:
+  remove old
+
+  07 Apr 2008; Ben de Groot <yngwin@gentoo.org>
+  cinelerra-cvs-20080301.ebuild, cinelerra-cvs-20080401.ebuild:
+  Pkgmove x264-svn to x264
+
+*cinelerra-cvs-20080401 (01 Apr 2008)
+
+  01 Apr 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/cinelerra-cvs-gcc-4.3.patch,
+  +files/cinelerra-cvs-ffmpegheaders.patch, +cinelerra-cvs-20080401.ebuild:
+  bump a new snapshot with a gcc 4.3 fix by Martin Väth
+  <vaeth@mathematik.uni-wuerzburg.de> (bug #215431) and a fix to build with
+  latest ffmpeg by me
+
+  20 Mar 2008; Alexis Ballier <aballier@gentoo.org>
+  -files/cinelerra-cvs-20080115-swscaler.patch,
+  -cinelerra-cvs-20080115.ebuild:
+  remove old
+
+*cinelerra-cvs-20080301 (01 Mar 2008)
+
+  01 Mar 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/cinelerra-cvs-defaultx264tocqp.patch,
+  +files/cinelerra-cvs-swscaler.patch, +cinelerra-cvs-20080301.ebuild:
+  version bump, workaround cinelerra's inability to set the ratecontrol method
+  by restoring the old default, thanks to Paul de Vries
+  <phs.de.vries@gmail.com> for reporting in bug #211206
+
+  26 Jan 2008; Alexis Ballier <aballier@gentoo.org>
+  cinelerra-cvs-20080115.ebuild:
+  run autotools in unpack phase, bug #207458
+
+  25 Jan 2008; Alexis Ballier <aballier@gentoo.org>
+  -files/cinelerra-cvs-swscaler.patch, -files/recentffmpeg.patch,
+  -cinelerra-cvs-20070726.ebuild:
+  remove old
+
+*cinelerra-cvs-20080115 (15 Jan 2008)
+
+  15 Jan 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/cinelerra-cvs-20080115-swscaler.patch,
+  +cinelerra-cvs-20080115.ebuild:
+  bump a new snapshot
+
+  13 Jan 2008; Alexis Ballier <aballier@gentoo.org>
+  cinelerra-cvs-20070726.ebuild:
+  add missing pkgconfig dep, bug #205580
+
+  25 Dec 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
+  Removing zypher from metadata.xml as per #26909.
+
+  12 Oct 2007; Alexis Ballier <aballier@gentoo.org>
+  -cinelerra-cvs-20070122.ebuild, -cinelerra-cvs-20070607.ebuild:
+  remove unused versions
+
+  14 Aug 2007; Hanno Boeck <hanno@gentoo.org>
+  +files/cinelerra-compilewarnings.diff, cinelerra-cvs-20070726.ebuild:
+  Fix QA warnings, patch sent upstream.
+
+*cinelerra-cvs-20070726 (26 Jul 2007)
+
+  26 Jul 2007; Alexis Ballier <aballier@gentoo.org>
+  +files/cinelerra-cvs-swscaler.patch, +cinelerra-cvs-20070726.ebuild:
+  Version bump, adding a patch to switch to swscaler api, closing bug #185132
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  cinelerra-cvs-20070122.ebuild, cinelerra-cvs-20070607.ebuild:
+  Drop virtual/x11 references.
+
+  02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org>
+  cinelerra-cvs-20070122.ebuild:
+  (QA) RESTRICT clean up.
+
+*cinelerra-cvs-20070607 (11 Jun 2007)
+
+  11 Jun 2007; Alexis Ballier <aballier@gentoo.org>
+  +files/recentffmpeg.patch, +cinelerra-cvs-20070607.ebuild:
+  Version bump, closing bug #181626 and bug #174159
+
+  25 Feb 2007; Alexis Ballier <aballier@gentoo.org>
+  -cinelerra-cvs-20061020.ebuild:
+  Cleanup old versions
+
+  28 Jan 2007; Joseph Jezak <josejx@gentoo.org>
+  cinelerra-cvs-20070122.ebuild:
+  Marked ~ppc for bug #163708.
+
+*cinelerra-cvs-20070122 (22 Jan 2007)
+
+  22 Jan 2007; Alexis Ballier <aballier@gentoo.org>
+  +cinelerra-cvs-20070122.ebuild:
+  New snapshot
+
+  22 Jan 2007; Alexis Ballier <aballier@gentoo.org>
+  -files/cinelerra-cvs-20060219-gcc41.patch, -cinelerra-cvs-20060219.ebuild,
+  -cinelerra-cvs-20060619.ebuild:
+  Cleanup old versions
+
+  05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+  cinelerra-cvs-20060219.ebuild, cinelerra-cvs-20060619.ebuild,
+  cinelerra-cvs-20061020.ebuild:
+  Convert to use elog.
+
+  26 Oct 2006; Alexis Ballier <aballier@gentoo.org>
+  cinelerra-cvs-20061020.ebuild:
+  Use freetype2 -> truetype
+
+  23 Oct 2006; Alexis Ballier <aballier@gentoo.org>
+  cinelerra-cvs-20061020.ebuild:
+  Adding missing lame dep, as pointed in bug #143596
+
+*cinelerra-cvs-20061020 (20 Oct 2006)
+
+  20 Oct 2006; Alexis Ballier <aballier@gentoo.org>
+  +cinelerra-cvs-20061020.ebuild:
+  Version bump, bug #147597 and #143596
+
+  08 Oct 2006; <malc@gentoo.org> cinelerra-cvs-20060619.ebuild:
+  Make plugin path respect $(get_libdir) to fix QA checks on x86_64 platforms - bug #145027
+
+*cinelerra-cvs-20060219 (19 Jun 2006)
+
+  25 Jun 2006; Marc Hildebrand <zypher@gentoo.org>
+  cinelerra-cvs-20060219.ebuild:
+  Version bump. Removed old 20051005 version.
+
+  29 Apr 2006; Mark Loeser <halcy0n@gentoo.org>
+  +files/cinelerra-cvs-20060219-gcc41.patch, cinelerra-cvs-20060219.ebuild:
+  Add patch to fix compilation with gcc-4.1; bug #119575
+
+*cinelerra-cvs-20060219 (19 Feb 2006)
+
+  05 Mar 2006; Marc Hildebrand <zypher@gentoo.org>
+  cinelerra-cvs-20060219.ebuild:
+  Version bump. Dep fixes. Removed old versions.
+  Closes bugs #108526, #109846, #116179, #123724, #73006
+
+  23 Jan 2006; Luca Barbato <lu_zero@gentoo.org>
+  cinelerra-cvs-20051005.ebuild:
+  Minor workaround
+
+  31 Oct 2005; Luca Barbato <lu_zero@gentoo.org>
+  cinelerra-cvs-20051005.ebuild:
+  Dep fix, as pointed in the bug #108525
+
+*cinelerra-cvs-20051005 (05 Oct 2005)
+
+  06 Oct 2005; Marc Hildebrand <zypher@gentoo.org> cinelerra-cvs-20051005.ebuild:
+  Version bump. This introduces Cinelerra version 2.0. Removed ppc keyword.
+
+  01 Aug 2005; Marc Hildebrand <zypher@gentoo.org> cinelerra-cvs-20050801.ebuild:
+  Added libtheora dependency.
+
+*cinelerra-cvs-20050801 (01 Aug 2005)
+
+  01 Aug 2005; Marc Hildebrand <zypher@gentoo.org> cinelerra-cvs-20050801.ebuild:
+  Version bump. Removed four old ebuilds.
+
+  18 May 2005; <zypher@gentoo.org> cinelerra-cvs-20050506.ebuild:
+  Marked ~ppc.
+
+  15 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  cinelerra-cvs-20040917.ebuild, cinelerra-cvs-20050102.ebuild,
+  cinelerra-cvs-20050127.ebuild, cinelerra-cvs-20050315.ebuild,
+  cinelerra-cvs-20050506.ebuild:
+  Converted to toolchain-funcs eclass. Added for a check for at least gcc3.
+  Moved nasm as a buildtime dependency on latest version.
+
+*cinelerra-cvs-20050506 (06 May 2005)
+
+  06 May 2005; Marc Hildebrand <zypher@gentoo.org> cinelerra-cvs-20050506.ebuild:
+  Version bump.
+
+  30 Mar 2005; Luca Barbato <lu_zero@gentoo.org>
+  cinelerra-cvs-20050315.ebuild:
+  Added faad2 dep, removed mmx and 3dnow useflags for now
+
+*cinelerra-cvs-20050315 (15 Mar 2005)
+
+  18 Mar 2005; Marc Hildebrand <zypher@gentoo.org> cinelerra-cvs-20050315.ebuild:
+  Version bump plus needed mjpegtools-dependency.
+
+*cinelerra-cvs-20050127 (27 Jan 2005)
+
+  28 Jan 2005; Marc Hildebrand <zypher@gentoo.org> cinelerra-cvs-20050127.ebuild:
+  Version bump.
+
+  15 Jan 2005; Luca Barbato <lu_zero@gentoo.org>
+  +files/libmpeg3-20050102-gcc3.4.patch, cinelerra-cvs-20050102.ebuild:
+  Fix asm statement problem
+
+  12 Jan 2005; Danny van Dyk <kugelfang@gentoo.org>
+  cinelerra-cvs-20040917.ebuild, cinelerra-cvs-20050102.ebuild:
+  Fixed dependencies (!media-video/cinelerra). Marked ~amd64.
+
+*cinelerra-cvs-20050102 (02 Jan 2004)
+
+  11 Jan 2005; Marc Hildebrand <zypher@gentoo.org> cinelerra-cvs-20050102.ebuild:
+  Version bump.
+
+*cinelerra-cvs-20040917 (17 Sep 2004)
+
+  18 Sep 2004; Marc Hildebrand <zypher@gentoo.org> cinelerra-cvs-20040917.ebuild:
+  Initial import.
diff --git a/media-video/cinelerra/Manifest b/media-video/cinelerra/Manifest
new file mode 100644
index 000000000000..92922575718a
--- /dev/null
+++ b/media-video/cinelerra/Manifest
@@ -0,0 +1,6 @@
+AUX cinelerra-cvs-defaultx264tocqp.patch 405 RMD160 a89e2be0b15581d880a4cc086fcd9f233ee97391 SHA1 88810ed033a030f48e0264b48dd28526ad517698 SHA256 13082a69d87805cd743fc2fe7eae66e16a87eba763e17524da3b03a23d1483ac
+AUX cinelerra-libtool22.diff 459 RMD160 cfd28e029a7fcffc9597f3937f06134dcd3ec6cd SHA1 b5abe5e73aea61d27e3700c61f67a0a734fc9f1a SHA256 805a0ed8dc5923e2ceb2bdcbe0210eaada1a92dc77821d6301329fd0edad39a5
+DIST cinelerra-20080602.tar.bz2 31256213 RMD160 968c32120c259e12707848763ea90f4030beb3ef SHA1 75d34bdac01e6f5f6702d3d2321fd43c4788029f SHA256 686ce3f100f8e01d5b1eac67cef59dcc5e6be4953f8dc16f756bd94217be145a
+EBUILD cinelerra-20080602.ebuild 2930 RMD160 997b7a692cbecdbf2bffd8e1f32bbf6b16a3911a SHA1 2da765a6c18316746c558fddf231d92134ce1f00 SHA256 0e2f6692fe643be844fa70c2aa5929814b96e712e43e84e2656311a585478b16
+MISC ChangeLog 8185 RMD160 3e4e34ea8bc7236723738b42853d761b84aab28d SHA1 812e485dd146286ec6aed29005256bff938f31fd SHA256 76c35cca5831f33bfbccdae1b1d2293b4dc545220acefc6ea6b26575ac334503
+MISC metadata.xml 159 RMD160 21717801992314b5fc85dfeb6da77bf71fc54c7e SHA1 26b6ea95dc60c40d9b482830ce7e7c54233a7698 SHA256 38df217d3a650829cd34e6c74bd2710a01751ccd5511b5be296e3f48dd4d81cb
diff --git a/media-video/cinelerra/cinelerra-20080602.ebuild b/media-video/cinelerra/cinelerra-20080602.ebuild
new file mode 100644
index 000000000000..b1671d865544
--- /dev/null
+++ b/media-video/cinelerra/cinelerra-20080602.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/cinelerra-20080602.ebuild,v 1.1 2008/06/24 12:23:17 hanno Exp $
+
+WANT_AUTOMAKE=1.9
+WANT_AUTOCONF=2.5
+
+inherit toolchain-funcs eutils flag-o-matic autotools
+
+#filter-flags "-fPIC -fforce-addr"
+
+DESCRIPTION="Cinelerra - Professional Video Editor - Unofficial CVS-version"
+HOMEPAGE="http://cvs.cinelerra.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="3dnow alsa esd mmx oss static truetype ieee1394 css altivec opengl"
+RDEPEND="media-libs/libpng
+	>=media-libs/libdv-1.0.0
+	media-libs/faad2
+	media-libs/faac
+	media-libs/a52dec
+	media-libs/libsndfile
+	media-libs/tiff
+	media-video/ffmpeg
+	media-sound/lame
+	>=sci-libs/fftw-3.0.1
+	media-libs/x264
+	ieee1394? ( media-libs/libiec61883 >=sys-libs/libraw1394-1.2.0 \
+		>=sys-libs/libavc1394-0.5.0 )
+	media-video/mjpegtools
+	alsa? ( media-libs/alsa-lib )
+	esd? ( >=media-sound/esound-0.2.34 )
+	truetype? ( >=media-libs/freetype-2.1.10 )
+	opengl? ( virtual/opengl )
+	>=media-libs/openexr-1.2.2
+	>=media-libs/libvorbis-1.1.0
+	>=media-libs/libogg-1.1
+	>=media-libs/libtheora-1.0_alpha4-r1
+	x11-libs/libX11
+	x11-libs/libXv
+	x11-libs/libXxf86vm
+	x11-libs/libXext
+	x11-libs/libXvMC
+	x11-libs/libXft"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	x86? ( dev-lang/nasm )"
+
+S="${WORKDIR}/hvirtual"
+
+pkg_setup() {
+	if [[ "$(gcc-major-version)" -lt "4" ]]; then
+		eerror "You need to have gcc 4 or better"
+		eerror "Please follow : http://www.gentoo.org/doc/en/gcc-upgrading.xml"
+		eerror "And have a look at bug #128659"
+		die "You must use gcc 4 or better."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/cinelerra-cvs-defaultx264tocqp.patch"
+	epatch "${FILESDIR}/cinelerra-libtool22.diff"
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_compile() {
+	econf \
+	`use_enable static` \
+	`use_enable alsa` \
+	`use_enable esd` \
+	`use_enable oss` \
+	`use_enable mmx` \
+	`use_enable 3dnow` \
+	--with-plugindir=/usr/$(get_libdir)/cinelerra \
+	`use_enable truetype freetype2` \
+	`use_enable ieee1394 firewire` \
+	`use_enable css` \
+	`use_enable opengl` \
+	`use_enable altivec` \
+	--with-external-ffmpeg \
+	--with-buildinfo=cust/"Gentoo - SVN r1055" \
+	|| die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dohtml -a png,html,texi,sdw -r doc/*
+	# workaround
+	rm -fR "${D}/usr/include"
+	mv "${D}/usr/bin/mpeg3cat" "${D}/usr/bin/mpeg3cat.hv"
+	mv "${D}/usr/bin/mpeg3dump" "${D}/usr/bin/mpeg3dump.hv"
+	mv "${D}/usr/bin/mpeg3toc" "${D}/usr/bin/mpeg3toc.hv"
+	ln -s /usr/bin/mpeg2enc "${D}/usr/$(get_libdir)/cinelerra/mpeg2enc.plugin"
+}
+
+pkg_postinst () {
+	elog "Please note that this is unofficial and somewhat experimental code."
+	elog "See cvs.cinelerra.org for a list of changes to the official cinelerra"
+	elog "release."
+}
diff --git a/media-video/cinelerra/files/cinelerra-cvs-defaultx264tocqp.patch b/media-video/cinelerra/files/cinelerra-cvs-defaultx264tocqp.patch
new file mode 100644
index 000000000000..88e98ebdb9ae
--- /dev/null
+++ b/media-video/cinelerra/files/cinelerra-cvs-defaultx264tocqp.patch
@@ -0,0 +1,12 @@
+Index: cinelerra-cvs/quicktime/qth264.c
+===================================================================
+--- cinelerra-cvs.orig/quicktime/qth264.c
++++ cinelerra-cvs/quicktime/qth264.c
+@@ -506,6 +506,7 @@ static quicktime_h264_codec_t* init_comm
+ 
+ 	codec = (quicktime_h264_codec_t*)codec_base->priv;
+ 	x264_param_default(&codec->param);
++	codec->param.rc.i_rc_method = X264_RC_CQP;
+ 
+ 
+ 	return codec;
diff --git a/media-video/cinelerra/files/cinelerra-libtool22.diff b/media-video/cinelerra/files/cinelerra-libtool22.diff
new file mode 100644
index 000000000000..48e8a0085dc9
--- /dev/null
+++ b/media-video/cinelerra/files/cinelerra-libtool22.diff
@@ -0,0 +1,15 @@
+--- hvirtual/configure.in.1	2008-06-23 23:32:05.000000000 +0200
++++ hvirtual/configure.in	2008-06-23 23:32:48.000000000 +0200
+@@ -20,10 +20,8 @@
+ AC_PROG_LIBTOOL
+ 
+ # hack for libtool 1.5 -- this is ugly and probably wrong, but works
+-if test `libtool --version | grep ltmain.sh | cut -b 25-27` = "1.5"; then
+-   LTC_FLAGS="--tag=CC"
+-   LTCXX_FLAGS="--tag=CXX"
+-fi
++LTC_FLAGS="--tag=CC"
++LTCXX_FLAGS="--tag=CXX"
+ AC_SUBST(LTC_FLAGS)
+ AC_SUBST(LTCXX_FLAGS)
+ 
diff --git a/media-video/cinelerra/metadata.xml b/media-video/cinelerra/metadata.xml
new file mode 100644
index 000000000000..92e4dbc04f50
--- /dev/null
+++ b/media-video/cinelerra/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>video</herd>
+</pkgmetadata>