aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/xorg-xserver/xserver-xorg_1.10.1.901.bb
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2011-04-06 11:01:50 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2011-05-13 11:33:28 +0200
commitbe6d19e5c732883944a6331b0fb939fdf6c8a4ff (patch)
tree3400d7a903a380d0a48fe543dae62e932919d3fb /recipes/xorg-xserver/xserver-xorg_1.10.1.901.bb
parenta02f8a6711952fc276e86ef7ce3c826bde5f5d01 (diff)
downloadopenembedded-be6d19e5c732883944a6331b0fb939fdf6c8a4ff.tar.gz
xserver-xorg: upgrade to 1.10.1.901 and make it default for SHR
* bump xorg-driver-common INC_PR to rebuild drivers against new ABI from xserver-1.10 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes/xorg-xserver/xserver-xorg_1.10.1.901.bb')
-rw-r--r--recipes/xorg-xserver/xserver-xorg_1.10.1.901.bb32
1 files changed, 32 insertions, 0 deletions
diff --git a/recipes/xorg-xserver/xserver-xorg_1.10.1.901.bb b/recipes/xorg-xserver/xserver-xorg_1.10.1.901.bb
new file mode 100644
index 0000000000..9978153585
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg_1.10.1.901.bb
@@ -0,0 +1,32 @@
+# 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"
+PE = "2"
+PR = "${INC_PR}.0"
+
+DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_shr = "1"
+
+SRC_URI += " \
+ file://hack-fbdev-ignore-return-mode.patch \
+ file://hack-assume-pixman-supports-overlapped-blt.patch \
+ "
+SRC_URI[archive.md5sum] = "64585a28abb18726d950cf1005bbcce4"
+SRC_URI[archive.sha256sum] = "b7d775891e7e7fc3001763cf5727995b81bf07b72e12d9d41db282fe625298e6"
+
+do_install_prepend() {
+ mkdir -p ${D}/${libdir}/X11/fonts
+}
+
+# The NVidia driver requires Xinerama support in the X server. Ion uses it.
+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 --disable-docs --disable-devel-docs"
+
+export LDFLAGS += " -ldl "