[oe-commits] Koen Kooi : xserver-xorg 1.7.3: add overlapped blit support for angstrom

[git version control]

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

Author: Koen Kooi <koen at openembedded.org>
Date:   Tue Dec 29 19:52:37 2009 +0100

xserver-xorg 1.7.3: add overlapped blit support for angstrom

* Needs support from pixman, so only enable this patch when you are sure your pixman supports it

---

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

diff --git a/recipes/xorg-xserver/xserver-xorg-1.7.3/hack-assume-pixman-supports-overlapped-blt.patch b/recipes/xorg-xserver/xserver-xorg-1.7.3/hack-assume-pixman-supports-overlapped-blt.patch
new file mode 100644
index 0000000..a947582
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg-1.7.3/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.7.3.bb b/recipes/xorg-xserver/xserver-xorg_1.7.3.bb
index 8f72741..6b28f76 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.7.3.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.7.3.bb
@@ -3,12 +3,15 @@ require xorg-xserver-common.inc
 DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts"
 PE = "2"
-PR = "r1"
+PR = "r2"
 
 SRC_URI += "file://sysroot_fix.patch;patch=1 \
             file://dolt-fix-1.7.0.patch;patch=1 \
             file://randr-support-1.7.0.patch;patch=1 \
            "
+
+SRC_URI_append_angstrom = " file://hack-assume-pixman-supports-overlapped-blt.patch;patch=1"
+
 do_install_prepend() {
         mkdir -p ${D}/${libdir}/X11/fonts
 }