rpms/xorg-x11-drv-i810/devel more-libcunwrap.patch, NONE, 1.1 xorg-x11-drv-i810.spec, 1.11, 1.12

[fedora-cvs-commits at redhat.com]

Author: krh

Update of /cvs/dist/rpms/xorg-x11-drv-i810/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6584

Modified Files:
	xorg-x11-drv-i810.spec 
Added Files:
	more-libcunwrap.patch 
Log Message:
* Tue Apr  4 2006 Kristian Høgsberg <krh at redhat.com> 1.4.1.3-4.cvs20060322.1
- Add patch to add missing #include's, specifically assert.h.


more-libcunwrap.patch:
 i810_dri.c    |    1 +
 i810_driver.c |    2 ++
 i830_dri.c    |    1 +
 i830_driver.c |    3 +++
 4 files changed, 7 insertions(+)

--- NEW FILE more-libcunwrap.patch ---
--- xf86-video-i810-cvs20060322/src/i830_driver.c.orig	2006-04-04 10:00:12.000000000 -0400
+++ xf86-video-i810-cvs20060322/src/i830_driver.c	2006-04-04 10:00:34.000000000 -0400
@@ -187,6 +187,9 @@
 #include "dri.h"
 #endif
 
+#include <unistd.h> /* for sleep variants */
+#include <stdlib.h> /* for atoi */
+
 #define BIT(x) (1 << (x))
 #define MAX(a,b) ((a) > (b) ? (a) : (b))
 #define NB_OF(x) (sizeof (x) / sizeof (*x))
--- xf86-video-i810-cvs20060322/src/i810_driver.c.orig	2006-04-04 09:57:28.000000000 -0400
+++ xf86-video-i810-cvs20060322/src/i810_driver.c	2006-04-04 09:58:57.000000000 -0400
@@ -90,6 +90,8 @@
 #include "dri.h"
 #endif
 
+#include <unistd.h> /* needed for sleep variants */
+
 /* Required Functions: */
 
 static void I810Identify(int flags);
--- xf86-video-i810-cvs20060322/src/i830_dri.c.orig	2006-04-04 10:01:53.000000000 -0400
+++ xf86-video-i810-cvs20060322/src/i830_dri.c	2006-04-04 10:01:57.000000000 -0400
@@ -64,6 +64,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <assert.h>
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
--- xf86-video-i810-cvs20060322/src/i810_dri.c.orig	2006-04-04 10:01:28.000000000 -0400
+++ xf86-video-i810-cvs20060322/src/i810_dri.c	2006-04-04 10:01:29.000000000 -0400
@@ -19,6 +19,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
+#include <assert.h>
 
 #include "xf86.h"
 #include "xf86_OSproc.h"


Index: xorg-x11-drv-i810.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/xorg-x11-drv-i810.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-i810.spec	23 Mar 2006 00:23:58 -0000	1.11
+++ xorg-x11-drv-i810.spec	4 Apr 2006 18:42:34 -0000	1.12
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 i810 video driver
 Name:      xorg-x11-drv-i810
 Version:   1.4.1.3
-Release:   4.%{cvsdate}
+Release:   4.%{cvsdate}.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}.tar.bz2
 Source1:   i810.xinf
@@ -23,6 +23,8 @@
 
 Requires:  xorg-x11-server-Xorg
 
+Patch0: more-libcunwrap.patch
+
 %description 
 X.Org X11 i810 video driver.
 
@@ -37,6 +39,8 @@
 %prep
 %setup -q -n %{tarball}
 
+%patch0 -p1 -b .more-libcunwrap
+
 %build
 %configure --disable-static
 make
@@ -74,6 +78,9 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* Tue Apr  4 2006 Kristian Høgsberg <krh at redhat.com> 1.4.1.3-4.cvs20060322.1
+- Add patch to add missing #include's, specifically assert.h.
+
 * Wed Mar 22 2006 Kristian Høgsberg <krh at redhat.com> 1.4.1.3-4.cvs20060322
 - Update to CVS snapshot of 20060322.