aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/xorg-xserver/xserver-xorg_git.bb
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2010-08-16 15:43:45 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2010-08-19 07:29:17 +0200
commit5250895e0421cbd95cb97d201fcb8fbc3a7bcc18 (patch)
tree61bd75f270c13c23d5d4bbb84926d724eb3b0dc2 /recipes/xorg-xserver/xserver-xorg_git.bb
parent2c2b2d98a72ede9a3cf6213351bcd0019bed686f (diff)
downloadopenembedded-5250895e0421cbd95cb97d201fcb8fbc3a7bcc18.tar.gz
xorg-xserver: move older not pinned versions to obsolete dir
Acked-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes/xorg-xserver/xserver-xorg_git.bb')
-rw-r--r--recipes/xorg-xserver/xserver-xorg_git.bb13
1 files changed, 8 insertions, 5 deletions
diff --git a/recipes/xorg-xserver/xserver-xorg_git.bb b/recipes/xorg-xserver/xserver-xorg_git.bb
index 46b0e0818a..9c821748cf 100644
--- a/recipes/xorg-xserver/xserver-xorg_git.bb
+++ b/recipes/xorg-xserver/xserver-xorg_git.bb
@@ -1,19 +1,21 @@
+# Assign it here, since the hal->udev transition happens post 1.7 in angstrom
+DISTRO_XORG_CONFIG_MANAGER_angstrom = "udev"
+
require xorg-xserver-common.inc
DESCRIPTION = "the X.Org X server"
DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts font-util-native"
-PV = "1.8.99.905"
+PV = "1.8.99.906"
PR = "${INC_PR}.4"
PR_append = "+gitr${SRCPV}"
PE = "2"
DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_shr = "1"
-SRCREV = "6dae7f3792611aace1df0cca63bf50c50d93de43"
+SRCREV = "71af1f71c0492c365707c6b3810f94642ff39352"
SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git;branch=master \
- file://dolt-fix-1.7.0.patch \
- file://randr-support-1.7.0.patch \
+ file://dolt-fix.patch \
+ file://randr-support.patch \
file://hack-fbdev-ignore-return-mode.patch \
"
@@ -31,5 +33,6 @@ PACKAGE_ARCH_ion = "${MACHINE_ARCH}"
XINERAMA = "${@['--disable-xinerama','--enable-xinerama'][bb.data.getVar('MACHINE',d) in ['ion']]}"
EXTRA_OECONF += " ${CONFIG_MANAGER_OPTION} ${XINERAMA} --disable-kdrive --disable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx"
+EXTRA_OECONF += " --enable-dri2 --disable-unit-tests "
export LDFLAGS += " -ldl "