[oe-commits] Martin Jansa : xserver-xorg: remove 1.8.0, keep 1.8.1 as 1.8 representative

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Thu Jul  1 16:23:12 2010 +0200

xserver-xorg: remove 1.8.0, keep 1.8.1 as 1.8 representative

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, 0 insertions(+), 47 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
deleted file mode 100644
index a947582..0000000
--- a/recipes/xorg-xserver/xserver-xorg-1.8.0/hack-assume-pixman-supports-overlapped-blt.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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
deleted file mode 100644
index afd66fc..0000000
--- a/recipes/xorg-xserver/xserver-xorg_1.8.0.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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}.2"
-
-SRC_URI += " \
-            file://dolt-fix-1.7.0.patch \
-            file://randr-support-1.7.0.patch \
-	    file://hack-fbdev-ignore-return-mode.patch \
-           "
-SRC_URI[archive.md5sum] = "7cec3a11890bb53f4a07854319360348"
-SRC_URI[archive.sha256sum] = "423a8092e28affb83aa736695408e01fd4641040727f34ed6bcfae9c06018b77"
-
-SRC_URI_append_angstrom = " file://hack-assume-pixman-supports-overlapped-blt.patch"
-SRC_URI_append_shr = " file://hack-assume-pixman-supports-overlapped-blt.patch"
-
-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 += " --enable-dri2 --disable-unit-tests "
-
-export LDFLAGS += " -ldl "