Mercurial Mercurial > upstream > spec-files-extra / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/dvgrab-02-v4l2.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 445 8739b4d845c1
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
445
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
     1
 
diff -ur dvgrab-3.0.orig/v4l2reader.cc dvgrab-3.0/v4l2reader.cc
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
     2
 
--- dvgrab-3.0.orig/v4l2reader.cc	2007-08-07 09:51:47.000000000 +0700
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
     3
 
+++ dvgrab-3.0/v4l2reader.cc	2007-09-04 13:53:45.183579886 +0700
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
     4
 
@@ -20,7 +20,7 @@
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
     5
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
     6
 
 #include "v4l2reader.h"
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
     7
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
     8
 
-#ifdef HAVE_LINUX_VIDEODEV2_H
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
     9
 
+#if defined(HAVE_LINUX_VIDEODEV2_H) || defined(HAVE_SYS_VIDEODEV2_H)
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    10
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    11
 
 #include <string>
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    12
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    13
 
@@ -31,9 +31,23 @@
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    14
 
 #include <stdlib.h>
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    15
 
 #include <errno.h>
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    16
 
 #include <sys/ioctl.h>
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    17
 
+#if defined(HAVE_ASM_TYPES_H)
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    18
 
 #include <asm/types.h>
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    19
 
+#endif
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    20
 
+#if defined(HAVE_INTTYPES_H)
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    21
 
+#include <inttypes.h>
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    22
 
+#endif
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    23
 
+#if defined(HAVE_SYS_IOCCOM_H)
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    24
 
+#include <sys/ioccom.h>
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    25
 
+#endif
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    26
 
 #include <sys/mman.h>
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    27
 
+#if defined(HAVE_LINUX_VIDEODEV2_H)
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    28
 
 #include <linux/videodev2.h>
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    29
 
+#elif defined(HAVE_SYS_VIDEODEV2_H)
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    30
 
+#include <sys/videodev2.h>
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    31
 
+#else
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    32
 
+#error "No videodev2.h found. You may have problems"
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    33
 
+#endif
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    34
 
 #include <assert.h>
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    35
 
 #include <poll.h>
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    36
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    37
 
diff -ur dvgrab-3.0.orig/v4l2reader.h dvgrab-3.0/v4l2reader.h
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    38
 
--- dvgrab-3.0.orig/v4l2reader.h	2007-08-07 09:51:47.000000000 +0700
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    39
 
+++ dvgrab-3.0/v4l2reader.h	2007-09-04 13:53:45.183631955 +0700
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    40
 
@@ -23,7 +23,7 @@
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    41
 
 #ifdef HAVE_CONFIG_H
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    42
 
 #include <config.h>
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    43
 
 #endif
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    44
 
-#ifdef HAVE_LINUX_VIDEODEV2_H
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    45
 
+#if defined(HAVE_LINUX_VIDEODEV2_H) || defined(HAVE_SYS_VIDEODEV2_H)
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    46
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    47
 
 #include "ieee1394io.h"
8739b4d845c1 2007-09-04 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    48
upstream/spec-files-extra