This is an automatic generated email to let you know that the following patch 
were queued at the 
http://git.linuxtv.org/xawtv3.git tree:

Subject: Auto-detect KFreeBSD variant
Author:  Dmitry Butskoy <[email protected]>
Date:    Wed Feb 2 15:50:04 2011 -0200

Patch imported from Debian package

Signed-off-by: Mauro Carvalho Chehab <[email protected]>

 configure.ac       |    3 +++
 libng/devices.c    |    2 +-
 vbistuff/ntsc-cc.c |    4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

---

http://git.linuxtv.org/xawtv3.git?a=commitdiff;h=8ebabb16b158d019c9ad3e885d88caf4d105f63b

diff --git a/configure.ac b/configure.ac
index b07a95e..3815215 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,6 +79,9 @@ case "`uname -s`" in
                LDLIBS="$LDLIBS -L/usr/local/lib"
                FOUND_OS="bsd"
                ;;
+       GNU/kFreeBSD)
+               FOUND_OS="bsd"
+               ;;
        *)
                AC_MSG_CHECKING(if xawtv will build on `uname -s`)
                AC_MSG_RESULT(maybe)
diff --git a/libng/devices.c b/libng/devices.c
index d1b11f6..cbdaa50 100644
--- a/libng/devices.c
+++ b/libng/devices.c
@@ -9,7 +9,7 @@
 /*
  * default devices names
  */
-#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(__OpenBSD__) || defined(__FreeBSD__) || 
defined(__FreeBSD_kernel__) || defined(__NetBSD__)
 struct ng_device_config ng_dev = {
     video:  "/dev/bktr0",
     radio:  NULL,
diff --git a/vbistuff/ntsc-cc.c b/vbistuff/ntsc-cc.c
index 8a4effb..29715f4 100644
--- a/vbistuff/ntsc-cc.c
+++ b/vbistuff/ntsc-cc.c
@@ -471,7 +471,7 @@ static int CCdecode(int data)
        return 0;
 }
 
-static int RAW(int data)
+static int print_raw(int data)
 {
        int b1, b2;
        if (data == -1)
@@ -697,7 +697,7 @@ int main(int argc,char **argv)
                                  x+1,128-buf[2048 * rawline+x*2+2]/2);
                  }
 #endif
-                 RAW(decode(&buf[2048 * rawline]));
+                 print_raw(decode(&buf[2048 * rawline]));
 #ifndef X_DISPLAY_MISSING
                  if (debugwin) {
                    XFlush(dpy);

_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to