packages: xorg-xserver-server/xorg-xserver-server.spec, xorg-xserver-server...

[arekm]

Author: arekm                        Date: Sat Dec 17 07:38:55 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.11.3

---- Files affected:
packages/xorg-xserver-server:
   xorg-xserver-server.spec (1.296 -> 1.297) , xorg-xserver-server-build.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/xorg-xserver-server/xorg-xserver-server.spec
diff -u packages/xorg-xserver-server/xorg-xserver-server.spec:1.296 packages/xorg-xserver-server/xorg-xserver-server.spec:1.297
--- packages/xorg-xserver-server/xorg-xserver-server.spec:1.296	Sun Nov  6 22:47:26 2011
+++ packages/xorg-xserver-server/xorg-xserver-server.spec	Sat Dec 17 08:38:49 2011
@@ -26,12 +26,12 @@
 Summary:	X.org server
 Summary(pl.UTF-8):	Serwer X.org
 Name:		xorg-xserver-server
-Version:	1.11.2
+Version:	1.11.3
 Release:	%{rel}%{?with_multigl:.mgl}
 License:	MIT
 Group:		X11/Servers
 Source0:	http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2
-# Source0-md5:	8796fff441e5435ee36a72579008af24
+# Source0-md5:	a7194c437963627e1db0dd2d6c1a1984
 Source1:	10-quirks.conf
 Source2:	xserver.pamd
 Source10:	%{name}-Xvfb.init
@@ -43,6 +43,7 @@
 Patch4:		%{name}-builtin-SHA1.patch
 Patch5:		%{name}-export-GetMaster.patch
 Patch6:		110_nvidia_slowdow_fix.patch
+Patch7:		%{name}-build.patch
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	Mesa-libGL-devel >= 7.8.1
 # for glx headers
@@ -385,6 +386,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 # xserver uses pixman-1 API/ABI so put that explictly here
 sed -i -e 's#<pixman\.h#<pixman-1/pixman.h#g' ./fb/fb.h ./include/miscstruct.h ./render/picture.h
@@ -638,6 +640,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.297  2011/12/17 07:38:49  arekm
+- up to 1.11.3
+
 Revision 1.296  2011/11/06 21:47:26  arekm
 - force latest pixman
 

================================================================
Index: packages/xorg-xserver-server/xorg-xserver-server-build.patch
diff -u /dev/null packages/xorg-xserver-server/xorg-xserver-server-build.patch:1.3
--- /dev/null	Sat Dec 17 08:38:55 2011
+++ packages/xorg-xserver-server/xorg-xserver-server-build.patch	Sat Dec 17 08:38:49 2011
@@ -0,0 +1,69 @@
+--- xorg-server-1.11.3/hw/kdrive/linux/keyboard.c.org	2011-12-17 08:32:26.955371326 +0100
++++ xorg-server-1.11.3/hw/kdrive/linux/keyboard.c	2011-12-17 08:32:45.179135298 +0100
+@@ -692,7 +692,7 @@
+         return !Success;
+ 
+     fd = LinuxConsoleFd;
+-    ki->driverPrivate = (void *) fd;
++    ki->driverPrivate = (void *) (uintptr_t) fd;
+ 
+     ioctl (fd, KDGKBMODE, &LinuxKbdTrans);
+     tcgetattr (fd, &LinuxTermios);
+@@ -724,7 +724,7 @@
+     if (!ki)
+         return;
+ 
+-    fd = (int) ki->driverPrivate;
++    fd = (int) (uintptr_t) ki->driverPrivate;
+ 
+     KdUnregisterFd(ki, fd, FALSE);
+     ioctl(fd, KDSKBMODE, LinuxKbdTrans);
+@@ -753,7 +753,7 @@
+     if (!ki)
+         return;
+ 
+-    ioctl ((int)ki->driverPrivate, KDSETLED, leds & 7);
++    ioctl ((int) (uintptr_t)ki->driverPrivate, KDSETLED, leds & 7);
+ }
+ 
+ KdKeyboardDriver LinuxKeyboardDriver = {
+--- xorg-server-1.11.3/hw/kdrive/linux/ms.c.org	2011-12-17 08:33:00.929507448 +0100
++++ xorg-server-1.11.3/hw/kdrive/linux/ms.c	2011-12-17 08:33:21.106650997 +0100
+@@ -152,7 +152,7 @@
+     }
+     if (KdRegisterFd (port, MsRead, pi))
+ 	return TRUE;
+-    pi->driverPrivate = (void *)port;
++    pi->driverPrivate = (void *) (uintptr_t)port;
+ 
+     return Success;
+ 
+@@ -164,7 +164,7 @@
+ static void
+ MsDisable (KdPointerInfo *pi)
+ {
+-    KdUnregisterFd (pi, (int)pi->driverPrivate, TRUE);
++    KdUnregisterFd (pi, (int)(uintptr_t)pi->driverPrivate, TRUE);
+ }
+ 
+ static void
+--- xorg-server-1.11.3/hw/kdrive/linux/ps2.c.org	2011-12-17 08:33:34.930310934 +0100
++++ xorg-server-1.11.3/hw/kdrive/linux/ps2.c	2011-12-17 08:33:53.580751546 +0100
+@@ -159,7 +159,7 @@
+         return BadAlloc;
+     }
+ 
+-    pi->driverPrivate = (void *)fd;
++    pi->driverPrivate = (void *)(uintptr_t)fd;
+ 
+     return Success;
+ }
+@@ -168,7 +168,7 @@
+ static void
+ Ps2Disable (KdPointerInfo *pi)
+ {
+-    KdUnregisterFd (pi, (int)pi->driverPrivate, TRUE);
++    KdUnregisterFd (pi, (int)(uintptr_t)pi->driverPrivate, TRUE);
+ }
+ 
+ static void
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-xserver-server/xorg-xserver-server.spec?r1=1.296&r2=1.297&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-xserver-server/xorg-xserver-server-build.patch?r1=1.2&r2=1.3&f=u