Author: arekm Date: Sat Feb 13 07:36:03 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 1.7.99.901; switch to udev instead of hal; requires unreleased Mesa
7.8. Stable xserver at XORG_XSERVER_1_7
---- Files affected:
packages/xorg-xserver-server:
xorg-xserver-server.spec (1.217 -> 1.218) , xorg-xserver-server-ac.patch
(1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/xorg-xserver-server/xorg-xserver-server.spec
diff -u packages/xorg-xserver-server/xorg-xserver-server.spec:1.217
packages/xorg-xserver-server/xorg-xserver-server.spec:1.218
--- packages/xorg-xserver-server/xorg-xserver-server.spec:1.217 Fri Jan 29
22:30:53 2010
+++ packages/xorg-xserver-server/xorg-xserver-server.spec Sat Feb 13
08:35:57 2010
@@ -3,36 +3,36 @@
# Conditional build:
%bcond_with multigl # package libglx.so in a way allowing concurrent
install with nvidia/fglrx drivers
%bcond_without dri2 # DRI2 support
-%bcond_without dbus # D-BUS support
-%bcond_without hal # HAL support
+%bcond_with dbus # D-BUS support
+%bcond_with hal # HAL support
+%bcond_without udev # UDEV support
%bcond_without 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_extension_abi 3.0
%define xorg_xserver_server_font_abi 0.6
-%define xorg_xserver_server_videodrv_abi 6.0
-%define xorg_xserver_server_xinput_abi 7.0
+%define xorg_xserver_server_videodrv_abi 7.0
+%define xorg_xserver_server_xinput_abi 9.0
-%define rel 1
+%define rel 0.1
Summary: X.org server
Summary(pl.UTF-8): Serwer X.org
Name: xorg-xserver-server
-Version: 1.7.4
+Version: 1.7.99.901
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: 75d27c3a1c12293f620a2d6518fcbdfa
+# Source0-md5: 9717fea6a0b6e84fdaf4cd2bdb74bdf9
Source2: xserver.pamd
Patch0: %{name}-xwrapper.patch
Patch1: %{name}-pic-libxf86config.patch
Patch2: %{name}-fb-size.patch
-Patch6: %{name}-less-acpi-brokenness.patch
-Patch7: %{name}-ac.patch
+Patch3: %{name}-less-acpi-brokenness.patch
URL: http://xorg.freedesktop.org/
-BuildRequires: Mesa-libGL-devel >= 7.3
+BuildRequires: Mesa-libGL-devel >= 7.8
# for glx headers
BuildRequires: OpenGL-GLX-devel
BuildRequires: autoconf >= 2.57
@@ -112,7 +112,7 @@
Requires: xorg-app-rgb >= 0.99.3
Requires: xorg-app-xkbcomp
# xserver default config expects evdev+dbus+hald
-Suggests: dbus
+%{?with_hal:Suggests: dbus}
Suggests: hal
Suggests: udev-acl
Suggests: xorg-driver-input-evdev
@@ -328,8 +328,7 @@
%patch0 -p0
%patch1 -p1
%patch2 -p1
-%patch6 -p1
-%patch7 -p0
+%patch3 -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
@@ -373,6 +372,7 @@
--with-os-vendor="PLD/Team" \
--%{?with_dbus:en}%{!?with_dbus:dis}able-config-dbus \
%{!?with_hal:--disable-config-hal} \
+ --%{?with_dbus:en}%{!?with_dbus:dis}able-config-udev \
--enable-aiglx \
--enable-builddocs \
--enable-dga \
@@ -538,6 +538,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.218 2010/02/13 07:35:57 arekm
+- up to 1.7.99.901; switch to udev instead of hal; requires unreleased Mesa
7.8. Stable xserver at XORG_XSERVER_1_7
+
Revision 1.217 2010/01/29 21:30:53 gotar
- Xephyr R: pixman >= 0.15.0 due to pixman_disable_out_of_bounds_workaround
symbol
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-xserver-server/xorg-xserver-server.spec?r1=1.217&r2=1.218&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
