From 2a63f34d405e3ed812339bbf836bc09ffb4b07f2 Mon Sep 17 00:00:00 2001 From: Laurentiu Palcu Date: Mon, 28 Apr 2014 12:44:15 +0300 Subject: xserver-xorg: upgrade to 1.15.1 (From OE-Core rev: 7800dd17e6ff511c9146de2bceea6765b0dc1c2c) Signed-off-by: Laurentiu Palcu Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../xorg-xserver/xserver-xorg_1.15.0.bb | 34 ---------------------- .../xorg-xserver/xserver-xorg_1.15.1.bb | 34 ++++++++++++++++++++++ 2 files changed, 34 insertions(+), 34 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg_1.15.0.bb create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg_1.15.1.bb (limited to 'meta') diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.15.0.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.15.0.bb deleted file mode 100644 index 1f9fa04c8d..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.15.0.bb +++ /dev/null @@ -1,34 +0,0 @@ -require xserver-xorg.inc - -# Misc build failure for master HEAD -SRC_URI += "file://crosscompile.patch \ - file://fix_open_max_preprocessor_error.patch \ - file://mips64-compiler.patch \ - file://aarch64.patch \ - file://xorg-CVE-2013-6424.patch \ - " - -SRC_URI[md5sum] = "c2ace3697b32414094cf8c597c39d7d9" -SRC_URI[sha256sum] = "613b2f2e7ee2a06d2f8e862c836dc70d319c52f1537749e027398f40086aabb8" - -# These extensions are now integrated into the server, so declare the migration -# path for in-place upgrades. - -RREPLACES_${PN} = "${PN}-extension-dri \ - ${PN}-extension-dri2 \ - ${PN}-extension-record \ - ${PN}-extension-extmod \ - ${PN}-extension-dbe \ - " -RPROVIDES_${PN} = "${PN}-extension-dri \ - ${PN}-extension-dri2 \ - ${PN}-extension-record \ - ${PN}-extension-extmod \ - ${PN}-extension-dbe \ - " -RCONFLICTS_${PN} = "${PN}-extension-dri \ - ${PN}-extension-dri2 \ - ${PN}-extension-record \ - ${PN}-extension-extmod \ - ${PN}-extension-dbe \ - " diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.15.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.15.1.bb new file mode 100644 index 0000000000..6a4168e3e6 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.15.1.bb @@ -0,0 +1,34 @@ +require xserver-xorg.inc + +# Misc build failure for master HEAD +SRC_URI += "file://crosscompile.patch \ + file://fix_open_max_preprocessor_error.patch \ + file://mips64-compiler.patch \ + file://aarch64.patch \ + file://xorg-CVE-2013-6424.patch \ + " + +SRC_URI[md5sum] = "e4c70262ed89764be8f8f5d699ed9227" +SRC_URI[sha256sum] = "626db6882602ebe1ff81f7a4231c7ccc6ceb5032f2b5b3954bf749e1567221e2" + +# These extensions are now integrated into the server, so declare the migration +# path for in-place upgrades. + +RREPLACES_${PN} = "${PN}-extension-dri \ + ${PN}-extension-dri2 \ + ${PN}-extension-record \ + ${PN}-extension-extmod \ + ${PN}-extension-dbe \ + " +RPROVIDES_${PN} = "${PN}-extension-dri \ + ${PN}-extension-dri2 \ + ${PN}-extension-record \ + ${PN}-extension-extmod \ + ${PN}-extension-dbe \ + " +RCONFLICTS_${PN} = "${PN}-extension-dri \ + ${PN}-extension-dri2 \ + ${PN}-extension-record \ + ${PN}-extension-extmod \ + ${PN}-extension-dbe \ + " -- cgit v1.2.3-54-g00ecf