X Strike Force XFree86 SVN commit: r1504 - in trunk/debian: . patches
Author: branden
Date: 2004-06-02 23:15:26 -0500 (Wed, 02 Jun 2004)
New Revision: 1504
Modified:
trunk/debian/CHANGESETS
trunk/debian/TODO
trunk/debian/changelog
trunk/debian/patches/000_stolen_from_HEAD.diff
Log:
Grab missing part of updated XVideo (Xv) server-side implementation from
XFree86 CVS as of 2003-04-30. Update module loader to export the new
symbols xf86XVCopyYUV12ToPacked and xf86XVCopyPacked to drivers. Thanks
to Michel D?\195?\164nzer for diagnosing the problem. (Closes: #251307)
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-06-02 08:45:31 UTC (rev 1503)
+++ trunk/debian/CHANGESETS 2004-06-03 04:15:26 UTC (rev 1504)
@@ -39,4 +39,10 @@
Jacobowitz!). (Closes: #223089)
1503
+Grab missing part of updated XVideo (Xv) server-side implementation from
+XFree86 CVS as of 2003-04-30. Update module loader to export the new
+symbols xf86XVCopyYUV12ToPacked and xf86XVCopyPacked to drivers. Thanks
+to Michel Dänzer for diagnosing the problem. (Closes: #251307)
+ 1504
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2004-06-02 08:45:31 UTC (rev 1503)
+++ trunk/debian/TODO 2004-06-03 04:15:26 UTC (rev 1504)
@@ -17,10 +17,6 @@
4.3.0.dfsg.1-5
--------------
-* #251307: xserver-xfree86: [ati/atimisc] XVideo apps crash X server; complaints
- of unresolved symbol xf86XVCopyYUV12ToPacked on 3D Rage IIC AGP rev 122
- Michel Dänzer reports that this is due to failure to export that symbol
- via SYMFUNC() in xc/programs/Xserver/hw/xfree86/loader/xf86sym.c.
* #225526: Fix PCI domains / Mach64 cards on SPARCs running Linux 2.6. Apply
patch by Daniel Seyffer and Ciaran McCreesh of the Gentoo SPARC team.
* Apply "other half" of SPARC 64-bit avoidance patch to Mesa; see #241331.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-06-02 08:45:31 UTC (rev 1503)
+++ trunk/debian/changelog 2004-06-03 04:15:26 UTC (rev 1504)
@@ -50,8 +50,13 @@
retrying CCE idle commands until the timeout is reached (thanks, Daniel
Jacobowitz!). (Closes: #223089)
- -- Branden Robinson <branden@debian.org> Wed, 2 Jun 2004 03:41:18 -0500
+ * Grab missing part of updated XVideo (Xv) server-side implementation from
+ XFree86 CVS as of 2003-04-30. Update module loader to export the new
+ symbols xf86XVCopyYUV12ToPacked and xf86XVCopyPacked to drivers. Thanks
+ to Michel Dänzer for diagnosing the problem. (Closes: #251307)
+ -- Branden Robinson <branden@debian.org> Wed, 2 Jun 2004 03:47:39 -0500
+
xfree86 (4.3.0.dfsg.1-4) unstable; urgency=medium
* The "thanks for the 'testing'" release.
Modified: trunk/debian/patches/000_stolen_from_HEAD.diff
===================================================================
--- trunk/debian/patches/000_stolen_from_HEAD.diff 2004-06-02 08:45:31 UTC (rev 1503)
+++ trunk/debian/patches/000_stolen_from_HEAD.diff 2004-06-03 04:15:26 UTC (rev 1504)
@@ -109,6 +109,7 @@
xc/programs/Xserver/hw/xfree86/common/xf86xv.h @ 1.24
xc/programs/Xserver/hw/xfree86/common/xf86xvmc.c @ 1.4
xc/programs/Xserver/hw/xfree86/common/xf86xvpriv.h @ 1.1
+xc/programs/Xserver/hw/xfree86/loader/xf86sym.c @ 1.232
129. Initialise v4l's XVideo adaptors last (Marc La France).
128. Reduce cut&paste effects by adding more helpers to Xv
(derived from #5645, Bj?rn Augustsson, Marc La France).
@@ -3658,6 +3659,23 @@
}
+#endif /* _XF86_FOURCC_H_ */
+Index: xc/programs/Xserver/hw/xfree86/loader/xf86sym.c
+===================================================================
+RCS file: /cvs/xc/programs/Xserver/hw/xfree86/loader/xf86sym.c,v
+retrieving revision 1.231
+retrieving revision 1.232
+diff -u -r1.231 -r1.232
+--- xc/programs/Xserver/hw/xfree86/loader/xf86sym.c 3 Apr 2003 16:16:02 -0000 1.231
++++ xc/programs/Xserver/hw/xfree86/loader/xf86sym.c 23 Apr 2003 21:51:52 -0000 1.232
+@@ -569,6 +569,8 @@
+ SYMFUNC(xf86XVFreeVideoAdaptorRec)
+ SYMFUNC(xf86XVFillKeyHelper)
+ SYMFUNC(xf86XVClipVideoHelper)
++ SYMFUNC(xf86XVCopyYUV12ToPacked)
++ SYMFUNC(xf86XVCopyPacked)
+
+ /* xf86xvmc.c */
+ SYMFUNC(xf86XvMCScreenInit)
--- xc/programs/xdm/access.c~ 2004-05-07 15:10:12.000000000 -0500
+++ xc/programs/xdm/access.c 2004-05-07 15:10:18.000000000 -0500
@@ -290,7 +290,7 @@
Reply to: