SPECS: Mesa.spec - enable swrast dri (replaces xserver libGLcore.so); fix b...

arekm arekm at pld-linux.org
Tue Jul 1 12:18:29 CEST 2008


Author: arekm                        Date: Tue Jul  1 10:18:28 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- enable swrast dri (replaces xserver libGLcore.so); fix build with libdrm 2.3.1

---- Files affected:
SPECS:
   Mesa.spec (1.169 -> 1.170) 

---- Diffs:

================================================================
Index: SPECS/Mesa.spec
diff -u SPECS/Mesa.spec:1.169 SPECS/Mesa.spec:1.170
--- SPECS/Mesa.spec:1.169	Wed May 28 22:49:17 2008
+++ SPECS/Mesa.spec	Tue Jul  1 12:18:20 2008
@@ -15,7 +15,7 @@
 Summary(pl.UTF-8):	Wolnodostępna implementacja standardu OpenGL
 Name:		Mesa
 Version:	7.1
-Release:	0.%{?with_multigl:.mgl}.%{snap}.1
+Release:	0.%{?with_multigl:mgl.}%{snap}.1
 License:	MIT (core), SGI (GLU,libGLw) and others - see license.html file
 Group:		X11/Libraries
 # Source0:	http://dl.sourceforge.net/mesa3d/%{name}Lib-%{version}.tar.bz2
@@ -26,6 +26,7 @@
 # Source1-md5:	e3df10e4efa3ff3fc3b2572f8af06f12
 Source2:	nouveau_drm.h
 Patch0:		%{name}-realclean.patch
+Patch1:		%{name}-libdrm.patch
 URL:		http://www.mesa3d.org/
 BuildRequires:	expat-devel
 #%if %{with nouveau}
@@ -536,6 +537,20 @@
 %description dri-driver-sis -l pl.UTF-8
 Sterowniki X.org DRI dla rodziny kart SiS.
 
+%package dri-driver-swrast
+Summary:	X.org DRI drivers
+Summary(pl.UTF-8):	Sterowniki DRI dla X.org
+License:	MIT
+Group:		X11/Libraries
+Requires:	xorg-xserver-libglx(glapi) = %{version}
+Requires:	xorg-xserver-server
+
+%description dri-driver-swrast
+DRI software rasterizer driver for X.org.
+
+%description dri-driver-swrast -l pl.UTF-8
+DRI software rasterizer driver for X.org.
+
 %package dri-driver-tdfx
 Summary:	X.org DRI drivers
 Summary(pl.UTF-8):	Sterowniki DRI dla X.org
@@ -588,6 +603,7 @@
 %prep
 %setup -q -b1 -n %{name}-%{version}-%{snap}
 %patch0 -p0
+%patch1 -p1
 
 # until new libdrm release and Mesa update for nouveau_drm patchlevel
 [ -f src/mesa/drivers/dri/nouveau/nouveau_drm.h  ] && exit 1
@@ -599,6 +615,8 @@
 # s3v, sis, trident missing there - don't override list from linux-dri
 sed -i -e '/^DRI_DIRS/d' configs/linux-dri-x86-64
 
+sed -i -e 's/ i810 / swrast i810 /' configs/linux-dri
+
 %if %{with nouveau}
 sed -i -e 's/ ffb$/ ffb nouveau/' configs/linux-dri
 %endif
@@ -895,6 +913,10 @@
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/sis_dri.so
 %endif
 
+%files dri-driver-swrast
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/xorg/modules/dri/swrast_dri.so
+
 %files dri-driver-tdfx
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/tdfx_dri.so
@@ -917,7 +939,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.169  2008/05/28 20:49:17  arekm
+Revision 1.170  2008/07/01 10:18:20  arekm
+- enable swrast dri (replaces xserver libGLcore.so); fix build with libdrm 2.3.1
+
+Revision 1.169  2008-05-28 20:49:17  arekm
 - up to 7.1 rc1
 
 Revision 1.168  2008-04-05 20:44:31  arekm
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/Mesa.spec?r1=1.169&r2=1.170&f=u



More information about the pld-cvs-commit mailing list