From ace56dcd6eed1ab92af9bdf5bd6d9b11e35a0917 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 8 Sep 2014 12:58:35 +0100 Subject: pixman: upgrade to 0.32.6 Revert a patch to the MIPS-specific code that was causing compile failures. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../xorg-lib/pixman/mips-export-revert.patch | 22 +++++++++++++ meta/recipes-graphics/xorg-lib/pixman_0.32.4.bb | 37 --------------------- meta/recipes-graphics/xorg-lib/pixman_0.32.6.bb | 38 ++++++++++++++++++++++ 3 files changed, 60 insertions(+), 37 deletions(-) create mode 100644 meta/recipes-graphics/xorg-lib/pixman/mips-export-revert.patch delete mode 100644 meta/recipes-graphics/xorg-lib/pixman_0.32.4.bb create mode 100644 meta/recipes-graphics/xorg-lib/pixman_0.32.6.bb (limited to 'meta') 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 + +--- 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.4.bb deleted file mode 100644 index 51cca5d13a..0000000000 --- a/meta/recipes-graphics/xorg-lib/pixman_0.32.4.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "Pixman: Pixel Manipulation library" - -DESCRIPTION = "Pixman provides a library for manipulating pixel regions \ --- a set of Y-X banded rectangles, image compositing using the \ -Porter/Duff model and implicit mask generation for geometric primitives \ -including trapezoids, triangles, and rectangles." - -require xorg-lib-common.inc - -LICENSE = "MIT & MIT-style & PD" -LIC_FILES_CHKSUM = "file://COPYING;md5=14096c769ae0cbb5fcb94ec468be11b3 \ - file://pixman/pixman-matrix.c;endline=25;md5=ba6e8769bfaaee2c41698755af04c4be \ - file://pixman/pixman-arm-neon-asm.h;endline=24;md5=9a9cc1e51abbf1da58f4d9528ec9d49b \ - " -DEPENDS += "zlib libpng" -BBCLASSEXTEND = "native nativesdk" - -PE = "1" - -IWMMXT = "--disable-arm-iwmmxt" -LOONGSON_MMI = "--disable-loongson-mmi" -NEON = " --disable-arm-neon " -NEON_class-nativesdk = " --disable-arm-neon " -NEON_armv7a = " " -NEON_armv7a-vfp-neon = " " - -EXTRA_OECONF = "--disable-gtk ${IWMMXT} ${LOONGSON_MMI} ${NEON}" -EXTRA_OECONF_class-native = "--disable-gtk" - -SRC_URI += "\ - file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \ -" - -SRC_URI[md5sum] = "cdb566504fe9daf6728c7b03cc7ea228" -SRC_URI[sha256sum] = "ae2bd664057e330d41b40336ed296d3512318ce7f2401cc42601f2613d371e4c" - -REQUIRED_DISTRO_FEATURES = "" diff --git a/meta/recipes-graphics/xorg-lib/pixman_0.32.6.bb b/meta/recipes-graphics/xorg-lib/pixman_0.32.6.bb new file mode 100644 index 0000000000..467ba508ee --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/pixman_0.32.6.bb @@ -0,0 +1,38 @@ +SUMMARY = "Pixman: Pixel Manipulation library" + +DESCRIPTION = "Pixman provides a library for manipulating pixel regions \ +-- a set of Y-X banded rectangles, image compositing using the \ +Porter/Duff model and implicit mask generation for geometric primitives \ +including trapezoids, triangles, and rectangles." + +require xorg-lib-common.inc + +LICENSE = "MIT & MIT-style & PD" +LIC_FILES_CHKSUM = "file://COPYING;md5=14096c769ae0cbb5fcb94ec468be11b3 \ + file://pixman/pixman-matrix.c;endline=25;md5=ba6e8769bfaaee2c41698755af04c4be \ + file://pixman/pixman-arm-neon-asm.h;endline=24;md5=9a9cc1e51abbf1da58f4d9528ec9d49b \ + " +DEPENDS += "zlib libpng" +BBCLASSEXTEND = "native nativesdk" + +PE = "1" + +IWMMXT = "--disable-arm-iwmmxt" +LOONGSON_MMI = "--disable-loongson-mmi" +NEON = " --disable-arm-neon " +NEON_class-nativesdk = " --disable-arm-neon " +NEON_armv7a = " " +NEON_armv7a-vfp-neon = " " + +EXTRA_OECONF = "--disable-gtk ${IWMMXT} ${LOONGSON_MMI} ${NEON}" +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] = "8a9e8f14743a39cf303803f369c1f344" +SRC_URI[sha256sum] = "201fc0d7d6bc0017496f2bd27b3ca14224aea0df6b624c5ee2dc0307a4ff14a4" + +REQUIRED_DISTRO_FEATURES = "" -- cgit 1.2.3-korg