From 32ae6fa5ac7b2490c5b0f8d89ce42a232e173399 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Mon, 5 Mar 2012 06:02:05 +0000 Subject: [PATCH] - up to 1.12.0 Changed files: xorg-xserver-server-less-acpi-brokenness.patch -> 1.2 xorg-xserver-server.spec -> 1.302 --- ...-xserver-server-less-acpi-brokenness.patch | 22 +++++++------------ xorg-xserver-server.spec | 16 +++++++------- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/xorg-xserver-server-less-acpi-brokenness.patch b/xorg-xserver-server-less-acpi-brokenness.patch index cc80e6c..41e6ff3 100644 --- a/xorg-xserver-server-less-acpi-brokenness.patch +++ b/xorg-xserver-server-less-acpi-brokenness.patch @@ -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 -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 diff --git a/xorg-xserver-server.spec b/xorg-xserver-server.spec index 39b16de..a900086 100644 --- a/xorg-xserver-server.spec +++ b/xorg-xserver-server.spec @@ -15,20 +15,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 @@ -99,7 +99,7 @@ BuildRequires: xorg-proto-fixesproto-devel >= 5.0 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 @@ -300,7 +300,7 @@ Requires: xorg-lib-libpciaccess-devel >= 0.8.0 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 -- 2.44.0