[oe-commits] Koen Kooi : xserver-xorg: use overlapped blts, needs pixman support, hence not default

[git version control]

Module: openembedded.git
Branch: shr/merge
Commit: bdc1442952b8ab1bec976d6aae7afc5a36365495
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=bdc1442952b8ab1bec976d6aae7afc5a36365495

Author: Koen Kooi <koen at openembedded.org>
Date:   Fri Nov 20 13:06:56 2009 +0100

xserver-xorg: use overlapped blts, needs pixman support, hence not default

---

 ...ack-assume-pixman-supports-overlapped-blt.patch |   14 ++++++++++++++
 recipes/xorg-xserver/xserver-xorg_1.6.1.bb         |    5 ++++-
 2 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/recipes/xorg-xserver/xserver-xorg-1.6.1/hack-assume-pixman-supports-overlapped-blt.patch b/recipes/xorg-xserver/xserver-xorg-1.6.1/hack-assume-pixman-supports-overlapped-blt.patch
new file mode 100644
index 0000000..a947582
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg-1.6.1/hack-assume-pixman-supports-overlapped-blt.patch
@@ -0,0 +1,14 @@
+diff --git a/fb/fbcopy.c b/fb/fbcopy.c
+index 07eb663..ba394b7 100644
+--- a/fb/fbcopy.c
++++ b/fb/fbcopy.c
+@@ -91,8 +91,7 @@ fbCopyNtoN (DrawablePtr	pSrcDrawable,
+     while (nbox--)
+     {
+ #ifndef FB_ACCESS_WRAPPER /* pixman_blt() doesn't support accessors yet */
+-	if (pm == FB_ALLONES && alu == GXcopy && !reverse &&
+-	    !upsidedown)
++	if (pm == FB_ALLONES && alu == GXcopy)
+ 	{
+ 	    if (!pixman_blt ((uint32_t *)src, (uint32_t *)dst, srcStride, dstStride, srcBpp, dstBpp,
+ 			     (pbox->x1 + dx + srcXoff),
diff --git a/recipes/xorg-xserver/xserver-xorg_1.6.1.bb b/recipes/xorg-xserver/xserver-xorg_1.6.1.bb
index 5218fde..ff8e1cf 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.6.1.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.6.1.bb
@@ -4,11 +4,14 @@ DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman libpciaccess openssl xineramaproto libxinerama"
 RDEPENDS += "hal"
 PE = "2"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 SRC_URI += "file://sysroot_fix.patch;patch=1 \
 	    file://dolt-fix.patch;patch=1"
 
+# This requires support in pixman, which the default one doesn't have
+SRC_URI_append_angstrom = " file://hack-assume-pixman-supports-overlapped-blt.patch;patch=1"
+
 MESA_VER = "7.2"
 
 export LDFLAGS += " -ldl "