Package: xorg-x11
Severity: important
Version: 6.8.2.dfsg.1-5
Tags: patch
This is the build failure:
gcc -m32 -g -O2 -fno-strict-aliasing -ansi -pedantic -Wall
[...]
-I../../../../../../exports/include -D__i386__
-D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE
-D_XOPEN_SOURCE -D_BSD_SOURCE
-D_SVID_SOURCE -D_GNU_SOURCE
-DSHAPE -DXINPUT -DXKB -DLBX -DXAPPGROUP -DXCSECURITY -DTOGCUP
-DXF86BIGFONT -DDPMSExtension -DPIXPRIV -DPANORAMIX -DRENDER
-DRANDR -DXFIXES -DDAMAGE -DCOMPOSITE -DXEVIE -DGCCUSESGAS
-DAVOID_GLYPHBLT -DPIXPRIV -DSINGLEDEPTH
-DXFreeXDGA -DXvExtension -DXFree86LOADER
-DXFree86Server -DXF86VIDMODE
-DXvMCExtension -DSMART_SCHEDULE
-DBUILDDEBUG -DXResExtension
-DX_BYTE_ORDER=X_LITTLE_ENDIAN
-DXORG_VERSION_CURRENT="(((6) * 10000000) + ((8) * 100000) + ((2) *
1000) + 0)" -DNDEBUG -DFUNCPROTO=15 -DNARROWPROTO -DIN_MODULE
-DXFree86Module -DX_NEED_XVPRIV_H -DX_USE_LINEARFB -DX_USE_REGION_NULL
-DX_NEED_I2CSTART -c via_driver.c
In file included from via_common.h:4,
from via_priv.h:4,
from via_driver.h:65,
from via_driver.c:42:
../../../../../../programs/Xserver/hw/xfree86/os-support/xf86drm.h:39:17:
error: drm.h: No such file or directory
This has been filed and fixed upstream as #804. Resynced patch
attached.
Michael
--
Michael Banck
Debian Developer
[EMAIL PROTECTED]
http://www.advogato.org/person/mbanck/diary.html
--- xc/programs/Xserver/hw/xfree86/drivers/via/via_memory.c.orig
2005-08-27 01:52:11.000000000 +0200
+++ xc/programs/Xserver/hw/xfree86/drivers/via/via_memory.c 2005-08-27
01:54:32.000000000 +0200
@@ -26,14 +26,18 @@
#include "xf86fbman.h"
#include "via.h"
+#ifdef XF86DRI
#include "xf86drm.h"
+#endif
#include "via_overlay.h"
#include "via_driver.h"
#include "via_regrec.h"
#include "via_priv.h"
#include "via_swov.h"
+#ifdef XF86DRI
#include "via_common.h"
+#endif
/*
--- xc/programs/Xserver/hw/xfree86/drivers/via/via_priv.h.orig 2005-08-27
01:52:11.000000000 +0200
+++ xc/programs/Xserver/hw/xfree86/drivers/via/via_priv.h 2005-08-27
01:52:47.000000000 +0200
@@ -1,7 +1,9 @@
#ifndef _VIA_PRIV_H_
#define _VIA_PRIV_H_ 1
+#ifdef XF86DRI
#include "via_common.h"
+#endif
/*
* Alignment macro functions
@@ -128,8 +130,10 @@
typedef struct {
unsigned long base; /* Offset into fb */
int pool; /* Pool we drew from */
+#ifdef XF86DRI
int drm_fd; /* Fd in DRM mode */
drmViaMem drm; /* DRM management object */
+#endif
int slot; /* Pool 3 slot */
void *pVia; /* VIA driver pointer */
FBLinearPtr linear; /* X linear pool info ptr */
--- xc/programs/Xserver/hw/xfree86/drivers/via/via_swov.c.orig 2005-08-27
01:52:11.000000000 +0200
+++ xc/programs/Xserver/hw/xfree86/drivers/via/via_swov.c 2005-08-27
01:53:55.000000000 +0200
@@ -29,14 +29,18 @@
#include "xf86fbman.h"
#include "via.h"
+#ifdef XF86DRI
#include "xf86drm.h"
+#endif
#include "via_overlay.h"
#include "via_driver.h"
#include "via_regrec.h"
#include "via_priv.h"
#include "via_swov.h"
+#ifdef XF86DRI
#include "via_common.h"
+#endif
#include "via_vgahw.h"
#include "via_id.h"
