Package: xserver-xorg-video-i810
Version: 2:1.6.5-1
Severity: important
Tags: patch
Hi,
This package FTBFS on systems that don't have DRM, here is a patch.
Samuel
-- System Information:
Debian Release: testing/unstable
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: hurd-i386 (i686-AT386)
Shell: /bin/sh linked to /bin/bash
Kernel: GNU-Mach 1.3/Hurd-0.3
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
Versions of packages xserver-xorg-video-i810 depends on:
ii libc0.3 2.3.6-18-youpi1 GNU C Library: Shared libraries
ii xserver-xorg-core 1:1.1.1-2 X.Org X server -- core server
xserver-xorg-video-i810 recommends no packages.
-- no debconf information
diff -ur xserver-xorg-video-i810-1.6.5/debian/control xserver-xorg-video-i810-1.6.5-hurd/debian/control
--- xserver-xorg-video-i810-1.6.5/debian/control 2006-08-20 17:28:24.000000000 +0000
+++ xserver-xorg-video-i810-1.6.5-hurd/debian/control 2006-08-20 17:09:48.000000000 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL PROTECTED]>, Fabio M. Di Nitto <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0), pkg-config, xserver-xorg-dev (>= 1.1.1-1), x11proto-gl-dev, x11proto-video-dev, libdrm-dev, libgl1-mesa-dev | libgl-dev, libxvmc-dev (>= 1:1.0.1-1), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-xinerama-dev, libdrm-dev (>> 2.0), x11proto-xf86dri-dev
+Build-Depends: debhelper (>= 4.0.0), pkg-config, xserver-xorg-dev (>= 1.1.1-1), x11proto-gl-dev, x11proto-video-dev, libdrm-dev [!hurd-i386], libgl1-mesa-dev | libgl-dev, libxvmc-dev (>= 1:1.0.1-1), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-xinerama-dev, libdrm-dev (>> 2.0) [!hurd-i386], x11proto-xf86dri-dev
Standards-Version: 3.6.1
Package: xserver-xorg-video-i810
diff -ur xserver-xorg-video-i810-1.6.5/src/brw_structs.h xserver-xorg-video-i810-1.6.5-hurd/src/brw_structs.h
--- xserver-xorg-video-i810-1.6.5/src/brw_structs.h 2006-08-08 22:51:25.000000000 +0000
+++ xserver-xorg-video-i810-1.6.5-hurd/src/brw_structs.h 2006-08-20 17:23:05.000000000 +0000
@@ -28,6 +28,8 @@
#ifndef BRW_STRUCTS_H
#define BRW_STRUCTS_H
+#include <GL/gl.h>
+
/* Command packets:
*/
struct header
diff -ur xserver-xorg-video-i810-1.6.5/src/i810_driver.c xserver-xorg-video-i810-1.6.5-hurd/src/i810_driver.c
--- xserver-xorg-video-i810-1.6.5/src/i810_driver.c 2006-08-10 20:40:39.000000000 +0000
+++ xserver-xorg-video-i810-1.6.5-hurd/src/i810_driver.c 2006-08-20 19:06:38.000000000 +0000
@@ -333,6 +333,8 @@
NULL
};
+#endif /* I830_ONLY */
+
const char *I810shadowSymbols[] = {
"shadowInit",
"shadowSetup",
@@ -340,8 +342,6 @@
NULL
};
-#endif /* I830_ONLY */
-
#ifndef I810_DEBUG
int I810_DEBUG = (0
/* | DEBUG_ALWAYS_SYNC */
@@ -408,9 +408,9 @@
#ifdef XF86DRI
I810drmSymbols,
I810driSymbols,
+#endif
I810shadowSymbols,
I810shadowFBSymbols,
-#endif
I810vbeSymbols, vbeOptionalSymbols,
I810ddcSymbols, I810int10Symbols, NULL);
diff -ur xserver-xorg-video-i810-1.6.5/src/i830_accel.c xserver-xorg-video-i810-1.6.5-hurd/src/i830_accel.c
--- xserver-xorg-video-i810-1.6.5/src/i830_accel.c 2006-08-08 22:51:25.000000000 +0000
+++ xserver-xorg-video-i810-1.6.5-hurd/src/i830_accel.c 2006-08-20 17:17:35.000000000 +0000
@@ -395,6 +395,7 @@
return XAAInit(pScreen, infoPtr);
}
+#ifdef XF86DRI
static unsigned int
CheckTiling(ScrnInfoPtr pScrn)
{
@@ -416,6 +417,9 @@
return tiled;
}
+#else
+#define CheckTiling(pScrn) 0
+#endif
void
I830SetupForSolidFill(ScrnInfoPtr pScrn, int color, int rop,
