18. Merged in XFree86 code up to 4.4.0 including changes to files that had

a changed license. There was only one change which happened to be from me (Egbert Eich).
merge most of XFree86 RC3 (4.3.99.903) from vendor branch. bug #214
2026-04-14 11:14:32 +00:00 · 2004-03-04 17:47:58 +00:00 · 2004-02-23 21:36:27 +00:00 · 2003-12-20 00:28:29 +00:00 · 2003-11-26 22:49:00 +00:00
4 changed files with 7 additions and 7 deletions
--- a/2
+++ b/2
@@ -34,4 +34,4 @@
 


-$XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/README,v 1.2 2001/05/07 21:59:07 tsi Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/README,v 1.1 1999/03/28 15:32:50 dawes Exp $
--- a/man/v4l.man
+++ b/man/v4l.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.man,v 1.3 2001/05/29 22:24:06 dawes Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.man,v 1.2 2001/01/27 18:20:55 dawes Exp $ 
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH V4L __drivermansuffix__ __vendorversion__
--- a/src/v4l.c
+++ b/src/v4l.c
@@ -12,7 +12,7 @@
 #include "xf86PciInfo.h"
 #include "xf86fbman.h"
 #include "xf86xv.h"
-#include <X11/extensions/Xv.h>
+#include "Xv.h"
 #include "regionstr.h"
 #include "dgaproc.h"
 #include "xf86str.h"
@@ -29,7 +29,7 @@ static void     V4LIdentify(int flags);
 static Bool     V4LProbe(DriverPtr drv, int flags);
 static const OptionInfoRec * V4LAvailableOptions(int chipid, int busid);

-_X_EXPORT DriverRec V4L = {
+DriverRec V4L = {
        40000,
        "v4l",
        V4LIdentify, /* Identify*/
@@ -50,7 +50,7 @@ static XF86ModuleVersionInfo v4lVersRec =
        MODULEVENDORSTRING,
        MODINFOSTRING1,
        MODINFOSTRING2,
-        XORG_VERSION_CURRENT,
+        XF86_VERSION_CURRENT,
        0, 0, 1,
        ABI_CLASS_VIDEODRV,
        ABI_VIDEODRV_VERSION,
@@ -58,7 +58,7 @@ static XF86ModuleVersionInfo v4lVersRec =
        {0,0,0,0}
 };

-_X_EXPORT XF86ModuleData v4lModuleData = { &v4lVersRec, v4lSetup, NULL };
+XF86ModuleData v4lModuleData = { &v4lVersRec, v4lSetup, NULL };

 static pointer
 v4lSetup(pointer module, pointer opts, int *errmaj, int *errmin)
--- a/src/videodev.h
+++ b/src/videodev.h
@@ -9,7 +9,7 @@
 */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/videodev.h,v 1.7tsi Exp $ */

-#include <X11/Xmd.h>
+#include "Xmd.h"

 #define VID_TYPE_CAPTURE	1	/* Can capture */
 #define VID_TYPE_TUNER		2	/* Can tune */
Author	SHA1	Message	Date
Egbert Eich	0ab6d7eb5e	18. Merged in XFree86 code up to 4.4.0 including changes to files that had a changed license. There was only one change which happened to be from me (Egbert Eich).	2004-03-04 17:47:58 +00:00
Kaleb Keithley	11fe587203	merge most of XFree86 RC3 (4.3.99.903) from vendor branch. bug #214	2004-02-23 21:36:27 +00:00
Kaleb Keithley	be350fa186	merge XFree86 RC2 (4.3.99.902) from vendor branch	2003-12-20 00:28:29 +00:00
Kaleb Keithley	f6186e5b91	merge latest (4.3.99.16) from XFree86 (vendor) branch	2003-11-26 22:49:00 +00:00