From 0f0c8af996b7555f448df330c81a1b2c84038ce33120b034cc4061cb9ac20e67 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Mon, 16 Sep 2013 09:19:09 +0000
Subject: [PATCH] Accepting request 199030 from home:tobijk:X11:XOrg

update to version 1.14.3

OBS-URL: https://build.opensuse.org/request/show/199030
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=459
---
 u_init_framebuffer_base.patch | 21 ---------------------
 xorg-server-1.14.2.tar.bz2    |  3 ---
 xorg-server-1.14.3.tar.bz2    |  3 +++
 xorg-x11-server.changes       |  8 ++++++++
 xorg-x11-server.spec          |  4 +---
 5 files changed, 12 insertions(+), 27 deletions(-)
 delete mode 100644 u_init_framebuffer_base.patch
 delete mode 100644 xorg-server-1.14.2.tar.bz2
 create mode 100644 xorg-server-1.14.3.tar.bz2

diff --git a/u_init_framebuffer_base.patch b/u_init_framebuffer_base.patch
deleted file mode 100644
index 033eab4..0000000
--- a/u_init_framebuffer_base.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: xorg-server-1.13.2/glx/glxdri.c
-===================================================================
---- xorg-server-1.13.2/glx/glxdri.c
-+++ xorg-server-1.13.2/glx/glxdri.c
-@@ -971,13 +971,15 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
-     size_t buffer_size;
-     ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
- 
-+    framebuffer.base = NULL;
-+
-     if (!xf86LoaderCheckSymbol("DRIQueryDirectRenderingCapable") ||
-         !DRIQueryDirectRenderingCapable(pScreen, &isCapable) || !isCapable) {
-         LogMessage(X_INFO,
-                    "AIGLX: Screen %d is not DRI capable\n", pScreen->myNum);
-         return NULL;
-     }
--
-+   
-     screen = calloc(1, sizeof *screen);
-     if (screen == NULL)
-         return NULL;
diff --git a/xorg-server-1.14.2.tar.bz2 b/xorg-server-1.14.2.tar.bz2
deleted file mode 100644
index 65322e3..0000000
--- a/xorg-server-1.14.2.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f6ddfb3f1cfff2d69d45657aec626ebe8b5847810154ff7df7ed2072b076c86b
-size 5490488
diff --git a/xorg-server-1.14.3.tar.bz2 b/xorg-server-1.14.3.tar.bz2
new file mode 100644
index 0000000..7226474
--- /dev/null
+++ b/xorg-server-1.14.3.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:02125ae13a443dcbb55f964d5c37f1da2f58ad54c2102356037bec23c1b84f5e
+size 5502845
diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index 2baa0fc..b13498e 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Sep 13 23:39:28 UTC 2013 - tobias.johannes.klausmann@mni.thm.de
+
+- Update to version 1.14.3:
+  Bugfix release. Changes all over the place.
+- Remove upstreamed patches:
+  + Patch227: u_init_framebuffer_base.patch
+
 -------------------------------------------------------------------
 Tue Sep 10 09:23:38 UTC 2013 - sndirsch@suse.com
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 7cb723f..8b936bf 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -18,7 +18,7 @@
 
 Name:           xorg-x11-server
 
-%define dirsuffix 1.14.2
+%define dirsuffix 1.14.3
 
 Summary:        X
 License:        GPL-2.0+ and MIT
@@ -151,7 +151,6 @@ Patch213:       N_xorg-server-xdmcp.patch
 Patch222:       N_sync-fix.patch
 
 Patch226:       u_vgaHW-no-legacy.patch
-Patch227:       u_init_framebuffer_base.patch
 Patch228:       u_aarch64-support.patch
 Patch229:       u_disable-acpi-code.patch
 Patch230:       u_xserver_xvfb-randr.patch
@@ -237,7 +236,6 @@ cp %{SOURCE96} .
 ### patch222 might not be applicable anymore
 #%patch222 -p1
 %patch226 -p0
-%patch227 -p1
 %patch228 -p1
 %patch229 -p1
 %patch230 -p1