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 <constantinx.musca@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 3 insertions, 18 deletions

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 <cazfi74@gmail.com>
-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.29.2.bb
index 59c2691591..9140f4b164 100644
--- a/meta/recipes-graphics/xorg-lib/pixman_0.28.2.bb
+++ b/meta/recipes-graphics/xorg-lib/pixman_0.29.2.bb
@@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=14096c769ae0cbb5fcb94ec468be11b3 \
 DEPENDS += "zlib libpng"
 BBCLASSEXTEND = "native nativesdk"
 
-PR = "r1"
+PR = "r0"
 
 PE = "1"
 
@@ -31,8 +31,7 @@ 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"
+SRC_URI[md5sum] = "6e64a6d73559973ef6a9f125b5161ad3"
+SRC_URI[sha256sum] = "aa3dca46f6c90ae7731929d4e12195a981c52c3a423669ec3329d5a9c469841f"