X Strike Force X.Org X11 SVN commit: r613 - in trunk/debian: . patches patches/hurd
Author: dnusinow
Date: 2005-09-22 17:31:09 -0500 (Thu, 22 Sep 2005)
New Revision: 613
Added:
trunk/debian/patches/hurd/805_via_nodri.patch
Modified:
trunk/debian/changelog
trunk/debian/patches/series
Log:
* Added hurd/805_via_nodri.patch. Thanks Michael Banck. (closes: #325243)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-09-22 22:07:22 UTC (rev 612)
+++ trunk/debian/changelog 2005-09-22 22:31:09 UTC (rev 613)
@@ -14,11 +14,12 @@
(closes: #328878).
[ David Nusinow ]
- * Added various hurd-i386 patches. Thanks, Michael Banck.
+ * Added various hurd-i386 patches. Thanks, Michael Banck.
+ hurd/806_gnuLib_update.diff (closes: #295472)
+ hurd/804_maxhostnamelen.diff (closes: #325204)
+ + hurd/805_via_nodri.patch (closes: #325243)
- -- David Nusinow <dnusinow@debian.org> Thu, 22 Sep 2005 18:05:48 -0400
+ -- David Nusinow <dnusinow@debian.org> Thu, 22 Sep 2005 18:23:32 -0400
xorg-x11 (6.8.2.dfsg.1-7) unstable; urgency=high
Added: trunk/debian/patches/hurd/805_via_nodri.patch
===================================================================
--- trunk/debian/patches/hurd/805_via_nodri.patch 2005-09-22 22:07:22 UTC (rev 612)
+++ trunk/debian/patches/hurd/805_via_nodri.patch 2005-09-22 22:31:09 UTC (rev 613)
@@ -0,0 +1,65 @@
+--- xc/programs/Xserver/hw/xfree86/drivers/via/via_memory.c.orig 2005-08-27 01:52:11.000000000 +0200
++++ xc/programs/Xserver/hw/xfree86/drivers/via/via_memory.c 2005-08-27 01:54:32.000000000 +0200
+@@ -26,14 +26,18 @@
+ #include "xf86fbman.h"
+
+ #include "via.h"
++#ifdef XF86DRI
+ #include "xf86drm.h"
++#endif
+
+ #include "via_overlay.h"
+ #include "via_driver.h"
+ #include "via_regrec.h"
+ #include "via_priv.h"
+ #include "via_swov.h"
++#ifdef XF86DRI
+ #include "via_common.h"
++#endif
+
+
+ /*
+--- xc/programs/Xserver/hw/xfree86/drivers/via/via_priv.h.orig 2005-08-27 01:52:11.000000000 +0200
++++ xc/programs/Xserver/hw/xfree86/drivers/via/via_priv.h 2005-08-27 01:52:47.000000000 +0200
+@@ -1,7 +1,9 @@
+ #ifndef _VIA_PRIV_H_
+ #define _VIA_PRIV_H_ 1
+
++#ifdef XF86DRI
+ #include "via_common.h"
++#endif
+
+ /*
+ * Alignment macro functions
+@@ -128,8 +130,10 @@
+ typedef struct {
+ unsigned long base; /* Offset into fb */
+ int pool; /* Pool we drew from */
++#ifdef XF86DRI
+ int drm_fd; /* Fd in DRM mode */
+ drmViaMem drm; /* DRM management object */
++#endif
+ int slot; /* Pool 3 slot */
+ void *pVia; /* VIA driver pointer */
+ FBLinearPtr linear; /* X linear pool info ptr */
+--- xc/programs/Xserver/hw/xfree86/drivers/via/via_swov.c.orig 2005-08-27 01:52:11.000000000 +0200
++++ xc/programs/Xserver/hw/xfree86/drivers/via/via_swov.c 2005-08-27 01:53:55.000000000 +0200
+@@ -29,14 +29,18 @@
+ #include "xf86fbman.h"
+
+ #include "via.h"
++#ifdef XF86DRI
+ #include "xf86drm.h"
++#endif
+
+ #include "via_overlay.h"
+ #include "via_driver.h"
+ #include "via_regrec.h"
+ #include "via_priv.h"
+ #include "via_swov.h"
++#ifdef XF86DRI
+ #include "via_common.h"
++#endif
+ #include "via_vgahw.h"
+ #include "via_id.h"
+
Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series 2005-09-22 22:07:22 UTC (rev 612)
+++ trunk/debian/patches/series 2005-09-22 22:31:09 UTC (rev 613)
@@ -138,6 +138,7 @@
hurd/800_gnu_config.diff -p0
hurd/803_gnu_xterm_openpty.diff -p0
hurd/804_maxhostnamelen.diff -p0
+hurd/805_via_nodri.patch -p0
hurd/806_gnuLib_update.diff -p0
netbsd/840_netbsd_bsdLib.rules_fix.diff -p0
netbsd/841_netbsd_imake.c_fixes.diff -p0
Reply to: