From 656891d0193a1f46a89720192ea8f4ed086aca54 Mon Sep 17 00:00:00 2001 From: Constantin Musca Date: Mon, 11 Feb 2013 14:58:33 +0200 Subject: pixman: upgrade to 0.29.2 obsolete_automake_macros.patch: removed - included in the new version (From OE-Core rev: 31fc8a621fbeb4f5bec7c6b6fd03043bb382c34d) Signed-off-by: Constantin Musca Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../xorg-lib/pixman/obsolete_automake_macros.patch | 14 -------- meta/recipes-graphics/xorg-lib/pixman_0.28.2.bb | 38 ---------------------- meta/recipes-graphics/xorg-lib/pixman_0.29.2.bb | 37 +++++++++++++++++++++ 3 files changed, 37 insertions(+), 52 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-lib/pixman/obsolete_automake_macros.patch delete mode 100644 meta/recipes-graphics/xorg-lib/pixman_0.28.2.bb create mode 100644 meta/recipes-graphics/xorg-lib/pixman_0.29.2.bb diff --git a/meta/recipes-graphics/xorg-lib/pixman/obsolete_automake_macros.patch b/meta/recipes-graphics/xorg-lib/pixman/obsolete_automake_macros.patch deleted file mode 100644 index 7a4237c999..0000000000 --- a/meta/recipes-graphics/xorg-lib/pixman/obsolete_automake_macros.patch +++ /dev/null @@ -1,14 +0,0 @@ -Upstream-Status: Accepted - -Signed-off-by: Marko Lindqvist -diff -Nurd pixman-0.28.2/configure.ac pixman-0.28.2/configure.ac ---- pixman-0.28.2/configure.ac 2012-12-10 13:46:36.000000000 +0200 -+++ pixman-0.28.2/configure.ac 2013-01-03 06:31:07.574848073 +0200 -@@ -64,7 +64,7 @@ - # Suppress verbose compile lines - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - - AC_CANONICAL_HOST diff --git a/meta/recipes-graphics/xorg-lib/pixman_0.28.2.bb b/meta/recipes-graphics/xorg-lib/pixman_0.28.2.bb deleted file mode 100644 index 59c2691591..0000000000 --- a/meta/recipes-graphics/xorg-lib/pixman_0.28.2.bb +++ /dev/null @@ -1,38 +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" - -PR = "r1" - -PE = "1" - -IWMMXT = "--disable-arm-iwmmxt" -LOONGSON_MMI = "--disable-loongson-mmi" -NEON = " --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://Generic-C-implementation-of-pixman_blt-with-overlapp.patch \ - file://obsolete_automake_macros.patch \ -" - -SRC_URI[md5sum] = "f6e3294c4edb7b6bca8459e604286348" -SRC_URI[sha256sum] = "583686afbfa5a1dfc40a21e888a3eacf31fe0e02469d20b821b5d8f719165a51" diff --git a/meta/recipes-graphics/xorg-lib/pixman_0.29.2.bb b/meta/recipes-graphics/xorg-lib/pixman_0.29.2.bb new file mode 100644 index 0000000000..9140f4b164 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/pixman_0.29.2.bb @@ -0,0 +1,37 @@ +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" + +PR = "r0" + +PE = "1" + +IWMMXT = "--disable-arm-iwmmxt" +LOONGSON_MMI = "--disable-loongson-mmi" +NEON = " --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://Generic-C-implementation-of-pixman_blt-with-overlapp.patch \ +" + +SRC_URI[md5sum] = "6e64a6d73559973ef6a9f125b5161ad3" +SRC_URI[sha256sum] = "aa3dca46f6c90ae7731929d4e12195a981c52c3a423669ec3329d5a9c469841f" -- cgit v1.2.3-54-g00ecf