xorg: add newer xserver 1.8.1, xdm, imake

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

5 files changed, 81 insertions, 4 deletions

diff --git a/conf/distro/include/preferred-xorg-versions-live.inc b/conf/distro/include/preferred-xorg-versions-live.inc
index 62046f8eca..5746254e0d 100644
--- a/conf/distro/include/preferred-xorg-versions-live.inc
+++ b/conf/distro/include/preferred-xorg-versions-live.inc
@@ -1,4 +1,4 @@
-#Wed Apr  7 09:27:09 CEST 2010
+#Tue May 11 11:49:22 CEST 2010
 #app
 PREFERRED_VERSION_appres ?= "1.0.2"
 PREFERRED_VERSION_bdftopcf ?= "1.0.2"
@@ -47,7 +47,7 @@ PREFERRED_VERSION_xcursorgen ?= "1.0.3"
 PREFERRED_VERSION_xcursorgen-native ?= "1.0.3"
 PREFERRED_VERSION_xdbedizzy ?= "1.0.2"
 PREFERRED_VERSION_xditview ?= "1.0.1"
-PREFERRED_VERSION_xdm ?= "1.1.9"
+PREFERRED_VERSION_xdm ?= "1.1.10"
 PREFERRED_VERSION_xdpyinfo ?= "1.1.0"
 PREFERRED_VERSION_xdriinfo ?= "1.0.3"
 PREFERRED_VERSION_xedit ?= "1.1.2"
@@ -343,7 +343,7 @@ PREFERRED_VERSION_xproto-native ?= "7.0.16"
 PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.3"
 #util
 PREFERRED_VERSION_gccmakedep ?= "1.0.2"
-PREFERRED_VERSION_imake ?= "1.0.2"
+PREFERRED_VERSION_imake ?= "1.0.3"
 PREFERRED_VERSION_lndir ?= "1.0.1"
 PREFERRED_VERSION_makedepend ?= "1.0.2"
 PREFERRED_VERSION_makedepend-native ?= "1.0.2"
@@ -351,4 +351,4 @@ PREFERRED_VERSION_util-macros ?= "1.7.0"
 PREFERRED_VERSION_util-macros-native ?= "1.7.0"
 PREFERRED_VERSION_xorg-cf-files ?= "1.0.3"
 #xserver
-PREFERRED_VERSION_xserver-xorg ?= "1.8.0"
+PREFERRED_VERSION_xserver-xorg ?= "1.8.1"
diff --git a/recipes/xorg-app/xdm_1.1.10.bb b/recipes/xorg-app/xdm_1.1.10.bb
new file mode 100644
index 0000000000..28202b7dfb
--- /dev/null
+++ b/recipes/xorg-app/xdm_1.1.10.bb
@@ -0,0 +1,17 @@
+require xorg-app-common.inc
+PE = "1"
+PR = "r1"
+
+DESCRIPTION = "X display manager"
+
+DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau virtual/libx11 libxext libxdmcp libxt libxaw"
+
+EXTRA_OECONF += "\
+	--with-random-device=/dev/urandom --with-utmp-file=/var/run/utmp \
+	--with-wtmp-file=/var/log/wtmp \
+	"
+
+FILES_${PN}-dbg += "${libdir}/X11/xdm/.debug/*"
+
+SRC_URI[archive.md5sum] = "329383040cdbda5b5c8ce6c7e1120c97"
+SRC_URI[archive.sha256sum] = "1487f7168e65fb7ea8cf21e99cdec412e643680c5dac9688aad5f87beba4f97f"
diff --git a/recipes/xorg-util/imake_1.0.3.bb b/recipes/xorg-util/imake_1.0.3.bb
new file mode 100644
index 0000000000..ce51d59ecb
--- /dev/null
+++ b/recipes/xorg-util/imake_1.0.3.bb
@@ -0,0 +1,9 @@
+require xorg-util-common.inc
+
+DESCRIPTION = "C preprocessor interface to the make utility"
+RDEPENDS = "perl xproto"
+
+PR = "r2"
+PE = "1"
+SRC_URI[archive.md5sum] = "579377af36a146913b3429cad1f7e8ab"
+SRC_URI[archive.sha256sum] = "5d149c3cc9a0d7eca2a4bb44e5597f50f6d7ec75b61d7ca2ded842294214012d"
diff --git a/recipes/xorg-xserver/xserver-xorg-1.8.1/hack-assume-pixman-supports-overlapped-blt.patch b/recipes/xorg-xserver/xserver-xorg-1.8.1/hack-assume-pixman-supports-overlapped-blt.patch
new file mode 100644
index 0000000000..a947582f15
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg-1.8.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.8.1.bb b/recipes/xorg-xserver/xserver-xorg_1.8.1.bb
new file mode 100644
index 0000000000..d3df4c3a18
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg_1.8.1.bb
@@ -0,0 +1,37 @@
+# Assign it here, since the hal->udev transition happens post 1.7 in angstrom
+DISTRO_XORG_CONFIG_MANAGER_angstrom = "udev"
+
+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}.1"
+
+# 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] = "7c3b873692f4e93938261d774510e78d"
+SRC_URI[archive.sha256sum] = "bddb974d8f21107ab8f79abf92cebb06ec13243f1ffd1ef56b48452c4994659d"
+
+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.
+PACKAGE_ARCH_ion = "${MACHINE_ARCH}"
+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 "