--- /dev/null
+Index: xorg-server-1.4/xorg-server.pc.in
+===================================================================
+--- xorg-server-1.4.orig/xorg-server.pc.in 2008-02-29 12:29:02.000000000 +0000
++++ xorg-server-1.4/xorg-server.pc.in 2008-02-29 12:27:36.000000000 +0000
+@@ -7,6 +7,7 @@
+
+ Name: xorg-server
+ Description: Modular X.Org X Server
++Requires: pixman-1
+ Version: @PACKAGE_VERSION@
+-Cflags: -I${sdkdir} @PIXMAN_CFLAGS@
++Cflags: -I${sdkdir}
+ Libs: -L${libdir}
+++ /dev/null
-Index: xorg-server-1.4/xorg-server.pc.in
-===================================================================
---- xorg-server-1.4.orig/xorg-server.pc.in 2008-02-29 12:29:02.000000000 +0000
-+++ xorg-server-1.4/xorg-server.pc.in 2008-02-29 12:27:36.000000000 +0000
-@@ -7,6 +7,7 @@
-
- Name: xorg-server
- Description: Modular X.Org X Server
-+Requires: pixman
- Version: @PACKAGE_VERSION@
--Cflags: -I${sdkdir} @PIXMAN_CFLAGS@
-+Cflags: -I${sdkdir}
- Libs: -L${libdir}
--- /dev/null
+Index: xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am
+===================================================================
+--- xorg-server-1.4.orig/hw/xfree86/os-support/linux/Makefile.am 2007-08-23 21:04:53.000000000 +0200
++++ xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am 2008-03-13 18:27:23.000000000 +0100
+@@ -41,7 +41,7 @@
+
+ AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES)
+
+-INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack
++INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS)
+
+ # FIXME: These need to be added to the build
+ LNX_EXTRA_SRCS = \
--- /dev/null
+require xorg-xserver-common.inc
+
+DESCRIPTION = "the X.Org X server"
+DEPENDS += "pixman"
+PE = "1"
+
+SRC_URI += "file://drmfix.patch;patch=1 \
+ file://pkgconfig_fix.patch;patch=1"
+
+MESA_VER = "7.0.2"
+
+EXTRA_OECONF += " ac_cv_file__usr_share_X11_sgml_defs_ent=no "
+
+export LDFLAGS += " -ldl "