[xorg-x11-drv-qxl] qxl-0.0.16-ftbfs.patch: Fix some FTBFS.

[Adam Jackson]

commit 17669614c829ac39d909182163bf837ab4ba8499
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Jan 4 17:39:19 2012 -0500

    qxl-0.0.16-ftbfs.patch: Fix some FTBFS.

 qxl-0.0.16-ftbfs.patch |   52 ++++++++++++++++++++++++++++++++++++++++++++++++
 xorg-x11-drv-qxl.spec  |    4 ++-
 2 files changed, 55 insertions(+), 1 deletions(-)
---
diff --git a/qxl-0.0.16-ftbfs.patch b/qxl-0.0.16-ftbfs.patch
new file mode 100644
index 0000000..1cd087a
--- /dev/null
+++ b/qxl-0.0.16-ftbfs.patch
@@ -0,0 +1,52 @@
+diff -up xf86-video-qxl-0.0.16/src/qxl_driver.c.jx xf86-video-qxl-0.0.16/src/qxl_driver.c
+--- xf86-video-qxl-0.0.16/src/qxl_driver.c.jx	2012-01-04 17:25:15.000000000 -0500
++++ xf86-video-qxl-0.0.16/src/qxl_driver.c	2012-01-04 17:26:38.638750279 -0500
+@@ -46,6 +46,8 @@
+ #include "spiceqxl_spice_server.h"
+ #endif /* XSPICE */
+ 
++extern void compat_init_scrn(ScrnInfoPtr);
++
+ #if 0
+ #define CHECK_POINT() ErrorF ("%s: %d  (%s)\n", __FILE__, __LINE__, __FUNCTION__);
+ #endif
+diff -up xf86-video-qxl-0.0.16/src/qxl_ring.c.jx xf86-video-qxl-0.0.16/src/qxl_ring.c
+--- xf86-video-qxl-0.0.16/src/qxl_ring.c.jx	2011-07-23 05:47:48.000000000 -0400
++++ xf86-video-qxl-0.0.16/src/qxl_ring.c	2012-01-04 17:36:58.409017660 -0500
+@@ -26,6 +26,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <stdlib.h>
++#include <sched.h>
+ #include "qxl.h"
+ 
+ struct ring
+@@ -78,7 +79,7 @@ qxl_ring_push (struct qxl_ring *ring,
+ #ifdef XSPICE
+ 	/* in gtkperf, circles, this is a major bottleneck. Can't be that good in a vm either
+ 	 * Adding the yield reduces cpu usage, but doesn't improve throughput. */
+-	pthread_yield();
++	sched_yield();
+ #endif
+ 	mem_barrier();
+     }
+diff -up xf86-video-qxl-0.0.16/src/spiceqxl_io_port.c.jx xf86-video-qxl-0.0.16/src/spiceqxl_io_port.c
+--- xf86-video-qxl-0.0.16/src/spiceqxl_io_port.c.jx	2011-07-23 06:39:35.000000000 -0400
++++ xf86-video-qxl-0.0.16/src/spiceqxl_io_port.c	2012-01-04 17:32:21.339583082 -0500
+@@ -21,6 +21,7 @@
+  */
+ 
+ #include <pthread.h>
++#include <sched.h>
+ 
+ #include <spice.h>
+ 
+@@ -230,7 +231,7 @@ void ioport_write(qxl_screen_t *qxl, uin
+         if (!SPICE_RING_IS_EMPTY(&header->release_ring)) {
+             break;
+         }
+-        pthread_yield();
++        sched_yield();
+         if (!SPICE_RING_IS_EMPTY(&header->release_ring)) {
+             break;
+         }
diff --git a/xorg-x11-drv-qxl.spec b/xorg-x11-drv-qxl.spec
index 27c3624..d2551ae 100644
--- a/xorg-x11-drv-qxl.spec
+++ b/xorg-x11-drv-qxl.spec
@@ -25,6 +25,7 @@ Patch8:    0008-Add-old-driver-in-as-a-compatibility-layer.patch
 Patch9:    0009-Link-in-the-compat-driver-various-renamings.patch
 Patch10:   0010-Translate-the-access-region-according-to-the-drawabl.patch
 Patch11:   qxl-0.0.16-vgahw.patch
+Patch12:   qxl-0.0.16-ftbfs.patch
 License:   MIT
 Group:     User Interface/X Hardware Support
 
@@ -70,6 +71,7 @@ XSpice is both an X and a Spice server.a
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 autoreconf -f -i
 
 
@@ -120,7 +122,7 @@ rm $RPM_BUILD_ROOT/usr/share/doc/xf86-video-qxl/spiceqxl.xorg.conf.example
 
 %changelog
 * Wed Jan 04 2012 Adam Jackson <ajax at redhat.com> 0.0.21-12
-- ABI rebuild
+- qxl-0.0.16-ftbfs.patch: Fix some FTBFS.
 
 * Wed Nov 16 2011 Adam Jackson <ajax at redhat.com> 0.0.21-11
 - qxl-0.0.16-vgahw.patch: API compat for xserver 1.12 (#753928)