summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2013-01-08 09:16:40 +0200
committerSaul Wold <sgw@linux.intel.com>2013-01-09 16:40:37 -0800
commitd425161761de48a8ab745915ebddaa224c516214 (patch)
treebbf3a121c5093e933ab05272d0c5d6b133c7bad8 /meta
parentdaee74c11411b78560a9682675a215da634a142a (diff)
downloadopenembedded-core-contrib-d425161761de48a8ab745915ebddaa224c516214.tar.gz
pixman: replace obsolete automake macros with working ones
Add obsolete_automake_macros.patch that replaces automake macros no longer supported by automake-1.13 with modern constructs. Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/xorg-lib/pixman/obsolete_automake_macros.patch14
-rw-r--r--meta/recipes-graphics/xorg-lib/pixman_0.28.2.bb3
2 files changed, 16 insertions, 1 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
new file mode 100644
index 0000000000..7a4237c999
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/pixman/obsolete_automake_macros.patch
@@ -0,0 +1,14 @@
+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.28.2.bb
index 4ec04902d2..59c2691591 100644
--- a/meta/recipes-graphics/xorg-lib/pixman_0.28.2.bb
+++ b/meta/recipes-graphics/xorg-lib/pixman_0.28.2.bb
@@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=14096c769ae0cbb5fcb94ec468be11b3 \
DEPENDS += "zlib libpng"
BBCLASSEXTEND = "native nativesdk"
-PR = "r0"
+PR = "r1"
PE = "1"
@@ -31,6 +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"