summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2006-04-07 21:45:55 +0000
committerAdam Jackson <ajax@nwnk.net>2006-04-07 21:45:55 +0000
commit0ae947b760b829010392a41c0d0497466d775474 (patch)
tree7ef9587ab81fd625f1b0b871eaf66c265898639e
parentf00943051a80d286e8a55f28bf60baebab2a4e92 (diff)
Unlibcwrap. Bump server version requirement. Bump to 0.1.0.v4l-0_1_0
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac4
-rw-r--r--src/v4l.c10
3 files changed, 16 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index e6c8681..d0dfc43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-07 Adam Jackson <ajax@freedesktop.org>
+
+ * configure.ac:
+ * src/v4l.c:
+ Unlibcwrap. Bump server version requirement. Bump to 0.1.0.
+
2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index d558bef..7c02be1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-v4l],
- 0.0.1.5,
+ 0.1.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-v4l)
@@ -52,7 +52,7 @@ XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
XORG_DRIVER_CHECK_EXT(XV, videoproto)
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, [xorg-server xproto $REQUIRED_MODULES])
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto $REQUIRED_MODULES])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
diff --git a/src/v4l.c b/src/v4l.c
index 9d691b3..43a2df0 100644
--- a/src/v4l.c
+++ b/src/v4l.c
@@ -8,10 +8,16 @@
#include "config.h"
#endif
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <string.h>
+#include <stdio.h>
+
#include "videodev.h"
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86_ansic.h"
#include "xf86Pci.h"
#include "xf86PciInfo.h"
#include "xf86fbman.h"
@@ -55,7 +61,7 @@ static XF86ModuleVersionInfo v4lVersRec =
MODINFOSTRING1,
MODINFOSTRING2,
XORG_VERSION_CURRENT,
- 0, 0, 1,
+ 0, 1, 0,
ABI_CLASS_VIDEODRV,
ABI_VIDEODRV_VERSION,
MOD_CLASS_NONE,