contrib: add zvbi

contrib/src/zvbi/SHA512SUMS

+aa89de27e0e939279fa072fdc32ed1ab0f07ab15f8e3404613eb331f433dad458c0d3e028a18c6ede54b37c0a8f477e363f07828b6200bafcbb862ca29fa271b  zvbi-0.2.33.tar.bz2

contrib/src/zvbi/rules.mak

+# zvbi
+
+ZVBI_VERSION := 0.2.33
+ZVBI_URL := $(SF)/zapping/zvbi-$(ZVBI_VERSION).tar.bz2
+
+PKGS += zvbi
+ifeq ($(call need_pkg,"zvbi-0.2"),)
+PKGS_FOUND += zvbi
+endif
+
+$(TARBALLS)/zvbi-$(ZVBI_VERSION).tar.bz2:
+	$(call download,$(ZVBI_URL))
+
+.sum-zvbi: zvbi-$(ZVBI_VERSION).tar.bz2
+
+zvbi: zvbi-$(ZVBI_VERSION).tar.bz2 .sum-zvbi
+	$(UNPACK)
+ifdef HAVE_WIN32
+	$(APPLY) $(SRC)/zvbi/zvbi-win32.patch
+endif
+	$(MOVE)
+
+DEPS_zvbi = pthreads
+
+ZVBI_CFLAGS := $(CFLAGS)
+ZVBICONF := \
+	--disable-v4l --disable-dvb --disable-bktr \
+	--disable-nls --disable-proxy \
+	--without-doxygen \
+	$(HOSTCONF)
+ifdef HAVE_MACOSX
+ZVBI_CFLAGS += -fnested-functions
+endif
+ifdef HAVE_WIN32
+ZVBI_CFLAGS += -DPTW32_STATIC_LIB
+endif
+
+.zvbi: zvbi
+	cd $< && $(HOSTVARS) CFLAGS="$(ZVBI_CFLAGS)" ./configure $(ZVBICONF)
+	cd $</src && $(MAKE) install
+	cd $< && $(MAKE) SUBDIRS=. install
+	touch $@

contrib/src/zvbi/zvbi-win32.patch

+diff -ruN zvbi/src/conv.c zvbi.new/src/conv.c
+--- zvbi/src/conv.c	2008-02-26 15:39:23.000000000 +0100
++++ zvbi.new/src/conv.c	2008-09-11 21:05:18.000000000 +0200
+@@ -26,7 +26,9 @@
+ #endif
+ 
+ #include <errno.h>
++#ifndef WIN32
+ #include <langinfo.h>
++#endif
+ 
+ #include "misc.h"
+ #include "conv.h"
+@@ -1234,9 +1236,12 @@
+ 	const char *dst_format;
+ 
+ 	dst_format = bind_textdomain_codeset (vbi_intl_domainname, NULL);
+-
++#ifdef WIN32
++#warning this is wrong
++#else
+ 	if (NULL == dst_format)
+ 		dst_format = nl_langinfo (CODESET);
++#endif
+ 
+ 	return dst_format; /* may be NULL */
+ }
+diff -ruN zvbi/src/export.c zvbi.new/src/export.c
+--- zvbi/src/export.c	2008-02-19 01:35:15.000000000 +0100
++++ zvbi.new/src/export.c	2008-09-11 20:38:55.000000000 +0200
+@@ -40,6 +40,26 @@
+ #include "conv.h"
+ #include "vbi.h" /* asprintf */
+ 
++#ifndef EOVERFLOW
++ #define EOVERFLOW 75
++#endif
++
++#ifndef S_IRGRP
++#define S_IRGRP 0
++#endif
++
++#ifndef S_IWGRP
++#define S_IWGRP 0
++#endif
++
++#ifndef S_IROTH
++#define S_IROTH 0
++#endif
++
++#ifndef S_IWOTH
++#define S_IWOTH 0
++#endif
++
+ extern const char _zvbi_intl_domainname[];
+ 
+ /**
+diff -ruN zvbi/src/packet.c zvbi.new/src/packet.c
+--- zvbi/src/packet.c	2008-02-20 18:04:33.000000000 +0100
++++ zvbi.new/src/packet.c	2008-09-11 21:00:35.000000000 +0200
+@@ -32,7 +32,9 @@
+ #include <fcntl.h>
+ #include <time.h>
+ #include <errno.h>
++#ifndef WIN32
+ #include <sys/ioctl.h>
++#endif
+ 
+ #include "misc.h"
+ #include "hamm.h"
+diff -ruN zvbi/src/proxy-msg.c zvbi.new/src/proxy-msg.c
+--- zvbi/src/proxy-msg.c	2008-02-19 01:35:21.000000000 +0100
++++ zvbi.new/src/proxy-msg.c	2008-09-11 21:00:07.000000000 +0200
+@@ -129,7 +129,9 @@
+ #include <netinet/tcp.h>
+ #include <arpa/inet.h>
+ #include <netdb.h>
++#ifndef WIN32
+ #include <syslog.h>
++#endif
+ #include <assert.h>
+ #include <sys/ioctl.h>
+ #include <sys/mman.h>
+diff -ruN zvbi/src/proxy-msg.h zvbi.new/src/proxy-msg.h
+--- zvbi/src/proxy-msg.h	2008-02-19 01:35:21.000000000 +0100
++++ zvbi.new/src/proxy-msg.h	2008-09-11 20:59:40.000000000 +0200
+@@ -68,7 +68,9 @@
+ #ifndef PROXY_MSG_H
+ #define PROXY_MSG_H
+ 
++#ifndef WIN32
+ #include <sys/syslog.h>
++#endif
+ 
+ /* Public */
+ 
+diff -ruN zvbi/src/vbi.c zvbi.new/src/vbi.c
+--- zvbi/src/vbi.c	2008-03-05 14:33:04.000000000 +0100
++++ zvbi.new/src/vbi.c	2008-09-11 20:57:55.000000000 +0200
+@@ -39,7 +39,9 @@
+ #include <fcntl.h>
+ #include <time.h>
+ #include <errno.h>
++#ifndef WIN32
+ #include <sys/ioctl.h>
++#endif
+ #include <sys/time.h>
+ #include <pthread.h>
+ 
+--- zvbi/configure.in	2008-03-05 14:07:00.000000000 +0100
++++ zvbi.new/configure.in	2008-09-11 21:12:47.000000000 +0200
+@@ -164,14 +164,14 @@
+ dnl Check how to link pthreads functions.
+ dnl (-lpthread on Linux, -pthread on FreeBSD).
+ dnl
+-AC_CHECK_LIB(pthread, pthread_create,,[
+-  AC_TRY_LINK(, pthread_create();,,[
+-    LDFLAGS="$LDFLAGS -pthread"
+-    AC_TRY_LINK(, pthread_create();,,[
+-      AC_MSG_ERROR([Unable to link pthread functions])
+-    ])
+-  ])
+-])
++dnl AC_CHECK_LIB(pthread, pthread_create,,[
++dnl  AC_TRY_LINK(, pthread_create();,,[
++dnl    LDFLAGS="$LDFLAGS -pthread"
++dnl    AC_TRY_LINK(, pthread_create();,,[
++dnl      AC_MSG_ERROR([Unable to link pthread functions])
++dnl    ])
++dnl  ])
++dnl ])
+ 
+ dnl
+ dnl Check for Gnome unicode library or libc 2.1.
+--- zvbi/src/io.c	2008-02-19 01:35:20.000000000 +0100
++++ zvbi2/src/io.c	2008-09-11 21:18:59.000000000 +0200
+@@ -28,8 +28,10 @@
+ 
+ #include <fcntl.h>		/* open() */
+ #include <unistd.h>		/* close(), mmap(), munmap(), gettimeofday() */
++#ifndef WIN32
+ #include <sys/ioctl.h>		/* ioctl() */
+ #include <sys/mman.h>		/* mmap(), munmap() */
++#endif
+ #include <sys/time.h>		/* struct timeval */
+ #include <sys/types.h>
+ #include <errno.h>
+@@ -514,7 +516,7 @@
+ 	}
+ }
+ 
+-
++#ifndef WIN32
+ /**
+  * @internal
+  *
+@@ -554,7 +556,7 @@
+ 		return ret;
+ 	}
+ }
+-
++#endif
+ /* Helper functions to log the communication between the library and drivers.
+    FIXME remove fp arg, call user log function instead (0.3). */
+ 
+@@ -668,7 +670,9 @@
+ 				 "EXCL", O_EXCL,
+ 				 "TRUNC", O_TRUNC,
+ 				 "APPEND", O_APPEND,
++#ifndef WIN32
+ 				 "NONBLOCK", O_NONBLOCK,
++#endif
+ 				 0);
+ 		fprintf (fp, ", 0%o)", mode);
+ 
+@@ -773,6 +777,7 @@
+ 	return err;
+ }
+ 
++#ifndef WIN32
+ /**
+  * @internal
+  * Drop-in for mmap(). Logs the request on fp if not NULL.
+@@ -822,7 +827,7 @@
+ 
+ 	return r;
+ }
+-
++#endif
+ /**
+  * @internal
+  * Drop-in for munmap(). Logs the request on fp if not NULL.
+--- zvbi/zvbi-0.2.pc.in 2009-10-15 14:47:54.000000000 +0200
++++ zvbi.new/zvbi-0.2.pc.in 2009-10-15 14:47:46.000000000 +0200
+@@ -7,5 +7,5 @@
+ Description: VBI Capturing and Decoding Library
+ Requires: 
+ Version: @VERSION@
+-Libs: -L${libdir} -lzvbi -lm @LIBS@
++Libs: -L${libdir} -lzvbi -lm -lpthreadGC2 -lwsock32 @LIBS@
+ Cflags: -I${includedir}