summaryrefslogtreecommitdiff
path: root/recipes/xorg-xserver
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin@buglabs.net>2009-05-27 16:20:27 +0200
committerMarcin Juszkiewicz <marcin@buglabs.net>2009-05-27 16:20:27 +0200
commit62190cac2b84432ff5d686c3e4d12d5bc3a3d788 (patch)
treef57c66caccb858e434ef595534e23d8970e61149 /recipes/xorg-xserver
parent82922b867c1aa0915d6966be39f342b4cf71899b (diff)
xorg-xserver: added 1.6.1 (tested only on armv6/glibc)
Diffstat (limited to 'recipes/xorg-xserver')
-rw-r--r--recipes/xorg-xserver/xserver-xorg-1.6.1/drmfix.patch13
-rw-r--r--recipes/xorg-xserver/xserver-xorg_1.6.1.bb10
2 files changed, 23 insertions, 0 deletions
diff --git a/recipes/xorg-xserver/xserver-xorg-1.6.1/drmfix.patch b/recipes/xorg-xserver/xserver-xorg-1.6.1/drmfix.patch
new file mode 100644
index 0000000000..e0f633bc24
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg-1.6.1/drmfix.patch
@@ -0,0 +1,13 @@
+Index: xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am
+===================================================================
+--- xorg-server-1.5.1.orig/hw/xfree86/os-support/linux/Makefile.am 2008-09-23 19:24:59.000000000 +0100
++++ xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am 2008-10-27 13:27:40.000000000 +0000
+@@ -40,7 +40,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 = \
diff --git a/recipes/xorg-xserver/xserver-xorg_1.6.1.bb b/recipes/xorg-xserver/xserver-xorg_1.6.1.bb
new file mode 100644
index 0000000000..575021dfd3
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg_1.6.1.bb
@@ -0,0 +1,10 @@
+require xorg-xserver-common.inc
+
+DESCRIPTION = "the X.Org X server"
+DEPENDS += "pixman libpciaccess openssl xineramaproto libxinerama"
+RDEPENDS += "hal"
+PE = "2"
+
+MESA_VER = "7.2"
+
+export LDFLAGS += " -ldl "