summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorConstantin Musca <constantinx.musca@intel.com>2013-02-11 14:58:33 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-12 13:22:44 +0000
commit656891d0193a1f46a89720192ea8f4ed086aca54 (patch)
tree4862cbaddc5c60c63f677368c3d16fa3bade7542 /meta/recipes-graphics
parent7d8a50eecc1c6cfd4920e682f3d0dbb5dbb4e7d4 (diff)
downloadpoky-656891d0193a1f46a89720192ea8f4ed086aca54.tar.gz
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>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/xorg-lib/pixman/obsolete_automake_macros.patch14
-rw-r--r--meta/recipes-graphics/xorg-lib/pixman_0.29.2.bb (renamed from meta/recipes-graphics/xorg-lib/pixman_0.28.2.bb)7
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 @@
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.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 \
15DEPENDS += "zlib libpng" 15DEPENDS += "zlib libpng"
16BBCLASSEXTEND = "native nativesdk" 16BBCLASSEXTEND = "native nativesdk"
17 17
18PR = "r1" 18PR = "r0"
19 19
20PE = "1" 20PE = "1"
21 21
@@ -31,8 +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 \
35" 34"
36 35
37SRC_URI[md5sum] = "f6e3294c4edb7b6bca8459e604286348" 36SRC_URI[md5sum] = "6e64a6d73559973ef6a9f125b5161ad3"
38SRC_URI[sha256sum] = "583686afbfa5a1dfc40a21e888a3eacf31fe0e02469d20b821b5d8f719165a51" 37SRC_URI[sha256sum] = "aa3dca46f6c90ae7731929d4e12195a981c52c3a423669ec3329d5a9c469841f"