packages: cinelerra-cv/cinelerra-cv-build.patch, cinelerra-cv/cinelerra-cv....

arekm arekm at pld-linux.org
Wed Apr 6 20:56:42 CEST 2011 

Author: arekm                        Date: Wed Apr  6 18:56:42 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 20110406

---- Files affected:
packages/cinelerra-cv:
   cinelerra-cv-build.patch (1.8 -> 1.9) , cinelerra-cv.spec (1.37 -> 1.38) , remove-support-v4l-buzz-k2-6-38.diff (NONE -> 1.1)  (NEW), cinelerra-cv-libpng.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/cinelerra-cv/cinelerra-cv-build.patch
diff -u packages/cinelerra-cv/cinelerra-cv-build.patch:1.8 packages/cinelerra-cv/cinelerra-cv-build.patch:1.9
--- packages/cinelerra-cv/cinelerra-cv-build.patch:1.8	Thu Jun  3 17:57:31 2010
+++ packages/cinelerra-cv/cinelerra-cv-build.patch	Wed Apr  6 20:56:37 2011
@@ -28,39 +28,6 @@
  AC_SUBST(SOUND_CFLAGS)
  AC_SUBST(SOUND_LDFLAGS)
  ############### END OF SOUND
---- cinelerra-cv-2.1/cinelerra/Makefile.am.org	2006-11-26 01:42:58.101122750 +0100
-+++ cinelerra-cv-2.1/cinelerra/Makefile.am	2006-11-26 01:43:09.741850250 +0100
-@@ -19,26 +19,26 @@
- 
- if BUILDINFO_GIT
- GITVERSION=$(shell if [ -d $(top_srcdir)/.git ]; then cd $(top_srcdir); git rev-parse HEAD; else echo "unknown"; fi)
--	echo '#define REPOMAINTXT " GIT::$(GITVERSION) $(BUILDINFO_NONRC_S) (C) 2006 Heroine Virtual Ltd.\n at FFMPEG_EXTERNALTEXT@\nCompiled on $(BUILDDATE)"' >> versioninfo.h
-+	echo '#define REPOMAINTXT " GIT::$(GITVERSION) $(BUILDINFO_NONRC_S) (C) 2006 Heroine Virtual Ltd. @FFMPEG_EXTERNALTEXT@ Compiled on $(BUILDDATE)"' >> versioninfo.h
- 	echo '#define REPOABOUTPREFTXT "Git SHA-1: $(GITVERSION)"' >> versioninfo.h
- else
- 
- if BUILDINFO_SVN
- SVNVERSION=$(shell if [ -d $(top_srcdir)/.svn ]; then svnversion $(top_srcdir); else echo "unknown"; fi)
--	echo '#define REPOMAINTXT      " SVN $(SVNVERSION) $(BUILDINFO_NONRC_S) (C) 2006 Heroine Virtual Ltd.\n at FFMPEG_EXTERNALTEXT@\nCompiled on $(BUILDDATE)"' >> versioninfo.h
-+	echo '#define REPOMAINTXT      " SVN $(SVNVERSION) $(BUILDINFO_NONRC_S) (C) 2006 Heroine Virtual Ltd. @FFMPEG_EXTERNALTEXT@ Compiled on $(BUILDDATE)"' >> versioninfo.h
- 	echo '#define REPOABOUTPREFTXT "SVN Version: $(SVNVERSION) $(BUILDINFO_NONRC_S)"' >> versioninfo.h
- 
- else
- if BUILDINFO_CUST
- 
--	echo '#define REPOMAINTXT      " $(BUILDINFO_CUSTOM_TAG) (C) 2006 Heroine Virtual Ltd.\n at FFMPEG_EXTERNALTEXT@\nCompiled on $(BUILDDATE)"' >> versioninfo.h
-+	echo '#define REPOMAINTXT      " $(BUILDINFO_CUSTOM_TAG) (C) 2006 Heroine Virtual Ltd. @FFMPEG_EXTERNALTEXT@ Compiled on $(BUILDDATE)"' >> versioninfo.h
- 	echo '#define REPOABOUTPREFTXT "$(BUILDINFO_CUSTOM_TAG)"' >> versioninfo.h
- 
- 
- else # (no repository)
- 
- 
--	echo '#define REPOMAINTXT      "(C) 2006 Heroine Virtual Ltd.\nCompiled on $(BUILDDATE)"' >> versioninfo.h
-+	echo '#define REPOMAINTXT      "(C) 2006 Heroine Virtual Ltd. Compiled on $(BUILDDATE)"' >> versioninfo.h
- 	echo '#define REPOABOUTPREFTXT ""' >> versioninfo.h
- endif
- endif
 --- cinelerra-cv-2.1/libmpeg3/video/Makefile.am	2008-08-23 14:53:19.959321239 +0000
 +++ cinelerra-cv-2.1/libmpeg3/video/Makefile.am.org	2008-08-23 14:53:15.609327436 +0000
 @@ -11,6 +11,7 @@
@@ -107,16 +74,6 @@
  #include <swscale.h>
  }
  #endif
---- cinelerra-cv/cinelerra/edits.C~	2010-01-09 15:12:19.000000000 +0100
-+++ cinelerra-cv/cinelerra/edits.C	2010-04-26 09:13:43.381588613 +0200
-@@ -47,7 +47,6 @@
- 	this->edl = edl;
- 	this->track = track;
- 
--	List<Edit>::List<Edit>();
- 	default_edit->edl = edl;
- 	default_edit->track = track;
- 	default_edit->startproject = 0;
 --- cinelerra-cv/plugins/svg/svg.C~	2010-01-09 15:12:21.000000000 +0100
 +++ cinelerra-cv/plugins/svg/svg.C	2010-06-03 17:56:46.125079418 +0200
 @@ -29,6 +29,8 @@
@@ -128,3 +85,47 @@
  
  
  #include <libintl.h>
+--- cinelerra-cv/cinelerra/Makefile.am~	2011-04-06 19:57:22.664917219 +0200
++++ cinelerra-cv/cinelerra/Makefile.am	2011-04-06 20:02:23.865421062 +0200
+@@ -19,26 +19,26 @@
+ 
+ if BUILDINFO_GIT
+ GITVERSION=$(shell if [ -d $(top_srcdir)/.git ]; then cd $(top_srcdir); git rev-parse HEAD; else echo "unknown"; fi)
+-	echo '#define REPOMAINTXT " GIT::$(GITVERSION) $(BUILDINFO_NONRC_S) (C) 2010 Heroine Virtual Ltd.\n at FFMPEG_EXTERNALTEXT@\nCompiled on $(BUILDDATE)"' >> versioninfo.h
++	echo '#define REPOMAINTXT " GIT::$(GITVERSION) $(BUILDINFO_NONRC_S) (C) 2010 Heroine Virtual Ltd. @FFMPEG_EXTERNALTEXT@ Compiled on $(BUILDDATE)"' >> versioninfo.h
+ 	echo '#define REPOABOUTPREFTXT "Git SHA-1: $(GITVERSION)"' >> versioninfo.h
+ else
+ 
+ if BUILDINFO_SVN
+ SVNVERSION=$(shell if [ -d $(top_srcdir)/.svn ]; then svnversion $(top_srcdir); else echo "unknown"; fi)
+-	echo '#define REPOMAINTXT      " SVN $(SVNVERSION) $(BUILDINFO_NONRC_S) (C) 2010 Heroine Virtual Ltd.\n at FFMPEG_EXTERNALTEXT@\nCompiled on $(BUILDDATE)"' >> versioninfo.h
++	echo '#define REPOMAINTXT      " SVN $(SVNVERSION) $(BUILDINFO_NONRC_S) (C) 2010 Heroine Virtual Ltd. @FFMPEG_EXTERNALTEXT@ Compiled on $(BUILDDATE)"' >> versioninfo.h
+ 	echo '#define REPOABOUTPREFTXT "SVN Version: $(SVNVERSION) $(BUILDINFO_NONRC_S)"' >> versioninfo.h
+ 
+ else
+ if BUILDINFO_CUST
+ 
+-	echo '#define REPOMAINTXT      " $(BUILDINFO_CUSTOM_TAG) (C) 2010 Heroine Virtual Ltd.\n at FFMPEG_EXTERNALTEXT@\nCompiled on $(BUILDDATE)"' >> versioninfo.h
++	echo '#define REPOMAINTXT      " $(BUILDINFO_CUSTOM_TAG) (C) 2010 Heroine Virtual Ltd. @FFMPEG_EXTERNALTEXT@ Compiled on $(BUILDDATE)"' >> versioninfo.h
+ 	echo '#define REPOABOUTPREFTXT "$(BUILDINFO_CUSTOM_TAG)"' >> versioninfo.h
+ 
+ 
+ else # (no repository)
+ 
+ 
+-	echo '#define REPOMAINTXT      "(C) 2010 Heroine Virtual Ltd.\nCompiled on $(BUILDDATE)"' >> versioninfo.h
++	echo '#define REPOMAINTXT      "(C) 2010 Heroine Virtual Ltd. Compiled on $(BUILDDATE)"' >> versioninfo.h
+ 	echo '#define REPOABOUTPREFTXT ""' >> versioninfo.h
+ endif
+ endif
+--- cinelerra-cv/guicast/Makefile.am~	2011-04-06 20:40:24.939828081 +0200
++++ cinelerra-cv/guicast/Makefile.am	2011-04-06 20:47:51.613590918 +0200
+@@ -1,7 +1,7 @@
+ lib_LTLIBRARIES = libguicast.la
+ noinst_PROGRAMS=bootstrap
+ 
+-libguicast_la_LIBADD = $(OPENGL_LIBS) -lXxf86vm -lXv -lXext -lX11 $(X_EXTRA_LIBS)
++libguicast_la_LIBADD = $(OPENGL_LIBS) -lXxf86vm -lXv -lXext -lX11 $(X_EXTRA_LIBS) -lpng $(top_builddir)/quicktime/libquicktimehv.la
+ libguicast_la_LDFLAGS = $(X_LIBS) -version-info 1:0:0 
+ libguicast_la_SOURCES = \
+ 	bcbar.C \

================================================================
Index: packages/cinelerra-cv/cinelerra-cv.spec
diff -u packages/cinelerra-cv/cinelerra-cv.spec:1.37 packages/cinelerra-cv/cinelerra-cv.spec:1.38
--- packages/cinelerra-cv/cinelerra-cv.spec:1.37	Tue Mar 29 09:10:39 2011
+++ packages/cinelerra-cv/cinelerra-cv.spec	Wed Apr  6 20:56:37 2011
@@ -2,8 +2,8 @@
 # TODO:
 # - external libraries packages (is there any sense in that?)
 #
-%define		snap	20100109
-%define		rel		11
+%define		snap	20110406
+%define		rel		1
 Summary:	Cinelerra - capturing, editing and production of audio/video material
 Summary(pl.UTF-8):	Cinelerra - nagrywanie, obróbka i produkcja materiału audio/video
 Name:		cinelerra-cv
@@ -13,10 +13,11 @@
 Group:		X11/Applications
 # git clone git://git.cinelerra.org/j6t/cinelerra.git cinelerra-cv
 Source0:	%{name}-%{snap}.tar.bz2
-# Source0-md5:	e130b134a9e691ae36d2bbb117fc530b
+# Source0-md5:	c41bcabbc0c28b4575f6ff8631effed8
 Patch0:		%{name}-build.patch
-Patch1:		%{name}-libpng.patch
-Patch2:		%{name}-desktop.patch
+Patch1:		%{name}-desktop.patch
+# http://bugs.cinelerra.org/raw-attachment/ticket/949/remove-support-v4l-buzz-k2-6-38.diff
+Patch2:		remove-support-v4l-buzz-k2-6-38.diff
 URL:		http://cinelerra.org/
 BuildRequires:	OpenEXR-devel >= 1.2.1
 BuildRequires:	OpenGL-GLU-devel
@@ -103,7 +104,6 @@
 %patch2 -p1
 
 find -name Makefile.am | xargs %{__sed} -i -e 's#^LIBTOOL =.*##g'
-%{__sed} -i -e 's/png_check_sig((unsigned char\*)test, 8)/!png_sig_cmp((unsigned char\*)test, 0, 8)/g' cinelerra/filepng.C
 
 %build
 rm -f m4/*.m4 *.m4
@@ -117,6 +117,7 @@
 
 %configure \
 	CPPFLAGS="%{rpmcppflags} -I/usr/include/freetype2" \
+	CXXFLAGS="%{rpmcxxflags} -D__STDC_CONSTANT_MACROS=1" \
 %ifarch ppc
 	--enable-altivec \
 %endif
@@ -168,6 +169,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.38  2011/04/06 18:56:37  arekm
+- up to 20110406
+
 Revision 1.37  2011/03/29 07:10:39  arekm
 - release 11
 

================================================================
Index: packages/cinelerra-cv/remove-support-v4l-buzz-k2-6-38.diff
diff -u /dev/null packages/cinelerra-cv/remove-support-v4l-buzz-k2-6-38.diff:1.1
--- /dev/null	Wed Apr  6 20:56:42 2011
+++ packages/cinelerra-cv/remove-support-v4l-buzz-k2-6-38.diff	Wed Apr  6 20:56:37 2011
@@ -0,0 +1,1804 @@
+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/vdevicebuz.C cinelerra/cinelerra/vdevicebuz.C
+--- cinelerra.orig//cinelerra/vdevicebuz.C	2010-11-24 18:18:03.000000000 -0500
++++ cinelerra/cinelerra/vdevicebuz.C	1969-12-31 19:00:00.000000000 -0500
+@@ -1,796 +0,0 @@
+-
+-/*
+- * CINELERRA
+- * Copyright (C) 2008 Adam Williams <broadcast at earthling dot net>
+- * 
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2 of the License, or
+- * (at your option) any later version.
+- * 
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
+- * 
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+- * 
+- */
+-
+-// ALPHA C++ can't compile 64 bit headers
+-#undef _LARGEFILE_SOURCE
+-#undef _LARGEFILE64_SOURCE
+-#undef _FILE_OFFSET_BITS
+-
+-#include "assets.h"
+-#include "bcsignals.h"
+-#include "channel.h"
+-#include "chantables.h"
+-#include "condition.h"
+-#include "file.inc"
+-#include "mutex.h"
+-#include "picture.h"
+-#include "playbackconfig.h"
+-#include "preferences.h"
+-#include "recordconfig.h"
+-#include "strategies.inc"
+-#include "vdevicebuz.h"
+-#include "vframe.h"
+-#include "videoconfig.h"
+-#include "videodevice.h"
+-
+-#include <errno.h>
+-#include <stdint.h>
+-#include <linux/kernel.h>
+-//#include <linux/videodev2.h>
+-#include <linux/videodev.h>
+-#include <fcntl.h>
+-#include <sys/ioctl.h>
+-#include <sys/mman.h>
+-#include <unistd.h>
+-
+-
+-
+-#define READ_TIMEOUT 5000000
+-
+-
+-VDeviceBUZInput::VDeviceBUZInput(VDeviceBUZ *device)
+- : Thread(1, 1, 0)
+-{
+-	this->device = device;
+-	buffer = 0;
+-	buffer_size = 0;
+-	total_buffers = 0;
+-	current_inbuffer = 0;
+-	current_outbuffer = 0;
+-	done = 0;
+-	output_lock = new Condition(0, "VDeviceBUZInput::output_lock");
+-	buffer_lock = new Mutex("VDeviceBUZInput::buffer_lock");
+-}
+-
+-VDeviceBUZInput::~VDeviceBUZInput()
+-{
+-	if(Thread::running())
+-	{
+-		done = 1;
+-		Thread::cancel();
+-		Thread::join();
+-	}
+-
+-	if(buffer)
+-	{
+-		for(int i = 0; i < total_buffers; i++)
+-		{
+-			delete [] buffer[i];
+-		}
+-		delete [] buffer;
+-		delete [] buffer_size;
+-	}
+-	delete output_lock;
+-	delete buffer_lock;
+-}
+-
+-void VDeviceBUZInput::start()
+-{
+-// Create buffers
+-	total_buffers = device->device->in_config->capture_length;
+-	buffer = new char*[total_buffers];
+-	buffer_size = new int[total_buffers];
+-	bzero(buffer_size, sizeof(int) * total_buffers);
+-	for(int i = 0; i < total_buffers; i++)
+-	{
+-		buffer[i] = new char[INPUT_BUFFER_SIZE];
+-	}
+-
+-	Thread::start();
+-}
+-
+-void VDeviceBUZInput::run()
+-{
+-    struct buz_sync bsync;
+-
+-// Wait for frame
+-	while(1)
+-	{
+-		Thread::enable_cancel();
+-		if(ioctl(device->jvideo_fd, BUZIOC_SYNC, &bsync) < 0)
+-		{
+-			perror("VDeviceBUZInput::run BUZIOC_SYNC");
+-			if(done) return;
+-			Thread::disable_cancel();
+-		}
+-		else
+-		{
+-			Thread::disable_cancel();
+-
+-
+-
+-			int new_buffer = 0;
+-			buffer_lock->lock("VDeviceBUZInput::run");
+-// Save only if the current buffer is free.
+-			if(!buffer_size[current_inbuffer])
+-			{
+-				new_buffer = 1;
+-// Copy to input buffer
+-				memcpy(buffer[current_inbuffer], 
+-					device->input_buffer + bsync.frame * device->breq.size,
+-					bsync.length);
+-
+-// Advance input buffer number and decrease semaphore.
+-				buffer_size[current_inbuffer] = bsync.length;
+-				increment_counter(&current_inbuffer);
+-			}
+-
+-			buffer_lock->unlock();
+-
+-			if(ioctl(device->jvideo_fd, BUZIOC_QBUF_CAPT, &bsync.frame))
+-				perror("VDeviceBUZInput::run BUZIOC_QBUF_CAPT");
+-
+-			if(new_buffer) output_lock->unlock();
+-		}
+-	}
+-}
+-
+-void VDeviceBUZInput::get_buffer(char **ptr, int *size)
+-{
+-// Increase semaphore to wait for buffer.
+-	int result = output_lock->timed_lock(READ_TIMEOUT, "VDeviceBUZInput::get_buffer");
+-
+-
+-// The driver has its own timeout routine but it doesn't work because
+-// because the tuner lock is unlocked and relocked with no delay.
+-//	int result = 0;
+-//	output_lock->lock("VDeviceBUZInput::get_buffer");
+-
+-	if(!result)
+-	{
+-// Take over buffer table
+-		buffer_lock->lock("VDeviceBUZInput::get_buffer");
+-		*ptr = buffer[current_outbuffer];
+-		*size = buffer_size[current_outbuffer];
+-		buffer_lock->unlock();
+-	}
+-	else
+-	{
+-//printf("VDeviceBUZInput::get_buffer 1\n");
+-		output_lock->unlock();
+-	}
+-}
+-
+-void VDeviceBUZInput::put_buffer()
+-{
+-	buffer_lock->lock("VDeviceBUZInput::put_buffer");
+-	buffer_size[current_outbuffer] = 0;
+-	buffer_lock->unlock();
+-	increment_counter(&current_outbuffer);
+-}
+-
+-void VDeviceBUZInput::increment_counter(int *counter)
+-{
+-	(*counter)++;
+-	if(*counter >= total_buffers) *counter = 0;
+-}
+-
+-void VDeviceBUZInput::decrement_counter(int *counter)
+-{
+-	(*counter)--;
+-	if(*counter < 0) *counter = total_buffers - 1;
+-}
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-VDeviceBUZ::VDeviceBUZ(VideoDevice *device)
+- : VDeviceBase(device)
+-{
+-	reset_parameters();
+-	render_strategies.append(VRENDER_MJPG);
+-	tuner_lock = new Mutex("VDeviceBUZ::tuner_lock");
+-}
+-
+-VDeviceBUZ::~VDeviceBUZ()
+-{
+-	close_all();
+-	delete tuner_lock;
+-}
+-
+-int VDeviceBUZ::reset_parameters()
+-{
+-	jvideo_fd = 0;
+-	input_buffer = 0;
+-	output_buffer = 0;
+-	frame_buffer = 0;
+-	frame_size = 0;
+-	frame_allocated = 0;
+-	input_error = 0;
+-	last_frame_no = 0;
+-	temp_frame = 0;
+-	user_frame = 0;
+-	mjpeg = 0;
+-	total_loops = 0;
+-	output_number = 0;
+-	input_thread = 0;
+-	brightness = 32768;
+-	hue = 32768;
+-	color = 32768;
+-	contrast = 32768;
+-	whiteness = 32768;
+-}
+-
+-int VDeviceBUZ::close_input_core()
+-{
+-	if(input_thread)
+-	{
+-		delete input_thread;
+-		input_thread = 0;
+-	}
+-
+-
+-	if(device->r)
+-	{
+-		if(jvideo_fd) close(jvideo_fd);
+-		jvideo_fd = 0;
+-	}
+-
+-	if(input_buffer)
+-	{
+-		if(input_buffer > 0)
+-			munmap(input_buffer, breq.count * breq.size);
+-		input_buffer = 0;
+-	}
+-}
+-
+-int VDeviceBUZ::close_output_core()
+-{
+-//printf("VDeviceBUZ::close_output_core 1\n");
+-	if(device->w)
+-	{
+-		int n = -1;
+-// 		if(ioctl(jvideo_fd, BUZIOC_QBUF_PLAY, &n) < 0)
+-// 			perror("VDeviceBUZ::close_output_core BUZIOC_QBUF_PLAY");
+-		if(jvideo_fd) close(jvideo_fd);
+-		jvideo_fd = 0;
+-	}
+-	if(output_buffer)
+-	{
+-		if(output_buffer > 0)
+-			munmap(output_buffer, breq.count * breq.size);
+-		output_buffer = 0;
+-	}
+-	if(temp_frame)
+-	{
+-		delete temp_frame;
+-		temp_frame = 0;
+-	}
+-	if(mjpeg)
+-	{
+-		mjpeg_delete(mjpeg);
+-		mjpeg = 0;
+-	}
+-	if(user_frame)
+-	{
+-		delete user_frame;
+-		user_frame = 0;
+-	}
+-//printf("VDeviceBUZ::close_output_core 2\n");
+-	return 0;
+-}
+-
+-
+-int VDeviceBUZ::close_all()
+-{
+-//printf("VDeviceBUZ::close_all 1\n");
+-	close_input_core();
+-//printf("VDeviceBUZ::close_all 1\n");
+-	close_output_core();
+-//printf("VDeviceBUZ::close_all 1\n");
+-	if(frame_buffer) delete frame_buffer;
+-//printf("VDeviceBUZ::close_all 1\n");
+-	reset_parameters();
+-//printf("VDeviceBUZ::close_all 2\n");
+-	return 0;
+-}
+-
+-#define COMPOSITE_TEXT "Composite"
+-#define SVIDEO_TEXT "S-Video"
+-#define BUZ_COMPOSITE 0
+-#define BUZ_SVIDEO 1
+-
+-void VDeviceBUZ::get_inputs(ArrayList<Channel*> *input_sources)
+-{
+-	Channel *new_source = new Channel;
+-
+-	new_source = new Channel;
+-	strcpy(new_source->device_name, COMPOSITE_TEXT);
+-	input_sources->append(new_source);
+-
+-	new_source = new Channel;
+-	strcpy(new_source->device_name, SVIDEO_TEXT);
+-	input_sources->append(new_source);
+-}
+-
+-int VDeviceBUZ::open_input()
+-{
+-	device->channel->use_norm = 1;
+-	device->channel->use_input = 1;
+-
+-	device->picture->use_brightness = 1;
+-	device->picture->use_contrast = 1;
+-	device->picture->use_color = 1;
+-	device->picture->use_hue = 1;
+-	device->picture->use_whiteness = 1;
+-
+-// Can't open input until after the channel is set
+-	return 0;
+-}
+-
+-int VDeviceBUZ::open_output()
+-{
+-// Can't open output until after the channel is set
+-	return 0;
+-}
+-
+-int VDeviceBUZ::set_channel(Channel *channel)
+-{
+-	if(!channel) return 0;
+-
+-	tuner_lock->lock("VDeviceBUZ::set_channel");
+-
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cinelerra-cv/cinelerra-cv-build.patch?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cinelerra-cv/cinelerra-cv.spec?r1=1.37&r2=1.38&f=u

More information about the pld-cvs-commit mailing list