4 files changed, 172 insertions, 136 deletions

diff --git a/meta-oe/recipes-graphics/xorg-lib/pixman-0.26.2/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch b/meta-oe/recipes-graphics/xorg-lib/pixman-0.26.2/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch
deleted file mode 100644
index b56e690e9..000000000
--- a/meta-oe/recipes-graphics/xorg-lib/pixman-0.26.2/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From dad8537110c27b45795f8879a3e0a54aa77546b9 Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Tue, 11 Jan 2011 18:10:39 +0200
-Subject: [PATCH] ARM: qemu related workarounds in cpu features detection code
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- pixman/pixman-cpu.c |   67 +++++++++++++++++++++++++++++++++++++++++---------
- 1 files changed, 55 insertions(+), 12 deletions(-)
-
-diff --git a/pixman/pixman-cpu.c b/pixman/pixman-cpu.c
-index aa9036f..a8f2494 100644
---- a/pixman/pixman-cpu.c
-+++ b/pixman/pixman-cpu.c
-@@ -333,15 +333,30 @@ pixman_arm_read_auxv_or_cpu_features ()
- #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).
-+ */
- static void
- pixman_arm_read_auxv_or_cpu_features ()
- {
-     int fd;
-     Elf32_auxv_t aux;
-+    uint32_t hwcap = 0;
-+    const char *plat = NULL;
-+    int plat_cnt = 0;
- 
-     fd = open ("/proc/self/auxv", O_RDONLY);
-     if (fd >= 0)
-@@ -350,32 +365,60 @@ pixman_arm_read_auxv_or_cpu_features ()
-        {
-            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
--                */
--               arm_has_vfp = (hwcap & 64) != 0;
--               arm_has_iwmmxt = (hwcap & 512) != 0;
--               /* this flag is only present on kernel 2.6.29 */
--               arm_has_neon = (hwcap & 4096) != 0;
-+               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)
-                {
-                    arm_has_v7 = TRUE;
-                    arm_has_v6 = TRUE;
-+                   hwcap |= 64; /* qemu is supposed to emulate vfp */
-+                   hwcap |= 4096; /* qemu is supposed to emulate neon */
-                }
--               else if (strncmp (plat, "v6l", 3) == 0)
-+               else if (strcmp (u.machine, "armv6l") == 0)
-                {
-                    arm_has_v6 = TRUE;
-+                   hwcap |= 64; /* qemu is supposed to emulate vfp */
-                }
-            }
-        }
--       close (fd);
-+       else if (strncmp (plat, "v7l", 3) == 0)
-+       {
-+           arm_has_v7 = TRUE;
-+           arm_has_v6 = TRUE;
-+       }
-+       else if (strncmp (plat, "v6l", 3) == 0)
-+       {
-+           arm_has_v6 = TRUE;
-+       }
-     }
- 
-+    /* hardcode these values to avoid depending on specific
-+     * versions of the hwcap header, e.g. HWCAP_NEON
-+     */
-+    arm_has_vfp = (hwcap & 64) != 0;
-+    arm_has_iwmmxt = (hwcap & 512) != 0;
-+    arm_has_neon = (hwcap & 4096) != 0;
-+
-     arm_tests_initialized = TRUE;
- }
- 
--- 
-1.7.8.6
-
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
new file mode 100644
index 000000000..8a1c524a8
--- /dev/null
+++ b/meta-oe/recipes-graphics/xorg-lib/pixman-0.27.2/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch
@@ -0,0 +1,145 @@
+From d140e69c1d76ed61d1feb53b79820951707ee5a6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Sun, 19 Aug 2012 15:15:45 +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]
+
+[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
+
+Upstream-Status: Inappropriate [other] qemu fix
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ pixman/pixman-arm.c |   74 +++++++++++++++++++++++++++++++++++++++++++++++---
+ 1 files changed, 69 insertions(+), 5 deletions(-)
+
+diff --git a/pixman/pixman-arm.c b/pixman/pixman-arm.c
+index 23374e4..d0771fd 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,22 +166,23 @@ detect_cpu_features (void)
+        {
+            if (aux.a_type == AT_HWCAP)
+            {
+-               uint32_t hwcap = aux.a_un.a_val;
++               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)
++               if ((hwcap & ARM_HWCAP_VFP) != 0)
+                    features |= ARM_VFP;
+-               if ((hwcap & 512) != 0)
++               if ((hwcap & ARM_HWCAP_IWMMXT) != 0)
+                    features |= ARM_IWMMXT;
+                /* this flag is only present on kernel 2.6.29 */
+-               if ((hwcap & 4096) != 0)
++               if ((hwcap & ARM_HWCAP_NEON) != 0)
+                    features |= ARM_NEON;
+            }
+            else if (aux.a_type == AT_PLATFORM)
+            {
+-               const char *plat = (const char*) aux.a_un.a_val;
++               plat = (const char*) aux.a_un.a_val;
++               plat_cnt++;
+ 
+                if (strncmp (plat, "v7l", 3) == 0)
+                    features |= (ARM_V7 | ARM_V6);
+@@ -171,8 +191,52 @@ detect_cpu_features (void)
+            }
+        }
+        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);
++                   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 */
++               }
++           }
++       }
++       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;
++    if ((hwcap & ARM_HWCAP_NEON) != 0)
++        features |= ARM_NEON;
++
+     return features;
+ }
+ 
+-- 
+1.7.4.4
+
diff --git a/meta-oe/recipes-graphics/xorg-lib/pixman-0.26.2/0008-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
index 34f96ed1d..abd501a10 100644
--- a/meta-oe/recipes-graphics/xorg-lib/pixman-0.26.2/0008-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
@@ -1,8 +1,13 @@
-From 0c7aa6a3ebc29d7986d2417371df210f3e9a65b4 Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Tue, 16 Mar 2010 16:55:28 +0100
-Subject: [PATCH 8/8] Generic C implementation of pixman_blt with overlapping support
+From 211b2bcdb19f86f3868a18520df7dcb4fd122f05 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@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).
@@ -13,16 +18,22 @@ 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@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 2ccdfcd..90461b6 100644
+index d4b2daa..a86b206 100644
 --- a/pixman/pixman-general.c
 +++ b/pixman/pixman-general.c
-@@ -227,9 +227,24 @@ general_blt (pixman_implementation_t *imp,
+@@ -215,9 +215,24 @@ general_blt (pixman_implementation_t *imp,
               int                      width,
               int                      height)
  {
@@ -51,10 +62,10 @@ index 2ccdfcd..90461b6 100644
  
  static pixman_bool_t
 diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
-index cbd48f3..c20d9f0 100644
+index d5e6a72..c77d256 100644
 --- a/pixman/pixman-private.h
 +++ b/pixman/pixman-private.h
-@@ -10,6 +10,7 @@
+@@ -24,6 +24,7 @@
  
  #include "pixman.h"
  #include <time.h>
@@ -62,9 +73,9 @@ index cbd48f3..c20d9f0 100644
  #include <assert.h>
  #include <stdio.h>
  #include <string.h>
-@@ -998,4 +999,46 @@ void pixman_timer_register (pixman_timer_t *timer);
- 
- #endif /* PIXMAN_TIMERS */
+@@ -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
@@ -108,7 +119,9 @@ index cbd48f3..c20d9f0 100644
 +    }
 +}
 +
+ #endif /* __ASSEMBLER__ */
+ 
  #endif /* PIXMAN_PRIVATE_H */
 -- 
-1.6.6.1
+1.7.4.4
 
diff --git a/meta-oe/recipes-graphics/xorg-lib/pixman_0.26.2.bbappend b/meta-oe/recipes-graphics/xorg-lib/pixman_0.27.2.bbappend
index b5be2b50c..a04a549a5 100644
--- a/meta-oe/recipes-graphics/xorg-lib/pixman_0.26.2.bbappend
+++ b/meta-oe/recipes-graphics/xorg-lib/pixman_0.27.2.bbappend
@@ -1,9 +1,8 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
 
-PRINC := "${@int(PRINC) + 10}"
-
-SRC_URI += " file://0008-Generic-C-implementation-of-pixman_blt-with-overlapp.patch \
+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 "