Remove old.

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

3 files changed, 5 insertions, 213 deletions

diff --git a/media-video/cinelerra/ChangeLog b/media-video/cinelerra/ChangeLog
index c8ab1b18f69a..3e866e659063 100644
--- a/media-video/cinelerra/ChangeLog
+++ b/media-video/cinelerra/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/cinelerra
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.55 2012/05/05 08:58:56 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.56 2012/05/16 09:03:47 scarabeus Exp $
+
+  16 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> -cinelerra-20101104.ebuild,
+  -files/cinelerra-v4l1_removal.patch:
+  Remove old.
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> cinelerra-20101104.ebuild,
   cinelerra-20111223.ebuild:
diff --git a/media-video/cinelerra/cinelerra-20101104.ebuild b/media-video/cinelerra/cinelerra-20101104.ebuild
deleted file mode 100644
index ce8a76cedc22..000000000000
--- a/media-video/cinelerra/cinelerra-20101104.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/cinelerra-20101104.ebuild,v 1.7 2012/05/05 08:58:56 jdhore Exp $
-
-EAPI=3
-inherit autotools eutils multilib flag-o-matic
-
-DESCRIPTION="Professional Video Editor (Unofficial GIT-snapshot)"
-HOMEPAGE="http://www.cinelerra.org/"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="3dnow alsa altivec css ieee1394 mmx opengl oss"
-
-RDEPEND=">=media-libs/libpng-1.4.0
-	>=media-libs/libdv-1.0.0
-	media-libs/faad2
-	media-libs/faac
-	media-libs/a52dec
-	media-libs/libsndfile
-	media-libs/tiff
-	virtual/ffmpeg
-	media-sound/lame
-	>=sci-libs/fftw-3.0.1
-	media-libs/x264
-	media-video/mjpegtools
-	>=media-libs/freetype-2.1.10
-	>=media-libs/openexr-1.2.2
-	>=media-libs/libvorbis-1.2.3
-	>=media-libs/libogg-1.1.4
-	>=media-libs/libtheora-1.1.1
-	x11-libs/libX11
-	x11-libs/libXv
-	x11-libs/libXxf86vm
-	x11-libs/libXext
-	x11-libs/libXvMC
-	x11-libs/libXft
-	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
-	virtual/pkgconfig
-	mmx? ( dev-lang/nasm )"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-v4l1_removal.patch" \
-		"${FILESDIR}/${PN}-ffmpeg.patch"
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_configure() {
-	append-flags -D__STDC_CONSTANT_MACROS #321945
-
-	econf \
-		--disable-dependency-tracking \
-		$(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)/cinelerra \
-		--with-buildinfo=cust/"Gentoo - ${PV}" \
-		--with-external-ffmpeg
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	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)/cinelerra/mpeg2enc.plugin
-
-	find "${D}" -name '*.la' -exec rm -f '{}' +
-}
diff --git a/media-video/cinelerra/files/cinelerra-v4l1_removal.patch b/media-video/cinelerra/files/cinelerra-v4l1_removal.patch
deleted file mode 100644
index 9df4004fe158..000000000000
--- a/media-video/cinelerra/files/cinelerra-v4l1_removal.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-http://bugs.cinelerra.org/ticket/949
-https://bugs.gentoo.org/show_bug.cgi?id=361709
-
-diff -Nru cinelerra.orig//cinelerra/channelpicker.C cinelerra/cinelerra/channelpicker.C
---- cinelerra.orig//cinelerra/channelpicker.C	2010-11-24 18:18:03.000000000 -0500
-+++ cinelerra/cinelerra/channelpicker.C	2011-02-17 13:31:30.147880002 -0500
-@@ -39,7 +39,7 @@
- #include "recordgui.h"
- #include "recordmonitor.h"
- #include "theme.h"
--#include "vdevicebuz.h"
-+//#include "vdevicebuz.h"
- #include "vdeviceprefs.h"
- #include "videodevice.h"
- 
-@@ -280,7 +280,7 @@
- //	printf("PrefsChannelPicker::PrefsChannelPicker 1\n");
- 	this->mwindow = mwindow;
- 	this->prefs = prefs;
--	VDeviceBUZ::get_inputs(&input_sources);
-+//	VDeviceBUZ::get_inputs(&input_sources);
- }
- 
- PrefsChannelPicker::~PrefsChannelPicker()
-diff -Nru cinelerra.orig//cinelerra/Makefile.am cinelerra/cinelerra/Makefile.am
---- cinelerra.orig//cinelerra/Makefile.am	2010-11-24 18:18:03.000000000 -0500
-+++ cinelerra/cinelerra/Makefile.am	2011-02-17 13:31:30.147880002 -0500
-@@ -305,10 +305,8 @@
- 		    vattachmentpoint.C \
- 		    vautomation.C \
- 		    vdevicebase.C \
--		    vdevicebuz.C \
- 		    vdevicedvb.C \
- 		    vdeviceprefs.C \
--		    vdevicev4l.C \
- 		    vdevicev4l2.C \
- 		    vdevicev4l2jpeg.C \
- 		    vdevicex11.C \
-diff -Nru cinelerra.orig//cinelerra/reversemake cinelerra/cinelerra/reversemake
---- cinelerra.orig//cinelerra/reversemake	2010-11-24 18:18:03.000000000 -0500
-+++ cinelerra/cinelerra/reversemake	2011-02-17 13:31:30.151880002 -0500
-@@ -32,10 +32,8 @@
- make $OBJDIR/vedits.o
- make $OBJDIR/vedit.o
- make $OBJDIR/vdevicex11.o
--make $OBJDIR/vdevicev4l.o
- make $OBJDIR/vdeviceprefs.o
- make $OBJDIR/vdevicelml.o
--make $OBJDIR/vdevicebuz.o
- make $OBJDIR/vdevicebase.o
- make $OBJDIR/vdevice1394.o
- make $OBJDIR/vautomation.o
-diff -Nru cinelerra.orig//cinelerra/videodevice.C cinelerra/cinelerra/videodevice.C
---- cinelerra.orig//cinelerra/videodevice.C	2010-11-24 18:18:03.000000000 -0500
-+++ cinelerra/cinelerra/videodevice.C	2011-02-17 13:41:53.239880001 -0500
-@@ -39,9 +39,9 @@
- #ifdef HAVE_FIREWIRE
- #include "vdevice1394.h"
- #endif
--#include "vdevicebuz.h"
-+//#include "vdevicebuz.h"
- #include "vdevicedvb.h"
--#include "vdevicev4l.h"
-+//#include "vdevicev4l.h"
- #include "vdevicev4l2.h"
- #include "vdevicev4l2jpeg.h"
- #include "vdevicex11.h"
-@@ -203,7 +203,6 @@
- 			result = input_base->open_input();
- 			break;
- 
--
- #ifdef HAVE_VIDEO4LINUX2
- 		case VIDEO4LINUX2:
- 			new_device_base();
-@@ -250,8 +249,8 @@
- {
- 	switch(in_config->driver)
- 	{
--		case VIDEO4LINUX:
--			return input_base = new VDeviceV4L(this);
-+		//case VIDEO4LINUX:
-+		//	return input_base = new VDeviceV4L(this);
- 
- #ifdef HAVE_VIDEO4LINUX2
- 		case VIDEO4LINUX2:
-@@ -264,8 +263,8 @@
- 		case SCREENCAPTURE:
- 			return input_base = new VDeviceX11(this, 0);
- 
--		case CAPTURE_BUZ:
--			return input_base = new VDeviceBUZ(this);
-+		//case CAPTURE_BUZ:
-+		//	return input_base = new VDeviceBUZ(this);
- 
- #ifdef HAVE_FIREWIRE
- 		case CAPTURE_FIREWIRE:
-@@ -662,9 +661,9 @@
- //printf("VideoDevice::open_output 1 %d\n", out_config->driver);
- 	switch(out_config->driver)
- 	{
--		case PLAYBACK_BUZ:
--			output_base = new VDeviceBUZ(this);
--			break;
-+		//case PLAYBACK_BUZ:
-+		//	output_base = new VDeviceBUZ(this);
-+		//	break;
- 		case PLAYBACK_X11:
- 		case PLAYBACK_X11_XV:
- 		case PLAYBACK_X11_GL:
-diff -Nru cinelerra.orig//cinelerra/videodevice.h cinelerra/cinelerra/videodevice.h
---- cinelerra.orig//cinelerra/videodevice.h	2010-11-24 18:18:03.000000000 -0500
-+++ cinelerra/cinelerra/videodevice.h	2011-02-17 13:31:30.167880002 -0500
-@@ -40,9 +40,9 @@
- #include "thread.h"
- #include "picture.inc"
- #include "vdevicebase.inc"
--#include "vdevicebuz.inc"
-+//#include "vdevicebuz.inc"
- #include "vdevicelml.inc"
--#include "vdevicev4l.inc"
-+//#include "vdevicev4l.inc"
- #include "vdevicex11.inc"
- #include "videoconfig.inc"
- #include "videowindow.inc"