diff options
| -rw-r--r-- | meta/recipes-graphics/xorg-lib/pixman/asm_include.patch | 29 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-lib/pixman_0.38.0.bb (renamed from meta/recipes-graphics/xorg-lib/pixman_0.34.0.bb) | 5 |
2 files changed, 2 insertions, 32 deletions
diff --git a/meta/recipes-graphics/xorg-lib/pixman/asm_include.patch b/meta/recipes-graphics/xorg-lib/pixman/asm_include.patch deleted file mode 100644 index b52a5707d6..0000000000 --- a/meta/recipes-graphics/xorg-lib/pixman/asm_include.patch +++ /dev/null | |||
| @@ -1,29 +0,0 @@ | |||
| 1 | Fixes errors like | ||
| 2 | |||
| 3 | Assembler messages: | ||
| 4 | Fatal error: can't create .libs/pixman-mips-dspr2-asm.o: No such file or directory | ||
| 5 | |||
| 6 | it works with glibc because it uses gcc fixed-headers but thats not right. | ||
| 7 | |||
| 8 | We move the include under C block | ||
| 9 | |||
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 11 | Upstream-Status: Pending | ||
| 12 | Index: pixman-0.32.6/pixman/pixman-private.h | ||
| 13 | =================================================================== | ||
| 14 | --- pixman-0.32.6.orig/pixman/pixman-private.h | ||
| 15 | +++ pixman-0.32.6/pixman/pixman-private.h | ||
| 16 | @@ -1,4 +1,3 @@ | ||
| 17 | -#include <float.h> | ||
| 18 | |||
| 19 | #ifndef PIXMAN_PRIVATE_H | ||
| 20 | #define PIXMAN_PRIVATE_H | ||
| 21 | @@ -17,6 +16,8 @@ | ||
| 22 | |||
| 23 | #ifndef __ASSEMBLER__ | ||
| 24 | |||
| 25 | +#include <float.h> | ||
| 26 | + | ||
| 27 | #ifndef PACKAGE | ||
| 28 | # error config.h must be included before pixman-private.h | ||
| 29 | #endif | ||
diff --git a/meta/recipes-graphics/xorg-lib/pixman_0.34.0.bb b/meta/recipes-graphics/xorg-lib/pixman_0.38.0.bb index c290fa4614..49c3d62342 100644 --- a/meta/recipes-graphics/xorg-lib/pixman_0.34.0.bb +++ b/meta/recipes-graphics/xorg-lib/pixman_0.38.0.bb | |||
| @@ -31,11 +31,10 @@ EXTRA_OECONF_class-nativesdk = "--disable-gtk" | |||
| 31 | 31 | ||
| 32 | SRC_URI += "\ | 32 | SRC_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://asm_include.patch \ | ||
| 35 | file://0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch \ | 34 | file://0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch \ |
| 36 | " | 35 | " |
| 37 | 36 | ||
| 38 | SRC_URI[md5sum] = "002a4fcb644ddfcb4b0e4191576a0d59" | 37 | SRC_URI[md5sum] = "04ecad28edcc14e7eb5f7ed6df29c7a0" |
| 39 | SRC_URI[sha256sum] = "39ba3438f3d17c464b0cb8be006dacbca0ab5aee97ebde69fec7ecdbf85794a0" | 38 | SRC_URI[sha256sum] = "b768e3f7895ddebdc0f07478729d9cec4fe0a9d2201f828c900d67b0e5b436a8" |
| 40 | 39 | ||
| 41 | REQUIRED_DISTRO_FEATURES = "" | 40 | REQUIRED_DISTRO_FEATURES = "" |
