| 1 |
ssuominen 11/03/31 17:05:45 |
| 2 |
|
| 3 |
Added: pygame-1.9.1-linux-headers-2.6.38.patch |
| 4 |
Log: |
| 5 |
punt support for v4lv1, see ChangeLog for details |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha29/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-python/pygame/files/pygame-1.9.1-linux-headers-2.6.38.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pygame/files/pygame-1.9.1-linux-headers-2.6.38.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pygame/files/pygame-1.9.1-linux-headers-2.6.38.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: pygame-1.9.1-linux-headers-2.6.38.patch |
| 16 |
=================================================================== |
| 17 |
--- Setup.in |
| 18 |
+++ Setup.in |
| 19 |
@@ -34,7 +34,7 @@ |
| 20 |
_numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG) |
| 21 |
movie src/movie.c $(SDL) $(SMPEG) $(DEBUG) |
| 22 |
scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG) |
| 23 |
-_camera src/_camera.c src/camera_v4l2.c src/camera_v4l.c $(SDL) $(DEBUG) |
| 24 |
+_camera src/_camera.c src/camera_v4l2.c $(SDL) $(DEBUG) |
| 25 |
pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG) |
| 26 |
|
| 27 |
GFX = src/SDL_gfx/SDL_gfxPrimitives.c |
| 28 |
--- src/_camera.c |
| 29 |
+++ src/_camera.c |
| 30 |
@@ -160,20 +160,8 @@ |
| 31 |
{ |
| 32 |
#if defined(__unix__) |
| 33 |
if (v4l2_open_device(self) == 0) { |
| 34 |
- if (v4l_open_device(self) == 0) { |
| 35 |
- v4l2_close_device(self); |
| 36 |
- return NULL; |
| 37 |
- } else { |
| 38 |
- self->camera_type = CAM_V4L; |
| 39 |
- if (v4l_init_device(self) == 0) { |
| 40 |
- v4l2_close_device(self); |
| 41 |
- return NULL; |
| 42 |
- } |
| 43 |
- if (v4l_start_capturing(self) == 0) { |
| 44 |
- v4l2_close_device(self); |
| 45 |
- return NULL; |
| 46 |
- } |
| 47 |
- } |
| 48 |
+ v4l2_close_device(self); |
| 49 |
+ return NULL; |
| 50 |
} else { |
| 51 |
self->camera_type = CAM_V4L2; |
| 52 |
if (v4l2_init_device(self) == 0) { |
| 53 |
--- src/camera.h |
| 54 |
+++ src/camera.h |
| 55 |
@@ -39,7 +39,6 @@ |
| 56 |
|
| 57 |
#include <asm/types.h> /* for videodev2.h */ |
| 58 |
|
| 59 |
- #include <linux/videodev.h> |
| 60 |
#include <linux/videodev2.h> |
| 61 |
#endif |
| 62 |
|
| 63 |
@@ -51,7 +50,6 @@ |
| 64 |
#define RGB_OUT 1 |
| 65 |
#define YUV_OUT 2 |
| 66 |
#define HSV_OUT 4 |
| 67 |
-#define CAM_V4L 1 |
| 68 |
#define CAM_V4L2 2 |
| 69 |
|
| 70 |
struct buffer |
| 71 |
@@ -111,8 +109,4 @@ |
| 72 |
int v4l2_close_device (PyCameraObject* self); |
| 73 |
int v4l2_open_device (PyCameraObject* self); |
| 74 |
|
| 75 |
-/* internal functions specific to v4l */ |
| 76 |
-int v4l_open_device (PyCameraObject* self); |
| 77 |
-int v4l_init_device(PyCameraObject* self); |
| 78 |
-int v4l_start_capturing(PyCameraObject* self); |
| 79 |
#endif |
Archives