summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-09-08 12:58:35 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-10 11:33:24 +0100
commit7df591073e1ff3d8ad54d506bee5c2449ca67f7f (patch)
tree715adc2a757db6995277ea8d03eaae0593030bb4 /meta/recipes-graphics
parent28500e52095751e3e4c60b4bf88aba558489bf64 (diff)
downloadpoky-7df591073e1ff3d8ad54d506bee5c2449ca67f7f.tar.gz
pixman: upgrade to 0.32.6
Revert a patch to the MIPS-specific code that was causing compile failures. (From OE-Core rev: ace56dcd6eed1ab92af9bdf5bd6d9b11e35a0917) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/xorg-lib/pixman/mips-export-revert.patch22
-rw-r--r--meta/recipes-graphics/xorg-lib/pixman_0.32.6.bb (renamed from meta/recipes-graphics/xorg-lib/pixman_0.32.4.bb)5
2 files changed, 25 insertions, 2 deletions
diff --git a/meta/recipes-graphics/xorg-lib/pixman/mips-export-revert.patch b/meta/recipes-graphics/xorg-lib/pixman/mips-export-revert.patch
new file mode 100644
index 0000000000..14a5fd209b
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/pixman/mips-export-revert.patch
@@ -0,0 +1,22 @@
1Revert a commit in pixman 0.32.6 which breaks compliation on MIPS machines with
2errors such as:
3
4pixman-0.32.6/pixman/pixman-mips-dspr2-asm.S:4267:
5Error: invalid operands `mflo $14,$ac3'
6
7Upstream-Status: Pending
8Signed-off-by: Ross Burton <ross.burton@intel.com>
9
10--- b/pixman/pixman-mips-dspr2-asm.h
11+++ a/pixman/pixman-mips-dspr2-asm.h
12@@ -72,10 +72,7 @@
13 #define LEAF_MIPS32R2(symbol) \
14 .globl symbol; \
15 .align 2; \
16-#ifdef __ELF__
17- .hidden symbol; \
18 .type symbol, @function; \
19-#endif
20 .ent symbol, 0; \
21 symbol: .frame sp, 0, ra; \
22 .set push; \
diff --git a/meta/recipes-graphics/xorg-lib/pixman_0.32.4.bb b/meta/recipes-graphics/xorg-lib/pixman_0.32.6.bb
index 51cca5d13a..467ba508ee 100644
--- a/meta/recipes-graphics/xorg-lib/pixman_0.32.4.bb
+++ b/meta/recipes-graphics/xorg-lib/pixman_0.32.6.bb
@@ -29,9 +29,10 @@ EXTRA_OECONF_class-native = "--disable-gtk"
29 29
30SRC_URI += "\ 30SRC_URI += "\
31 file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \ 31 file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \
32 file://mips-export-revert.patch \
32" 33"
33 34
34SRC_URI[md5sum] = "cdb566504fe9daf6728c7b03cc7ea228" 35SRC_URI[md5sum] = "8a9e8f14743a39cf303803f369c1f344"
35SRC_URI[sha256sum] = "ae2bd664057e330d41b40336ed296d3512318ce7f2401cc42601f2613d371e4c" 36SRC_URI[sha256sum] = "201fc0d7d6bc0017496f2bd27b3ca14224aea0df6b624c5ee2dc0307a4ff14a4"
36 37
37REQUIRED_DISTRO_FEATURES = "" 38REQUIRED_DISTRO_FEATURES = ""