- Fix OSMesa symlink bug. (#424545)
- Build OSMesa with -Os to be slightly less bloaty. - Re-add osmesa.h to libOSMesa-devel. - Really restore -fvisibility=hidden.
This commit is contained in:
parent
2c6d81999d
commit
78fe81f459
27
mesa.spec
27
mesa.spec
@ -15,7 +15,7 @@
|
|||||||
Summary: Mesa graphics libraries
|
Summary: Mesa graphics libraries
|
||||||
Name: mesa
|
Name: mesa
|
||||||
Version: 7.1
|
Version: 7.1
|
||||||
Release: 0.16%{?dist}
|
Release: 0.17%{?dist}
|
||||||
License: MIT
|
License: MIT
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
URL: http://www.mesa3d.org
|
URL: http://www.mesa3d.org
|
||||||
@ -163,10 +163,11 @@ sed -i 's,isosurf.dat,%{_libdir}/mesa-demos-data/&,' progs/demos/isosurf.c
|
|||||||
sed -i 's,terrain.dat,%{_libdir}/mesa-demos-data/&,' progs/demos/terrain.c
|
sed -i 's,terrain.dat,%{_libdir}/mesa-demos-data/&,' progs/demos/terrain.c
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fvisibility=hidden"
|
|
||||||
|
|
||||||
autoreconf --install
|
autoreconf --install
|
||||||
|
|
||||||
|
export CFLAGS="$RPM_OPT_FLAGS -fvisibility=hidden -Os"
|
||||||
|
export CXXFLAGS="$RPM_OPT_FLAGS -fvisibility=hidden -Os"
|
||||||
# first, build the osmesa variants
|
# first, build the osmesa variants
|
||||||
%configure --with-driver=osmesa --with-osmesa-bits=8
|
%configure --with-driver=osmesa --with-osmesa-bits=8
|
||||||
make %{_smp_mflags} SRC_DIRS=mesa
|
make %{_smp_mflags} SRC_DIRS=mesa
|
||||||
@ -186,6 +187,9 @@ make clean
|
|||||||
# just to be sure...
|
# just to be sure...
|
||||||
[ `find . -name \*.o | wc -l` -eq 0 ] || exit "make cleaner plz"
|
[ `find . -name \*.o | wc -l` -eq 0 ] || exit "make cleaner plz"
|
||||||
|
|
||||||
|
export CFLAGS="$RPM_OPT_FLAGS -fvisibility=hidden"
|
||||||
|
export CXXFLAGS="$RPM_OPT_FLAGS -fvisibility=hidden"
|
||||||
|
|
||||||
# now build the rest of mesa
|
# now build the rest of mesa
|
||||||
%configure \
|
%configure \
|
||||||
--disable-glw \
|
--disable-glw \
|
||||||
@ -237,12 +241,7 @@ install -m 0644 progs/images/*.rgb $RPM_BUILD_ROOT/%{_libdir}/mesa-demos-data
|
|||||||
install -m 0644 progs/demos/*.dat $RPM_BUILD_ROOT/%{_libdir}/mesa-demos-data
|
install -m 0644 progs/demos/*.dat $RPM_BUILD_ROOT/%{_libdir}/mesa-demos-data
|
||||||
|
|
||||||
# and osmesa
|
# and osmesa
|
||||||
install -m 0755 -t $RPM_BUILD_ROOT%{_libdir} osmesa*/*.so.?
|
mv osmesa*/* $RPM_BUILD_ROOT%{_libdir}
|
||||||
pushd $RPM_BUILD_ROOT%{_libdir}
|
|
||||||
for i in libOSMesa* ; do
|
|
||||||
ln -s $i $(basename $i .6)
|
|
||||||
done
|
|
||||||
popd
|
|
||||||
|
|
||||||
# man pages
|
# man pages
|
||||||
pushd ../%{manpages}
|
pushd ../%{manpages}
|
||||||
@ -316,9 +315,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
|
|
||||||
%files libOSMesa
|
%files libOSMesa
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%{_libdir}/libOSMesa.so.6
|
%{_libdir}/libOSMesa.so.6*
|
||||||
%{_libdir}/libOSMesa16.so.6
|
%{_libdir}/libOSMesa16.so.6*
|
||||||
%{_libdir}/libOSMesa32.so.6
|
%{_libdir}/libOSMesa32.so.6*
|
||||||
|
|
||||||
%files libOSMesa-devel
|
%files libOSMesa-devel
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
@ -394,6 +393,12 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_libdir}/mesa-demos-data
|
%{_libdir}/mesa-demos-data
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Feb 26 2008 Adam Jackson <ajax@redhat.com> 7.1-0.17
|
||||||
|
- Fix OSMesa symlink bug. (#424545)
|
||||||
|
- Build OSMesa with -Os to be slightly less bloaty.
|
||||||
|
- Re-add osmesa.h to libOSMesa-devel.
|
||||||
|
- Really restore -fvisibility=hidden.
|
||||||
|
|
||||||
* Thu Feb 21 2008 Adam Jackson <ajax@redhat.com> 7.1-0.16
|
* Thu Feb 21 2008 Adam Jackson <ajax@redhat.com> 7.1-0.16
|
||||||
- Fix build on powerpc and amd64.
|
- Fix build on powerpc and amd64.
|
||||||
- Disable %%_smp_mflags for DRI drivers for now.
|
- Disable %%_smp_mflags for DRI drivers for now.
|
||||||
|
Loading…
Reference in New Issue
Block a user