packages (DEVEL): Mesa/Mesa.spec - fix build without gallium

[wiget]

Author: wiget                        Date: Thu Mar 24 12:46:23 2011 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- fix build without gallium

---- Files affected:
packages/Mesa:
   Mesa.spec (1.263.2.10 -> 1.263.2.11) 

---- Diffs:

================================================================
Index: packages/Mesa/Mesa.spec
diff -u packages/Mesa/Mesa.spec:1.263.2.10 packages/Mesa/Mesa.spec:1.263.2.11
--- packages/Mesa/Mesa.spec:1.263.2.10	Sun Mar 13 21:55:56 2011
+++ packages/Mesa/Mesa.spec	Thu Mar 24 13:46:17 2011
@@ -34,7 +34,7 @@
 Summary(pl.UTF-8):	Wolnodostępna implementacja standardu OpenGL
 Name:		Mesa
 Version:	7.11
-Release:	0.%{snap}.1%{?with_multigl:.mgl}
+Release:	0.%{snap}.2%{?with_multigl:.mgl}
 License:	MIT (core), SGI (GLU,libGLw) and others - see license.html file
 Group:		X11/Libraries
 Source0:	%{name}Lib-%{snap}.tar.bz2
@@ -786,6 +786,7 @@
 %configure $common_flags \
 %if %{with gallium}
 	--enable-gallium \
+	--enable-openvg \
 %if %{with gallium_intel}
 	--enable-gallium-i915 \
 	--enable-gallium-i965 \
@@ -802,7 +803,6 @@
 %else
 	--disable-gallium \
 %endif
-	--enable-openvg \
 	--with-driver=dri \
 	--with-dri-drivers=${dri_drivers} \
 	--with-dri-driverdir=%{_libdir}/xorg/modules/dri
@@ -819,7 +819,7 @@
 	DESTDIR=$RPM_BUILD_ROOT
 
 %if %{with osmesa}
-install osmesa*/*OSMesa* $RPM_BUILD_ROOT%{_libdir}
+cp -Pp osmesa*/*OSMesa* $RPM_BUILD_ROOT%{_libdir}
 %endif
 
 rm -rf $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/*/{.deps,CVS,Makefile.{BeOS*,win,cygnus,DJ,dja}}
@@ -876,9 +876,13 @@
 %attr(755,root,root) %ghost %{_libdir}/libEGL.so.1
 %attr(755,root,root) %{_libdir}/libglapi.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libglapi.so.0
-%dir %{_libdir}/egl
 %if %{with gallium}
+%dir %{_libdir}/egl
 %attr(755,root,root) %{_libdir}/egl/egl_gallium.so
+%attr(755,root,root) %{_libdir}/egl/pipe_swrast.so
+%attr(755,root,root) %{_libdir}/egl/pipe_vmwgfx.so
+%attr(755,root,root) %{_libdir}/egl/st_GL.so
+%attr(755,root,root) %{_libdir}/egl/st_OpenVG.so
 %if %{with gallium_nouveau}
 %attr(755,root,root) %{_libdir}/egl/pipe_nouveau.so
 %endif
@@ -890,14 +894,7 @@
 %attr(755,root,root) %{_libdir}/egl/pipe_i915.so
 %attr(755,root,root) %{_libdir}/egl/pipe_i965.so
 %endif
-%else
-%attr(755,root,root) %{_libdir}/egl/egl_dri2.so
-%attr(755,root,root) %{_libdir}/egl/egl_glx.so
 %endif
-%attr(755,root,root) %{_libdir}/egl/pipe_swrast.so
-%attr(755,root,root) %{_libdir}/egl/pipe_vmwgfx.so
-%attr(755,root,root) %{_libdir}/egl/st_GL.so
-%attr(755,root,root) %{_libdir}/egl/st_OpenVG.so
 
 %files libEGL-devel
 %defattr(644,root,root,755)
@@ -1026,6 +1023,7 @@
 %endif
 %endif
 
+%if %{with gallium}
 %files libOpenVG
 %defattr(644,root,root,755)
 %attr(755,root,root) %ghost %{_libdir}/libOpenVG.so.1
@@ -1036,6 +1034,7 @@
 %{_includedir}/VG
 %{_libdir}/libOpenVG.so
 %{_pkgconfigdir}/vg.pc
+%endif
 
 %files dri-driver-ati-mach64
 %defattr(644,root,root,755)
@@ -1142,6 +1141,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.263.2.11  2011/03/24 12:46:17  wiget
+- fix build without gallium
+
 Revision 1.263.2.10  2011/03/13 20:55:56  wiget
 - build OpenVG
 - more BRs with egl and gallium bconds
================================================================

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