Package: xorg-x11
Version: 6.8.2.dfsg.1-5
Severity: important
Tags: patch
Hi,
another build failure due to improper handling of DRI, while linking the
static debug Xorg:
/build/mbanck/xorg-x11-6.8.2.dfsg.1/build-tree/xc-xserver-xorg-dbg/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c:3323:
undefined reference to `I810shadowFBSymbols'
collect2: ld returned 1 exit status
make[4]: *** [Xorg] Error 1
This had been filed as #3850 upstream and since fixed in CVS. The patch
from CVS is attached (named #808 cause I got some other patches queued
up I need to test some more, feel free to renumber)
cheers,
Michael
2005-07-26 Alan Hourihane <[EMAIL PROTECTED]>
* programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c
Bug #3850: <https://bugs.freedesktop.org/show_bug.cgi?id=3850>
Fix non-DRI builds.
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c,v
rcsdiff: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c,v:
warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c 2005/07/11
02:29:51 1.20
+++ xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c 2005/07/26
08:07:37 1.21
@@ -272,6 +272,11 @@
NULL
};
+const char *I810shadowFBSymbols[] = {
+ "ShadowFBInit",
+ NULL
+};
+
#ifdef XF86DRI
const char *I810drmSymbols[] = {
"drmAddBufs",
@@ -313,13 +318,6 @@
NULL
};
-#ifdef XF86DRI
-
-const char *I810shadowFBSymbols[] = {
- "ShadowFBInit",
- NULL
-};
-
const char *I810shadowSymbols[] = {
"shadowInit",
"shadowSetup",
@@ -327,9 +325,7 @@
NULL
};
-#endif
-
-#endif /* I830_ONLY */
+#endif
#ifndef I810_DEBUG
int I810_DEBUG = (0
