diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2015-05-07 13:39:19 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-03 16:38:48 +0100 |
commit | f63e9b30eaa8107b8f66e3c118bd4d24185bf662 (patch) | |
tree | a4242770122a182f599be706adc364ea1e119372 /meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | |
parent | 0420f7f47818d96964d48fd1309cea5f341432ed (diff) | |
download | poky-f63e9b30eaa8107b8f66e3c118bd4d24185bf662.tar.gz |
xserver-xorg: Upgrade 1.16.3 -> 1.17.1 (OELAYOUT_ABI change)
* Increase OELAYOUT_ABI: this is required because the
xf86-video-modesetting package moves from its own recipe to
xserver-xorg and sanity check cannot handle that currently.
The upgrade will delete old xf86-video-modesetting files from
sysroots.
* Remove upstreamed xserver-xorg patches
* Remove xf86-video-modesetting recipe: the driver is now included in
xserver-xorg recipe, which now produces the xf86-video-modesetting
package. The package version changes from 0.9 to 1.17.1
* Update xserver-xorg license checksum: modesetting license
info (another MIT one) has been added to the file
(From OE-Core rev: 950846d019ffac21909a96d90af8cf7e5bdd5738)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg.inc')
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index cc95da6394..04289f833e 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" | |||
2 | HOMEPAGE = "http://www.x.org" | 2 | HOMEPAGE = "http://www.x.org" |
3 | SECTION = "x11/base" | 3 | SECTION = "x11/base" |
4 | LICENSE = "MIT-X" | 4 | LICENSE = "MIT-X" |
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=15b5bf9327341c81089137aec4830bfd" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880" |
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: |
@@ -63,7 +63,11 @@ PACKAGES =+ "${PN}-security-policy \ | |||
63 | ${PN}-module-exa \ | 63 | ${PN}-module-exa \ |
64 | ${PN}-module-xaa \ | 64 | ${PN}-module-xaa \ |
65 | ${PN}-module-libxf1bpp \ | 65 | ${PN}-module-libxf1bpp \ |
66 | ${PN}-module-libxf4bpp" | 66 | ${PN}-module-libxf4bpp \ |
67 | xf86-video-modesetting" | ||
68 | |||
69 | SUMMARY_xf86-video-modesetting = "X.Org X server -- modesetting display driver" | ||
70 | INSANE_SKIP_xf86-video-modesetting = "xorg-driver-abi" | ||
67 | 71 | ||
68 | RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config xkbcomp" | 72 | RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config xkbcomp" |
69 | RDEPENDS_${PN}-xvfb += "xkeyboard-config" | 73 | RDEPENDS_${PN}-xvfb += "xkeyboard-config" |
@@ -99,6 +103,7 @@ FILES_${PN}-module-exa = "${libdir}/xorg/modules/libexa.so" | |||
99 | FILES_${PN}-module-xaa = "${libdir}/xorg/modules/libxaa.so" | 103 | FILES_${PN}-module-xaa = "${libdir}/xorg/modules/libxaa.so" |
100 | FILES_${PN}-module-libxf1bpp = "${libdir}/xorg/modules/libxf1bpp.so" | 104 | FILES_${PN}-module-libxf1bpp = "${libdir}/xorg/modules/libxf1bpp.so" |
101 | FILES_${PN}-module-libxf4bpp = "${libdir}/xorg/modules/libxf4bpp.so" | 105 | FILES_${PN}-module-libxf4bpp = "${libdir}/xorg/modules/libxf4bpp.so" |
106 | FILES_xf86-video-modesetting = "${libdir}/xorg/modules/drivers/modesetting_drv.so" | ||
102 | 107 | ||
103 | EXTRA_OECONF += "--with-fop=no \ | 108 | EXTRA_OECONF += "--with-fop=no \ |
104 | --with-pic \ | 109 | --with-pic \ |