xserver-xorg-video-v4l: Changes to 'debian-experimental'
.cvsignore | 19 +++++++++++++++++++
README | 2 +-
autogen.sh | 12 ++++++++++++
man/.cvsignore | 2 ++
man/Makefile.am | 2 +-
src/.cvsignore | 6 ++++++
6 files changed, 41 insertions(+), 2 deletions(-)
New commits:
commit 0fb67e3f76398b85f19c634b095cbc1522c76ef5
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Apr 8 01:52:08 2006 +0000
Bump to 0.1.1 for Xv changes.
diff --git a/ChangeLog b/ChangeLog
index 31827cf..02fc6fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-07 Adam Jackson <ajax@freedesktop.org>
+
+ * configure.ac:
+ * src/v4l.c:
+ Bump to 0.1.1 for Xv changes.
+
2006-04-07 Aaron Plattner <aplattner@nvidia.com>
* src/v4l.c: (V4lPutVideo), (V4lPutStill):
diff --git a/configure.ac b/configure.ac
index 7c02be1..e9a4ebb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-video-v4l],
- 0.1.0,
+ 0.1.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-v4l)
diff --git a/src/v4l.c b/src/v4l.c
index e0acf3b..86c26e2 100644
--- a/src/v4l.c
+++ b/src/v4l.c
@@ -61,7 +61,7 @@ static XF86ModuleVersionInfo v4lVersRec
MODINFOSTRING1,
MODINFOSTRING2,
XORG_VERSION_CURRENT,
- 0, 1, 0,
+ 0, 1, 1,
ABI_CLASS_VIDEODRV,
ABI_VIDEODRV_VERSION,
MOD_CLASS_NONE,
commit 3288506bb324c1de36985170d9862c5c7d143b61
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Fri Apr 7 23:17:04 2006 +0000
Add a DrawablePtr argument to the XV functions to pave the way for
redirected video.
diff --git a/ChangeLog b/ChangeLog
index d0dfc43..31827cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-07 Aaron Plattner <aplattner@nvidia.com>
+
+ * src/v4l.c: (V4lPutVideo), (V4lPutStill):
+ Add a DrawablePtr argument to the XV functions to pave the way for
+ redirected video.
+
2006-04-07 Adam Jackson <ajax@freedesktop.org>
* configure.ac:
diff --git a/src/v4l.c b/src/v4l.c
index 43a2df0..e0acf3b 100644
--- a/src/v4l.c
+++ b/src/v4l.c
@@ -279,7 +279,7 @@ static int
V4lPutVideo(ScrnInfoPtr pScrn,
short vid_x, short vid_y, short drw_x, short drw_y,
short vid_w, short vid_h, short drw_w, short drw_h,
- RegionPtr clipBoxes, pointer data)
+ RegionPtr clipBoxes, pointer data, DrawablePtr pDraw)
{
PortPrivPtr pPPriv = (PortPrivPtr) data;
struct video_clip *clip;
@@ -474,7 +474,7 @@ static int
V4lPutStill(ScrnInfoPtr pScrn,
short vid_x, short vid_y, short drw_x, short drw_y,
short vid_w, short vid_h, short drw_w, short drw_h,
- RegionPtr clipBoxes, pointer data)
+ RegionPtr clipBoxes, pointer data, DrawablePtr pDraw)
{
#if 0
PortPrivPtr pPPriv = (PortPrivPtr) data;
commit 0ae947b760b829010392a41c0d0497466d775474
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 7 21:45:55 2006 +0000
Unlibcwrap. Bump server version requirement. Bump to 0.1.0.
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 @@ # Process this file with autoconf to pro
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 @@ #ifdef HAVE_CONFIG_H
#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,
commit f00943051a80d286e8a55f28bf60baebab2a4e92
Author: Kevin E Martin <kem@kem.org>
Date: Wed Dec 21 02:30:04 2005 +0000
Update package version for X11R7 release.
diff --git a/ChangeLog b/ChangeLog
index 253fecf..e6c8681 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * configure.ac:
+ Update package version for X11R7 release.
+
2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index 228d969..d558bef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-video-v4l],
- 0.0.1.4,
+ 0.0.1.5,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-v4l)
commit 58443583fbef699ebc4dda243bf86241913edbe8
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Dec 19 16:25:56 2005 +0000
Stub COPYING files
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..7f33cbf
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,12 @@
+This is a stub file. This package has not yet had its complete licensing
+information compiled. Please see the individual source files for details on
+your rights to use and modify this software.
+
+Please submit updated COPYING files to the Xorg bugzilla:
+
+https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+All licensing questions regarding this software should be directed at the
+Xorg mailing list:
+
+http://lists.freedesktop.org/mailman/listinfo/xorg
commit 0f0ae40ac9a9815d50c1ae3eee4b524557b9fb68
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Dec 19 09:07:50 2005 +0000
Typo fixes, mailing list & url updates, and other changes to prepare for
X11R6.9 & 7.0 releases.
diff --git a/man/v4l.man b/man/v4l.man
index 5337112..f59e524 100644
--- 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__
@@ -13,13 +13,13 @@ v4l \- video4linux driver
.fi
.SH DESCRIPTION
.B v4l
-is an XFree86 driver for video4linux cards. It provides a Xvideo
-extention port for video overlay. Just add the driver to the module
-list within the module section of your XF86Config file if you want
+is an __xservername__ driver for video4linux cards. It provides a Xvideo
+extension port for video overlay. Just add the driver to the module
+list within the module section of your __xconfigfile__ file if you want
to use it. There are no config options.
.P
Note that the the extmod module is also required for the Xvideo
-support (and lots of other extentions too).
+support (and lots of other extensions too).
.SH SUPPORTED HARDWARE
The
.B v4l
@@ -30,10 +30,10 @@ overlay.
bt848/bt878-based TV cards are the most popular hardware these
days.
.SH CONFIGURATION DETAILS
-Please refer to XF86Config(__filemansuffix__) for general configuration
+Please refer to __xconfigfile__(__filemansuffix__) for general configuration
details. This section only covers configuration details specific to this
driver.
.SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
.SH AUTHORS
Authors include: Gerd Knorr <kraxel@bytesex.org>
commit c3917f36a9ac2b2cd77b8aff2b74a5245f687ef3
Author: Kevin E Martin <kem@kem.org>
Date: Thu Dec 15 00:24:21 2005 +0000
Update package version number for final X11R7 release candidate.
diff --git a/ChangeLog b/ChangeLog
index f1bd720..253fecf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * configure.ac:
+ Update package version number for final X11R7 release candidate.
+
2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
* man/Makefile.am:
diff --git a/configure.ac b/configure.ac
index 9ddd13c..228d969 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-video-v4l],
- 0.0.1.3,
+ 0.0.1.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-v4l)
commit 6a46c3a4dba3f2470290191c760c1e657214e1f7
Author: Kevin E Martin <kem@kem.org>
Date: Tue Dec 6 22:48:40 2005 +0000
Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
diff --git a/ChangeLog b/ChangeLog
index e56beeb..f1bd720 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * man/Makefile.am:
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/man/Makefile.am b/man/Makefile.am
index 27106a2..bf7ec17 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -27,9 +27,9 @@ #
drivermandir = $(DRIVER_MAN_DIR)
-driverman_SOURCES = @DRIVER_NAME@.man
+driverman_PRE = @DRIVER_NAME@.man
-driverman_DATA = $(driverman_SOURCES:man=@DRIVER_MAN_SUFFIX@)
+driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
EXTRA_DIST = @DRIVER_NAME@.man
commit 7b16fc59d14b2ca0db3a270f44d455f2911d2924
Author: Kevin E Martin <kem@kem.org>
Date: Sat Dec 3 05:49:36 2005 +0000
Update package version number for X11R7 RC3 release.
diff --git a/ChangeLog b/ChangeLog
index 749c638..e56beeb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * configure.ac:
+ Update package version number for X11R7 RC3 release.
+
2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index 21a8aa5..9ddd13c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-video-v4l],
- 0.0.1.2,
+ 0.0.1.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-v4l)
commit db38e33e96bb3a9a6e4ab6456f41796ee164584d
Author: Kevin E Martin <kem@kem.org>
Date: Fri Dec 2 02:16:11 2005 +0000
Remove extraneous AC_MSG_RESULT.
diff --git a/ChangeLog b/ChangeLog
index 1cc1dfb..749c638 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * configure.ac:
+ Remove extraneous AC_MSG_RESULT.
+
2005-11-29 Adam Jackson <ajax@freedesktop.org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index ca04c8a..21a8aa5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,7 +53,6 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto)
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server xproto $REQUIRED_MODULES])
-AC_MSG_RESULT([yes])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
commit e09d3fa5a2954bb5d651eddc79b24998a64a3c46
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Nov 29 23:30:06 2005 +0000
Only build dlloader modules by default.
diff --git a/ChangeLog b/ChangeLog
index be8ef2c..1cc1dfb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-29 Adam Jackson <ajax@freedesktop.org>
+
+ * configure.ac:
+ Only build dlloader modules by default.
+
2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index db863de..ca04c8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,6 +35,7 @@ AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
# Checks for programs.
+AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AC_PROG_CC
commit b960665c1a03112251537bbf324cac85dcd105f7
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Nov 28 22:04:14 2005 +0000
Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
diff --git a/man/Makefile.am b/man/Makefile.am
index a16ec06..27106a2 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -25,7 +25,7 @@ # other dealings in this Software withou
# from the copyright holders.
#
-drivermandir = $(mandir)/man$(DRIVER_MAN_SUFFIX)
+drivermandir = $(DRIVER_MAN_DIR)
driverman_SOURCES = @DRIVER_NAME@.man
commit 9e9e26cbfcd483b0f4f59fa3f58cb2176f86e45b
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Nov 21 10:49:21 2005 +0000
Add .cvsignores for drivers.
diff --git a/.cvsignore b/.cvsignore
new file mode 100644
index 0000000..fb1befd
--- /dev/null
+++ b/.cvsignore
@@ -0,0 +1,19 @@
+Makefile
+Makefile.in
+*.la
+*.lo
+aclocal.m4
+autom4te.cache
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+depcomp
+install-sh
+libtool
+ltmain.sh
+missing
+stamp-h1
diff --git a/man/.cvsignore b/man/.cvsignore
new file mode 100644
index 0000000..282522d
--- /dev/null
+++ b/man/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/src/.cvsignore b/src/.cvsignore
new file mode 100644
index 0000000..9730646
--- /dev/null
+++ b/src/.cvsignore
@@ -0,0 +1,6 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.la
+*.lo
commit f95d090f2618019cbddc4eba95304aa7fd06482f
Author: Kevin E Martin <kem@kem.org>
Date: Wed Nov 9 21:15:22 2005 +0000
Update package version number for X11R7 RC2 release.
diff --git a/ChangeLog b/ChangeLog
index e4d905b..be8ef2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * configure.ac:
+ Update package version number for X11R7 RC2 release.
+
2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index 6b8f623..db863de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-video-v4l],
- 0.0.1.1,
+ 0.0.1.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-v4l)
commit f1b782df5d01a4f17e33fb5506dff5523b65c9e2
Author: Kevin E Martin <kem@kem.org>
Date: Tue Nov 1 15:08:56 2005 +0000
Update pkgcheck depedencies to work with separate build roots.
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..e4d905b
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,4 @@
+2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * configure.ac:
+ Update pkgcheck dependencies to work with separate build roots.
diff --git a/configure.ac b/configure.ac
index 67ff75c..6b8f623 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,8 +45,14 @@ AC_ARG_WITH(xorg-module-dir,
[Default xorg module directory [[default=$libdir/xorg/modules]]]),
[moduledir="$withval"],
[moduledir="$libdir/xorg/modules"])
+
+# Checks for extensions
+XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
+XORG_DRIVER_CHECK_EXT(XV, videoproto)
+
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, [xorg-server xproto])
+PKG_CHECK_MODULES(XORG, [xorg-server xproto $REQUIRED_MODULES])
+AC_MSG_RESULT([yes])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
commit bec1ce8deaad0f3f8a25e669e1cb5118f7ba81ce
Author: Kevin E Martin <kem@kem.org>
Date: Wed Oct 19 02:48:06 2005 +0000
Update package version number for RC1 release.
diff --git a/configure.ac b/configure.ac
index 3bd7bd1..67ff75c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-video-v4l],
- 4.0.0,
+ 0.0.1.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-v4l)
commit d66e3714e897eca8c21a588b73c630e6505efa1d
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Oct 18 00:01:55 2005 +0000
Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro
substitutions to work better with BSD make
diff --git a/man/Makefile.am b/man/Makefile.am
index eb3fe06..a16ec06 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -29,7 +29,7 @@ drivermandir = $(mandir)/man$(DRIVER_MAN
driverman_SOURCES = @DRIVER_NAME@.man
-driverman_DATA = $(driverman_SOURCES:man=$(DRIVER_MAN_SUFFIX))
+driverman_DATA = $(driverman_SOURCES:man=@DRIVER_MAN_SUFFIX@)
EXTRA_DIST = @DRIVER_NAME@.man
commit ff178dcf9abded36bfaa6b9b62eae792095b7c67
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Oct 17 22:57:37 2005 +0000
More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead
of indirectly
diff --git a/man/Makefile.am b/man/Makefile.am
index 0eabf46..eb3fe06 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -31,7 +31,7 @@ driverman_SOURCES = @DRIVER_NAME@.man
driverman_DATA = $(driverman_SOURCES:man=$(DRIVER_MAN_SUFFIX))
-EXTRA_DIST = $(driverman_SOURCES)
+EXTRA_DIST = @DRIVER_NAME@.man
CLEANFILES = $(driverman_DATA)
commit c61d66bc02c1ac7bc15d90ceb15aa4ed1841f881
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Oct 17 00:09:08 2005 +0000
Use sed & cpp to substitute variables in driver man pages
diff --git a/configure.ac b/configure.ac
index a9d0897..3bd7bd1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,6 +57,10 @@ AC_HEADER_STDC
AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
+DRIVER_NAME=v4l
+AC_SUBST([DRIVER_NAME])
+
+XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
AC_OUTPUT([
diff --git a/man/Makefile.am b/man/Makefile.am
index 5639a0f..0eabf46 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,22 +1,59 @@
-# Copyright 2005 Adam Jackson.
+# $Id$
#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# on the rights to use, copy, modify, merge, publish, distribute, sub
-# license, and/or sell copies of the Software, and to permit persons to whom
-# the Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
-# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-dist_man_MANS = \
- v4l.4
+# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+#
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation.
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the copyright holders shall
+# not be used in advertising or otherwise to promote the sale, use or
+# other dealings in this Software without prior written authorization
+# from the copyright holders.
+#
+
+drivermandir = $(mandir)/man$(DRIVER_MAN_SUFFIX)
+
+driverman_SOURCES = @DRIVER_NAME@.man
+
+driverman_DATA = $(driverman_SOURCES:man=$(DRIVER_MAN_SUFFIX))
+
+EXTRA_DIST = $(driverman_SOURCES)
+
+CLEANFILES = $(driverman_DATA)
+
+SED = sed
+
+# Strings to replace in man pages
+XORGRELSTRING = @PACKAGE_STRING@
+ XORGMANNAME = X Version 11
+
+MAN_SUBSTS = \
+ -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+ -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+ -e 's|__xservername__|Xorg|g' \
+ -e 's|__xconfigfile__|xorg.conf|g' \
+ -e 's|__projectroot__|$(prefix)|g' \
+ -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
+ -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
+ -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
+ -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
+ -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
+
+SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
+
+.man.$(DRIVER_MAN_SUFFIX):
+ sed $(MAN_SUBSTS) < $< > $@
commit 083adf60322bf9de0a6838846f5688928b2cb017
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Sep 21 00:30:22 2005 +0000
Bug #4328: Add build skeleton for the poor forgotten v4l driver.
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..3ae2692
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,23 @@
+# Copyright 2005 Adam Jackson.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# on the rights to use, copy, modify, merge, publish, distribute, sub
+# license, and/or sell copies of the Software, and to permit persons to whom
+# the Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+AUTOMAKE_OPTIONS = foreign
+SUBDIRS = src man
+EXTRA_DIST = README
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..904cd67
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,12 @@
+#! /bin/sh
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+
+autoreconf -v --install || exit 1
+cd $ORIGDIR || exit $?
+
+$srcdir/configure --enable-maintainer-mode "$@"
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..a9d0897
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,66 @@
+# Copyright 2005 Adam Jackson.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# on the rights to use, copy, modify, merge, publish, distribute, sub
+# license, and/or sell copies of the Software, and to permit persons to whom
+# the Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Process this file with autoconf to produce a configure script
+
+AC_PREREQ(2.57)
+AC_INIT([xf86-video-v4l],
+ 4.0.0,
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ xf86-video-v4l)
+
+AC_CONFIG_SRCDIR([Makefile.am])
+AM_CONFIG_HEADER([config.h])
+AC_CONFIG_AUX_DIR(.)
+
+AM_INIT_AUTOMAKE([dist-bzip2])
+
+AM_MAINTAINER_MODE
+
+# Checks for programs.
+AC_PROG_LIBTOOL
+AC_PROG_CC
+
+AH_TOP([#include "xorg-server.h"])
+
+AC_ARG_WITH(xorg-module-dir,
+ AC_HELP_STRING([--with-xorg-module-dir=DIR],
+ [Default xorg module directory [[default=$libdir/xorg/modules]]]),
+ [moduledir="$withval"],
+ [moduledir="$libdir/xorg/modules"])
+# Checks for pkg-config packages
+PKG_CHECK_MODULES(XORG, [xorg-server xproto])
+sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+
+# Checks for libraries.
+
+# Checks for header files.
+AC_HEADER_STDC
+
+AC_SUBST([XORG_CFLAGS])
+AC_SUBST([moduledir])
+
+XORG_RELEASE_VERSION
+
+AC_OUTPUT([
+ Makefile
+ src/Makefile
+ man/Makefile
+])
diff --git a/man/Makefile.am b/man/Makefile.am
new file mode 100644
index 0000000..5639a0f
--- /dev/null
+++ b/man/Makefile.am
@@ -0,0 +1,22 @@
+# Copyright 2005 Adam Jackson.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# on the rights to use, copy, modify, merge, publish, distribute, sub
+# license, and/or sell copies of the Software, and to permit persons to whom
+# the Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+dist_man_MANS = \
+ v4l.4
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..ed30a80
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,34 @@
+# Copyright 2005 Adam Jackson.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# on the rights to use, copy, modify, merge, publish, distribute, sub
+# license, and/or sell copies of the Software, and to permit persons to whom
+# the Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+# this is obnoxious:
+# -module lets us name the module exactly how we want
+# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
+# _ladir passes a dummy rpath to libtool so the thing will actually link
+# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
+AM_CFLAGS = @XORG_CFLAGS@
+v4l_drv_la_LTLIBRARIES = v4l_drv.la
+v4l_drv_la_LDFLAGS = -module -avoid-version
+v4l_drv_ladir = @moduledir@/drivers
+
+v4l_drv_la_SOURCES = \
+ v4l.c
+
+EXTRA_DIST = videodev.h
commit 1f05cde42c682f3b366543958f78e119f755415f
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Jul 11 02:30:06 2005 +0000
Prep for modular builds by adding guarded #include "config.h" everywhere.
diff --git a/src/v4l.c b/src/v4l.c
index cebfeca..9d691b3 100644
--- a/src/v4l.c
+++ b/src/v4l.c
@@ -4,6 +4,10 @@
*/
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c,v 1.33 2003/12/05 03:55:32 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "videodev.h"
#include "xf86.h"
#include "xf86_OSproc.h"
commit 1fa8d2f701bd9173c36610ecf09bce25c1b32a82
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jun 25 21:16:59 2005 +0000
Bug #3626: _X_EXPORT tags for video and input drivers.
diff --git a/src/v4l.c b/src/v4l.c
index c380300..cebfeca 100644
--- a/src/v4l.c
+++ b/src/v4l.c
@@ -29,7 +29,7 @@ static void V4LIdentify(int flags);
static Bool V4LProbe(DriverPtr drv, int flags);
static const OptionInfoRec * V4LAvailableOptions(int chipid, int busid);
-DriverRec V4L = {
+_X_EXPORT DriverRec V4L = {
40000,
"v4l",
V4LIdentify, /* Identify*/
@@ -58,7 +58,7 @@ static XF86ModuleVersionInfo v4lVersRec
{0,0,0,0}
};
-XF86ModuleData v4lModuleData = { &v4lVersRec, v4lSetup, NULL };
+_X_EXPORT XF86ModuleData v4lModuleData = { &v4lVersRec, v4lSetup, NULL };
static pointer
v4lSetup(pointer module, pointer opts, int *errmaj, int *errmin)
commit 7123df70e01cbcca9a49a0b54b7f421f4a91760a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Apr 20 12:25:32 2005 +0000
Fix includes right throughout the Xserver tree:
change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h;
change "foo.h", "extensions/foo.h" and "X11/foo.h" to
<X11/extensions/foo.h> for extension headers, e.g. Xv.h;
change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files.
diff --git a/src/v4l.c b/src/v4l.c
index 241f528..c380300 100644
--- a/src/v4l.c
+++ b/src/v4l.c
@@ -2,7 +2,7 @@
* video4linux Xv Driver
* based on Michael Schimek's permedia 2 driver.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c,v 1.31 2003/07/16 01:38:47 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c,v 1.33 2003/12/05 03:55:32 dawes Exp $ */
#include "videodev.h"
#include "xf86.h"
@@ -12,7 +12,7 @@ #include "xf86Pci.h"
#include "xf86PciInfo.h"
#include "xf86fbman.h"
#include "xf86xv.h"
-#include "Xv.h"
+#include <X11/extensions/Xv.h>
#include "regionstr.h"
#include "dgaproc.h"
#include "xf86str.h"
@@ -50,7 +50,7 @@ static XF86ModuleVersionInfo v4lVersRec
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
0, 0, 1,
ABI_CLASS_VIDEODRV,
ABI_VIDEODRV_VERSION,
@@ -220,7 +220,7 @@ static int V4lOpenDevice(PortPrivPtr pPP
if (first) {
first = 0;
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
- "v4l: memPhysBase=%p\n", pScrn->memPhysBase);
+ "v4l: memPhysBase=0x%lx\n", pScrn->memPhysBase);
}
switch (pScrn->bitsPerPixel) {
@@ -718,11 +718,11 @@ static void
V4LBuildEncodings(PortPrivPtr p, int fd, int channels)
{
static struct video_channel channel;
- int i,entries,have_bttv;
+ int i,entries,have_bttv,bttv_ver;
#define BTTV_VERSION _IOR('v' , BASE_VIDIOCPRIVATE+6, int)
have_bttv = 0;
- if (-1 != ioctl(fd,BTTV_VERSION,NULL))
+ if (-1 != ioctl(fd,BTTV_VERSION,&bttv_ver))
have_bttv = 1;
entries = (have_bttv ? 7 : 3) * channels;
@@ -747,17 +747,17 @@ #define BTTV_VERSION _IOR('v' , BASE_VID
continue;
}
- v4l_add_enc(p->enc, p->nenc,"pal", channel.name, 768,576, 1,50);
+ v4l_add_enc(p->enc, p->nenc,"PAL", channel.name, 768,576, 1,50);
p->norm[p->nenc] = VIDEO_MODE_PAL;
p->input[p->nenc] = i;
p->nenc++;
- v4l_add_enc(p->enc,p->nenc,"ntsc", channel.name, 640,480, 1001,60000);
+ v4l_add_enc(p->enc,p->nenc,"NTSC", channel.name, 640,480, 1001,60000);
p->norm[p->nenc] = VIDEO_MODE_NTSC;
p->input[p->nenc] = i;
p->nenc++;
- v4l_add_enc(p->enc,p->nenc,"secam",channel.name, 768,576, 1,50);
+ v4l_add_enc(p->enc,p->nenc,"SECAM",channel.name, 768,576, 1,50);
p->norm[p->nenc] = VIDEO_MODE_SECAM;
p->input[p->nenc] = i;
p->nenc++;
@@ -767,28 +767,28 @@ #define BTTV_VERSION _IOR('v' , BASE_VID
ntsc and secam. But there are a few more norms (pal versions
with a different timings used in south america for example).
The bttv driver can handle these too. */
- if (0 != v4l_add_enc(p->enc,p->nenc,"palnc",channel.name,
+ if (0 != v4l_add_enc(p->enc,p->nenc,"PAL-Nc",channel.name,
640, 576, 1,50))
goto fail;
p->norm[p->nenc] = 3;
p->input[p->nenc] = i;
p->nenc++;
- if (0 != v4l_add_enc(p->enc,p->nenc,"palm",channel.name,
+ if (0 != v4l_add_enc(p->enc,p->nenc,"PAL-M",channel.name,
640, 576, 1,50))
goto fail;
p->norm[p->nenc] = 4;
p->input[p->nenc] = i;
p->nenc++;
- if (0 != v4l_add_enc(p->enc, p->nenc,"paln", channel.name,
+ if (0 != v4l_add_enc(p->enc, p->nenc,"PAL-N", channel.name,
768,576, 1,50))
goto fail;
p->norm[p->nenc] = 5;
p->input[p->nenc] = i;
p->nenc++;
- if (0 != v4l_add_enc(p->enc,p->nenc,"ntscjp", channel.name,
+ if (0 != v4l_add_enc(p->enc,p->nenc,"NTSC-JP", channel.name,
640,480, 1001,60000))
goto fail;
p->norm[p->nenc] = 6;
diff --git a/src/videodev.h b/src/videodev.h
index 77b592e..1fed203 100644
--- a/src/videodev.h
+++ b/src/videodev.h
@@ -7,9 +7,9 @@ #define __LINUX_VIDEODEV_H
* Used here with the explicit permission of the original author, Alan Cox.
* <alan@lxorguk.ukuu.org.uk>
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/videodev.h,v 1.8 2001/03/03 22:46:31 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/videodev.h,v 1.7tsi Exp $ */
-#include "Xmd.h"
+#include <X11/Xmd.h>
#define VID_TYPE_CAPTURE 1 /* Can capture */
#define VID_TYPE_TUNER 2 /* Can tune */
commit b299863dd21226e2ea47f7983f31e1920ac70cd9
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Jun 16 09:24:09 2004 +0000
DRI XFree86-4_3_99_12-merge import
diff --git a/README b/README
index e40f639..a21e915 100644
--- a/README
+++ b/README
@@ -34,4 +34,4 @@
-$XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/README,v 1.1 1999/03/28 15:32:50 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/README,v 1.2 2001/05/07 21:59:07 tsi Exp $
diff --git a/man/v4l.man b/man/v4l.man
index ab2f844..5337112 100644
--- a/man/v4l.man
+++ b/man/v4l.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.man,v 1.2 2001/01/27 18:20:55 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.man,v 1.3 2001/05/29 22:24:06 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH V4L __drivermansuffix__ __vendorversion__
@@ -13,9 +13,9 @@ v4l \- video4linux driver
.fi
.SH DESCRIPTION
.B v4l
-is an __xservername__ driver for video4linux cards. It provides a Xvideo
+is an XFree86 driver for video4linux cards. It provides a Xvideo
extention port for video overlay. Just add the driver to the module
-list within the module section of your __xconfigfile__ file if you want
+list within the module section of your XF86Config file if you want
to use it. There are no config options.
.P
Note that the the extmod module is also required for the Xvideo
@@ -30,10 +30,10 @@ overlay.
bt848/bt878-based TV cards are the most popular hardware these
days.
.SH CONFIGURATION DETAILS
-Please refer to __xconfigfile__(__filemansuffix__) for general configuration
+Please refer to XF86Config(__filemansuffix__) for general configuration
details. This section only covers configuration details specific to this
driver.
.SH "SEE ALSO"
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
.SH AUTHORS
Authors include: Gerd Knorr <kraxel@bytesex.org>
diff --git a/src/v4l.c b/src/v4l.c
index 9899743..241f528 100644
--- a/src/v4l.c
+++ b/src/v4l.c
@@ -2,7 +2,7 @@
* video4linux Xv Driver
* based on Michael Schimek's permedia 2 driver.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c,v 1.33 2003/12/05 03:55:32 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c,v 1.31 2003/07/16 01:38:47 dawes Exp $ */
#include "videodev.h"
#include "xf86.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,
@@ -220,7 +220,7 @@ static int V4lOpenDevice(PortPrivPtr pPP
if (first) {
first = 0;
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
- "v4l: memPhysBase=0x%lx\n", pScrn->memPhysBase);
+ "v4l: memPhysBase=%p\n", pScrn->memPhysBase);
}
switch (pScrn->bitsPerPixel) {
@@ -718,11 +718,11 @@ static void
V4LBuildEncodings(PortPrivPtr p, int fd, int channels)
{
static struct video_channel channel;
- int i,entries,have_bttv,bttv_ver;
+ int i,entries,have_bttv;
#define BTTV_VERSION _IOR('v' , BASE_VIDIOCPRIVATE+6, int)
have_bttv = 0;
- if (-1 != ioctl(fd,BTTV_VERSION,&bttv_ver))
+ if (-1 != ioctl(fd,BTTV_VERSION,NULL))
have_bttv = 1;
entries = (have_bttv ? 7 : 3) * channels;
@@ -747,17 +747,17 @@ #define BTTV_VERSION _IOR('v' , BASE_VID
continue;
}
- v4l_add_enc(p->enc, p->nenc,"PAL", channel.name, 768,576, 1,50);
+ v4l_add_enc(p->enc, p->nenc,"pal", channel.name, 768,576, 1,50);
p->norm[p->nenc] = VIDEO_MODE_PAL;
p->input[p->nenc] = i;
p->nenc++;
- v4l_add_enc(p->enc,p->nenc,"NTSC", channel.name, 640,480, 1001,60000);
+ v4l_add_enc(p->enc,p->nenc,"ntsc", channel.name, 640,480, 1001,60000);
p->norm[p->nenc] = VIDEO_MODE_NTSC;
p->input[p->nenc] = i;
p->nenc++;
- v4l_add_enc(p->enc,p->nenc,"SECAM",channel.name, 768,576, 1,50);
+ v4l_add_enc(p->enc,p->nenc,"secam",channel.name, 768,576, 1,50);
p->norm[p->nenc] = VIDEO_MODE_SECAM;
p->input[p->nenc] = i;
p->nenc++;
@@ -767,28 +767,28 @@ #define BTTV_VERSION _IOR('v' , BASE_VID
ntsc and secam. But there are a few more norms (pal versions
with a different timings used in south america for example).
The bttv driver can handle these too. */
- if (0 != v4l_add_enc(p->enc,p->nenc,"PAL-Nc",channel.name,
+ if (0 != v4l_add_enc(p->enc,p->nenc,"palnc",channel.name,
640, 576, 1,50))
goto fail;
p->norm[p->nenc] = 3;
p->input[p->nenc] = i;
p->nenc++;
- if (0 != v4l_add_enc(p->enc,p->nenc,"PAL-M",channel.name,
+ if (0 != v4l_add_enc(p->enc,p->nenc,"palm",channel.name,
640, 576, 1,50))
goto fail;
p->norm[p->nenc] = 4;
p->input[p->nenc] = i;
p->nenc++;
- if (0 != v4l_add_enc(p->enc, p->nenc,"PAL-N", channel.name,
+ if (0 != v4l_add_enc(p->enc, p->nenc,"paln", channel.name,
768,576, 1,50))
goto fail;
p->norm[p->nenc] = 5;
p->input[p->nenc] = i;
p->nenc++;
- if (0 != v4l_add_enc(p->enc,p->nenc,"NTSC-JP", channel.name,
+ if (0 != v4l_add_enc(p->enc,p->nenc,"ntscjp", channel.name,
640,480, 1001,60000))
goto fail;
p->norm[p->nenc] = 6;
diff --git a/src/videodev.h b/src/videodev.h
index 1d6991e..77b592e 100644
--- a/src/videodev.h
+++ b/src/videodev.h
@@ -7,7 +7,7 @@ #define __LINUX_VIDEODEV_H
* Used here with the explicit permission of the original author, Alan Cox.
* <alan@lxorguk.ukuu.org.uk>
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/videodev.h,v 1.7tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/videodev.h,v 1.8 2001/03/03 22:46:31 tsi Exp $ */
#include "Xmd.h"
commit 1f8ceb0991d6154eb5993cf2eb8b2d9a68a8eaf9
Author: Egbert Eich <eich@suse.de>
Date: Fri Apr 23 19:52:24 2004 +0000
Merging XORG-CURRENT into trunk
diff --git a/README b/README
index a21e915..e40f639 100644
--- a/README
+++ b/README
@@ -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 $
diff --git a/man/v4l.man b/man/v4l.man
index 5337112..ab2f844 100644
--- 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__
@@ -13,9 +13,9 @@ v4l \- video4linux driver
.fi
.SH DESCRIPTION
.B v4l
-is an XFree86 driver for video4linux cards. It provides a Xvideo
+is an __xservername__ driver for video4linux cards. It provides a Xvideo
extention port for video overlay. Just add the driver to the module
-list within the module section of your XF86Config file if you want
+list within the module section of your __xconfigfile__ file if you want
to use it. There are no config options.
.P
Note that the the extmod module is also required for the Xvideo
@@ -30,10 +30,10 @@ overlay.
bt848/bt878-based TV cards are the most popular hardware these
days.
.SH CONFIGURATION DETAILS
-Please refer to XF86Config(__filemansuffix__) for general configuration
+Please refer to __xconfigfile__(__filemansuffix__) for general configuration
details. This section only covers configuration details specific to this
driver.
.SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
.SH AUTHORS
Authors include: Gerd Knorr <kraxel@bytesex.org>
diff --git a/src/v4l.c b/src/v4l.c
index 30a829c..9899743 100644
--- a/src/v4l.c
+++ b/src/v4l.c
@@ -2,7 +2,7 @@
* video4linux Xv Driver
* based on Michael Schimek's permedia 2 driver.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c,v 1.34 2003/12/31 06:08:53 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c,v 1.33 2003/12/05 03:55:32 dawes Exp $ */
#include "videodev.h"
#include "xf86.h"
@@ -50,7 +50,7 @@ static XF86ModuleVersionInfo v4lVersRec
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
0, 0, 1,
ABI_CLASS_VIDEODRV,
ABI_VIDEODRV_VERSION,
diff --git a/src/videodev.h b/src/videodev.h
index 77b592e..1d6991e 100644
--- a/src/videodev.h
+++ b/src/videodev.h
@@ -7,7 +7,7 @@ #define __LINUX_VIDEODEV_H
* Used here with the explicit permission of the original author, Alan Cox.
* <alan@lxorguk.ukuu.org.uk>
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/videodev.h,v 1.8 2001/03/03 22:46:31 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/videodev.h,v 1.7tsi Exp $ */
#include "Xmd.h"
commit fb4a148b6ea5f839f418a8dc7ab0f44bd90678d1
Author: Egbert Eich <eich@suse.de>
Date: Sun Mar 14 08:33:41 2004 +0000
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
diff --git a/README b/README
index e40f639..a21e915 100644
--- a/README
+++ b/README
@@ -34,4 +34,4 @@
-$XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/README,v 1.1 1999/03/28 15:32:50 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/README,v 1.2 2001/05/07 21:59:07 tsi Exp $
diff --git a/man/v4l.man b/man/v4l.man
index 38014b7..5337112 100644
--- a/man/v4l.man
+++ b/man/v4l.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.man,v 1.2 2001/01/27 18:20:55 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.man,v 1.3 2001/05/29 22:24:06 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH V4L __drivermansuffix__ __vendorversion__
diff --git a/src/v4l.c b/src/v4l.c
index 11ff025..30a829c 100644
--- a/src/v4l.c
+++ b/src/v4l.c
@@ -2,7 +2,7 @@
* video4linux Xv Driver
* based on Michael Schimek's permedia 2 driver.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c,v 1.33 2003/12/05 03:55:32 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c,v 1.34 2003/12/31 06:08:53 dawes Exp $ */
#include "videodev.h"
#include "xf86.h"
diff --git a/src/videodev.h b/src/videodev.h
index 1d6991e..77b592e 100644
--- a/src/videodev.h
+++ b/src/videodev.h
@@ -7,7 +7,7 @@ #define __LINUX_VIDEODEV_H
* Used here with the explicit permission of the original author, Alan Cox.
* <alan@lxorguk.ukuu.org.uk>
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/videodev.h,v 1.7tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/videodev.h,v 1.8 2001/03/03 22:46:31 tsi Exp $ */
#include "Xmd.h"
commit abaaf69833e147c48bbcc355597f4ac2f86f2774
Author: Egbert Eich <eich@suse.de>
Date: Wed Mar 3 12:12:28 2004 +0000
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
diff --git a/README b/README
index a21e915..e40f639 100644
--- a/README
+++ b/README
@@ -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 $
diff --git a/man/v4l.man b/man/v4l.man
index 5337112..38014b7 100644
--- 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__
diff --git a/src/v4l.c b/src/v4l.c
index 30a829c..11ff025 100644
--- a/src/v4l.c
+++ b/src/v4l.c
@@ -2,7 +2,7 @@
* video4linux Xv Driver
* based on Michael Schimek's permedia 2 driver.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c,v 1.34 2003/12/31 06:08:53 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c,v 1.33 2003/12/05 03:55:32 dawes Exp $ */
#include "videodev.h"
#include "xf86.h"
diff --git a/src/videodev.h b/src/videodev.h
index 77b592e..1d6991e 100644
--- a/src/videodev.h
+++ b/src/videodev.h
@@ -7,7 +7,7 @@ #define __LINUX_VIDEODEV_H
* Used here with the explicit permission of the original author, Alan Cox.
* <alan@lxorguk.ukuu.org.uk>
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/videodev.h,v 1.8 2001/03/03 22:46:31 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/videodev.h,v 1.7tsi Exp $ */
#include "Xmd.h"
commit bd8c0455c20035003f93d4cfe17036de0236f646
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 13:35:55 2004 +0000
readding XFree86's cvs IDs
diff --git a/README b/README
index 64111b5..a21e915 100644
--- a/README
+++ b/README
@@ -34,4 +34,4 @@
-$XFree86$
+$XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/README,v 1.2 2001/05/07 21:59:07 tsi Exp $
diff --git a/man/v4l.man b/man/v4l.man
index 1b69c79..5337112 100644
--- a/man/v4l.man
+++ b/man/v4l.man
@@ -1,4 +1,4 @@
-.\" $XFree86$
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.man,v 1.3 2001/05/29 22:24:06 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH V4L __drivermansuffix__ __vendorversion__
diff --git a/src/v4l.c b/src/v4l.c
index 283fb67..30a829c 100644
--- a/src/v4l.c
+++ b/src/v4l.c
@@ -2,7 +2,7 @@
* video4linux Xv Driver
* based on Michael Schimek's permedia 2 driver.
*/
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c,v 1.34 2003/12/31 06:08:53 dawes Exp $ */
#include "videodev.h"
#include "xf86.h"
diff --git a/src/videodev.h b/src/videodev.h
index 41c5f87..77b592e 100644
--- a/src/videodev.h
+++ b/src/videodev.h
@@ -7,7 +7,7 @@ #define __LINUX_VIDEODEV_H
* Used here with the explicit permission of the original author, Alan Cox.
* <alan@lxorguk.ukuu.org.uk>
*/
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/videodev.h,v 1.8 2001/03/03 22:46:31 tsi Exp $ */
#include "Xmd.h"
commit 9c34b95344359a22f1c730165be3af80a804df7e
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 09:23:28 2004 +0000
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
diff --git a/README b/README
index a21e915..64111b5 100644
--- a/README
+++ b/README
@@ -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$
diff --git a/man/v4l.man b/man/v4l.man
index 5337112..1b69c79 100644
--- 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$
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH V4L __drivermansuffix__ __vendorversion__
diff --git a/src/v4l.c b/src/v4l.c
index 30a829c..283fb67 100644
--- a/src/v4l.c
+++ b/src/v4l.c
@@ -2,7 +2,7 @@
* video4linux Xv Driver
* based on Michael Schimek's permedia 2 driver.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c,v 1.34 2003/12/31 06:08:53 dawes Exp $ */
+/* $XFree86$ */
#include "videodev.h"
#include "xf86.h"
diff --git a/src/videodev.h b/src/videodev.h
index 77b592e..41c5f87 100644
--- a/src/videodev.h
+++ b/src/videodev.h
@@ -7,7 +7,7 @@ #define __LINUX_VIDEODEV_H
* Used here with the explicit permission of the original author, Alan Cox.
* <alan@lxorguk.ukuu.org.uk>
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/videodev.h,v 1.8 2001/03/03 22:46:31 tsi Exp $ */
+/* $XFree86$ */
#include "Xmd.h"
commit 871d6d6aeffa34b9a6fe8072f8dba94da9d733a8
Author: Egbert Eich <eich@suse.de>
Date: Thu Jan 29 08:08:41 2004 +0000
Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004
diff --git a/src/v4l.c b/src/v4l.c
index 81ae284..30a829c 100644
--- a/src/v4l.c
+++ b/src/v4l.c
@@ -2,7 +2,7 @@
* video4linux Xv Driver
* based on Michael Schimek's permedia 2 driver.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c,v 1.33 2003/12/05 03:55:32 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c,v 1.34 2003/12/31 06:08:53 dawes Exp $ */
#include "videodev.h"
#include "xf86.h"
@@ -747,17 +747,17 @@ #define BTTV_VERSION _IOR('v' , BASE_VID
continue;
}
- v4l_add_enc(p->enc, p->nenc,"pal", channel.name, 768,576, 1,50);
+ v4l_add_enc(p->enc, p->nenc,"PAL", channel.name, 768,576, 1,50);
p->norm[p->nenc] = VIDEO_MODE_PAL;
p->input[p->nenc] = i;
p->nenc++;
- v4l_add_enc(p->enc,p->nenc,"ntsc", channel.name, 640,480, 1001,60000);
+ v4l_add_enc(p->enc,p->nenc,"NTSC", channel.name, 640,480, 1001,60000);
p->norm[p->nenc] = VIDEO_MODE_NTSC;
p->input[p->nenc] = i;
p->nenc++;
- v4l_add_enc(p->enc,p->nenc,"secam",channel.name, 768,576, 1,50);
+ v4l_add_enc(p->enc,p->nenc,"SECAM",channel.name, 768,576, 1,50);
p->norm[p->nenc] = VIDEO_MODE_SECAM;
p->input[p->nenc] = i;
p->nenc++;
@@ -767,28 +767,28 @@ #define BTTV_VERSION _IOR('v' , BASE_VID
ntsc and secam. But there are a few more norms (pal versions
with a different timings used in south america for example).
The bttv driver can handle these too. */
- if (0 != v4l_add_enc(p->enc,p->nenc,"palnc",channel.name,
+ if (0 != v4l_add_enc(p->enc,p->nenc,"PAL-Nc",channel.name,
640, 576, 1,50))
goto fail;
p->norm[p->nenc] = 3;
p->input[p->nenc] = i;
p->nenc++;
- if (0 != v4l_add_enc(p->enc,p->nenc,"palm",channel.name,
+ if (0 != v4l_add_enc(p->enc,p->nenc,"PAL-M",channel.name,
640, 576, 1,50))
goto fail;
p->norm[p->nenc] = 4;
p->input[p->nenc] = i;
p->nenc++;
- if (0 != v4l_add_enc(p->enc, p->nenc,"paln", channel.name,
+ if (0 != v4l_add_enc(p->enc, p->nenc,"PAL-N", channel.name,
768,576, 1,50))
goto fail;
p->norm[p->nenc] = 5;
p->input[p->nenc] = i;
p->nenc++;
- if (0 != v4l_add_enc(p->enc,p->nenc,"ntscjp", channel.name,
+ if (0 != v4l_add_enc(p->enc,p->nenc,"NTSC-JP", channel.name,
640,480, 1001,60000))
goto fail;
p->norm[p->nenc] = 6;
commit e8bf6a26c81b32da1b9a02dc8a5dc9998b5ce708
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Dec 19 20:55:19 2003 +0000
XFree86 4.3.99.902 (RC 2)
diff --git a/src/v4l.c b/src/v4l.c
index 0532ac0..81ae284 100644
--- a/src/v4l.c
+++ b/src/v4l.c
@@ -2,7 +2,7 @@
* video4linux Xv Driver
* based on Michael Schimek's permedia 2 driver.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c,v 1.32 2003/09/24 02:43:30 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c,v 1.33 2003/12/05 03:55:32 dawes Exp $ */
#include "videodev.h"
#include "xf86.h"
@@ -718,11 +718,11 @@ static void
V4LBuildEncodings(PortPrivPtr p, int fd, int channels)
{
static struct video_channel channel;
- int i,entries,have_bttv;
+ int i,entries,have_bttv,bttv_ver;
#define BTTV_VERSION _IOR('v' , BASE_VIDIOCPRIVATE+6, int)
have_bttv = 0;
- if (-1 != ioctl(fd,BTTV_VERSION,NULL))
+ if (-1 != ioctl(fd,BTTV_VERSION,&bttv_ver))
have_bttv = 1;
entries = (have_bttv ? 7 : 3) * channels;
commit 0fc7fdb71a319c3af5cf33cc46f0ebc0c2648e67
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Tue Nov 25 19:28:43 2003 +0000
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
diff --git a/src/v4l.c b/src/v4l.c
index 156d63c..0532ac0 100644
--- a/src/v4l.c
+++ b/src/v4l.c
@@ -2,7 +2,7 @@
* video4linux Xv Driver
* based on Michael Schimek's permedia 2 driver.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c,v 1.30 2002/05/14 20:19:53 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c,v 1.32 2003/09/24 02:43:30 dawes Exp $ */
#include "videodev.h"
#include "xf86.h"
@@ -13,7 +13,7 @@ #include "xf86PciInfo.h"
#include "xf86fbman.h"
#include "xf86xv.h"
#include "Xv.h"
-#include "miscstruct.h"
+#include "regionstr.h"
#include "dgaproc.h"
#include "xf86str.h"
@@ -220,7 +220,7 @@ static int V4lOpenDevice(PortPrivPtr pPP
if (first) {
first = 0;
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
- "v4l: memPhysBase=%p\n", pScrn->memPhysBase);
+ "v4l: memPhysBase=0x%lx\n", pScrn->memPhysBase);
}
switch (pScrn->bitsPerPixel) {
Reply to: