summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-lib
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-05-12 10:20:33 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-13 13:41:26 +0100
commit5f6e5e45d565ead19e7072826167b098181871b6 (patch)
tree685bf9dba659614431996e9c42b166529152cfd0 /meta/recipes-graphics/xorg-lib
parentc2ceef39735bd8d20cb97df0d6da60d46696057f (diff)
downloadpoky-5f6e5e45d565ead19e7072826167b098181871b6.tar.gz
pixman: Upgrade 0.32.8 -> 0.34.0
Remove two patches that are no longer needed. (From OE-Core rev: 7b8a99c2715583b48d1d3a1d9004c0607b99ddd1) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-lib')
-rw-r--r--meta/recipes-graphics/xorg-lib/pixman/0001-v3-test-add-a-check-for-FE_DIVBYZERO.patch65
-rw-r--r--meta/recipes-graphics/xorg-lib/pixman/mips-export-revert.patch22
-rw-r--r--meta/recipes-graphics/xorg-lib/pixman_0.34.0.bb (renamed from meta/recipes-graphics/xorg-lib/pixman_0.32.8.bb)6
3 files changed, 2 insertions, 91 deletions
diff --git a/meta/recipes-graphics/xorg-lib/pixman/0001-v3-test-add-a-check-for-FE_DIVBYZERO.patch b/meta/recipes-graphics/xorg-lib/pixman/0001-v3-test-add-a-check-for-FE_DIVBYZERO.patch
deleted file mode 100644
index 6b7c1e62a2..0000000000
--- a/meta/recipes-graphics/xorg-lib/pixman/0001-v3-test-add-a-check-for-FE_DIVBYZERO.patch
+++ /dev/null
@@ -1,65 +0,0 @@
1From fcd5eb9bd0e8674a6f4987a8fce7dc1ba8f9320c Mon Sep 17 00:00:00 2001
2From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
3Date: Thu, 17 Sep 2015 03:08:36 +0200
4Subject: [PATCH] [v3] test: add a check for FE_DIVBYZERO
5
6Some architectures, such as Microblaze and Nios2, currently do not
7implement FE_DIVBYZERO, even though they have <fenv.h> and
8feenableexcept(). This commit adds a configure.ac check to verify
9whether FE_DIVBYZERO is defined or not, and if not, disables the
10problematic code in test/utils.c.
11
12Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
13Signed-off-by: Marek Vasut <marex@denx.de>
14Upstream-Status: Backport [commit 4297e9058]
15---
16Changes v1 -> v2:
17
18 * Use the ac_cv_have_decl_FE_DIVBYZERO variable, which is
19 automatically set by AC_CHECK_DECL, to decide whether or not
20 HAVE_FEDIVBYZERO should be defined.
21
22Changes v2 -> v3:
23
24 * Use action-if-yes of AC_CHECK_DECL as suggested in
25 http://lists.freedesktop.org/archives/pixman/2014-February/003176.html
26---
27 configure.ac | 5 +++++
28 test/utils.c | 2 ++
29 2 files changed, 7 insertions(+)
30
31diff --git a/configure.ac b/configure.ac
32index f93cc30..424bfd3 100644
33--- a/configure.ac
34+++ b/configure.ac
35@@ -891,6 +891,11 @@ if test x$have_feenableexcept = xyes; then
36 AC_DEFINE(HAVE_FEENABLEEXCEPT, 1, [Whether we have feenableexcept()])
37 fi
38
39+AC_CHECK_DECL([FE_DIVBYZERO],
40+ [AC_DEFINE(HAVE_FEDIVBYZERO, 1, [Whether we have FE_DIVBYZERO])],
41+ [],
42+ [[#include <fenv.h>]])
43+
44 AC_CHECK_FUNC(gettimeofday, have_gettimeofday=yes, have_gettimeofday=no)
45 AC_CHECK_HEADER(sys/time.h, have_sys_time_h=yes, have_sys_time_h=no)
46 if test x$have_gettimeofday = xyes && test x$have_sys_time_h = xyes; then
47diff --git a/test/utils.c b/test/utils.c
48index 222d4d5..8657966 100644
49--- a/test/utils.c
50+++ b/test/utils.c
51@@ -966,9 +966,11 @@ enable_divbyzero_exceptions (void)
52 {
53 #ifdef HAVE_FENV_H
54 #ifdef HAVE_FEENABLEEXCEPT
55+#ifdef HAVE_FEDIVBYZERO
56 feenableexcept (FE_DIVBYZERO);
57+#endif
58 #endif
59 #endif
60 }
61
62 void
63--
642.1.4
65
diff --git a/meta/recipes-graphics/xorg-lib/pixman/mips-export-revert.patch b/meta/recipes-graphics/xorg-lib/pixman/mips-export-revert.patch
deleted file mode 100644
index 14a5fd209b..0000000000
--- a/meta/recipes-graphics/xorg-lib/pixman/mips-export-revert.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1Revert a commit in pixman 0.32.6 which breaks compliation on MIPS machines with
2errors such as:
3
4pixman-0.32.6/pixman/pixman-mips-dspr2-asm.S:4267:
5Error: invalid operands `mflo $14,$ac3'
6
7Upstream-Status: Pending
8Signed-off-by: Ross Burton <ross.burton@intel.com>
9
10--- b/pixman/pixman-mips-dspr2-asm.h
11+++ a/pixman/pixman-mips-dspr2-asm.h
12@@ -72,10 +72,7 @@
13 #define LEAF_MIPS32R2(symbol) \
14 .globl symbol; \
15 .align 2; \
16-#ifdef __ELF__
17- .hidden symbol; \
18 .type symbol, @function; \
19-#endif
20 .ent symbol, 0; \
21 symbol: .frame sp, 0, ra; \
22 .set push; \
diff --git a/meta/recipes-graphics/xorg-lib/pixman_0.32.8.bb b/meta/recipes-graphics/xorg-lib/pixman_0.34.0.bb
index 553ce369b7..87da5c2abc 100644
--- a/meta/recipes-graphics/xorg-lib/pixman_0.32.8.bb
+++ b/meta/recipes-graphics/xorg-lib/pixman_0.34.0.bb
@@ -31,12 +31,10 @@ EXTRA_OECONF_class-nativesdk = "--disable-gtk"
31 31
32SRC_URI += "\ 32SRC_URI += "\
33 file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \ 33 file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \
34 file://mips-export-revert.patch \
35 file://asm_include.patch \ 34 file://asm_include.patch \
36 file://0001-v3-test-add-a-check-for-FE_DIVBYZERO.patch \
37" 35"
38 36
39SRC_URI[md5sum] = "18d6b62abdb7bc0f8e6b0ddf48986b2c" 37SRC_URI[md5sum] = "002a4fcb644ddfcb4b0e4191576a0d59"
40SRC_URI[sha256sum] = "5c63dbb3523fc4d86ed4186677815918a941b7cb390d5eec4f55cb5d66b59fb1" 38SRC_URI[sha256sum] = "39ba3438f3d17c464b0cb8be006dacbca0ab5aee97ebde69fec7ecdbf85794a0"
41 39
42REQUIRED_DISTRO_FEATURES = "" 40REQUIRED_DISTRO_FEATURES = ""