packages: xorg-xserver-server/xorg-xserver-server-less-acpi-brokenness.patc...

[arekm]

Author: arekm                        Date: Mon Mar  5 06:02:10 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.12.0

---- Files affected:
packages/xorg-xserver-server:
   xorg-xserver-server-less-acpi-brokenness.patch (1.1 -> 1.2) , xorg-xserver-server.spec (1.301 -> 1.302) 

---- Diffs:

================================================================
Index: packages/xorg-xserver-server/xorg-xserver-server-less-acpi-brokenness.patch
diff -u packages/xorg-xserver-server/xorg-xserver-server-less-acpi-brokenness.patch:1.1 packages/xorg-xserver-server/xorg-xserver-server-less-acpi-brokenness.patch:1.2
--- packages/xorg-xserver-server/xorg-xserver-server-less-acpi-brokenness.patch:1.1	Thu Mar 26 22:12:26 2009
+++ packages/xorg-xserver-server/xorg-xserver-server-less-acpi-brokenness.patch	Mon Mar  5 07:02:05 2012
@@ -1,31 +1,25 @@
-From a8079882f1884edc62a9de28af915bd8b65dfbbe Mon Sep 17 00:00:00 2001
+From 392ce7dc5062416a8cf1c9a66e0dce1677f46804 Mon Sep 17 00:00:00 2001
 From: Adam Jackson <ajax at redhat.com>
-Date: Wed, 11 Mar 2009 14:02:11 -0400
+Date: Wed, 9 Nov 2011 11:52:06 +1000
 Subject: [PATCH] Don't build the ACPI code.
 
 No good can come of this.
 ---
- configure.ac |    2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
+ configure.ac |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 72ae67e..04716f8 100644
+index 63d59f9..6683005 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1269,13 +1269,11 @@ if test "x$XORG" = xyes; then
- 		case $host_cpu in
- 		  ia64*)
- 			linux_ia64=yes
--			linux_acpi="yes"
- 			;;
- 		  alpha*)
+@@ -1624,7 +1624,6 @@ if test "x$XORG" = xyes; then
  		  	linux_alpha=yes
  			;;
- 		  i*86|amd64*|x86_64*)
+ 		  i*86|amd64*|x86_64*|ia64*)
 -			linux_acpi="yes"
  			;;
  		  *)
  			;;
 -- 
-1.6.1.3
+1.7.7
 

================================================================
Index: packages/xorg-xserver-server/xorg-xserver-server.spec
diff -u packages/xorg-xserver-server/xorg-xserver-server.spec:1.301 packages/xorg-xserver-server/xorg-xserver-server.spec:1.302
--- packages/xorg-xserver-server/xorg-xserver-server.spec:1.301	Wed Feb 15 14:30:54 2012
+++ packages/xorg-xserver-server/xorg-xserver-server.spec	Mon Mar  5 07:02:05 2012
@@ -16,20 +16,20 @@
 %define	xorg_xserver_server_ansic_abi		0.4
 %define	xorg_xserver_server_extension_abi	6.0
 %define	xorg_xserver_server_font_abi		0.6
-%define	xorg_xserver_server_videodrv_abi	11.0
-%define	xorg_xserver_server_xinput_abi		13.0
+%define	xorg_xserver_server_videodrv_abi	12.0
+%define	xorg_xserver_server_xinput_abi		16.0
 #
-%define	pixman_ver	0.24.0
+%define	pixman_ver	0.24.4
 
 Summary:	X.org server
 Summary(pl.UTF-8):	Serwer X.org
 Name:		xorg-xserver-server
-Version:	1.11.4
-Release:	2
+Version:	1.12.0
+Release:	1
 License:	MIT
 Group:		X11/Servers
 Source0:	http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2
-# Source0-md5:	256325e9b17dff479d92bed97f6b0adb
+# Source0-md5:	3a3c4281f32c8702749e8f129372a355
 Source1:	10-quirks.conf
 Source2:	xserver.pamd
 Source10:	%{name}-Xvfb.init
@@ -100,7 +100,7 @@
 BuildRequires:	xorg-proto-fontcacheproto-devel
 BuildRequires:	xorg-proto-fontsproto-devel
 BuildRequires:	xorg-proto-glproto-devel >= 1.4.14
-BuildRequires:	xorg-proto-inputproto-devel >= 1.9.99.902
+BuildRequires:	xorg-proto-inputproto-devel >= 2.2
 BuildRequires:	xorg-proto-kbproto-devel >= 1.0.3
 BuildRequires:	xorg-proto-printproto-devel
 BuildRequires:	xorg-proto-randrproto-devel >= 1.3
@@ -301,7 +301,7 @@
 Requires:	xorg-lib-libxkbfile-devel
 %{?with_dri2:Requires:	xorg-proto-dri2proto-devel >= 2.6}
 Requires:	xorg-proto-fontsproto-devel
-Requires:	xorg-proto-inputproto-devel >= 1.9.99.902
+Requires:	xorg-proto-inputproto-devel >= 2.2
 Requires:	xorg-proto-kbproto-devel >= 1.0.3
 Requires:	xorg-proto-randrproto-devel >= 1.3
 Requires:	xorg-proto-renderproto-devel >= 0.11
@@ -604,6 +604,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.302  2012/03/05 06:02:05  arekm
+- up to 1.12.0
+
 Revision 1.301  2012/02/15 13:30:54  baggins
 - rel 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-xserver-server/xorg-xserver-server-less-acpi-brokenness.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-xserver-server/xorg-xserver-server.spec?r1=1.301&r2=1.302&f=u