Versio bump. Introducing cinelerra 2.0. Remover ppc keyword.

Package-Manager: portage-2.0.53_rc4

5 files changed, 192 insertions, 9 deletions

diff --git a/media-video/cinelerra-cvs/ChangeLog b/media-video/cinelerra-cvs/ChangeLog
index 5052e865d1d7..ce485262b6c4 100644
--- a/media-video/cinelerra-cvs/ChangeLog
+++ b/media-video/cinelerra-cvs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/cinelerra-cvs
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra-cvs/ChangeLog,v 1.12 2005/08/01 18:44:30 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra-cvs/ChangeLog,v 1.13 2005/10/06 14:00:08 zypher Exp $
+
+*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.
diff --git a/media-video/cinelerra-cvs/Manifest b/media-video/cinelerra-cvs/Manifest
index 2999bed33127..59fccde0f934 100644
--- a/media-video/cinelerra-cvs/Manifest
+++ b/media-video/cinelerra-cvs/Manifest
@@ -1,17 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 a225a222fcd607641ccc6641553ec0e0 ChangeLog 2325
 MD5 52bb20649b74c2aa7f6f9204cec3f7f8 cinelerra-cvs-20050506.ebuild 1688
 MD5 3e962f56ba898d0261d3569f4bf277db cinelerra-cvs-20050801.ebuild 1784
-MD5 955f56e990f8c32d705708b4cc4db089 metadata.xml 251
-MD5 8b04d706ab919a1e15256a99fc8f5999 ChangeLog 2127
-MD5 6a608309dd1406724b18475452d2e410 files/libmpeg3-20050102-gcc3.4.patch 6060
-MD5 4bd71d15accb4c84eda25a5266c82112 files/digest-cinelerra-cvs-20050801 77
+MD5 fe27c9c6b38b9a514d3c3dd639aa45b1 cinelerra-cvs-20051005.ebuild 1883
+MD5 b775c5b9f768f5e27002063c6693a623 files/20051005-nox264.patch 3391
 MD5 0a7a7d289ef0d57df644a1cc47144170 files/digest-cinelerra-cvs-20050506 77
+MD5 4bd71d15accb4c84eda25a5266c82112 files/digest-cinelerra-cvs-20050801 77
+MD5 af930f0191a6c60306ce736e62c6db74 files/digest-cinelerra-cvs-20051005 77
+MD5 6a608309dd1406724b18475452d2e410 files/libmpeg3-20050102-gcc3.4.patch 6060
+MD5 955f56e990f8c32d705708b4cc4db089 metadata.xml 251
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFC7m2OpNOQ4DjaQW0RAl4UAJ0X5CXkIefnBimGnrVyKilmGjDu6wCeOlLQ
-DKA4fwZ8S3h9May2kJlLEJs=
-=bpSb
+iD8DBQFDRS4SpNOQ4DjaQW0RAopPAKCTOELt7IoL2pnEDug1eCPqz/TIfgCcD3Za
+SP576Tm85n65GBVa+asUpig=
+=UKad
 -----END PGP SIGNATURE-----
diff --git a/media-video/cinelerra-cvs/cinelerra-cvs-20051005.ebuild b/media-video/cinelerra-cvs/cinelerra-cvs-20051005.ebuild
new file mode 100644
index 000000000000..1e82f1dbd1ba
--- /dev/null
+++ b/media-video/cinelerra-cvs/cinelerra-cvs-20051005.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra-cvs/cinelerra-cvs-20051005.ebuild,v 1.1 2005/10/06 14:00:08 zypher Exp $
+
+inherit toolchain-funcs eutils flag-o-matic
+
+#filter-flags "-fPIC -fforce-addr"
+
+RESTRICT="nostrip"
+
+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="~x86 ~amd64"
+IUSE="3dnow alsa esd mmx oss static"
+
+RDEPEND="!media-video/cinelerra
+	virtual/x11
+	media-libs/libpng
+	media-libs/libdv
+	media-libs/faad2
+	media-libs/faac
+	x86? ( media-libs/x264-svn )
+	media-libs/libiec61883
+	media-video/mjpegtools
+	>=sys-libs/libavc1394-0.4.1
+	>=sys-libs/libraw1394-0.9.0
+	esd? ( >=media-sound/esound-0.2.34 )
+	>=media-libs/openexr-1.2.2
+	>=media-libs/libvorbis-1.1.0
+	>=media-libs/libogg-1.1
+	>=media-libs/libtheora-1.0_alpha4-r1
+	!media-video/cinelerra"
+
+DEPEND="${RDEPEND}
+	x86? ( dev-lang/nasm )"
+
+pkg_setup() {
+	if [[ "$(gcc-major-version)" -lt "3" ]]; then
+		die "You must use gcc 3 or better."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	use amd64 && epatch ${FILESDIR}/${PV}-nox264.patch
+}
+
+src_compile() {
+	cd ${S}
+	export WANT_AUTOMAKE=1.7
+	export WANT_AUTOCONF=2.5
+
+	cd ${S}
+	./autogen.sh
+	econf \
+	`use_enable static` \
+	`use_enable alsa` \
+	`use_enable oss` \
+	`use_enable mmx` \
+	`use_enable 3dnow` \
+	|| die "configure failed"
+	make || die "make failed"
+}
+
+src_install() {
+
+	make DESTDIR=${D} install || die
+	dohtml -a png,html,texi,sdw -r doc/*
+}
+
+pkg_postinst () {
+
+einfo "Please note that this is unofficial and somewhat experimental code."
+einfo "See cvs.cinelerra.org for a list of changes to the official cinelerra"
+einfo "release."
+einfo "The blue dot theme has not (yet) been merged into the new release."
+}
diff --git a/media-video/cinelerra-cvs/files/20051005-nox264.patch b/media-video/cinelerra-cvs/files/20051005-nox264.patch
new file mode 100644
index 000000000000..d926c0c36852
--- /dev/null
+++ b/media-video/cinelerra-cvs/files/20051005-nox264.patch
@@ -0,0 +1,93 @@
+diff -aur work2/cinelerra-cvs-20051004/quicktime/Makefile.am work1/cinelerra-cvs-20051004/quicktime/Makefile.am
+--- work2/cinelerra-cvs-20051005/quicktime/Makefile.am	2005-10-04 11:01:16.000000000 +0200
++++ work1/cinelerra-cvs-20051005/quicktime/Makefile.am	2005-10-04 11:45:43.000000000 +0200
+@@ -22,7 +22,6 @@
+ 	-lfaac \
+ 	encore50/libencore.la \
+ 	$(top_builddir)/libmpeg3/libmpeg3hv.la \
+-	-lx264 \
+ 	-ldv -ljpeg -lpng \
+ 	-lz -lpthread -lm
+ 
+@@ -56,7 +55,6 @@
+ 	plugin.c \
+ 	qtdv.c \
+ 	qtffmpeg.c \
+-	qth264.c \
+ 	qtpng.c \
+ 	qtmp3.c \
+ 	quicktime.c \
+@@ -89,7 +87,6 @@
+ 	mpeg4.h \
+ 	qtdv.h \
+ 	qtffmpeg.h \
+-	qth264.h \
+ 	qtmp3.h \
+ 	qtpng.h \
+ 	qtprivate.h \
+diff -aur work2/cinelerra-cvs-20051004/quicktime/ffmpeg/configure work1/cinelerra-cvs-20051004/quicktime/ffmpeg/configure
+--- work2/cinelerra-cvs-20051005/quicktime/ffmpeg/configure	2005-10-04 11:01:15.000000000 +0200
++++ work1/cinelerra-cvs-20051005/quicktime/ffmpeg/configure	2005-10-04 11:52:05.000000000 +0200
+@@ -483,8 +483,6 @@
+   ;;
+   --enable-xvid) xvid="yes"
+   ;;
+-  --enable-x264) x264="yes"; extralibs="$extralibs -lx264"
+-  ;;
+   --enable-dc1394) dc1394="yes"
+   ;;
+   --disable-vhook) vhook="no"
+@@ -1528,8 +1526,8 @@
+ fi
+ 
+ if test "$x264" = "yes" ; then
+-  echo "#define CONFIG_X264 1" >> $TMPH
+-  echo "CONFIG_X264=yes" >> config.mak
++  echo "#define CONFIG_X264 0" >> $TMPH
++  echo "CONFIG_X264=no" >> config.mak
+ fi
+ 
+ if test "$mingw32" = "yes" ; then
+diff -aur work2/cinelerra-cvs-20051004/quicktime/ffmpeg/libavcodec/Makefile.am work1/cinelerra-cvs-20051004/quicktime/ffmpeg/libavcodec/Makefile.am
+--- work2/cinelerra-cvs-20051005/quicktime/ffmpeg/libavcodec/Makefile.am	2005-10-04 11:01:16.000000000 +0200
++++ work1/cinelerra-cvs-20051005/quicktime/ffmpeg/libavcodec/Makefile.am	2005-10-04 11:53:02.000000000 +0200
+@@ -136,8 +136,6 @@
+ libavcodec_la_LIBADD += -lfaac
+ #libavcodec_la_SOURCES += xvidff.c
+ #libavcodec_la_LIBADD += -lxvidcore
+-libavcodec_la_SOURCES += x264.c
+-libavcodec_la_LIBADD += -lx264
+ libavcodec_la_SOURCES  += mp3lameaudio.c
+ libavcodec_la_LIBADD += -lmp3lame
+ libavcodec_la_SOURCES  += oggvorbis.c
+diff -aur work2/cinelerra-cvs-20051004/quicktime/ffmpeg/libavcodec/allcodecs.c work1/cinelerra-cvs-20051004/quicktime/ffmpeg/libavcodec/allcodecs.c
+--- work2/cinelerra-cvs-20051005/quicktime/ffmpeg/libavcodec/allcodecs.c	2005-10-04 11:01:15.000000000 +0200
++++ work1/cinelerra-cvs-20051005/quicktime/ffmpeg/libavcodec/allcodecs.c	2005-10-04 11:55:01.000000000 +0200
+@@ -181,6 +181,7 @@
+ #ifdef CONFIG_SONIC_LS_ENCODER
+     register_avcodec(&sonic_ls_encoder);
+ #endif //CONFIG_SONIC_LS_ENCODER
++#undef CONFIG_X264
+ #ifdef CONFIG_X264
+ #ifdef CONFIG_X264_ENCODER
+     register_avcodec(&x264_encoder);
+diff -aur work2/cinelerra-cvs-20051004/quicktime/plugin.c work1/cinelerra-cvs-20051004/quicktime/plugin.c
+--- work2/cinelerra-cvs-20051005/quicktime/plugin.c	2005-10-04 11:01:16.000000000 +0200
++++ work1/cinelerra-cvs-20051005/quicktime/plugin.c	2005-10-04 11:46:43.000000000 +0200
+@@ -64,7 +64,6 @@
+ 
+ 
+ 
+-#include "qth264.h"
+ #include "raw.h"
+ #include "qtdv.h"
+ #include "jpeg.h"
+@@ -83,8 +82,6 @@
+ 
+ 	register_vcodec(quicktime_init_codec_raw);
+ 
+-	register_vcodec(quicktime_init_codec_h264);
+-	register_vcodec(quicktime_init_codec_hv64);
+ 	register_vcodec(quicktime_init_codec_divx);
+ 	register_vcodec(quicktime_init_codec_hv60);
+ 	register_vcodec(quicktime_init_codec_div5);
diff --git a/media-video/cinelerra-cvs/files/digest-cinelerra-cvs-20051005 b/media-video/cinelerra-cvs/files/digest-cinelerra-cvs-20051005
new file mode 100644
index 000000000000..bed828b31d93
--- /dev/null
+++ b/media-video/cinelerra-cvs/files/digest-cinelerra-cvs-20051005
@@ -0,0 +1 @@
+MD5 77a9429cf46648d0c4670e48cf7c15a4 cinelerra-cvs-20051005.tar.bz2 16215069