[oe-commits] org.oe.dev xserver-xorg: apply drmfix.patch to get rid of /usr/include/drm

[hrw commit]

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

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 6ffb91c6ed7cb12ad15b404b2661660cf1988445
ViewMTN: http://monotone.openembedded.org/revision.psp?id=6ffb91c6ed7cb12ad15b404b2661660cf1988445
Files:
1
packages/xorg-xserver/xserver-xorg-1.3.0.0
packages/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch
packages/xorg-xserver/xserver-xorg_1.3.0.0.bb
Diffs:

#
# mt diff -r5d7605d1cca32eb21bad01816037c46d68c0b79c -r6ffb91c6ed7cb12ad15b404b2661660cf1988445
#
# 
# 
# add_dir "packages/xorg-xserver/xserver-xorg-1.3.0.0"
# 
# add_file "packages/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch"
#  content [72edf4806ea57b3c561a14e789d07709534e163a]
# 
# patch "packages/xorg-xserver/xserver-xorg_1.3.0.0.bb"
#  from [c73bffb1e3641cde21223b8fe821232c15036b4d]
#    to [c33cdc04da5f76dfa5814af63e8f55d82464ae61]
# 
============================================================
--- packages/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch	72edf4806ea57b3c561a14e789d07709534e163a
+++ packages/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch	72edf4806ea57b3c561a14e789d07709534e163a
@@ -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 = \
============================================================
--- packages/xorg-xserver/xserver-xorg_1.3.0.0.bb	c73bffb1e3641cde21223b8fe821232c15036b4d
+++ packages/xorg-xserver/xserver-xorg_1.3.0.0.bb	c33cdc04da5f76dfa5814af63e8f55d82464ae61
@@ -1,8 +1,11 @@ PE = "1"
 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 "
 
 export LDFLAGS += " -ldl "