- one more libOSMesa build fix

This commit is contained in:
Dave Airlie 2009-12-21 00:13:57 +00:00
parent 7fbcaf36ad
commit a85de44b09

View file

@ -21,7 +21,7 @@
Summary: Mesa graphics libraries Summary: Mesa graphics libraries
Name: mesa Name: mesa
Version: 7.8 Version: 7.8
Release: 0.4%{?dist} Release: 0.5%{?dist}
License: MIT License: MIT
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://www.mesa3d.org URL: http://www.mesa3d.org
@ -230,8 +230,8 @@ export CXXFLAGS="$RPM_OPT_FLAGS -Os"
%configure %{common_flags} \ %configure %{common_flags} \
--disable-glw \ --disable-glw \
--disable-glut \ --disable-glut \
--disable-gallium \
--disable-gl-osmesa \ --disable-gl-osmesa \
--enable-gallium-nouveau \
--with-driver=dri \ --with-driver=dri \
--with-dri-driverdir=%{_libdir}/dri \ --with-dri-driverdir=%{_libdir}/dri \
%{?dri_drivers} %{?dri_drivers}
@ -286,7 +286,7 @@ install -m 0644 progs/images/*.rgb $RPM_BUILD_ROOT/%{demodir}
install -m 0644 progs/demos/*.dat $RPM_BUILD_ROOT/%{demodir} install -m 0644 progs/demos/*.dat $RPM_BUILD_ROOT/%{demodir}
# and osmesa # and osmesa
mv osmesa*/* $RPM_BUILD_ROOT%{_libdir} mv osmesa*/libOS* $RPM_BUILD_ROOT%{_libdir}
pushd ../%{xdriinfo} pushd ../%{xdriinfo}
make %{?_smp_mflags} install DESTDIR=$RPM_BUILD_ROOT make %{?_smp_mflags} install DESTDIR=$RPM_BUILD_ROOT
@ -325,11 +325,9 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_libdir}/dri %dir %{_libdir}/dri
%{_libdir}/dri/libdricore.so %{_libdir}/dri/libdricore.so
%{_libdir}/dri/*_dri.so %{_libdir}/dri/*_dri.so
%exclude %{_libdir}/dri/r600_dri.so
%files dri-drivers-experimental %files dri-drivers-experimental
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_libdir}/dri/r600_dri.so
%files libGL-devel %files libGL-devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
@ -385,6 +383,9 @@ rm -rf $RPM_BUILD_ROOT
%{demodir} %{demodir}
%changelog %changelog
* Mon Dec 21 2009 Dave Airlie <airlied@redhat.com> 7.8-0.5
- one more libOSMesa build fix
* Mon Dec 21 2009 Dave Airlie <airlied@redhat.com> 7.8-0.4 * Mon Dec 21 2009 Dave Airlie <airlied@redhat.com> 7.8-0.4
- fix OSmesa builds hopefully - fix OSmesa builds hopefully