summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2013-01-08 09:16:40 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-10 23:43:12 +0000
commit78dec5d44afe2467fa73ff88bedb231903e23433 (patch)
treee1bb8bca01332c178783cc38ac406323f7d35cd6
parent1b1e1b3f0a31f7e21a881a5d4a251ec6e5f5e9bf (diff)
downloadpoky-78dec5d44afe2467fa73ff88bedb231903e23433.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. (From OE-Core rev: d425161761de48a8ab745915ebddaa224c516214) Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 @@
1Upstream-Status: Accepted
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd pixman-0.28.2/configure.ac pixman-0.28.2/configure.ac
5--- pixman-0.28.2/configure.ac 2012-12-10 13:46:36.000000000 +0200
6+++ pixman-0.28.2/configure.ac 2013-01-03 06:31:07.574848073 +0200
7@@ -64,7 +64,7 @@
8 # Suppress verbose compile lines
9 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
10
11-AM_CONFIG_HEADER(config.h)
12+AC_CONFIG_HEADERS(config.h)
13
14 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 \
15DEPENDS += "zlib libpng" 15DEPENDS += "zlib libpng"
16BBCLASSEXTEND = "native nativesdk" 16BBCLASSEXTEND = "native nativesdk"
17 17
18PR = "r0" 18PR = "r1"
19 19
20PE = "1" 20PE = "1"
21 21
@@ -31,6 +31,7 @@ EXTRA_OECONF_class-native = "--disable-gtk"
31SRC_URI += "\ 31SRC_URI += "\
32 file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \ 32 file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \
33 file://Generic-C-implementation-of-pixman_blt-with-overlapp.patch \ 33 file://Generic-C-implementation-of-pixman_blt-with-overlapp.patch \
34 file://obsolete_automake_macros.patch \
34" 35"
35 36
36SRC_URI[md5sum] = "f6e3294c4edb7b6bca8459e604286348" 37SRC_URI[md5sum] = "f6e3294c4edb7b6bca8459e604286348"