xserver-xorg: apply drmfix.patch to get rid of /usr/include/drm

diff --git a/packages/xorg-xserver/xserver-xorg-1.3.0.0/.mtn2git_empty b/packages/xorg-xserver/xserver-xorg-1.3.0.0/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch b/packages/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch
new file mode 100644 (file)
index 0000000..9692448
--- /dev/null
+++ b/packages/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch
@@ -0,0 +1,11 @@
+--- xorg-server-1.3.0.0.orig/hw/xfree86/os-support/linux/Makefile.am
++++ xorg-server-1.3.0.0/hw/xfree86/os-support/linux/Makefile.am
+@@ -38,7 +38,7 @@
+ 
+ AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(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_SOURCES = \

diff --git a/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb b/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb
index 78fdc01..b04ef19 100644 (file)
--- a/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb
+++ b/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb
@@ -2,6 +2,9 @@ MESA_VER = "6.5.2"
 
 require xorg-xserver-common.inc
 PE = "1"
+PR = "r1"
+
+SRC_URI += "file://drmfix.patch;patch=1"
 
 EXTRA_OECONF += " ac_cv_file__usr_share_X11_sgml_defs_ent=no "