From f0184ebb8e757bb771972681709f2a9c77e608e3 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 10 Feb 2010 10:42:57 +0100 Subject: xorg: add latest xorg packages for 2010-02-10 and xserver-xorg git recipe Signed-off-by: Martin Jansa --- .../include/preferred-xorg-versions-live.inc | 17 ++++++----- recipes/xorg-app/luit_1.0.5.bb | 7 +++++ recipes/xorg-app/xmessage_1.0.3.bb | 8 ++++++ recipes/xorg-driver/xf86-input-vmmouse_12.6.6.bb | 9 ++++++ recipes/xorg-driver/xf86-video-geode_2.11.7.bb | 8 ++++++ recipes/xorg-util/util-macros-native_1.6.0.bb | 7 +++++ recipes/xorg-util/util-macros_1.6.0.bb | 9 ++++++ recipes/xorg-xserver/xserver-xorg_git.bb | 33 ++++++++++++++++++++++ 8 files changed, 89 insertions(+), 9 deletions(-) create mode 100644 recipes/xorg-app/luit_1.0.5.bb create mode 100644 recipes/xorg-app/xmessage_1.0.3.bb create mode 100644 recipes/xorg-driver/xf86-input-vmmouse_12.6.6.bb create mode 100644 recipes/xorg-driver/xf86-video-geode_2.11.7.bb create mode 100644 recipes/xorg-util/util-macros-native_1.6.0.bb create mode 100644 recipes/xorg-util/util-macros_1.6.0.bb create mode 100644 recipes/xorg-xserver/xserver-xorg_git.bb diff --git a/conf/distro/include/preferred-xorg-versions-live.inc b/conf/distro/include/preferred-xorg-versions-live.inc index 65e94fac5c..b567db5fd8 100644 --- a/conf/distro/include/preferred-xorg-versions-live.inc +++ b/conf/distro/include/preferred-xorg-versions-live.inc @@ -1,4 +1,4 @@ -#Mon Jan 18 14:00:56 CET 2010 +#Wed Feb 10 09:53:18 CET 2010 #app PREFERRED_VERSION_appres ?= "1.0.2" PREFERRED_VERSION_bdftopcf ?= "1.0.2" @@ -14,7 +14,7 @@ PREFERRED_VERSION_iceauth ?= "1.0.3" PREFERRED_VERSION_ico ?= "1.0.2" PREFERRED_VERSION_lbxproxy ?= "1.0.2" PREFERRED_VERSION_listres ?= "1.0.2" -PREFERRED_VERSION_luit ?= "1.0.4" +PREFERRED_VERSION_luit ?= "1.0.5" PREFERRED_VERSION_mkcfm ?= "1.0.1" PREFERRED_VERSION_mkcomposecache ?= "1.2.1" PREFERRED_VERSION_mkfontdir ?= "1.0.5" @@ -78,7 +78,7 @@ PREFERRED_VERSION_xlsclients ?= "1.0.2" PREFERRED_VERSION_xlsfonts ?= "1.0.2" PREFERRED_VERSION_xmag ?= "1.0.3" PREFERRED_VERSION_xman ?= "1.1.0" -PREFERRED_VERSION_xmessage ?= "1.0.2" +PREFERRED_VERSION_xmessage ?= "1.0.3" PREFERRED_VERSION_xmh ?= "1.0.1" PREFERRED_VERSION_xmodmap ?= "1.0.4" PREFERRED_VERSION_xmore ?= "1.0.1" @@ -138,7 +138,7 @@ PREFERRED_VERSION_xf86-input-summa ?= "1.2.0" PREFERRED_VERSION_xf86-input-synaptics ?= "1.2.1" PREFERRED_VERSION_xf86-input-tek4957 ?= "1.2.0" PREFERRED_VERSION_xf86-input-ur98 ?= "1.1.0" -PREFERRED_VERSION_xf86-input-vmmouse ?= "12.6.5" +PREFERRED_VERSION_xf86-input-vmmouse ?= "12.6.6" PREFERRED_VERSION_xf86-input-void ?= "1.3.0" PREFERRED_VERSION_xf86-video-apm ?= "1.2.2" PREFERRED_VERSION_xf86-video-ark ?= "0.7.2" @@ -149,7 +149,7 @@ PREFERRED_VERSION_xf86-video-cirrus ?= "1.3.2" PREFERRED_VERSION_xf86-video-cyrix ?= "1.1.0" PREFERRED_VERSION_xf86-video-dummy ?= "0.3.3" PREFERRED_VERSION_xf86-video-fbdev ?= "0.4.1" -PREFERRED_VERSION_xf86-video-geode ?= "2.11.6" +PREFERRED_VERSION_xf86-video-geode ?= "2.11.7" PREFERRED_VERSION_xf86-video-glint ?= "1.2.4" PREFERRED_VERSION_xf86-video-i128 ?= "1.3.3" PREFERRED_VERSION_xf86-video-i740 ?= "1.3.2" @@ -346,9 +346,8 @@ PREFERRED_VERSION_imake ?= "1.0.2" PREFERRED_VERSION_lndir ?= "1.0.1" PREFERRED_VERSION_makedepend ?= "1.0.2" PREFERRED_VERSION_makedepend-native ?= "1.0.2" -PREFERRED_VERSION_util-macros ?= "1.5.0" -PREFERRED_VERSION_util-macros-native ?= "1.5.0" +PREFERRED_VERSION_util-macros ?= "1.6.0" +PREFERRED_VERSION_util-macros-native ?= "1.6.0" PREFERRED_VERSION_xorg-cf-files ?= "1.0.3" #xserver -#PREFERRED_VERSION_xserver-xorg ?= "1.7.99.2" -PREFERRED_VERSION_xserver-xorg ?= "1.7.4" +PREFERRED_VERSION_xserver-xorg ?= "1.7.999" diff --git a/recipes/xorg-app/luit_1.0.5.bb b/recipes/xorg-app/luit_1.0.5.bb new file mode 100644 index 0000000000..86d77d28c0 --- /dev/null +++ b/recipes/xorg-app/luit_1.0.5.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +DESCRIPTION = "a filter for locale and ISO 2022 support on Unicode terminals" +DEPENDS += " zlib zlib virtual/libx11 libfontenc" +PE = "1" + +SRC_URI[archive.md5sum] = "fd8579a993c4480978e3504a4c53c189" +SRC_URI[archive.sha256sum] = "8eeb1cf7809acc17cf6cecfdc899613854560052229b21e6115b03a088cd059b" diff --git a/recipes/xorg-app/xmessage_1.0.3.bb b/recipes/xorg-app/xmessage_1.0.3.bb new file mode 100644 index 0000000000..2b8e70e418 --- /dev/null +++ b/recipes/xorg-app/xmessage_1.0.3.bb @@ -0,0 +1,8 @@ +require xorg-app-common.inc + +DESCRIPTION = "xmessage displays a message or query in a window." +DEPENDS += " libxaw libxt" +PE = "1" + +SRC_URI[archive.md5sum] = "76ac52710234ebb9d0e2762bb5d11ea1" +SRC_URI[archive.sha256sum] = "cfa35d3ad4ad1306e49878163982e9d54872a20a497e77ab0a8d5de05c8b3d5b" diff --git a/recipes/xorg-driver/xf86-input-vmmouse_12.6.6.bb b/recipes/xorg-driver/xf86-input-vmmouse_12.6.6.bb new file mode 100644 index 0000000000..9965fad3c3 --- /dev/null +++ b/recipes/xorg-driver/xf86-input-vmmouse_12.6.6.bb @@ -0,0 +1,9 @@ +require xorg-driver-input.inc + +DESCRIPTION = "X.Org X server -- VMMouse input driver to use with VMWare" +PE = "1" + +COMPATIBLE_HOST = 'i.86.*-linux' + +SRC_URI[archive.md5sum] = "1c57338928a8897b7ca0b5524fcb1223" +SRC_URI[archive.sha256sum] = "0cb2896b7a284efd6337c019c599fd4d5a6de74a58c6e6c31c31ed399efa8171" diff --git a/recipes/xorg-driver/xf86-video-geode_2.11.7.bb b/recipes/xorg-driver/xf86-video-geode_2.11.7.bb new file mode 100644 index 0000000000..4abc862c6e --- /dev/null +++ b/recipes/xorg-driver/xf86-video-geode_2.11.7.bb @@ -0,0 +1,8 @@ +require xorg-driver-video.inc +PE = "1" + +COMPATIBLE_HOST = 'i.86.*-linux' +DESCRIPTION = "X.org server -- Geode GX2/LX display driver" + +SRC_URI[archive.md5sum] = "086daecd062835eea51e2a718761dda3" +SRC_URI[archive.sha256sum] = "ed864a37b44dabb760f0b7caac8a796e3b1a0a7f305b44c4684f871b273a9f9b" diff --git a/recipes/xorg-util/util-macros-native_1.6.0.bb b/recipes/xorg-util/util-macros-native_1.6.0.bb new file mode 100644 index 0000000000..618e78f116 --- /dev/null +++ b/recipes/xorg-util/util-macros-native_1.6.0.bb @@ -0,0 +1,7 @@ +require util-macros_${PV}.bb + +inherit native + +XORG_PN = "util-macros" + +S = "${WORKDIR}/util-macros-${PV}" diff --git a/recipes/xorg-util/util-macros_1.6.0.bb b/recipes/xorg-util/util-macros_1.6.0.bb new file mode 100644 index 0000000000..661eba4654 --- /dev/null +++ b/recipes/xorg-util/util-macros_1.6.0.bb @@ -0,0 +1,9 @@ +require xorg-util-common.inc + +DESCRIPTION = "X autotools macros" +PE = "1" + +ALLOW_EMPTY = "1" + +SRC_URI[archive.md5sum] = "eb991c709781f811fbfcdbd43f9edd16" +SRC_URI[archive.sha256sum] = "12c7a8819f2df62ff7fca20152438d6b4e93ac581d7de211e31149739aa37ce9" 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 " -- cgit v1.2.3