Gentoo Archives: gentoo-commits

From: "Stefaan De Roeck (stefaan)" <stefaan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/libdc1394/files: libdc1394-disable-raw-capture.patch
Date: Sat, 31 Jan 2009 10:36:47
Message-Id: E1LTDDR-0004LO-EZ@stork.gentoo.org
1 stefaan 09/01/31 10:36:45
2
3 Added: libdc1394-disable-raw-capture.patch
4 Log:
5 Version bump, + new patch to disable obsolete raw capture (required for bug #231908)
6 (Portage version: 2.2_rc23/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 media-libs/libdc1394/files/libdc1394-disable-raw-capture.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libdc1394/files/libdc1394-disable-raw-capture.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libdc1394/files/libdc1394-disable-raw-capture.patch?rev=1.1&content-type=text/plain
13
14 Index: libdc1394-disable-raw-capture.patch
15 ===================================================================
16 --- /tmp/libdc1394-1.2.2/libdc1394/dc1394_capture.c 2007-08-03 08:47:33.000000000 +0200
17 +++ libdc1394-1.2.2/libdc1394/dc1394_capture.c 2008-12-09 12:16:28.000000000 +0100
18 @@ -27,6 +27,7 @@
19 #include <sys/ioctl.h>
20 #include <sys/mman.h>
21 #include <errno.h>
22 +#include <stdio.h>
23
24 #include "config.h"
25 #include "dc1394_control.h"
26 @@ -424,6 +425,12 @@
27 dc1394_multi_capture(raw1394handle_t handle, dc1394_cameracapture *cams,
28 int num)
29 {
30 + // this functionality is not supported anymore in libraw1394-2.0.0,
31 + // nor in recent linux kernels, and is superseded by the dma capture
32 + // functions below
33 + fprintf(stderr, "libdc1394: error, raw capture mode is not supported anymore");
34 + return DC1394_FAILURE;
35 +#if 0
36 int i, j;
37 _dc1394_all_captured= num;
38
39 @@ -493,6 +500,7 @@
40 }
41
42 return DC1394_SUCCESS;
43 +#endif
44 }
45
46 /**********************************