1 diff -ruN zvbi/src/conv.c zvbi.new/src/conv.c
2 --- zvbi/src/conv.c 2008-02-26 15:39:23.000000000 +0100
3 +++ zvbi.new/src/conv.c 2008-09-11 21:05:18.000000000 +0200
14 @@ -1234,9 +1236,12 @@
15 const char *dst_format;
17 dst_format = bind_textdomain_codeset (vbi_intl_domainname, NULL);
20 +#warning this is wrong
22 if (NULL == dst_format)
23 dst_format = nl_langinfo (CODESET);
26 return dst_format; /* may be NULL */
28 diff -ruN zvbi/src/export.c zvbi.new/src/export.c
29 --- zvbi/src/export.c 2008-02-19 01:35:15.000000000 +0100
30 +++ zvbi.new/src/export.c 2008-09-11 20:38:55.000000000 +0200
33 #include "vbi.h" /* asprintf */
36 + #define EOVERFLOW 75
55 extern const char _zvbi_intl_domainname[];
58 diff -ruN zvbi/src/packet.c zvbi.new/src/packet.c
59 --- zvbi/src/packet.c 2008-02-20 18:04:33.000000000 +0100
60 +++ zvbi.new/src/packet.c 2008-09-11 21:00:35.000000000 +0200
66 #include <sys/ioctl.h>
71 diff -ruN zvbi/src/proxy-msg.c zvbi.new/src/proxy-msg.c
72 --- zvbi/src/proxy-msg.c 2008-02-19 01:35:21.000000000 +0100
73 +++ zvbi.new/src/proxy-msg.c 2008-09-11 21:00:07.000000000 +0200
75 #include <netinet/tcp.h>
76 #include <arpa/inet.h>
82 #include <sys/ioctl.h>
84 diff -ruN zvbi/src/proxy-msg.h zvbi.new/src/proxy-msg.h
85 --- zvbi/src/proxy-msg.h 2008-02-19 01:35:21.000000000 +0100
86 +++ zvbi.new/src/proxy-msg.h 2008-09-11 20:59:40.000000000 +0200
92 #include <sys/syslog.h>
97 diff -ruN zvbi/src/vbi.c zvbi.new/src/vbi.c
98 --- zvbi/src/vbi.c 2008-03-05 14:33:04.000000000 +0100
99 +++ zvbi.new/src/vbi.c 2008-09-11 20:57:55.000000000 +0200
105 #include <sys/ioctl.h>
107 #include <sys/time.h>
110 --- zvbi/configure.in 2008-03-05 14:07:00.000000000 +0100
111 +++ zvbi.new/configure.in 2008-09-11 21:12:47.000000000 +0200
112 @@ -164,14 +164,14 @@
113 dnl Check how to link pthreads functions.
114 dnl (-lpthread on Linux, -pthread on FreeBSD).
116 -AC_CHECK_LIB(pthread, pthread_create,,[
117 - AC_TRY_LINK(, pthread_create();,,[
118 - LDFLAGS="$LDFLAGS -pthread"
119 - AC_TRY_LINK(, pthread_create();,,[
120 - AC_MSG_ERROR([Unable to link pthread functions])
124 +dnl AC_CHECK_LIB(pthread, pthread_create,,[
125 +dnl AC_TRY_LINK(, pthread_create();,,[
126 +dnl LDFLAGS="$LDFLAGS -pthread"
127 +dnl AC_TRY_LINK(, pthread_create();,,[
128 +dnl AC_MSG_ERROR([Unable to link pthread functions])
134 dnl Check for Gnome unicode library or libc 2.1.
135 --- zvbi/src/io.c 2008-02-19 01:35:20.000000000 +0100
136 +++ zvbi2/src/io.c 2008-09-11 21:18:59.000000000 +0200
139 #include <fcntl.h> /* open() */
140 #include <unistd.h> /* close(), mmap(), munmap(), gettimeofday() */
142 #include <sys/ioctl.h> /* ioctl() */
143 #include <sys/mman.h> /* mmap(), munmap() */
145 #include <sys/time.h> /* struct timeval */
146 #include <sys/types.h>
163 /* Helper functions to log the communication between the library and drivers.
164 FIXME remove fp arg, call user log function instead (0.3). */
171 "NONBLOCK", O_NONBLOCK,
174 fprintf (fp, ", 0%o)", mode);
183 * Drop-in for mmap(). Logs the request on fp if not NULL.
192 * Drop-in for munmap(). Logs the request on fp if not NULL.
193 --- zvbi/zvbi-0.2.pc.in 2009-10-15 14:47:54.000000000 +0200
194 +++ zvbi.new/zvbi-0.2.pc.in 2009-10-15 14:47:46.000000000 +0200
196 Description: VBI Capturing and Decoding Library
199 -Libs: -L${libdir} -lzvbi -lm @LIBS@
200 +Libs: -L${libdir} -lzvbi -lm -lpthreadGC2 -lwsock32 @LIBS@
201 Cflags: -I${includedir}