X Strike Force XFree86 SVN commit: r1946 - in trunk/debian: . patches
Author: branden
Date: 2004-10-12 11:59:28 -0500 (Tue, 12 Oct 2004)
New Revision: 1946
Modified:
trunk/debian/CHANGESETS
trunk/debian/changelog
trunk/debian/patches/000_stolen_from_HEAD.diff
Log:
Grab from XFree86 CVS (no later than 2003-12-31) several updates to the
Video4Linux (v4l) driver:
+ [#include regionstr.h, not miscstruct.h.] (#A.1859, Alexander Stohr)
[David Dawes]
+ [Update format string when reporting memPhysBase.] (David Dawes)
+ Fix a problem with the v4l driver not seeing all the tv-norms available
under the bttv driver with the Linux 2.6.0-test11 kernel (#5976, Marco
Antonio Alvarez). [David Dawes]
+ Change v4l "norm" names to the bttv versions (#5993, Marco Antonio
Alvarez). [David Dawes]
(Closes: #270496)
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-10-12 16:09:53 UTC (rev 1945)
+++ trunk/debian/CHANGESETS 2004-10-12 16:59:28 UTC (rev 1946)
@@ -122,4 +122,17 @@
that the former can override the latter. See Bug#276143.
1945
+Grab from XFree86 CVS (no later than 2003-12-31) several updates to the
+Video4Linux (v4l) driver:
++ [#include regionstr.h, not miscstruct.h.] (#A.1859, Alexander Stohr)
+ [David Dawes]
++ [Update format string when reporting memPhysBase.] (David Dawes)
++ Fix a problem with the v4l driver not seeing all the tv-norms available
+ under the bttv driver with the Linux 2.6.0-test11 kernel (#5976, Marco
+ Antonio Alvarez). [David Dawes]
++ Change v4l "norm" names to the bttv versions (#5993, Marco Antonio
+ Alvarez). [David Dawes]
+(Closes: #270496)
+ 1946
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-10-12 16:09:53 UTC (rev 1945)
+++ trunk/debian/changelog 2004-10-12 16:59:28 UTC (rev 1946)
@@ -34,6 +34,18 @@
changelog entry for 4.3.0.dfsg.1-7 for more information. Thanks to Adrian
Bunk for this suggestion.
+ * Grab from XFree86 CVS (no later than 2003-12-31) several updates to the
+ Video4Linux (v4l) driver:
+ + [#include regionstr.h, not miscstruct.h.] (#A.1859, Alexander Stohr)
+ [David Dawes]
+ + [Update format string when reporting memPhysBase.] (David Dawes)
+ + Fix a problem with the v4l driver not seeing all the tv-norms available
+ under the bttv driver with the Linux 2.6.0-test11 kernel (#5976, Marco
+ Antonio Alvarez). [David Dawes]
+ + Change v4l "norm" names to the bttv versions (#5993, Marco Antonio
+ Alvarez). [David Dawes]
+ (Closes: #270496)
+
Changes by Denis Barbier and Fabio M. Di Nitto:
* Edit xc/programs/xkbcomp/symbols/pc/Imakefile so that the new pc/us_intl
@@ -104,7 +116,7 @@
+ Set UseBios default to "no" for PROSAVAGE_DDR and PROSAVAGE_DDRK, as
described at <URL: http://www.probo.com/timr/savage40.html >.
- -- Branden Robinson <branden@debian.org> Mon, 11 Oct 2004 15:40:55 -0500
+ -- Branden Robinson <branden@debian.org> Tue, 12 Oct 2004 11:51:07 -0500
xfree86 (4.3.0.dfsg.1-8) unstable; urgency=high
Modified: trunk/debian/patches/000_stolen_from_HEAD.diff
===================================================================
--- trunk/debian/patches/000_stolen_from_HEAD.diff 2004-10-12 16:09:53 UTC (rev 1945)
+++ trunk/debian/patches/000_stolen_from_HEAD.diff 2004-10-12 16:59:28 UTC (rev 1946)
@@ -626,7 +626,29 @@
Add "modifier_map none" syntax to remove modifier bindings from the
specified key. [Ivan Pascal]
+xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c @ 1.31
+[...]
+ 307. A lot of X server prototype cleanups, including fixing an
+ inconsistency between the cfbBitBlt and CopyPlane functions
+ exposed by the prototyping (#A.1859, Alexander Stohr).
+ [David Dawes]
+xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c @ 1.32
+[...]
+ 453. Add gcc format checking for the X server's message and logging
+ functions, and fix lots of associated warnings (David Dawes).
+
+xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c @ 1.33
+ 648. Fix a problem with the v4l driver not seeing all the tv-norms
+ available under the bttv driver with the Linux 2.6.0-test11 kernel
+ (#5976, Marco Antonio Alvarez).
+ [David Dawes]
+
+xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c @ 1.34
+ 719. Change v4l "norm" names to the bttv versions (#5993,
+ Marco Antonio Alvarez).
+ [David Dawes]
+
diff -urN xc.orig/config/imake/imake.c xc/config/imake/imake.c
--- xc.orig/config/imake/imake.c 2002-12-17 09:48:27.000000000 +1100
+++ xc/config/imake/imake.c 2003-04-09 01:58:14.000000000 +1000
@@ -23631,3 +23653,106 @@
#endif
Dst++; Y += 2; V++; U++;
}
+Index: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c
+===================================================================
+RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c,v
+retrieving revision 1.30
+retrieving revision 1.34
+diff -u -r1.30 -r1.34
+--- xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c 14 May 2002 20:19:53 -0000 1.30
++++ xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c 31 Dec 2003 06:08:53 -0000 1.34
+@@ -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.34 2003/12/31 06:08:53 dawes Exp $ */
+
+ #include "videodev.h"
+ #include "xf86.h"
+@@ -13,7 +13,7 @@
+ #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 @@
+ 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 @@
+ 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 @@
+ 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 @@
+ 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;
Reply to: