summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.14.4.bb
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-11-07 12:06:04 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-08 17:29:52 +0000
commit60973d0584e2533f0debfcd8e80c5e29beb68e37 (patch)
treebd431ed82dfa93c89bba176b14bdc593b8e44454 /meta/recipes-graphics/xorg-xserver/xserver-xorg_1.14.4.bb
parenta0525f3da109848e4b1989247b07fac411b270ce (diff)
downloadopenembedded-core-contrib-60973d0584e2533f0debfcd8e80c5e29beb68e37.tar.gz
xserver-xorg: upgrade to 1.14.4
The xinerama and dixstruct patches are merged in 1.14.4, so drop them. Also drop explicit PR statement. Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg_1.14.4.bb')
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg_1.14.4.bb33
1 files changed, 33 insertions, 0 deletions
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
new file mode 100644
index 0000000000..22b1f82e89
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.14.4.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] = "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 \
+ "