xserver-xorg: 1.9.2.902 is now 1.9.3, remove old 1.9.2

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

10 files changed, 2 insertions, 212 deletions

diff --git a/recipes/xorg-xserver/xserver-xorg-1.9.2/dolt-fix.patch b/recipes/xorg-xserver/xserver-xorg-1.9.2/dolt-fix.patch
deleted file mode 100644
index e332ce0bbe..0000000000
--- a/recipes/xorg-xserver/xserver-xorg-1.9.2/dolt-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: xorg-server/m4/dolt.m4
-===================================================================
---- xorg-server.orig/m4/dolt.m4	2009-04-14 21:14:56.000000000 +0400
-+++ xorg-server/m4/dolt.m4	2009-07-15 12:38:33.796848843 +0400
-@@ -147,7 +147,7 @@
-     cat <<__DOLTLIBTOOL__EOF__ > doltlibtool
- #!$DOLT_BASH
- __DOLTLIBTOOL__EOF__
--    cat <<'__DOLTLIBTOOL__EOF__' >>doltlibtool
-+    cat <<'__DOLTLIBTOOL__EOF__' | sed -e "s/@host_alias@/$host_alias/g" >>doltlibtool
- top_builddir_slash="${0%%doltlibtool}"
- : ${top_builddir_slash:=./}
- args=()
-@@ -163,7 +163,7 @@
- if $modeok && $tagok ; then
-     . ${top_builddir_slash}doltcompile "${args@<:@@@:>@}"
- else
--    exec ${top_builddir_slash}libtool "$[]@"
-+    exec ${top_builddir_slash}@host_alias@-libtool "$[]@"
- fi
- __DOLTLIBTOOL__EOF__
- 
diff --git a/recipes/xorg-xserver/xserver-xorg-1.9.2/hack-assume-pixman-supports-overlapped-blt.patch b/recipes/xorg-xserver/xserver-xorg-1.9.2/hack-assume-pixman-supports-overlapped-blt.patch
deleted file mode 100644
index a947582f15..0000000000
--- a/recipes/xorg-xserver/xserver-xorg-1.9.2/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.9.2/hack-fbdev-ignore-return-mode.patch b/recipes/xorg-xserver/xserver-xorg-1.9.2/hack-fbdev-ignore-return-mode.patch
deleted file mode 100644
index d3661cbea2..0000000000
--- a/recipes/xorg-xserver/xserver-xorg-1.9.2/hack-fbdev-ignore-return-mode.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Ugly hack that prevents server termination with xf86-video-fbdev-0.4.1
-(and probably other) while returning from chvt or resume on some
-hardware (e. g. zaurus).
-
-Correct fix would require debugging of fbdev mode during LeaveVT and
-EnterVT.
-
-This patch may cause staying in incorrect or corrupted display mode
-after EnterVT, but on man affected devices it does not cause any visible
-problems.
-
-Hacked code is never called on properly written drivers.
-
-Devices affected and testers involved for future patch removal:
-Sharp Zaurus (spitz/akita): Stanislav Brabec <utx@penguin.cz>
-
-See also:
-https://bugzilla.redhat.com/show_bug.cgi?id=238451
-
-The bug (first line indicates that your device is affected):
-
-(EE) FBDEV(0): FBIOPUT_VSCREENINFO succeeded but modified mode
-
-Fatal server error:
-EnterVT failed for screen 0
-
-Index: xorg-server-1.7.3/hw/xfree86/fbdevhw/fbdevhw.c
-===================================================================
---- xorg-server-1.7.3.orig/hw/xfree86/fbdevhw/fbdevhw.c
-+++ xorg-server-1.7.3/hw/xfree86/fbdevhw/fbdevhw.c
-@@ -571,7 +571,7 @@ fbdevHWSetMode(ScrnInfoPtr pScrn, Displa
- #if DEBUG
- 		print_fbdev_mode("returned", &set_var);
- #endif
--		return FALSE;
-+		/* return FALSE; UGLY HACK to allow return from chvt */
- 	}
- 
- 	if (!check)
diff --git a/recipes/xorg-xserver/xserver-xorg-1.9.2/randr-support.patch b/recipes/xorg-xserver/xserver-xorg-1.9.2/randr-support.patch
deleted file mode 100644
index abc7db41eb..0000000000
--- a/recipes/xorg-xserver/xserver-xorg-1.9.2/randr-support.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-diff -uNr xorg-server-1.9.0.orig//hw/xfree86/common/xf86Xinput.c xorg-server-1.9.0/hw/xfree86/common/xf86Xinput.c
---- xorg-server-1.9.0.orig//hw/xfree86/common/xf86Xinput.c	2010-08-13 07:53:48.000000000 +0200
-+++ xorg-server-1.9.0/hw/xfree86/common/xf86Xinput.c	2010-08-28 21:31:10.000000000 +0200
-@@ -106,6 +106,8 @@
- 
- #include "os.h"
- 
-+#define RR_Rotate_All    (RR_Rotate_0|RR_Rotate_90|RR_Rotate_180|RR_Rotate_270)
-+
- EventListPtr xf86Events = NULL;
- 
- /**
-@@ -1359,4 +1361,73 @@
-     EnableDevice(dev, TRUE);
- }
- 
-+/* Taken from evdev-properties.h. */
-+#define EVDEV_PROP_SWAP_AXES "Evdev Axes Swap"
-+#define EVDEV_PROP_INVERT_AXES "Evdev Axis Inversion"
-+
-+/* This is a hack until we get device -> CRTC association. */
-+void
-+xf86InputRotationNotify(Rotation rotation)
-+{
-+    DeviceIntPtr dev;
-+    LocalDevicePtr local;
-+    int ret;
-+    int swap_axes = 0;
-+    CARD8 invert[2] = { 0, 0 };
-+    static Atom prop_swap = 0, prop_invert = 0;
-+    static int atom_generation = -1;
-+    
-+    if (atom_generation != serverGeneration) {
-+        prop_swap = 0;
-+        prop_invert = 0;
-+    }
-+
-+    switch (rotation & RR_Rotate_All) {
-+    case RR_Rotate_0:
-+        swap_axes = 1;
-+        invert[0] = 0;
-+ 	 invert[1] = 0;
-+        break;
-+    case RR_Rotate_90:
-+        swap_axes = 0;
-+        invert[0] = 0;
-+ 	 invert[1] = 1;
-+        break;
-+    case RR_Rotate_180:
-+        swap_axes = 1;
-+        invert[0] = 0;
-+        invert[1] = 0;
-+        break;
-+    case RR_Rotate_270:
-+        swap_axes = 0;
-+        invert[0] = 0;
-+ 	 invert[1] = 1;
-+        break;
-+    }
-+
-+    if (!prop_swap)
-+        prop_swap = MakeAtom(EVDEV_PROP_SWAP_AXES,
-+                             strlen(EVDEV_PROP_SWAP_AXES), TRUE);
-+    if (!prop_invert)
-+        prop_invert = MakeAtom(EVDEV_PROP_INVERT_AXES,
-+                               strlen(EVDEV_PROP_INVERT_AXES), TRUE);
-+
-+    for (dev = inputInfo.devices; dev; dev = dev->next) {
-+        local = dev->public.devicePrivate;
-+        ret = XIChangeDeviceProperty(dev, prop_swap, XA_INTEGER, 8,
-+                                     PropModeReplace, 1, &swap_axes, FALSE);
-+        if (ret != Success) {
-+            xf86Msg(X_ERROR, "Changing swap_xy property failed!\n");
-+            continue;
-+        }
-+        ret = XIChangeDeviceProperty(dev, prop_invert, XA_INTEGER, 8,
-+                                     PropModeReplace, 2, invert, FALSE);
-+        if (ret != Success) {
-+            xf86Msg(X_ERROR, "Changing invert property failed!\n");
-+            continue;
-+        }
-+    }
-+}
-+
-+
- /* end of xf86Xinput.c */
-diff -uNr xorg-server-1.9.0.orig//hw/xfree86/modes/xf86Crtc.c xorg-server-1.9.0/hw/xfree86/modes/xf86Crtc.c
---- xorg-server-1.9.0.orig//hw/xfree86/modes/xf86Crtc.c	2010-07-20 05:24:12.000000000 +0200
-+++ xorg-server-1.9.0/hw/xfree86/modes/xf86Crtc.c	2010-08-28 21:28:48.000000000 +0200
-@@ -387,6 +387,12 @@
-     if (didLock)
- 	crtc->funcs->unlock (crtc);
- 
-+    /*
-+     * Rotate Touchscreen
-+     */
-+    xf86InputRotationNotify(crtc->rotation);
-+
-+    
-     return ret;
- }
- 
diff --git a/recipes/xorg-xserver/xserver-xorg-1.9.2.902/dolt-fix.patch b/recipes/xorg-xserver/xserver-xorg-1.9.3/dolt-fix.patch
index e332ce0bbe..e332ce0bbe 100644
--- a/recipes/xorg-xserver/xserver-xorg-1.9.2.902/dolt-fix.patch
+++ b/recipes/xorg-xserver/xserver-xorg-1.9.3/dolt-fix.patch
diff --git a/recipes/xorg-xserver/xserver-xorg-1.9.2.902/hack-assume-pixman-supports-overlapped-blt.patch b/recipes/xorg-xserver/xserver-xorg-1.9.3/hack-assume-pixman-supports-overlapped-blt.patch
index a947582f15..a947582f15 100644
--- a/recipes/xorg-xserver/xserver-xorg-1.9.2.902/hack-assume-pixman-supports-overlapped-blt.patch
+++ b/recipes/xorg-xserver/xserver-xorg-1.9.3/hack-assume-pixman-supports-overlapped-blt.patch
diff --git a/recipes/xorg-xserver/xserver-xorg-1.9.2.902/hack-fbdev-ignore-return-mode.patch b/recipes/xorg-xserver/xserver-xorg-1.9.3/hack-fbdev-ignore-return-mode.patch
index d3661cbea2..d3661cbea2 100644
--- a/recipes/xorg-xserver/xserver-xorg-1.9.2.902/hack-fbdev-ignore-return-mode.patch
+++ b/recipes/xorg-xserver/xserver-xorg-1.9.3/hack-fbdev-ignore-return-mode.patch
diff --git a/recipes/xorg-xserver/xserver-xorg-1.9.2.902/randr-support.patch b/recipes/xorg-xserver/xserver-xorg-1.9.3/randr-support.patch
index abc7db41eb..abc7db41eb 100644
--- a/recipes/xorg-xserver/xserver-xorg-1.9.2.902/randr-support.patch
+++ b/recipes/xorg-xserver/xserver-xorg-1.9.3/randr-support.patch
diff --git a/recipes/xorg-xserver/xserver-xorg_1.9.2.bb b/recipes/xorg-xserver/xserver-xorg_1.9.2.bb
deleted file mode 100644
index 667bdbc6ca..0000000000
--- a/recipes/xorg-xserver/xserver-xorg_1.9.2.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}.0"
-
-SRC_URI += " \
-            file://dolt-fix.patch \
-            file://randr-support.patch \
-            file://hack-fbdev-ignore-return-mode.patch \
-           "
-SRC_URI[archive.md5sum] = "5c8773499a6a8c1ddaedf33577ec9634"
-SRC_URI[archive.sha256sum] = "8b30800004c98fc7a8e6ff31a339f28451be5132e774443be22bf226e1791e34"
-
-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 "
diff --git a/recipes/xorg-xserver/xserver-xorg_1.9.2.902.bb b/recipes/xorg-xserver/xserver-xorg_1.9.3.bb
index c7a370ab9c..973ed2ee35 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.9.2.902.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.9.3.bb
@@ -13,8 +13,8 @@ SRC_URI += " \
             file://randr-support.patch \
             file://hack-fbdev-ignore-return-mode.patch \
            "
-SRC_URI[archive.md5sum] = "4152bea87a40672355e9a6d525e64225"
-SRC_URI[archive.sha256sum] = "b89064cc9473f48aa2a6a81c330d6107b95a6ea08fda9a62404f834b353e2af9"
+SRC_URI[archive.md5sum] = "5bef6839a76d029204ab31aa2fcb5201"
+SRC_URI[archive.sha256sum] = "864831f51e841ff37f2445d1c85b86b559c8860a435fb496aead4f256a2b141d"
 
 SRC_URI_append_angstrom = " file://hack-assume-pixman-supports-overlapped-blt.patch"
 SRC_URI_append_shr = " file://hack-assume-pixman-supports-overlapped-blt.patch"