summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2014-02-06 17:29:31 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-09 09:42:53 +0000
commit3bfb713d1cffadde17a0fcf85d87ad9769622bda (patch)
tree46e6043164f84725673e3763d559cb90739ff5b2 /meta
parenta493de417875b62fdcf1718867ab15e8d8cc3f10 (diff)
downloadpoky-3bfb713d1cffadde17a0fcf85d87ad9769622bda.tar.gz
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. (From OE-Core rev: b18fb872baa0deb89f1b8250883122fb5f6328c5) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg.inc4
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg_1.15.0.bb (renamed from meta/recipes-graphics/xorg-xserver/xserver-xorg_1.14.4.bb)4
2 files changed, 4 insertions, 4 deletions
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"
2HOMEPAGE = "http://www.x.org" 2HOMEPAGE = "http://www.x.org"
3SECTION = "x11/base" 3SECTION = "x11/base"
4LICENSE = "MIT-X" 4LICENSE = "MIT-X"
5LIC_FILES_CHKSUM = "file://COPYING;md5=bc098b9774ed096943f6c37b5beeef13" 5LIC_FILES_CHKSUM = "file://COPYING;md5=15b5bf9327341c81089137aec4830bfd"
6 6
7# xf86-*-* packages depend on an X server built with the xfree86 DDX 7# xf86-*-* packages depend on an X server built with the xfree86 DDX
8# so we have a virtual to represent that: 8# so we have a virtual to represent that:
@@ -23,7 +23,7 @@ S = "${WORKDIR}/${XORG_PN}-${PV}"
23 23
24inherit autotools pkgconfig 24inherit autotools pkgconfig
25 25
26PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86vidmodeproto compositeproto recordproto resourceproto videoproto scrnsaverproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto" 26PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86vidmodeproto compositeproto recordproto resourceproto videoproto scrnsaverproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto presentproto"
27LIB_DEPS = "pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl libgcrypt" 27LIB_DEPS = "pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl libgcrypt"
28DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} font-util" 28DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} font-util"
29 29
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.14.4.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.15.0.bb
index 22b1f82e89..a4dda4e7aa 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.14.4.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.15.0.bb
@@ -7,8 +7,8 @@ SRC_URI += "file://crosscompile.patch \
7 file://aarch64.patch \ 7 file://aarch64.patch \
8 " 8 "
9 9
10SRC_URI[md5sum] = "9d68a30258c67faa3c036a4a85e8bf97" 10SRC_URI[md5sum] = "c2ace3697b32414094cf8c597c39d7d9"
11SRC_URI[sha256sum] = "608ccfaafb845f6e559884a30f946d365209172416710d687b190e9e1ff65dc3" 11SRC_URI[sha256sum] = "613b2f2e7ee2a06d2f8e862c836dc70d319c52f1537749e027398f40086aabb8"
12 12
13# These extensions are now integrated into the server, so declare the migration 13# These extensions are now integrated into the server, so declare the migration
14# path for in-place upgrades. 14# path for in-place upgrades.