[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force X.Org X11 SVN commit: r3562 - in trunk/driver/xserver-xorg-video-via/debian: . patches



Author: dnusinow
Date: 2006-09-30 12:05:49 -0400 (Sat, 30 Sep 2006)
New Revision: 3562

Added:
   trunk/driver/xserver-xorg-video-via/debian/patches/
   trunk/driver/xserver-xorg-video-via/debian/patches/01_missing_assert.diff
   trunk/driver/xserver-xorg-video-via/debian/patches/series
Modified:
   trunk/driver/xserver-xorg-video-via/debian/changelog
   trunk/driver/xserver-xorg-video-via/debian/control
   trunk/driver/xserver-xorg-video-via/debian/rules
Log:
* Add 01_missing_assert.diff to add missing include to via_dri.c. Thanks 
  Starling. Closes: #389335

Modified: trunk/driver/xserver-xorg-video-via/debian/changelog
===================================================================
--- trunk/driver/xserver-xorg-video-via/debian/changelog	2006-09-30 12:59:20 UTC (rev 3561)
+++ trunk/driver/xserver-xorg-video-via/debian/changelog	2006-09-30 16:05:49 UTC (rev 3562)
@@ -1,3 +1,10 @@
+xserver-xorg-video-via (1:0.2.1-5) unstable; urgency=low
+
+  * Add 01_missing_assert.diff to add missing include to via_dri.c. Thanks 
+    Starling. Closes: #389335
+
+ -- David Nusinow <dnusinow@debian.org>  Sat, 30 Sep 2006 12:05:15 -0400
+
 xserver-xorg-video-via (1:0.2.1-4) unstable; urgency=low
 
   * Don't install the XvMC stuff on anything but i386 and amd64, since that's

Modified: trunk/driver/xserver-xorg-video-via/debian/control
===================================================================
--- trunk/driver/xserver-xorg-video-via/debian/control	2006-09-30 12:59:20 UTC (rev 3561)
+++ trunk/driver/xserver-xorg-video-via/debian/control	2006-09-30 16:05:49 UTC (rev 3562)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.1.1), libxvmc-dev, x11proto-xf86dri-dev, libdrm-dev, x11proto-gl-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, libdrm-dev (>> 2.0), libgl1-mesa-dev | libgl1-dev
+Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.1.1), libxvmc-dev, x11proto-xf86dri-dev, libdrm-dev, x11proto-gl-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, libdrm-dev (>> 2.0), libgl1-mesa-dev | libgl1-dev, quilt
 Standards-Version: 3.7.2.0
 
 Package: xserver-xorg-video-via

Added: trunk/driver/xserver-xorg-video-via/debian/patches/01_missing_assert.diff
===================================================================
--- trunk/driver/xserver-xorg-video-via/debian/patches/01_missing_assert.diff	                        (rev 0)
+++ trunk/driver/xserver-xorg-video-via/debian/patches/01_missing_assert.diff	2006-09-30 16:05:49 UTC (rev 3562)
@@ -0,0 +1,13 @@
+Index: xserver-xorg-video-via/src/via_dri.c
+===================================================================
+--- xserver-xorg-video-via.orig/src/via_dri.c	2006-09-30 12:04:00.000000000 -0400
++++ xserver-xorg-video-via/src/via_dri.c	2006-09-30 12:04:19.000000000 -0400
+@@ -44,6 +44,8 @@
+ #include "via_id.h"
+ #include "xf86drm.h"
+ 
++#include <assert.h>
++
+ #define VIDEO	0 
+ #define AGP		1
+ #define AGP_PAGE_SIZE 4096

Added: trunk/driver/xserver-xorg-video-via/debian/patches/series
===================================================================
--- trunk/driver/xserver-xorg-video-via/debian/patches/series	                        (rev 0)
+++ trunk/driver/xserver-xorg-video-via/debian/patches/series	2006-09-30 16:05:49 UTC (rev 3562)
@@ -0,0 +1 @@
+01_missing_assert.diff

Modified: trunk/driver/xserver-xorg-video-via/debian/rules
===================================================================
--- trunk/driver/xserver-xorg-video-via/debian/rules	2006-09-30 12:59:20 UTC (rev 3561)
+++ trunk/driver/xserver-xorg-video-via/debian/rules	2006-09-30 16:05:49 UTC (rev 3562)
@@ -31,7 +31,7 @@
 # kbd_drv.a isn't phenomenally useful; kbd_drv.so more so
 confflags += --disable-static
 
-build: build-stamp
+build: patch build-stamp
 build-stamp:
 	dh_testdir
 
@@ -44,7 +44,7 @@
 
 	touch build-stamp
 
-clean:
+clean: xsfclean
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp



Reply to: