Author: arekm Date: Fri Sep 4 10:14:57 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 1.6.99.900 (not meant for th)
---- Files affected:
packages/xorg-xserver-server:
xorg-xserver-server.spec (1.195 -> 1.196)
---- Diffs:
================================================================
Index: packages/xorg-xserver-server/xorg-xserver-server.spec
diff -u packages/xorg-xserver-server/xorg-xserver-server.spec:1.195
packages/xorg-xserver-server/xorg-xserver-server.spec:1.196
--- packages/xorg-xserver-server/xorg-xserver-server.spec:1.195 Wed Aug 26
08:37:53 2009
+++ packages/xorg-xserver-server/xorg-xserver-server.spec Fri Sep 4
12:14:51 2009
@@ -5,31 +5,29 @@
%bcond_without dri2 # DRI2 support
%bcond_without dbus # D-BUS support
%bcond_without hal # HAL support
-%bcond_without dmx # DMX support
+%bcond_with dmx # DMX support
%bcond_with record # RECORD extension
#
# ABI versions, see hw/xfree86/common/xf86Module.h
%define xorg_xserver_server_ansic_abi 0.4
%define xorg_xserver_server_extension_abi 2.0
%define xorg_xserver_server_font_abi 0.6
-%define xorg_xserver_server_videodrv_abi 5.0
-%define xorg_xserver_server_xinput_abi 4.0
+%define xorg_xserver_server_videodrv_abi 6.0
+%define xorg_xserver_server_xinput_abi 7.0
Summary: X.org server
Summary(pl.UTF-8): Serwer X.org
Name: xorg-xserver-server
-Version: 1.6.3.901
+Version: 1.6.99.900
Release: 1%{?with_multigl:.mgl}
License: MIT
Group: X11/Servers
Source0:
http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2
-# Source0-md5: 8d43c4cb43e6a10550e68fbbcad10e9d
+# Source0-md5: e12b367b44e27def991f4542d85a9c63
Source2: xserver.pamd
Patch0: %{name}-xwrapper.patch
Patch1: %{name}-pic-libxf86config.patch
Patch2: %{name}-fb-size.patch
-Patch3: %{name}-exa.patch
-Patch5: %{name}-xinerama-cursors.patch
Patch6: %{name}-less-acpi-brokenness.patch
Patch7: %{name}-ac.patch
URL: http://xorg.freedesktop.org/
@@ -48,7 +46,7 @@
BuildRequires: ncurses-devel
BuildRequires: pam-devel
BuildRequires: perl-base
-BuildRequires: pixman-devel >= 0.14.0
+BuildRequires: pixman-devel >= 0.16.0
BuildRequires: pkgconfig >= 1:0.19
BuildRequires: xorg-app-mkfontscale
BuildRequires: xorg-lib-libX11-devel
@@ -74,7 +72,7 @@
BuildRequires: xorg-lib-libxkbfile-devel
BuildRequires: xorg-lib-libxkbui-devel >= 1.0.2
BuildRequires: xorg-lib-xtrans-devel >= 1.2.2
-BuildRequires: xorg-proto-bigreqsproto-devel
+BuildRequires: xorg-proto-bigreqsproto-devel >= 1.1.0
BuildRequires: xorg-proto-compositeproto-devel >= 0.4
BuildRequires: xorg-proto-damageproto-devel >= 1.1
%{?with_dmx:BuildRequires: xorg-proto-dmxproto-devel}
@@ -84,17 +82,17 @@
BuildRequires: xorg-proto-fontcacheproto-devel
BuildRequires: xorg-proto-fontsproto-devel
BuildRequires: xorg-proto-glproto-devel >= 1.4.8
-BuildRequires: xorg-proto-inputproto-devel >= 1.5.0
+BuildRequires: xorg-proto-inputproto-devel >= 1.9.99.902
BuildRequires: xorg-proto-kbproto-devel >= 1.0.3
BuildRequires: xorg-proto-printproto-devel
BuildRequires: xorg-proto-randrproto-devel >= 1.2.99.3
%{?with_record:BuildRequires: xorg-proto-recordproto-devel}
-BuildRequires: xorg-proto-renderproto-devel >= 0.9.3
+BuildRequires: xorg-proto-renderproto-devel >= 0.11
BuildRequires: xorg-proto-resourceproto-devel
BuildRequires: xorg-proto-scrnsaverproto-devel >= 1.1.0
BuildRequires: xorg-proto-videoproto-devel
-BuildRequires: xorg-proto-xcmiscproto-devel
-BuildRequires: xorg-proto-xextproto-devel >= 7.0.3
+BuildRequires: xorg-proto-xcmiscproto-devel >= 1.2.0
+BuildRequires: xorg-proto-xextproto-devel >= 1:7.0.99.3
BuildRequires: xorg-proto-xf86bigfontproto-devel
BuildRequires: xorg-proto-xf86dgaproto-devel
BuildRequires: xorg-proto-xf86driproto-devel >= 2.0.4
@@ -106,7 +104,7 @@
#BR: xcalibrateproto, tslib (for KDRIVE only)
#BR: glitz-devel >= 0.4.3 (for XGL and EGL only)
Requires(triggerpostun): sed >= 4.0
-Requires: pixman >= 0.14.0
+Requires: pixman >= 0.16.0
Requires: xkeyboard-config
# for rgb.txt
Requires: xorg-app-rgb >= 0.99.3
@@ -262,14 +260,14 @@
Summary(pl.UTF-8): Pliki nagłówkowe dla serwera X.org
Group: X11/Development/Libraries
Requires: libdrm-devel >= 2.4.5
-Requires: pixman-devel >= 0.14.0
+Requires: pixman-devel >= 0.16.0
Requires: xorg-lib-libpciaccess-devel
Requires: xorg-lib-libxkbfile-devel
Requires: xorg-proto-dri2proto-devel >= 2.1
Requires: xorg-proto-fontsproto-devel
Requires: xorg-proto-renderproto-devel >= 0.9.3
Requires: xorg-proto-videoproto-devel
-Requires: xorg-proto-xextproto-devel >= 7.0.3
+Requires: xorg-proto-xextproto-devel >= 1:7.0.99.3
Requires: xorg-proto-xproto-devel >= 7.0.13
Obsoletes: X11-Xserver-devel < 1:7.0.0
Obsoletes: XFree86-Xserver-devel < 1:7.0.0
@@ -324,8 +322,6 @@
%patch0 -p0
%patch1 -p1
%patch2 -p1
-%patch3 -p1
-%patch5 -p1
%patch6 -p1
%patch7 -p0
@@ -362,7 +358,7 @@
fi
%{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
%{__autoconf}
%{__autoheader}
%{__automake}
@@ -440,7 +436,6 @@
%attr(4755,root,root) %{_bindir}/Xwrapper
%attr(755,root,root) %{_bindir}/cvt
%attr(755,root,root) %{_bindir}/gtf
-%{_libdir}/X11/Options
%dir %{_libdir}/xorg
%{_libdir}/xorg/protocol.txt
%dir %{_libdir}/xorg/modules
@@ -537,6 +532,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.196 2009/09/04 10:14:51 arekm
+- up to 1.6.99.900 (not meant for th)
+
Revision 1.195 2009/08/26 06:37:53 arekm
- up to 1.6.3.901 (it's RC for 1.6.4)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-xserver-server/xorg-xserver-server.spec?r1=1.195&r2=1.196&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
