summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-05-31 17:52:18 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-06-04 13:27:30 +0100
commitc21ec17576dbc767926473b66ad980d20c55fbc2 (patch)
tree842c9ec218fd599608159f5e4ba1474514b1e5f5 /meta
parent42e2e1ab4e8b565bfb04d9816cda413b87e7b529 (diff)
downloadpoky-c21ec17576dbc767926473b66ad980d20c55fbc2.tar.gz
pixman: upgrade 0.38.4 -> 0.40.0
(From OE-Core rev: 81357bfa4c833989775be3728cb3a4b6918f5956) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/xorg-lib/pixman/0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch33
-rw-r--r--meta/recipes-graphics/xorg-lib/pixman_0.40.0.bb (renamed from meta/recipes-graphics/xorg-lib/pixman_0.38.4.bb)5
2 files changed, 2 insertions, 36 deletions
diff --git a/meta/recipes-graphics/xorg-lib/pixman/0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch b/meta/recipes-graphics/xorg-lib/pixman/0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch
deleted file mode 100644
index 23cbf53a41..0000000000
--- a/meta/recipes-graphics/xorg-lib/pixman/0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From 0ccd906b904d21536d5ab41c6196760e3e5d72cb Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 17 May 2016 17:30:00 -0700
4Subject: [PATCH] test/utils: Check for FE_INVALID definition before use
5
6Some architectures e.g. nios2 do not support all exceptions
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10Upstream-Status: Submitted [https://gitlab.freedesktop.org/pixman/pixman/merge_requests/24]
11
12 test/utils.c | 2 ++
13 1 file changed, 2 insertions(+)
14
15diff --git a/test/utils.c b/test/utils.c
16index f8e42a5..fe32b1e 100644
17--- a/test/utils.c
18+++ b/test/utils.c
19@@ -978,9 +978,11 @@ enable_invalid_exceptions (void)
20 {
21 #ifdef HAVE_FENV_H
22 #ifdef HAVE_FEENABLEEXCEPT
23+#ifdef FE_INVALID
24 feenableexcept (FE_INVALID);
25 #endif
26 #endif
27+#endif
28 }
29
30 void *
31--
322.8.2
33
diff --git a/meta/recipes-graphics/xorg-lib/pixman_0.38.4.bb b/meta/recipes-graphics/xorg-lib/pixman_0.40.0.bb
index 22e19ba069..5a3bb22ec3 100644
--- a/meta/recipes-graphics/xorg-lib/pixman_0.38.4.bb
+++ b/meta/recipes-graphics/xorg-lib/pixman_0.40.0.bb
@@ -9,10 +9,9 @@ DEPENDS = "zlib"
9 9
10SRC_URI = "https://www.cairographics.org/releases/${BP}.tar.gz \ 10SRC_URI = "https://www.cairographics.org/releases/${BP}.tar.gz \
11 file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \ 11 file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \
12 file://0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch \
13 " 12 "
14SRC_URI[md5sum] = "267a7af290f93f643a1bc74490d9fdd1" 13SRC_URI[md5sum] = "73858c0862dd9896fb5f62ae267084a4"
15SRC_URI[sha256sum] = "da66d6fd6e40aee70f7bd02e4f8f76fc3f006ec879d346bae6a723025cfbdde7" 14SRC_URI[sha256sum] = "6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc"
16 15
17# see http://cairographics.org/releases/ - only even minor versions are stable 16# see http://cairographics.org/releases/ - only even minor versions are stable
18UPSTREAM_CHECK_REGEX = "pixman-(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)" 17UPSTREAM_CHECK_REGEX = "pixman-(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)"