remove old

(Portage version: 2.2_rc41/cvs/Linux x86_64)

3 files changed, 5 insertions, 149 deletions

diff --git a/media-video/cinelerra/ChangeLog b/media-video/cinelerra/ChangeLog
index a78db422ac0a..cdd6519852a0 100644
--- a/media-video/cinelerra/ChangeLog
+++ b/media-video/cinelerra/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/cinelerra
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.36 2009/09/09 10:04:48 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.37 2009/09/22 06:02:40 aballier Exp $
+
+  22 Sep 2009; Alexis Ballier <aballier@gentoo.org>
+  -cinelerra-20080717.ebuild, -files/cinelerra-ffmpeg.patch:
+  remove old
 
   09 Sep 2009; Alexis Ballier <aballier@gentoo.org>
   +files/cinelerra-pkgconfig-x264.patch, cinelerra-20090210.ebuild:
diff --git a/media-video/cinelerra/cinelerra-20080717.ebuild b/media-video/cinelerra/cinelerra-20080717.ebuild
deleted file mode 100644
index e8d718692ecb..000000000000
--- a/media-video/cinelerra/cinelerra-20080717.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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-20080717.ebuild,v 1.3 2008/10/06 22:25:52 aballier Exp $
-
-inherit autotools multilib eutils
-
-DESCRIPTION="Cinelerra - Professional Video Editor - Unofficial CVS-version"
-HOMEPAGE="http://www.cinelerra.org/"
-SRC_URI="mirror://gentoo/${P}.tar.lzma"
-
-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
-	mmx? ( 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}/${PN}-ffmpeg.patch"
-	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"
-}
diff --git a/media-video/cinelerra/files/cinelerra-ffmpeg.patch b/media-video/cinelerra/files/cinelerra-ffmpeg.patch
deleted file mode 100644
index 2c03c91dceda..000000000000
--- a/media-video/cinelerra/files/cinelerra-ffmpeg.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-commit 51a020685ef40489cdfdd16e7dcb9e7b5dbb64d5
-Author: Frans de Boer <frans@fransdb.nl>
-Date:   Sun Sep 28 23:38:48 2008 +0200
-
-    Fix for new FFmpeg API.
-    
-    This patch was proposed by Rafael2k and augmented by Nicolas to
-    cope with FFmpeg version 51 as well as version 52.
-
-diff --git a/quicktime/mpeg4.c b/quicktime/mpeg4.c
-index d418f66..bab1ac0 100644
---- a/quicktime/mpeg4.c
-+++ b/quicktime/mpeg4.c
-@@ -671,7 +671,11 @@ static int encode(quicktime_t *file, unsigned char **row_pointers, int track)
- 
-         	context->b_quant_factor = 1.25;
-         	context->b_quant_offset = 1.25;
-+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
- 			context->error_resilience = FF_ER_CAREFUL;
-+#else
-+			context->error_recognition = FF_ER_CAREFUL;
-+#endif
- 			context->error_concealment = 3;
- 			context->frame_skip_cmp = FF_CMP_DCTMAX;
- 			context->ildct_cmp = FF_CMP_VSAD;
-diff --git a/quicktime/wma.c b/quicktime/wma.c
-index 6ceefe5..07348a4 100644
---- a/quicktime/wma.c
-+++ b/quicktime/wma.c
-@@ -187,11 +187,21 @@ printf("decode 2 %x %llx %llx\n", chunk_size, chunk_offset, chunk_offset + chunk
- 
- // Decode chunk into work buffer.
- 		pthread_mutex_lock(&ffmpeg_lock);
-+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
- 		result = avcodec_decode_audio(codec->decoder_context, 
- 			(int16_t*)(codec->work_buffer + codec->output_size * sample_size), 
--            &bytes_decoded,
--            codec->packet_buffer, 
-+			&bytes_decoded,
-+			codec->packet_buffer,
- 			chunk_size);
-+#else
-+		bytes_decoded = AVCODEC_MAX_AUDIO_FRAME_SIZE;
-+		result = avcodec_decode_audio2(codec->decoder_context,
-+			(int16_t*)(codec->work_buffer + codec->output_size * sample_size),
-+			&bytes_decoded,
-+			codec->packet_buffer,
-+			chunk_size);
-+#endif
-+
- 		pthread_mutex_unlock(&ffmpeg_lock);
- 		if(bytes_decoded <= 0)
- 		{