Author: arekm Date: Tue Jul 1 10:57:59 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- disable dri2; fix swrast dep; builds now
---- Files affected:
SPECS:
xorg-xserver-server.spec (1.128 -> 1.129)
---- Diffs:
================================================================
Index: SPECS/xorg-xserver-server.spec
diff -u SPECS/xorg-xserver-server.spec:1.128
SPECS/xorg-xserver-server.spec:1.129
--- SPECS/xorg-xserver-server.spec:1.128 Mon Jun 30 22:55:26 2008
+++ SPECS/xorg-xserver-server.spec Tue Jul 1 12:57:53 2008
@@ -12,6 +12,7 @@
#
# Conditional build:
%bcond_with multigl # package libglx.so in a way allowing
concurrent install with nvidia/fglrx drivers
+%bcond_with dri2
#
Summary: X.org server
Summary(pl.UTF-8): Serwer X.org
@@ -26,7 +27,7 @@
Patch0: %{name}-ncurses.patch
Patch1: %{name}-xwrapper.patch
URL: http://xorg.freedesktop.org/
-BuildRequires: Mesa-libGL-devel >= 7.1.0
+BuildRequires: Mesa-libGL-devel >= 7.1
# for glx headers
BuildRequires: OpenGL-GLX-devel
BuildRequires: autoconf >= 2.57
@@ -34,7 +35,7 @@
BuildRequires: cpp
BuildRequires: dbus-devel
BuildRequires: hal-devel
-BuildRequires: libdrm-devel >= 2.3.0
+BuildRequires: libdrm-devel >= 2.3.1
BuildRequires: libtool
BuildRequires: ncurses-devel
BuildRequires: pam-devel
@@ -267,6 +268,8 @@
Summary(pl.UTF-8): Biblioteka rozszerzenia GLX dla serwera X.org
Group: X11/Servers
Requires: %{name} = %{version}-%{release}
+# Mesa-dri-driver-swrast replaces libGLcore.so
+Requires: xorg-xserver-libglx(glapi)
Provides: xorg-xserver-modules-libglx
Obsoletes: X11-OpenGL-core < 1:7.0.0
Obsoletes: XFree86-OpenGL-core < 1:7.0.0
@@ -335,6 +338,7 @@
--enable-xevie \
--enable-secure-rpc \
--enable-xorgcfg \
+ --%{?with_dri2:en}%{!?with_dri2:dis}able-dri2 \
--%{?with_xprint:en}%{!?with_xprint:dis}able-xprint \
--with-dri-driver-path=%{_libdir}/xorg/modules/dri \
--with-default-font-path="%{_fontsdir}/misc,%{_fontsdir}/TTF,%{_fontsdir}/OTF,%{_fontsdir}/Type1,%{_fontsdir}/100dpi,%{_fontsdir}/75dpi"
\
@@ -395,10 +399,9 @@
%dir %{_libdir}/xorg/modules/dri
%dir %{_libdir}/xorg/modules/drivers
%dir %{_libdir}/xorg/modules/extensions
-%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libGLcore.so
%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libdbe.so
%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libdri.so
-%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libdri2.so
+%{?with_dri2:%attr(755,root,root)
%{_libdir}/xorg/modules/extensions/libdri2.so}
%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libextmod.so
%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libxtrap.so
%dir %{_libdir}/xorg/modules/fonts
@@ -490,6 +493,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.129 2008/07/01 10:57:53 arekm
+- disable dri2; fix swrast dep; builds now
+
Revision 1.128 2008/06/30 20:55:26 arekm
- partial 1.4.99.905 update; mesa source no longer needed but mesa headers are
needed
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xorg-xserver-server.spec?r1=1.128&r2=1.129&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
