xserver-xorg-video-v4l: Changes to 'upstream-unstable'
.cvsignore | 19 -------------------
.gitignore | 20 ++++++++++++++++++++
configure.ac | 2 +-
man/.cvsignore | 2 --
man/.gitignore | 2 ++
man/Makefile.am | 1 -
man/v4l.man | 2 +-
src/.cvsignore | 6 ------
src/.gitignore | 6 ++++++
src/v4l.c | 8 +++++---
src/videodev.h | 1 -
11 files changed, 35 insertions(+), 34 deletions(-)
New commits:
commit 509d2914791f19aed96707cd4d7c64c2c52a2e33
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 19 16:43:42 2008 -0400
v4l 0.2.0
diff --git a/configure.ac b/configure.ac
index e9a4ebb..d9ac542 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-v4l],
- 0.1.1,
+ 0.2.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-v4l)
commit b0dad860b9bbe5db7ae7cf5ef1a8eacb3cb5db05
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 19 16:42:18 2008 -0400
Fix ioctl() outparameter on LP64 systems.
diff --git a/src/v4l.c b/src/v4l.c
index c7b3d38..b827f80 100644
--- a/src/v4l.c
+++ b/src/v4l.c
@@ -592,7 +592,8 @@ V4lSetPortAttribute(ScrnInfoPtr pScrn,
if (-1 == ioctl(V4L_FD,VIDIOCSAUDIO,&pPPriv->audio))
perror("ioctl VIDIOCSAUDIO");
} else if (attribute == xvFreq) {
- if (-1 == ioctl(V4L_FD,VIDIOCSFREQ,&value))
+ unsigned long freq = value;
+ if (-1 == ioctl(V4L_FD,VIDIOCSFREQ,&freq))
perror("ioctl VIDIOCSFREQ");
} else if (0 != pPPriv->yuv_format &&
pPPriv->myfmt->setAttribute) {
@@ -644,7 +645,9 @@ V4lGetPortAttribute(ScrnInfoPtr pScrn,
ret = BadValue;
}
} else if (attribute == xvFreq) {
- ioctl(V4L_FD,VIDIOCGFREQ,value);
+ unsigned long freq;
+ ioctl(V4L_FD,VIDIOCGFREQ,&freq);
+ *value = freq;
} else if (0 != pPPriv->yuv_format &&
pPPriv->myfmt->getAttribute) {
/* not mine -> pass to yuv scaler driver */
commit edfeb249a80e52fb67c075e1f5e07d420cccb2b5
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 19 16:14:52 2008 -0400
Death to RCS tags.
diff --git a/src/v4l.c b/src/v4l.c
index 86c26e2..c7b3d38 100644
--- a/src/v4l.c
+++ b/src/v4l.c
@@ -2,7 +2,6 @@
* 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 $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff --git a/src/videodev.h b/src/videodev.h
index 1fed203..3c9a7d8 100644
--- a/src/videodev.h
+++ b/src/videodev.h
@@ -7,7 +7,6 @@
* 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 $ */
#include <X11/Xmd.h>
commit eb742cfb9e0db0962e9e0380b57418cff2059110
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Mar 9 00:03:41 2008 +0100
Makefile.am: nuke RCS Id
diff --git a/man/Makefile.am b/man/Makefile.am
index bf7ec17..f0eb29b 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,4 +1,3 @@
-# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
commit a2cddcf03437f485fa91ee081bf1e0c2dccf86fe
Author: Fabrice Lorrain <Fabrice.Lorrain@free.fr>
Date: Sat Feb 16 18:07:48 2008 +0100
Fix typo in the manpage.
(Debian bug #466098)
diff --git a/man/v4l.man b/man/v4l.man
index f59e524..7d35b86 100644
--- a/man/v4l.man
+++ b/man/v4l.man
@@ -18,7 +18,7 @@ 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
+Note that the extmod module is also required for the Xvideo
support (and lots of other extensions too).
.SH SUPPORTED HARDWARE
The
commit 6260e7a8166cefb57c85d3e6aa3ac9f421e2a8b9
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Sep 3 05:52:48 2007 -0400
Add *~ to .gitignore to skip patch/emacs droppings
diff --git a/.gitignore b/.gitignore
index fb1befd..2df4a8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ libtool
ltmain.sh
missing
stamp-h1
+*~
commit 68ef5a3537dbb78644969e08eab09cfb29c32239
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Aug 23 19:26:00 2007 -0400
Rename .cvsignore to .gitignore
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index fb1befd..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,19 +0,0 @@
-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/.gitignore b/.gitignore
new file mode 100644
index 0000000..fb1befd
--- /dev/null
+++ b/.gitignore
@@ -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
deleted file mode 100644
index 282522d..0000000
--- a/man/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/man/.gitignore b/man/.gitignore
new file mode 100644
index 0000000..282522d
--- /dev/null
+++ b/man/.gitignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/src/.cvsignore b/src/.cvsignore
deleted file mode 100644
index 9730646..0000000
--- a/src/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
diff --git a/src/.gitignore b/src/.gitignore
new file mode 100644
index 0000000..9730646
--- /dev/null
+++ b/src/.gitignore
@@ -0,0 +1,6 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.la
+*.lo
Reply to: