[oe] [meta-oe][PATCH] pixman: drop patches, merged to oe-core
Martin Jansa
martin.jansa at gmail.com
Mon Sep 10 12:09:29 UTC 2012
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
...lated-workarounds-in-cpu-features-detecti.patch | 144 ---------------------
...mplementation-of-pixman_blt-with-overlapp.patch | 127 ------------------
.../xorg-lib/pixman_0.27.2.bbappend | 13 --
3 files changed, 284 deletions(-)
delete mode 100644 meta-oe/recipes-graphics/xorg-lib/pixman-0.27.2/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-lib/pixman-0.27.2/0002-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
diff --git a/meta-oe/recipes-graphics/xorg-lib/pixman-0.27.2/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch b/meta-oe/recipes-graphics/xorg-lib/pixman-0.27.2/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch
deleted file mode 100644
index 4569dca..0000000
--- a/meta-oe/recipes-graphics/xorg-lib/pixman-0.27.2/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-From a0f53e1dbb3851bb0f0efcfdbd565b05e4be9cac Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony at googlemail.com>
-Date: Thu, 23 Aug 2012 18:10:57 +0200
-Subject: [PATCH 1/2] ARM: qemu related workarounds in cpu features detection
- code
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This was ported from meta-oe's patch [1]. The original pixman patch is found
-at [2].
-
-[1] http://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-graphics/xorg-lib/pixman-0.26.2/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch
-[2] http://lists.freedesktop.org/archives/pixman/2011-January/000906.html
-
-Upstream-Status: Inappropriate [other] qemu fix
-
-Signed-off-by: Andreas Müller <schnitzeltony at googlemail.com>
----
- pixman/pixman-arm.c | 82 ++++++++++++++++++++++++++++++++++++++++----------
- 1 files changed, 65 insertions(+), 17 deletions(-)
-
-diff --git a/pixman/pixman-arm.c b/pixman/pixman-arm.c
-index 23374e4..d98bda6 100644
---- a/pixman/pixman-arm.c
-+++ b/pixman/pixman-arm.c
-@@ -129,16 +129,35 @@ detect_cpu_features (void)
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/mman.h>
-+#include <sys/utsname.h>
- #include <fcntl.h>
- #include <string.h>
- #include <elf.h>
-
-+/*
-+ * The whole CPU capabilities detection is a bit ugly: when running in
-+ * userspace qemu, we see /proc/self/auxv from the host system. To make
-+ * everything even worse, the size of each value is 64-bit when running
-+ * on a 64-bit host system. So the data is totally bogus because we expect
-+ * 32-bit values. As AT_PLATFORM value is used as a pointer, it may cause
-+ * segfault (null pointer dereference on x86-64 host). So in order to be
-+ * on a safe side, we require that AT_PLATFORM value is found only once,
-+ * and it has non-zero value (this is still not totally reliable for a big
-+ * endian 64-bit host system running qemu and may theoretically fail).
-+ */
-+#define ARM_HWCAP_VFP 64
-+#define ARM_HWCAP_IWMMXT 512
-+#define ARM_HWCAP_NEON 4096
-+
- static arm_cpu_features_t
- detect_cpu_features (void)
- {
- arm_cpu_features_t features = 0;
- Elf32_auxv_t aux;
- int fd;
-+ uint32_t hwcap = 0;
-+ const char *plat = NULL;
-+ int plat_cnt = 0;
-
- fd = open ("/proc/self/auxv", O_RDONLY);
- if (fd >= 0)
-@@ -147,32 +166,61 @@ detect_cpu_features (void)
- {
- if (aux.a_type == AT_HWCAP)
- {
-- uint32_t hwcap = aux.a_un.a_val;
--
-- /* hardcode these values to avoid depending on specific
-- * versions of the hwcap header, e.g. HWCAP_NEON
-- */
-- if ((hwcap & 64) != 0)
-- features |= ARM_VFP;
-- if ((hwcap & 512) != 0)
-- features |= ARM_IWMMXT;
-- /* this flag is only present on kernel 2.6.29 */
-- if ((hwcap & 4096) != 0)
-- features |= ARM_NEON;
-+ hwcap = aux.a_un.a_val;
- }
- else if (aux.a_type == AT_PLATFORM)
- {
-- const char *plat = (const char*) aux.a_un.a_val;
--
-- if (strncmp (plat, "v7l", 3) == 0)
-+ plat = (const char*) aux.a_un.a_val;
-+ plat_cnt++;
-+ }
-+ }
-+ close (fd);
-+ if (plat == NULL || plat_cnt != 1 || *plat != 'v')
-+ {
-+ /*
-+ * Something seems to be really wrong, most likely we are
-+ * running under qemu. Let's use machine type from "uname" for
-+ * CPU capabilities detection:
-+ * http://www.mail-archive.com/qemu-devel at nongnu.org/msg22212.html
-+ */
-+ struct utsname u;
-+ hwcap = 0; /* clear hwcap, because it is bogus */
-+ if (uname (&u) == 0)
-+ {
-+ if (strcmp (u.machine, "armv7l") == 0)
-+ {
- features |= (ARM_V7 | ARM_V6);
-- else if (strncmp (plat, "v6l", 3) == 0)
-+ hwcap |= ARM_HWCAP_VFP; /* qemu is supposed to emulate vfp */
-+ hwcap |= ARM_HWCAP_NEON; /* qemu is supposed to emulate neon */
-+ }
-+ else if (strcmp (u.machine, "armv6l") == 0)
-+ {
- features |= ARM_V6;
-+ hwcap |= ARM_HWCAP_VFP; /* qemu is supposed to emulate vfp */
-+ }
- }
- }
-- close (fd);
-+ else if (strncmp (plat, "v7l", 3) == 0)
-+ {
-+ features |= (ARM_V7 | ARM_V6);
-+ }
-+ else if (strncmp (plat, "v6l", 3) == 0)
-+ {
-+ features |= ARM_V6;
-+ }
- }
-
-+ /* hardcode these values to avoid depending on specific
-+ * versions of the hwcap header, e.g. HWCAP_NEON
-+ */
-+ if ((hwcap & ARM_HWCAP_VFP) != 0)
-+ features |= ARM_VFP;
-+ if ((hwcap & ARM_HWCAP_IWMMXT) != 0)
-+ features |= ARM_IWMMXT;
-+ /* this flag is only present on kernel 2.6.29 */
-+ if ((hwcap & ARM_HWCAP_NEON) != 0)
-+ features |= ARM_NEON;
-+
- return features;
- }
-
---
-1.7.6.5
-
diff --git a/meta-oe/recipes-graphics/xorg-lib/pixman-0.27.2/0002-Generic-C-implementation-of-pixman_blt-with-overlapp.patch b/meta-oe/recipes-graphics/xorg-lib/pixman-0.27.2/0002-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
deleted file mode 100644
index abd501a..0000000
--- a/meta-oe/recipes-graphics/xorg-lib/pixman-0.27.2/0002-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From 211b2bcdb19f86f3868a18520df7dcb4fd122f05 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony at googlemail.com>
-Date: Sun, 19 Aug 2012 14:48:00 +0200
-Subject: [PATCH 2/2] Generic C implementation of pixman_blt with overlapping
- support
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This was ported from meta-oe's patch [1]:
-Uses memcpy/memmove functions to copy pixels, can handle the
-case when both source and destination areas are in the same
-image (this is useful for scrolling).
-
-It is assumed that copying direction is only important when
-using the same image for both source and destination (and
-src_stride == dst_stride). Copying direction is undefined
-for the images with different source and destination stride
-which happen to be in the overlapped areas (but this is an
-unrealistic case anyway).
-
-[1] http://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-graphics/xorg-lib/pixman-0.26.2/0008-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
-
-Upstream-Status: Unknown - this patch is in meta-oe for a while
-
-Signed-off-by: Andreas Müller <schnitzeltony at googlemail.com>
----
- pixman/pixman-general.c | 21 ++++++++++++++++++---
- pixman/pixman-private.h | 43 +++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 61 insertions(+), 3 deletions(-)
-
-diff --git a/pixman/pixman-general.c b/pixman/pixman-general.c
-index d4b2daa..a86b206 100644
---- a/pixman/pixman-general.c
-+++ b/pixman/pixman-general.c
-@@ -215,9 +215,24 @@ general_blt (pixman_implementation_t *imp,
- int width,
- int height)
- {
-- /* We can't blit unless we have sse2 or mmx */
--
-- return FALSE;
-+ uint8_t *dst_bytes = (uint8_t *)dst_bits;
-+ uint8_t *src_bytes = (uint8_t *)src_bits;
-+ int bpp;
-+
-+ if (src_bpp != dst_bpp || src_bpp & 7)
-+ return FALSE;
-+
-+ bpp = src_bpp >> 3;
-+ width *= bpp;
-+ src_stride *= 4;
-+ dst_stride *= 4;
-+ pixman_blt_helper (src_bytes + src_y * src_stride + src_x * bpp,
-+ dst_bytes + dest_y * dst_stride + dest_x * bpp,
-+ src_stride,
-+ dst_stride,
-+ width,
-+ height);
-+ return TRUE;
- }
-
- static pixman_bool_t
-diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
-index d5e6a72..c77d256 100644
---- a/pixman/pixman-private.h
-+++ b/pixman/pixman-private.h
-@@ -24,6 +24,7 @@
-
- #include "pixman.h"
- #include <time.h>
-+#include <string.h>
- #include <assert.h>
- #include <stdio.h>
- #include <string.h>
-@@ -1096,6 +1097,48 @@ void pixman_timer_register (pixman_timer_t *timer);
- extern const uint8_t linear_to_srgb[4096];
- extern const uint16_t srgb_to_linear[256];
-
-+/* a helper function, can blit 8-bit images with src/dst overlapping support */
-+static inline void
-+pixman_blt_helper (uint8_t *src_bytes,
-+ uint8_t *dst_bytes,
-+ int src_stride,
-+ int dst_stride,
-+ int width,
-+ int height)
-+{
-+ /*
-+ * The second part of this check is not strictly needed, but it prevents
-+ * unnecessary upside-down processing of areas which belong to different
-+ * images. Upside-down processing can be slower with fixed-distance-ahead
-+ * prefetch and perceived as having more tearing.
-+ */
-+ if (src_bytes < dst_bytes + width &&
-+ src_bytes + src_stride * height > dst_bytes)
-+ {
-+ src_bytes += src_stride * height - src_stride;
-+ dst_bytes += dst_stride * height - dst_stride;
-+ dst_stride = -dst_stride;
-+ src_stride = -src_stride;
-+ /* Horizontal scrolling to the left needs memmove */
-+ if (src_bytes + width > dst_bytes)
-+ {
-+ while (--height >= 0)
-+ {
-+ memmove (dst_bytes, src_bytes, width);
-+ dst_bytes += dst_stride;
-+ src_bytes += src_stride;
-+ }
-+ return;
-+ }
-+ }
-+ while (--height >= 0)
-+ {
-+ memcpy (dst_bytes, src_bytes, width);
-+ dst_bytes += dst_stride;
-+ src_bytes += src_stride;
-+ }
-+}
-+
- #endif /* __ASSEMBLER__ */
-
- #endif /* PIXMAN_PRIVATE_H */
---
-1.7.4.4
-
diff --git a/meta-oe/recipes-graphics/xorg-lib/pixman_0.27.2.bbappend b/meta-oe/recipes-graphics/xorg-lib/pixman_0.27.2.bbappend
index c677167..d9f1c29 100644
--- a/meta-oe/recipes-graphics/xorg-lib/pixman_0.27.2.bbappend
+++ b/meta-oe/recipes-graphics/xorg-lib/pixman_0.27.2.bbappend
@@ -1,14 +1 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
-
PRINC := "${@int(PRINC) + 1}"
-
-SRC_URI += " \
- file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \
- file://0002-Generic-C-implementation-of-pixman_blt-with-overlapp.patch \
-"
-
-NEON = " --disable-arm-neon "
-NEON_armv7a = " "
-NEON_armv7a-vfp-neon = " "
-
-EXTRA_OECONF += "${NEON}"
--
1.7.12
More information about the Openembedded-devel
mailing list