--- Begin Message ---
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 <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>
-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,
--- End Message ---
--- Begin Message ---
Source: xserver-xorg-video-i810
Source-Version: 2:1.7.4-1
We believe that the bug you reported is fixed in the latest version of
xserver-xorg-video-i810, which is due to be installed in the Debian FTP archive:
xserver-xorg-video-i810_1.7.4-1.diff.gz
to pool/main/x/xserver-xorg-video-i810/xserver-xorg-video-i810_1.7.4-1.diff.gz
xserver-xorg-video-i810_1.7.4-1.dsc
to pool/main/x/xserver-xorg-video-i810/xserver-xorg-video-i810_1.7.4-1.dsc
xserver-xorg-video-i810_1.7.4-1_i386.deb
to pool/main/x/xserver-xorg-video-i810/xserver-xorg-video-i810_1.7.4-1_i386.deb
xserver-xorg-video-i810_1.7.4.orig.tar.gz
to pool/main/x/xserver-xorg-video-i810/xserver-xorg-video-i810_1.7.4.orig.tar.gz
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 383918@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
David Nusinow <dnusinow@debian.org> (supplier of updated xserver-xorg-video-i810 package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.7
Date: Sun, 4 Mar 2007 18:20:38 -0500
Source: xserver-xorg-video-i810
Binary: xserver-xorg-video-i810
Architecture: source i386
Version: 2:1.7.4-1
Distribution: experimental
Urgency: low
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Changed-By: David Nusinow <dnusinow@debian.org>
Description:
xserver-xorg-video-i810 - X.Org X server -- Intel i8xx, i9xx display driver
Closes: 383918 408797
Changes:
xserver-xorg-video-i810 (2:1.7.4-1) experimental; urgency=low
.
[ David Nusinow ]
* New upstream version
* Generate Provides: line automatically
* Bump xserver-xorg-core build-depend to 2:1.2.0-6 to handle this properly
.
[ Julien Cristau ]
* Drop duplicate build dependency on libdrm-dev, so this really
closes: #383918.
* Add support for the armeb and armel architectures, thanks to Riku Voipio
(closes: #408797).
* Drop all our patches, applied upstream.
* debian/rules clean needs to depend on xsfclean.
* Generate the dependency on xserver-xorg-core automatically.
Files:
45143394523c68dc513978e05a261ac2 1283 x11 optional xserver-xorg-video-i810_1.7.4-1.dsc
f5f452b10fdf0c992148ff7d7d879b15 619822 x11 optional xserver-xorg-video-i810_1.7.4.orig.tar.gz
1da80807fdd549c5901b108e693ca45d 117683 x11 optional xserver-xorg-video-i810_1.7.4-1.diff.gz
21141f5b5a2a68717fb491cfbdde42cf 164072 x11 optional xserver-xorg-video-i810_1.7.4-1_i386.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFF61W1yLfpNdY0ad8RAmkMAJ43eKFUNIYm+6dLGE+FQEYtSicd1QCgkdyc
gKCGAqQPUqDh3vI+ckg9HFI=
=54st
-----END PGP SIGNATURE-----
--- End Message ---