aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2011-04-14 10:35:19 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2011-04-16 13:50:12 +0200
commit6fe4d8981ace4a9210e63ac1c52e2dd60380e0f6 (patch)
treea4ecc131dc3315f3c4a2a1211395e6949abe247b /meta-oe
parenta615a728b214ba86d16284021aeecf58b188b5eb (diff)
downloadmeta-openembedded-contrib-6fe4d8981ace4a9210e63ac1c52e2dd60380e0f6.tar.gz
xserver-xorg: upgrade to 1.10.0.902
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.0.902/hack-assume-pixman-supports-overlapped-blt.patch (renamed from meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.0.901/hack-assume-pixman-supports-overlapped-blt.patch)0
-rw-r--r--meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.0.902/hack-fbdev-ignore-return-mode.patch (renamed from meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.0.901/hack-fbdev-ignore-return-mode.patch)0
-rw-r--r--meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.10.0.902.bb (renamed from meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.10.0.901.bb)5
-rw-r--r--meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_git.bb6
4 files changed, 6 insertions, 5 deletions
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.0.901/hack-assume-pixman-supports-overlapped-blt.patch b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.0.902/hack-assume-pixman-supports-overlapped-blt.patch
index a947582f15..a947582f15 100644
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.0.901/hack-assume-pixman-supports-overlapped-blt.patch
+++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.0.902/hack-assume-pixman-supports-overlapped-blt.patch
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.0.901/hack-fbdev-ignore-return-mode.patch b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.0.902/hack-fbdev-ignore-return-mode.patch
index d3661cbea2..d3661cbea2 100644
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.0.901/hack-fbdev-ignore-return-mode.patch
+++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.0.902/hack-fbdev-ignore-return-mode.patch
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.10.0.901.bb b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.10.0.902.bb
index c1d956648a..47fd3f8f97 100644
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.10.0.901.bb
+++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.10.0.902.bb
@@ -2,6 +2,7 @@
DISTRO_XORG_CONFIG_MANAGER_angstrom = "udev"
require xorg-xserver-common.inc
+LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
DESCRIPTION = "the X.Org X server"
DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts font-util-native"
@@ -12,8 +13,8 @@ SRC_URI += " \
file://hack-fbdev-ignore-return-mode.patch \
file://hack-assume-pixman-supports-overlapped-blt.patch \
"
-SRC_URI[md5sum] = "d750cf5f6342b548b7ac2be56e9d1841"
-SRC_URI[sha256sum] = "de18f52c35fc3d3f18c7e905296f9de5ac42dc71e4e01da9ae8e154a78c7771c"
+SRC_URI[md5sum] = "65e5db9e614cd75e97840247c3754521"
+SRC_URI[sha256sum] = "994ab87bb0cc9b56203e01e3294fddd502a96d074139496ea4ffc03c95b41b42"
do_install_prepend() {
mkdir -p ${D}/${libdir}/X11/fonts
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_git.bb b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_git.bb
index be441a35af..d18bdd758b 100644
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_git.bb
+++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_git.bb
@@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
DESCRIPTION = "the X.Org X server"
DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts font-util-native"
-PV = "1.10.0.901"
+PV = "1.10.0.902"
PR = "${INC_PR}.0"
PR_append = "+gitr${SRCPV}"
PE = "2"
-#DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE = "-1"
-SRCREV = "1f51fe4f748b2997e466863d8387bd6791b32931"
+SRCREV = "ec6e1e45627de2bb851f135df0507a360d0d99e6"
SRC_URI = " \
git://anongit.freedesktop.org/xorg/xserver;protocol=git;branch=server-1.10-branch \
file://hack-fbdev-ignore-return-mode.patch \