X Strike Force X.Org X11 SVN commit: r614 - in trunk/debian: . patches patches/hurd
Author: dnusinow
Date: 2005-09-22 17:36:34 -0500 (Thu, 22 Sep 2005)
New Revision: 614
Added:
trunk/debian/patches/hurd/808_i810_nodri.diff
Modified:
trunk/debian/changelog
trunk/debian/patches/series
Log:
* Added hurd/808_i810_nodri.diff. Thanks Michael Banck. (closes: #325243)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-09-22 22:31:09 UTC (rev 613)
+++ trunk/debian/changelog 2005-09-22 22:36:34 UTC (rev 614)
@@ -18,8 +18,9 @@
+ hurd/806_gnuLib_update.diff (closes: #295472)
+ hurd/804_maxhostnamelen.diff (closes: #325204)
+ hurd/805_via_nodri.patch (closes: #325243)
+ + hurd//808_i810_nodri.diff (closes: #325882)
- -- David Nusinow <dnusinow@debian.org> Thu, 22 Sep 2005 18:23:32 -0400
+ -- David Nusinow <dnusinow@debian.org> Thu, 22 Sep 2005 18:35:10 -0400
xorg-x11 (6.8.2.dfsg.1-7) unstable; urgency=high
Added: trunk/debian/patches/hurd/808_i810_nodri.diff
===================================================================
--- trunk/debian/patches/hurd/808_i810_nodri.diff 2005-09-22 22:31:09 UTC (rev 613)
+++ trunk/debian/patches/hurd/808_i810_nodri.diff 2005-09-22 22:36:34 UTC (rev 614)
@@ -0,0 +1,51 @@
+2005-07-26 Alan Hourihane <alanh@fairlite.demon.co.uk>
+
+ * programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c
+ Bug #3850: <https://bugs.freedesktop.org/show_bug.cgi?id=3850>
+ Fix non-DRI builds.
+
+===================================================================
+RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c,v
+rcsdiff: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c,v: warning: Unknown phrases like `commitid ...;' are present.
+retrieving revision 1.20
+retrieving revision 1.21
+diff -u -r1.20 -r1.21
+--- xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c 2005/07/11 02:29:51 1.20
++++ xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c 2005/07/26 08:07:37 1.21
+@@ -272,6 +272,11 @@
+ NULL
+ };
+
++const char *I810shadowFBSymbols[] = {
++ "ShadowFBInit",
++ NULL
++};
++
+ #ifdef XF86DRI
+ const char *I810drmSymbols[] = {
+ "drmAddBufs",
+@@ -313,13 +318,6 @@
+ NULL
+ };
+
+-#ifdef XF86DRI
+-
+-const char *I810shadowFBSymbols[] = {
+- "ShadowFBInit",
+- NULL
+-};
+-
+ const char *I810shadowSymbols[] = {
+ "shadowInit",
+ "shadowSetup",
+@@ -327,9 +325,7 @@
+ NULL
+ };
+
+-#endif
+-
+-#endif /* I830_ONLY */
++#endif
+
+ #ifndef I810_DEBUG
+ int I810_DEBUG = (0
Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series 2005-09-22 22:31:09 UTC (rev 613)
+++ trunk/debian/patches/series 2005-09-22 22:36:34 UTC (rev 614)
@@ -140,6 +140,7 @@
hurd/804_maxhostnamelen.diff -p0
hurd/805_via_nodri.patch -p0
hurd/806_gnuLib_update.diff -p0
+hurd/808_i810_nodri.diff -p0
netbsd/840_netbsd_bsdLib.rules_fix.diff -p0
netbsd/841_netbsd_imake.c_fixes.diff -p0
netbsd/842_netbsd_NetBSD.cf_fixes.diff -p0
Reply to: