summaryrefslogtreecommitdiff
path: root/recipes/xorg-xserver
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2010-02-10 10:42:57 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2010-02-12 11:38:45 +0100
commitf0184ebb8e757bb771972681709f2a9c77e608e3 (patch)
treea1c8bbc1a4e4cf7087c06845fcc3f51459755d80 /recipes/xorg-xserver
parent6172717a9c1b542ea60c5f9af62b82cd9c63c2ee (diff)
xorg: add latest xorg packages for 2010-02-10 and xserver-xorg git recipe
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes/xorg-xserver')
-rw-r--r--recipes/xorg-xserver/xserver-xorg_git.bb33
1 files changed, 33 insertions, 0 deletions
diff --git a/recipes/xorg-xserver/xserver-xorg_git.bb b/recipes/xorg-xserver/xserver-xorg_git.bb
new file mode 100644
index 0000000000..892b59f1c5
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg_git.bb
@@ -0,0 +1,33 @@
+require xorg-xserver-common.inc
+
+DESCRIPTION = "the X.Org X server"
+DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts"
+PV = "1.7.999"
+PR = "r0"
+PR_append = "+gitr${SRCREV}"
+PE = "2"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRCREV = "db687f718f760ba254ab51994769db101dc9ca3a"
+SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git;branch=master \
+ file://dolt-fix-1.7.0.patch;patch=1 \
+ file://randr-support-1.7.0.patch;patch=1 \
+ "
+
+S = "${WORKDIR}/git"
+
+do_install_prepend() {
+ mkdir -p ${D}/${libdir}/X11/fonts
+}
+
+# The NVidia driver requires Xinerama support in the X server. Ion uses it.
+XINERAMA = "${@['--disable-xinerama','--enable-xinerama'][bb.data.getVar('MACHINE',d) in ['ion']]}"
+
+# hal, udev or disable both
+DISTRO_XORG_CONFIG_MANAGER ?= "--enable-config-hal --disable-config-udev"
+DISTRO_XORG_CONFIG_MANAGER_shr ?= "--disable-config-udev --disable-config-hal"
+
+EXTRA_OECONF += " ${DISTRO_XORG_CONFIG_MANAGER} ${XINERAMA} --disable-kdrive --disable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx"
+
+export LDFLAGS += " -ldl "