packages: Mesa/Mesa.spec - renamed static bcond to static_libs - simplified...
qboosh
qboosh at pld-linux.org
Fri Aug 5 20:59:34 CEST 2011
Author: qboosh Date: Fri Aug 5 18:59:34 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- renamed static bcond to static_libs
- simplified gallium_nouveau bcond handling
- don't enable and disable at once egl for osmesa (just disable)
- updated rm commands
---- Files affected:
packages/Mesa:
Mesa.spec (1.286 -> 1.287)
---- Diffs:
================================================================
Index: packages/Mesa/Mesa.spec
diff -u packages/Mesa/Mesa.spec:1.286 packages/Mesa/Mesa.spec:1.287
--- packages/Mesa/Mesa.spec:1.286 Thu Aug 4 21:00:33 2011
+++ packages/Mesa/Mesa.spec Fri Aug 5 20:59:29 2011
@@ -13,7 +13,7 @@
%bcond_without motif # build static libGLw without Motif interface
%bcond_with multigl # package libGL in a way allowing concurrent install with nvidia/fglrx drivers
%bcond_without osmesa # don't build osmesa
-%bcond_with static # static libraries
+%bcond_with static_libs # static libraries
#
# minimal supported xserver version
%define xserver_ver 1.5.0
@@ -80,6 +80,7 @@
%if %{without gallium}
%undefine with_gallium_intel
+%undefine with_gallium_nouveau
%undefine with_gallium_radeon
%endif
@@ -796,16 +797,11 @@
gallium_drivers=$(echo $gallium_drivers | xargs | tr ' ' ',')
common_flags="\
- --enable-shared \
- --enable-selinux \
- --enable-pic \
--enable-glx-tls \
+ --enable-pic \
+ --enable-selinux \
+ %{?with_static_libs:--enable-static} \
--disable-glut \
-%if %{with egl}
- --enable-egl \
- --enable-gles1 \
- --enable-gles2 \
-%endif
"
osmesa_common_flags="\
@@ -823,6 +819,11 @@
%endif
%configure $common_flags \
+%if %{with egl}
+ --enable-egl \
+ --enable-gles1 \
+ --enable-gles2 \
+%endif
%if %{with gallium}
--enable-openvg \
--enable-gallium-egl \
@@ -839,24 +840,16 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-
# libs without drivers
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
%if %{with osmesa}
-cp -Pp osmesa*/*OSMesa* $RPM_BUILD_ROOT%{_libdir}
+cp -Pp osmesa*/libOSMesa* $RPM_BUILD_ROOT%{_libdir}
%endif
-rm -rf $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/*/{.deps,CVS,Makefile.{BeOS*,win,cygnus,DJ,dja}}
-
# strip out undesirable headers
-olddir=$(pwd)
-cd $RPM_BUILD_ROOT%{_includedir}/GL
-rm [a-fh-np-wyz]*.h glf*.h
-cd $RPM_BUILD_ROOT%{_libdir}
-cd $olddir
+%{__rm} $RPM_BUILD_ROOT%{_includedir}/GL/{glfbdev,mesa_wgl,vms_x_fix,wglext,wmesa}.h
%if %{with gallium}
# use gallium swrastg as swrast
@@ -929,7 +922,7 @@
%{_includedir}/KHR/khrplatform.h
%{_pkgconfigdir}/egl.pc
-%if %{with static}
+%if %{with static_libs}
%files libEGL-static
%defattr(644,root,root,755)
%{_libdir}/libEGL.a
@@ -970,7 +963,7 @@
%{_pkgconfigdir}/dri.pc
%{_pkgconfigdir}/gl.pc
-%if %{with static}
+%if %{with static_libs}
%files libGL-static
%defattr(644,root,root,755)
%{_libdir}/libGL.a
@@ -1004,7 +997,7 @@
%{_includedir}/GL/glu_mangle.h
%{_pkgconfigdir}/glu.pc
-%if %{with static}
+%if %{with static_libs}
%files libGLU-static
%defattr(644,root,root,755)
%{_libdir}/libGLU.a
@@ -1024,7 +1017,7 @@
%{_includedir}/GL/GLwMDrawAP.h
%{_pkgconfigdir}/glw.pc
-%if %{with static}
+%if %{with static_libs}
%files libGLw-static
%defattr(644,root,root,755)
%{_libdir}/libGLw.a
@@ -1041,7 +1034,7 @@
%attr(755,root,root) %{_libdir}/libOSMesa.so
%{_includedir}/GL/osmesa.h
-%if %{with static}
+%if %{with static_libs}
%files libOSMesa-static
%defattr(644,root,root,755)
%{_libdir}/libOSMesa.a
@@ -1118,13 +1111,11 @@
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/xorg/modules/dri/mga_dri.so
-%if %{with gallium}
%if %{with gallium_nouveau}
%files dri-driver-nouveau
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/xorg/modules/dri/nouveau_dri.so
%endif
-%endif
%files dri-driver-savage
%defattr(644,root,root,755)
@@ -1160,6 +1151,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.287 2011/08/05 18:59:29 qboosh
+- renamed static bcond to static_libs
+- simplified gallium_nouveau bcond handling
+- don't enable and disable at once egl for osmesa (just disable)
+- updated rm commands
+
Revision 1.286 2011/08/04 19:00:33 qboosh
- explicit GLES library filenames
- added info about implemented GLES/OpenVG versions to descriptions
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Mesa/Mesa.spec?r1=1.286&r2=1.287&f=u
More information about the pld-cvs-commit
mailing list