diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-08-19 11:08:39 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-08-19 11:08:39 +0000 |
| commit | 8f66510f0c7a19fe3d427a7d5d346b595fa35197 (patch) | |
| tree | 58aafd9ceca7f74b69d8327bd13b0e344c666431 /packages | |
| parent | 3f2af8e708acc5f64e507ed235c4285554b110c3 (diff) | |
| parent | e365c73d32fc87f49022828ea27b48e66c9dc249 (diff) | |
merge of '30914cc94bbce1be08b75646f1755f25e9f9f4e1'
and '6ffb91c6ed7cb12ad15b404b2661660cf1988445'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/xorg-xserver/xserver-xorg-1.3.0.0/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch | 11 | ||||
| -rw-r--r-- | packages/xorg-xserver/xserver-xorg_1.3.0.0.bb | 3 |
3 files changed, 14 insertions, 0 deletions
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 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/xorg-xserver/xserver-xorg-1.3.0.0/.mtn2git_empty 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 index 0000000000..96924484af --- /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 78fdc01b46..b04ef19038 100644 --- 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 " |