New Release

5 files changed, 118 insertions, 9 deletions

diff --git a/media-video/cinelerra/ChangeLog b/media-video/cinelerra/ChangeLog
index 4cde26b0bb56..7c41ebe2ac01 100644
--- a/media-video/cinelerra/ChangeLog
+++ b/media-video/cinelerra/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/cinelerra
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.23 2004/07/01 08:39:29 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.24 2004/08/27 14:52:06 lu_zero Exp $
+
+*cinelerra-1.2.1 (27 Aug 2004)
+
+  27 Aug 2004; Luca Barbato <lu_zero@gentoo.org>
+  +files/cinelerra-1.2.1-locale.patch, +cinelerra-1.2.1.ebuild:
+  New release
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
   cinelerra-1.0.0.ebuild, cinelerra-1.1.5.ebuild, cinelerra-1.1.7.ebuild,
diff --git a/media-video/cinelerra/Manifest b/media-video/cinelerra/Manifest
index 62fdcb729572..a6d02c6bc43b 100644
--- a/media-video/cinelerra/Manifest
+++ b/media-video/cinelerra/Manifest
@@ -1,16 +1,19 @@
-MD5 8d77c700e30119ad75f57add4d9a15e3 cinelerra-1.1.9.ebuild 1615
-MD5 7459c611f3534860abdb2b2d3c7e59f2 cinelerra-1.0.0.ebuild 1056
 MD5 1184107c8db8bb8e31af77bfe996601a cinelerra-1.1.5.ebuild 1261
-MD5 dbf440ff834a3e9c63cdcbdac8dc3ad8 cinelerra-1.1.7.ebuild 1631
-MD5 c8f78964af876ae64a36456701745d47 ChangeLog 3508
+MD5 7345031fbde9feb74a7333dc925f4bd3 ChangeLog 3665
 MD5 8abbf62fe482bf492386df7f1e562270 metadata.xml 227
+MD5 7459c611f3534860abdb2b2d3c7e59f2 cinelerra-1.0.0.ebuild 1056
+MD5 261f5e41a29c9ceb68db2f95563033ee cinelerra-1.2.1.ebuild 1803
 MD5 f55fba26a99c8308f7b000163cebb457 cinelerra-1.2.0.ebuild 1803
+MD5 8d77c700e30119ad75f57add4d9a15e3 cinelerra-1.1.9.ebuild 1615
+MD5 dbf440ff834a3e9c63cdcbdac8dc3ad8 cinelerra-1.1.7.ebuild 1631
+MD5 bffe8c026a4ffdf9220cbc62a75deb8e files/digest-cinelerra-1.1.9 74
 MD5 3d915d40f23c642ed22fa5a627519aec files/pthread_t_not_int.patch 880
-MD5 b2ee9332ec581ccf59714537ef55fc4b files/cinelerra-1.2.0-gcc34.patch 4523
+MD5 e4d5bcabebf377896bb5023460cbe4cb files/cinelerra-1.2.1-locale.patch 414
 MD5 12c40f831322db75d68c5449efaa4ac6 files/gcc-3.3.1-collate.patch 539
-MD5 bb1b390c6a20a9240f1100c3a3974b0d files/digest-cinelerra-1.0.0 73
+MD5 24ec03198ece5721568ba647098c703c files/digest-cinelerra-1.2.1 74
+MD5 b2ee9332ec581ccf59714537ef55fc4b files/cinelerra-1.2.0-gcc34.patch 4523
+MD5 6f63e3977c7e50e2cf783311d7dda0aa files/digest-cinelerra-1.2.0 74
 MD5 d2363d0c13405512bf1341d84a12d744 files/digest-cinelerra-1.1.5 148
+MD5 bb1b390c6a20a9240f1100c3a3974b0d files/digest-cinelerra-1.0.0 73
 MD5 5a786a19ac60d4ef490c82ccec2975b2 files/digest-cinelerra-1.1.7 74
-MD5 bffe8c026a4ffdf9220cbc62a75deb8e files/digest-cinelerra-1.1.9 74
-MD5 6f63e3977c7e50e2cf783311d7dda0aa files/digest-cinelerra-1.2.0 74
 MD5 6a0e5d7afc5e123e9c6a059b38351548 files/compile-1.1.6.diff 7517
diff --git a/media-video/cinelerra/cinelerra-1.2.1.ebuild b/media-video/cinelerra/cinelerra-1.2.1.ebuild
new file mode 100644
index 000000000000..511fdb645860
--- /dev/null
+++ b/media-video/cinelerra/cinelerra-1.2.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/cinelerra-1.2.1.ebuild,v 1.1 2004/08/27 14:52:06 lu_zero Exp $
+
+inherit gcc eutils flag-o-matic
+export WANT_GCC_3="yes"
+
+#export CFLAGS=${CFLAGS/-O?/-O2}
+
+filter-flags "-fPIC -fforce-addr"
+
+RESTRICT="nostrip"
+
+DESCRIPTION="Cinelerra - Professional Video Editor"
+HOMEPAGE="http://heroinewarrior.com/cinelerra.php3"
+SRC_URI="mirror://sourceforge/heroines/${P}-src.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 -ppc ~amd64"
+IUSE=""
+
+DEPEND="virtual/x11
+	virtual/libc
+	=sys-devel/gcc-3*
+	dev-lang/nasm"
+#	>=media-libs/a52dec-0.7.3"
+
+src_unpack() {
+	unpack ${A}
+#	epatch ${FILESDIR}/gcc-3.3.1-collate.patch
+#	epatch ${FILESDIR}/pthread_t_not_int.patch
+	epatch ${FILESDIR}/${P}-locale.patch
+	touch ${S}/hvirtual_config.h
+}
+
+src_compile() {
+	export CFLAGS=${CFLAGS}
+	cd ${S}/freetype-2.1.4/builds/unix
+	econf ||die
+	cd ${S}/quicktime/ffmpeg-0.4.8
+	econf ||die
+
+	echo "#undef HAVE_V4L2" >> ${S}/hvirtual_config.h
+
+	cd ${S}
+	make || die "make failed"
+}
+
+src_install() {
+	local myarch
+	if use x86; then
+		myarch="${CHOST/-*/}" #should solve the i586/i686 problem
+	fi
+	if use amd64; then
+		myarch="x86_64" #Fixes BUG #51740
+	fi
+	if use ppc; then
+		myarch="ppc"
+	fi
+	cd ${S}/${PN}/${myarch}
+	dobin ${PN} || die "cinelerra not built"
+
+	cd ${S}/plugins
+	insinto /usr/lib/${PN}
+	doins ${myarch}/*.plugin
+	insinto /usr/lib/${PN}/fonts
+	doins titler/fonts/*
+
+	cd ${S}/libmpeg3/${myarch}
+	dobin mpeg3dump mpeg3cat mpeg3toc
+
+#	cd ${S}/mix/i686
+#	dobin mix2000
+
+#	cd ${S}/xmovie/i686
+#	dobin xmovie
+
+	cd ${S}/mplexhi/${myarch}
+	dobin mplexhi
+
+	cd ${S}/mplexlo/${myarch}
+	dobin mplexlo
+
+	cd ${S}
+#	dodoc CVS COPYING
+	dohtml -a png,html,texi,sdw -r doc/*
+}
diff --git a/media-video/cinelerra/files/cinelerra-1.2.1-locale.patch b/media-video/cinelerra/files/cinelerra-1.2.1-locale.patch
new file mode 100644
index 000000000000..2a7cc41b250a
--- /dev/null
+++ b/media-video/cinelerra/files/cinelerra-1.2.1-locale.patch
@@ -0,0 +1,11 @@
+diff -ruN cinelerra-1.2.1.orig/cinelerra/main.C cinelerra-1.2.1/cinelerra/main.C
+--- cinelerra-1.2.1.orig/cinelerra/main.C	2004-08-27 13:25:48.806369912 +0200
++++ cinelerra-1.2.1/cinelerra/main.C	2004-08-27 13:35:45.447666648 +0200
+@@ -14,6 +14,7 @@
+ #include "renderfarmclient.h"
+ #include <stdlib.h>
+ #include <string.h>
++#include <locale.h>
+ 
+ #define PACKAGE "cinelerra"
+ #define LOCALEDIR "/usr/share/locale"
diff --git a/media-video/cinelerra/files/digest-cinelerra-1.2.1 b/media-video/cinelerra/files/digest-cinelerra-1.2.1
new file mode 100644
index 000000000000..3bc29329c1ee
--- /dev/null
+++ b/media-video/cinelerra/files/digest-cinelerra-1.2.1
@@ -0,0 +1 @@
+MD5 ee230582f2bc7e1e35fc36f92469a78e cinelerra-1.2.1-src.tar.bz2 22871848