Bug#372302: zvbi: FTBFS on GNU/kFreeBSD

[Petr Salinger]

tags 372302 +patch
severity 372302 important
thanks

Hi,

It looks like there is a proxy under FreeBSD, but not enabled by default.
So please use attached patch to fix building on GNU/kFreeBSD.

There are also two changes in sources,
I propose them to upstream.

Thanks in advance

                        Petr
diff -u zvbi-0.2.22/debian/rules zvbi-0.2.22/debian/rules
--- zvbi-0.2.22/debian/rules
+++ zvbi-0.2.22/debian/rules
@@ -21,7 +21,7 @@
 configure-stamp: patch-stamp
        dh_testdir
 
-       CPPFLAGS=-I/usr/include/libpng10 ./configure \
+       CPPFLAGS=-I/usr/include/libpng10 ./configure --enable-proxy=yes \
        --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
        --prefix=/usr --mandir=\$${prefix}/share/man CFLAGS="$(CFLAGS)"
 
only in patch2:
unchanged:
--- zvbi-0.2.22.orig/src/chains.c
+++ zvbi-0.2.22/src/chains.c
@@ -45,7 +45,7 @@
 #include "proxy-msg.h"
 #include "proxy-client.h"
 
-#if !defined (__NetBSD__) && !defined (__FreeBSD__)
+#if !defined (__NetBSD__) && !defined (__FreeBSD__) && !defined 
(__FreeBSD_kernel__)
 #include "videodev.h"
 #include "videodev2k.h"
 # define BASE_VIDIOCPRIVATE      192
only in patch2:
unchanged:
--- zvbi-0.2.22.orig/contrib/ntsc-cc.c
+++ zvbi-0.2.22/contrib/ntsc-cc.c
@@ -480,7 +480,7 @@
        return 0;
 }
 
-static int RAW(int data)
+static int get_raw(int data)
 {
        int b1, b2;
        if (data == -1)
@@ -837,7 +837,7 @@
 #endif
                  for (i = 0; i < n_lines; ++i) {
                     if (sliced[i].line == rawline) {
-                       RAW(sliced[i].data[0]
+                       get_raw(sliced[i].data[0]
                            + sliced[i].data[1] * 256);
                     }
                  }
@@ -905,7 +905,7 @@
                                  x+1,128-buf[2048 * rawline+x*2+2]/2);
                  }
 #endif
-                 RAW(decode(&buf[2048 * rawline]));
+                 get_raw(decode(&buf[2048 * rawline]));
 #ifndef X_DISPLAY_MISSING
                  if (debugwin) {
                    XFlush(dpy);