diff options
| author | Ross Burton <ross.burton@intel.com> | 2014-09-08 12:58:35 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-10 11:29:50 +0100 |
| commit | ace56dcd6eed1ab92af9bdf5bd6d9b11e35a0917 (patch) | |
| tree | ce77509ed33b6de9cc125693f3e8161a2becc9a0 /meta/recipes-graphics | |
| parent | 59fe6f91b39c4aa67e7e1734c3731d49c7ea8376 (diff) | |
| download | openembedded-core-ace56dcd6eed1ab92af9bdf5bd6d9b11e35a0917.tar.gz openembedded-core-ace56dcd6eed1ab92af9bdf5bd6d9b11e35a0917.tar.bz2 openembedded-core-ace56dcd6eed1ab92af9bdf5bd6d9b11e35a0917.zip | |
pixman: upgrade to 0.32.6
Revert a patch to the MIPS-specific code that was causing compile failures.
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.patch | 22 | ||||
| -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 @@ +Revert a commit in pixman 0.32.6 which breaks compliation on MIPS machines with +errors such as: + +pixman-0.32.6/pixman/pixman-mips-dspr2-asm.S:4267: +Error: invalid operands `mflo $14,$ac3' + +Upstream-Status: Pending +Signed-off-by: Ross Burton <ross.burton@intel.com> + +--- b/pixman/pixman-mips-dspr2-asm.h ++++ a/pixman/pixman-mips-dspr2-asm.h +@@ -72,10 +72,7 @@ + #define LEAF_MIPS32R2(symbol) \ + .globl symbol; \ + .align 2; \ +-#ifdef __ELF__ +- .hidden symbol; \ + .type symbol, @function; \ +-#endif + .ent symbol, 0; \ + symbol: .frame sp, 0, ra; \ + .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" SRC_URI += "\ file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \ + file://mips-export-revert.patch \ " -SRC_URI[md5sum] = "cdb566504fe9daf6728c7b03cc7ea228" -SRC_URI[sha256sum] = "ae2bd664057e330d41b40336ed296d3512318ce7f2401cc42601f2613d371e4c" +SRC_URI[md5sum] = "8a9e8f14743a39cf303803f369c1f344" +SRC_URI[sha256sum] = "201fc0d7d6bc0017496f2bd27b3ca14224aea0df6b624c5ee2dc0307a4ff14a4" REQUIRED_DISTRO_FEATURES = "" |