fix build and pkgver

1 files changed, 0 insertions, 125 deletions

diff --git a/v4l1_removal.patch b/v4l1_removal.patch
deleted file mode 100644
index 9df4004fe158..000000000000
--- a/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"