23. Merged with XFree86 4.4.0. Added changes that went into infected files.

Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid future conflicts on ASCII but not humal readable files. (There should probably be separate CreditsXorg.rtf files) (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-05 13:40:39 +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 5 additions and 5 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"
@@ -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,
--- 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	89c188f5b2	23. Merged with XFree86 4.4.0. Added changes that went into infected files. Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid future conflicts on ASCII but not humal readable files. (There should probably be separate CreditsXorg.rtf files) (Egbert Eich).	2004-03-05 13:40:39 +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