From b18fb872baa0deb89f1b8250883122fb5f6328c5 Mon Sep 17 00:00:00 2001 From: Laurentiu Palcu Date: Thu, 6 Feb 2014 17:29:31 +0200 Subject: xserver-xorg: upgrade to 1.15.0 License file changed slightly: a new person has been added to the list of authors. Add dependency of presentproto. Signed-off-by: Laurentiu Palcu Signed-off-by: Richard Purdie --- .../recipes-graphics/xorg-xserver/xserver-xorg.inc | 4 +-- .../xorg-xserver/xserver-xorg_1.14.4.bb | 33 ---------------------- .../xorg-xserver/xserver-xorg_1.15.0.bb | 33 ++++++++++++++++++++++ 3 files changed, 35 insertions(+), 35 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg_1.14.4.bb create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg_1.15.0.bb (limited to 'meta/recipes-graphics') diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index a0283cd014..2bacbe51da 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -2,7 +2,7 @@ SUMMARY = "The X.Org X server" HOMEPAGE = "http://www.x.org" SECTION = "x11/base" LICENSE = "MIT-X" -LIC_FILES_CHKSUM = "file://COPYING;md5=bc098b9774ed096943f6c37b5beeef13" +LIC_FILES_CHKSUM = "file://COPYING;md5=15b5bf9327341c81089137aec4830bfd" # xf86-*-* packages depend on an X server built with the xfree86 DDX # so we have a virtual to represent that: @@ -23,7 +23,7 @@ S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig -PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86vidmodeproto compositeproto recordproto resourceproto videoproto scrnsaverproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto" +PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86vidmodeproto compositeproto recordproto resourceproto videoproto scrnsaverproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto presentproto" LIB_DEPS = "pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl libgcrypt" DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} font-util" diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.14.4.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.14.4.bb deleted file mode 100644 index 22b1f82e89..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.14.4.bb +++ /dev/null @@ -1,33 +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 \ - " - -SRC_URI[md5sum] = "9d68a30258c67faa3c036a4a85e8bf97" -SRC_URI[sha256sum] = "608ccfaafb845f6e559884a30f946d365209172416710d687b190e9e1ff65dc3" - -# 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.0.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.15.0.bb new file mode 100644 index 0000000000..a4dda4e7aa --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.15.0.bb @@ -0,0 +1,33 @@ +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 \ + " + +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 \ + " -- cgit 1.2.3-korg