[oe-commits] Martin Jansa : xorg-xserver: add new 1.8.0 version

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 510979b0659a0739044898eed25bf7ead03fec4b
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=510979b0659a0739044898eed25bf7ead03fec4b

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Fri Apr  2 12:29:48 2010 +0200

xorg-xserver: add new 1.8.0 version

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 ...ack-assume-pixman-supports-overlapped-blt.patch |   14 ++++++++
 recipes/xorg-xserver/xserver-xorg_1.8.0.bb         |   33 ++++++++++++++++++++
 2 files changed, 47 insertions(+), 0 deletions(-)

diff --git a/recipes/xorg-xserver/xserver-xorg-1.8.0/hack-assume-pixman-supports-overlapped-blt.patch b/recipes/xorg-xserver/xserver-xorg-1.8.0/hack-assume-pixman-supports-overlapped-blt.patch
new file mode 100644
index 0000000..a947582
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg-1.8.0/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.8.0.bb b/recipes/xorg-xserver/xserver-xorg_1.8.0.bb
new file mode 100644
index 0000000..4d1630c
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg_1.8.0.bb
@@ -0,0 +1,33 @@
+require xorg-xserver-common.inc
+
+DESCRIPTION = "the X.Org X server"
+DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts font-util-native"
+PE = "2"
+PR = "${INC_PR}.0"
+
+# Needs newer mesa-dri, where is D_P = "-1"
+DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_shr = "1"
+
+SRC_URI += " \
+            file://dolt-fix-1.7.0.patch;patch=1 \
+            file://randr-support-1.7.0.patch;patch=1 \
+	    file://hack-fbdev-ignore-return-mode.patch;patch=1 \
+           "
+SRC_URI[archive.md5sum] = "7cec3a11890bb53f4a07854319360348"
+SRC_URI[archive.sha256sum] = "423a8092e28affb83aa736695408e01fd4641040727f34ed6bcfae9c06018b77"
+
+SRC_URI_append_angstrom = " file://hack-assume-pixman-supports-overlapped-blt.patch;patch=1"
+SRC_URI_append_shr = " file://hack-assume-pixman-supports-overlapped-blt.patch;patch=1"
+
+do_install_prepend() {
+        mkdir -p ${D}/${libdir}/X11/fonts
+}
+
+# The NVidia driver requires Xinerama support in the X server. Ion uses it.
+XINERAMA = "${@['--disable-xinerama','--enable-xinerama'][bb.data.getVar('MACHINE',d) in ['ion']]}"
+
+EXTRA_OECONF += " ${CONFIG_MANAGER_OPTION} ${XINERAMA} --disable-kdrive --disable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx"
+EXTRA_OECONF += " --disable-glx-tls --enable-dri2 --disable-unit-tests "
+
+export LDFLAGS += " -ldl "