Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Alexis Ballier (aballier)" <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-video/cinelerra/files: cinelerra-v4l1_removal.patch cinelerra-ffmpeg.patch
Date: Wed, 27 Apr 2011 18:08:12
Message-Id: 20110427180801.E80EC20057@flycatcher.gentoo.org
1 aballier 11/04/27 18:08:01
2
3 Added: cinelerra-v4l1_removal.patch cinelerra-ffmpeg.patch
4 Log:
5 fix build with latest linux headers (ie: drop v4l1 support), bug #361709; fix build with ffmpeg/libav trunk, convert to virtual/ffmpeg
6
7 (Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 media-video/cinelerra/files/cinelerra-v4l1_removal.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/cinelerra/files/cinelerra-v4l1_removal.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/cinelerra/files/cinelerra-v4l1_removal.patch?rev=1.1&content-type=text/plain
14
15 Index: cinelerra-v4l1_removal.patch
16 ===================================================================
17 http://bugs.cinelerra.org/ticket/949
18 https://bugs.gentoo.org/show_bug.cgi?id=361709
19
20 diff -Nru cinelerra.orig//cinelerra/channelpicker.C cinelerra/cinelerra/channelpicker.C
21 --- cinelerra.orig//cinelerra/channelpicker.C 2010-11-24 18:18:03.000000000 -0500
22 +++ cinelerra/cinelerra/channelpicker.C 2011-02-17 13:31:30.147880002 -0500
23 @@ -39,7 +39,7 @@
24 #include "recordgui.h"
25 #include "recordmonitor.h"
26 #include "theme.h"
27 -#include "vdevicebuz.h"
28 +//#include "vdevicebuz.h"
29 #include "vdeviceprefs.h"
30 #include "videodevice.h"
31
32 @@ -280,7 +280,7 @@
33 // printf("PrefsChannelPicker::PrefsChannelPicker 1\n");
34 this->mwindow = mwindow;
35 this->prefs = prefs;
36 - VDeviceBUZ::get_inputs(&input_sources);
37 +// VDeviceBUZ::get_inputs(&input_sources);
38 }
39
40 PrefsChannelPicker::~PrefsChannelPicker()
41 diff -Nru cinelerra.orig//cinelerra/Makefile.am cinelerra/cinelerra/Makefile.am
42 --- cinelerra.orig//cinelerra/Makefile.am 2010-11-24 18:18:03.000000000 -0500
43 +++ cinelerra/cinelerra/Makefile.am 2011-02-17 13:31:30.147880002 -0500
44 @@ -305,10 +305,8 @@
45 vattachmentpoint.C \
46 vautomation.C \
47 vdevicebase.C \
48 - vdevicebuz.C \
49 vdevicedvb.C \
50 vdeviceprefs.C \
51 - vdevicev4l.C \
52 vdevicev4l2.C \
53 vdevicev4l2jpeg.C \
54 vdevicex11.C \
55 diff -Nru cinelerra.orig//cinelerra/reversemake cinelerra/cinelerra/reversemake
56 --- cinelerra.orig//cinelerra/reversemake 2010-11-24 18:18:03.000000000 -0500
57 +++ cinelerra/cinelerra/reversemake 2011-02-17 13:31:30.151880002 -0500
58 @@ -32,10 +32,8 @@
59 make $OBJDIR/vedits.o
60 make $OBJDIR/vedit.o
61 make $OBJDIR/vdevicex11.o
62 -make $OBJDIR/vdevicev4l.o
63 make $OBJDIR/vdeviceprefs.o
64 make $OBJDIR/vdevicelml.o
65 -make $OBJDIR/vdevicebuz.o
66 make $OBJDIR/vdevicebase.o
67 make $OBJDIR/vdevice1394.o
68 make $OBJDIR/vautomation.o
69 diff -Nru cinelerra.orig//cinelerra/videodevice.C cinelerra/cinelerra/videodevice.C
70 --- cinelerra.orig//cinelerra/videodevice.C 2010-11-24 18:18:03.000000000 -0500
71 +++ cinelerra/cinelerra/videodevice.C 2011-02-17 13:41:53.239880001 -0500
72 @@ -39,9 +39,9 @@
73 #ifdef HAVE_FIREWIRE
74 #include "vdevice1394.h"
75 #endif
76 -#include "vdevicebuz.h"
77 +//#include "vdevicebuz.h"
78 #include "vdevicedvb.h"
79 -#include "vdevicev4l.h"
80 +//#include "vdevicev4l.h"
81 #include "vdevicev4l2.h"
82 #include "vdevicev4l2jpeg.h"
83 #include "vdevicex11.h"
84 @@ -203,7 +203,6 @@
85 result = input_base->open_input();
86 break;
87
88 -
89 #ifdef HAVE_VIDEO4LINUX2
90 case VIDEO4LINUX2:
91 new_device_base();
92 @@ -250,8 +249,8 @@
93 {
94 switch(in_config->driver)
95 {
96 - case VIDEO4LINUX:
97 - return input_base = new VDeviceV4L(this);
98 + //case VIDEO4LINUX:
99 + // return input_base = new VDeviceV4L(this);
100
101 #ifdef HAVE_VIDEO4LINUX2
102 case VIDEO4LINUX2:
103 @@ -264,8 +263,8 @@
104 case SCREENCAPTURE:
105 return input_base = new VDeviceX11(this, 0);
106
107 - case CAPTURE_BUZ:
108 - return input_base = new VDeviceBUZ(this);
109 + //case CAPTURE_BUZ:
110 + // return input_base = new VDeviceBUZ(this);
111
112 #ifdef HAVE_FIREWIRE
113 case CAPTURE_FIREWIRE:
114 @@ -662,9 +661,9 @@
115 //printf("VideoDevice::open_output 1 %d\n", out_config->driver);
116 switch(out_config->driver)
117 {
118 - case PLAYBACK_BUZ:
119 - output_base = new VDeviceBUZ(this);
120 - break;
121 + //case PLAYBACK_BUZ:
122 + // output_base = new VDeviceBUZ(this);
123 + // break;
124 case PLAYBACK_X11:
125 case PLAYBACK_X11_XV:
126 case PLAYBACK_X11_GL:
127 diff -Nru cinelerra.orig//cinelerra/videodevice.h cinelerra/cinelerra/videodevice.h
128 --- cinelerra.orig//cinelerra/videodevice.h 2010-11-24 18:18:03.000000000 -0500
129 +++ cinelerra/cinelerra/videodevice.h 2011-02-17 13:31:30.167880002 -0500
130 @@ -40,9 +40,9 @@
131 #include "thread.h"
132 #include "picture.inc"
133 #include "vdevicebase.inc"
134 -#include "vdevicebuz.inc"
135 +//#include "vdevicebuz.inc"
136 #include "vdevicelml.inc"
137 -#include "vdevicev4l.inc"
138 +//#include "vdevicev4l.inc"
139 #include "vdevicex11.inc"
140 #include "videoconfig.inc"
141 #include "videowindow.inc"
142
143
144
145 1.3 media-video/cinelerra/files/cinelerra-ffmpeg.patch
146
147 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/cinelerra/files/cinelerra-ffmpeg.patch?rev=1.3&view=markup
148 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/cinelerra/files/cinelerra-ffmpeg.patch?rev=1.3&content-type=text/plain
149 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/cinelerra/files/cinelerra-ffmpeg.patch?r1=1.2&r2=1.3
Report Message
Find on MARC Find on Google Groups