diff options
Diffstat (limited to 'poky/meta/recipes-graphics/xorg-lib')
-rw-r--r-- | poky/meta/recipes-graphics/xorg-lib/libxt_1.2.0.bb | 4 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/xorg-lib/pixman/0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch | 33 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/xorg-lib/pixman_0.40.0.bb (renamed from poky/meta/recipes-graphics/xorg-lib/pixman_0.38.4.bb) | 5 |
3 files changed, 4 insertions, 38 deletions
diff --git a/poky/meta/recipes-graphics/xorg-lib/libxt_1.2.0.bb b/poky/meta/recipes-graphics/xorg-lib/libxt_1.2.0.bb index 42df43505..54384521c 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libxt_1.2.0.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libxt_1.2.0.bb @@ -22,8 +22,8 @@ PE = "1" XORG_PN = "libXt" -SRC_URI += "file://libxt_fix_for_x32.patch \ - " +SRC_URI += "file://libxt_fix_for_x32.patch" + SRC_URI[md5sum] = "a9019421d3ee8b4937b6afd9025f018a" SRC_URI[sha256sum] = "b31df531dabed9f4611fc8980bc51d7782967e2aff44c4105251a1acb5a77831" diff --git a/poky/meta/recipes-graphics/xorg-lib/pixman/0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch b/poky/meta/recipes-graphics/xorg-lib/pixman/0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch deleted file mode 100644 index 23cbf53a4..000000000 --- a/poky/meta/recipes-graphics/xorg-lib/pixman/0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0ccd906b904d21536d5ab41c6196760e3e5d72cb Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 17 May 2016 17:30:00 -0700 -Subject: [PATCH] test/utils: Check for FE_INVALID definition before use - -Some architectures e.g. nios2 do not support all exceptions - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted [https://gitlab.freedesktop.org/pixman/pixman/merge_requests/24] - - test/utils.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/test/utils.c b/test/utils.c -index f8e42a5..fe32b1e 100644 ---- a/test/utils.c -+++ b/test/utils.c -@@ -978,9 +978,11 @@ enable_invalid_exceptions (void) - { - #ifdef HAVE_FENV_H - #ifdef HAVE_FEENABLEEXCEPT -+#ifdef FE_INVALID - feenableexcept (FE_INVALID); - #endif - #endif -+#endif - } - - void * --- -2.8.2 - diff --git a/poky/meta/recipes-graphics/xorg-lib/pixman_0.38.4.bb b/poky/meta/recipes-graphics/xorg-lib/pixman_0.40.0.bb index 22e19ba06..5a3bb22ec 100644 --- a/poky/meta/recipes-graphics/xorg-lib/pixman_0.38.4.bb +++ b/poky/meta/recipes-graphics/xorg-lib/pixman_0.40.0.bb @@ -9,10 +9,9 @@ DEPENDS = "zlib" SRC_URI = "https://www.cairographics.org/releases/${BP}.tar.gz \ file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \ - file://0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch \ " -SRC_URI[md5sum] = "267a7af290f93f643a1bc74490d9fdd1" -SRC_URI[sha256sum] = "da66d6fd6e40aee70f7bd02e4f8f76fc3f006ec879d346bae6a723025cfbdde7" +SRC_URI[md5sum] = "73858c0862dd9896fb5f62ae267084a4" +SRC_URI[sha256sum] = "6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc" # see http://cairographics.org/releases/ - only even minor versions are stable UPSTREAM_CHECK_REGEX = "pixman-(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)" |