packages: Mesa/Mesa.spec - rel 3; disable EGL; enable i915 driver

[arekm]

Author: arekm                        Date: Sun Jul 19 15:56:22 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3; disable EGL; enable i915 driver

---- Files affected:
packages/Mesa:
   Mesa.spec (1.208 -> 1.209) 

---- Diffs:

================================================================
Index: packages/Mesa/Mesa.spec
diff -u packages/Mesa/Mesa.spec:1.208 packages/Mesa/Mesa.spec:1.209
--- packages/Mesa/Mesa.spec:1.208	Sun Jul 19 15:55:27 2009
+++ packages/Mesa/Mesa.spec	Sun Jul 19 17:56:17 2009
@@ -3,7 +3,6 @@
 # TODO:
 # - subpackage with non-dri libGL for use with X-servers with missing GLX extension?
 # - resurrect static if it's useful
-# - what's libEGL?
 #
 # Conditional build:
 %bcond_without	motif	# build static libGLw without Motif interface
@@ -22,7 +21,7 @@
 Summary(pl.UTF-8):	Wolnodostępna implementacja standardu OpenGL
 Name:		Mesa
 Version:	7.5
-Release:	2%{?with_multigl:.mgl}
+Release:	3%{?with_multigl:.mgl}
 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
@@ -616,7 +615,8 @@
 common_flags="\
 	--enable-shared \
 	--enable-selinux \
-	--enable-pic"
+	--enable-pic \
+	--disable-egl"
 
 # osmesa variants
 %configure $common_flags \
@@ -650,7 +650,14 @@
 	--enable-glu \
 	--enable-glw \
 	--disable-glut \
-	--%{?with_gallium:en}%{!?with_gallium:dis}able-gallium \
+%if %{with gallium}
+	--enable-gallium \
+	--enable-gallium-intel \
+	--enable-gallium-nouveau \
+	--with-state-trackers=dri \
+%else
+	--disable-gallium \
+%endif
 	--with-driver=dri \
 	--with-dri-drivers=${dri_drivers} \
 	--with-dri-driverdir=%{_libdir}/xorg/modules/dri
@@ -699,9 +706,6 @@
 cd $RPM_BUILD_ROOT%{_includedir}/GL 
 rm [a-fh-np-wyz]*.h gg*.h glf*.h
 cd $RPM_BUILD_ROOT%{_libdir}
-%if %{without gallium}
-rm libEGL*
-%endif
 cd $olddir
 
 %if %{with multigl}
@@ -735,13 +739,10 @@
 %attr(755,root,root) %ghost %{_libdir}/Mesa/libGL.so.1
 %else
 %attr(755,root,root) %{_libdir}/libGL.so.*.*
-%attr(755,root,root) %{_libdir}/libEGL.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libGL.so.1
-%attr(755,root,root) %ghost %{_libdir}/libEGL.so.1
 # symlink for binary apps which fail to conform Linux OpenGL ABI
 # (and dlopen libGL.so instead of libGL.so.1)
 %attr(755,root,root) %{_libdir}/libGL.so
-%attr(755,root,root) %{_libdir}/libEGL.so
 %endif
 
 %files libGL-devel
@@ -870,7 +871,7 @@
 
 %files dri-driver-intel-i915
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/xorg/modules/dri/EGL_i915.so
+%attr(755,root,root) %{_libdir}/xorg/modules/dri/i915_dri.so
 
 %files dri-driver-intel-i965
 %defattr(644,root,root,755)
@@ -920,6 +921,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.209  2009/07/19 15:56:17  arekm
+- rel 3; disable EGL; enable i915 driver
+
 Revision 1.208  2009/07/19 13:55:27  arekm
 - rel 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Mesa/Mesa.spec?r1=1.208&r2=1.209&f=u