From f4b838e27ab427ff4a50aa137c5c0ca255bfe4d8 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 17 Apr 2011 14:21:55 +0200 Subject: [PATCH] xorg-xserver: upgrade to 1.10.1 * only one revert since 1.10.0.902 Signed-off-by: Martin Jansa --- .../hack-assume-pixman-supports-overlapped-blt.patch | 0 .../hack-fbdev-ignore-return-mode.patch | 0 .../{xserver-xorg_1.10.0.902.bb => xserver-xorg_1.10.1.bb} | 4 ++-- meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_git.bb | 4 ++-- 4 files changed, 4 insertions(+), 4 deletions(-) rename meta-oe/recipes-graphics/xorg-xserver/{xserver-xorg-1.10.0.902 => xserver-xorg-1.10.1}/hack-assume-pixman-supports-overlapped-blt.patch (100%) rename meta-oe/recipes-graphics/xorg-xserver/{xserver-xorg-1.10.0.902 => xserver-xorg-1.10.1}/hack-fbdev-ignore-return-mode.patch (100%) rename meta-oe/recipes-graphics/xorg-xserver/{xserver-xorg_1.10.0.902.bb => xserver-xorg_1.10.1.bb} (88%) diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.0.902/hack-assume-pixman-supports-overlapped-blt.patch b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.1/hack-assume-pixman-supports-overlapped-blt.patch similarity index 100% rename from meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.0.902/hack-assume-pixman-supports-overlapped-blt.patch rename to meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.1/hack-assume-pixman-supports-overlapped-blt.patch diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.0.902/hack-fbdev-ignore-return-mode.patch b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.1/hack-fbdev-ignore-return-mode.patch similarity index 100% rename from meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.0.902/hack-fbdev-ignore-return-mode.patch rename to meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.1/hack-fbdev-ignore-return-mode.patch diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.10.0.902.bb b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.10.1.bb similarity index 88% rename from meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.10.0.902.bb rename to meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.10.1.bb index 47fd3f8f97..7cb7339afb 100644 --- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.10.0.902.bb +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.10.1.bb @@ -13,8 +13,8 @@ SRC_URI += " \ file://hack-fbdev-ignore-return-mode.patch \ file://hack-assume-pixman-supports-overlapped-blt.patch \ " -SRC_URI[md5sum] = "65e5db9e614cd75e97840247c3754521" -SRC_URI[sha256sum] = "994ab87bb0cc9b56203e01e3294fddd502a96d074139496ea4ffc03c95b41b42" +SRC_URI[md5sum] = "75f117c74f2ecaf9dd167f6a66ac98de" +SRC_URI[sha256sum] = "143c7c3d7d4428352e1153dffa34fd64af391f72d30b2a03e911e54e36f00b5d" 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 d18bdd758b..811c2d6cdb 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.902" +PV = "1.10.1" PR = "${INC_PR}.0" PR_append = "+gitr${SRCPV}" PE = "2" DEFAULT_PREFERENCE = "-1" -SRCREV = "ec6e1e45627de2bb851f135df0507a360d0d99e6" +SRCREV = "a73311f8304193f9245fb077f173bf1e1d52e040" SRC_URI = " \ git://anongit.freedesktop.org/xorg/xserver;protocol=git;branch=server-1.10-branch \ file://hack-fbdev-ignore-return-mode.patch \