rpms/mesa
7
0
Fork 1
Code Issues Pull Requests Releases Activity

- Fix text relocations in OSMesa build. (#475146)

Browse Source 
- Re-enable textrel checks, for OSMesa only.
This commit is contained in:
Adam Jackson 2009-02-24 16:54:44 +00:00
parent 792edb2287
commit c553e35424
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mesa.spec
View File

@ -20,7 +20,7 @@
Summary: Mesa graphics libraries Summary: Mesa graphics libraries
Name: mesa Name: mesa
Version: 7.3 Version: 7.3
Release: 5%{?dist} Release: 6%{?dist}
License: MIT License: MIT
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://www.mesa3d.org URL: http://www.mesa3d.org
@ -188,21 +188,24 @@ autoreconf --install
export CFLAGS="$RPM_OPT_FLAGS -fvisibility=hidden -Os" export CFLAGS="$RPM_OPT_FLAGS -fvisibility=hidden -Os"
export CXXFLAGS="$RPM_OPT_FLAGS -fvisibility=hidden -Os" export CXXFLAGS="$RPM_OPT_FLAGS -fvisibility=hidden -Os"
%define common_flags --enable-selinux --enable-pic
%define osmesa_flags --with-driver=osmesa --disable-asm %{common_flags}
# first, build the osmesa variants. XXX this is overkill. osmesa32 is # first, build the osmesa variants. XXX this is overkill. osmesa32 is
# sufficient to render to any of the channel sizes, according to the # sufficient to render to any of the channel sizes, according to the
# docs. should fix this someday. # docs. should fix this someday.
%configure --with-driver=osmesa --with-osmesa-bits=8 --enable-selinux
%configure %{osmesa_flags} --with-osmesa-bits=8
make %{_smp_mflags} SRC_DIRS=mesa make %{_smp_mflags} SRC_DIRS=mesa
mv %{_lib} osmesa8 mv %{_lib} osmesa8
make clean make clean
%configure --with-driver=osmesa --with-osmesa-bits=16 --enable-selinux %configure %{osmesa_flags} --with-osmesa-bits=16
make %{_smp_mflags} SRC_DIRS=mesa make %{_smp_mflags} SRC_DIRS=mesa
mv %{_lib} osmesa16 mv %{_lib} osmesa16
make clean make clean
%configure --with-driver=osmesa --with-osmesa-bits=32 --enable-selinux %configure %{osmesa_flags} --with-osmesa-bits=32
make %{_smp_mflags} SRC_DIRS=mesa make %{_smp_mflags} SRC_DIRS=mesa
mv %{_lib} osmesa32 mv %{_lib} osmesa32
make clean make clean
@ -215,8 +218,7 @@ export CFLAGS="$RPM_OPT_FLAGS -Os"
export CXXFLAGS="$RPM_OPT_FLAGS -Os" export CXXFLAGS="$RPM_OPT_FLAGS -Os"
# now build the rest of mesa # now build the rest of mesa
%configure \ %configure %{common_flags} \
--enable-selinux \
--disable-glw \ --disable-glw \
--disable-glut \ --disable-glut \
--disable-gl-osmesa \ --disable-gl-osmesa \
@ -284,10 +286,10 @@ make %{?_smp_mflags} install DESTDIR=$RPM_BUILD_ROOT
popd popd
# this keeps breaking, check it early. note that the exit from eu-ftr is odd. # this keeps breaking, check it early. note that the exit from eu-ftr is odd.
#pushd $RPM_BUILD_ROOT%{_libdir} pushd $RPM_BUILD_ROOT%{_libdir}
#for i in *.so ; do for i in libOSMesa*.so ; do
# eu-findtextrel $i && exit 1 eu-findtextrel $i && exit 1
#done done
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -421,6 +423,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/mesa-demos-data %{_libdir}/mesa-demos-data
%changelog %changelog
* Tue Feb 24 2009 Adam Jackson <ajax@redhat.com> 7.3-6
- Fix text relocations in OSMesa build. (#475146)
- Re-enable textrel checks, for OSMesa only.
* Mon Feb 23 2009 Adam Jackson <ajax@redhat.com> 7.3-5 * Mon Feb 23 2009 Adam Jackson <ajax@redhat.com> 7.3-5
- libGL Requires: mesa-dri-drivers%%{?_isa}. Gets both 32 and 64 bit - libGL Requires: mesa-dri-drivers%%{?_isa}. Gets both 32 and 64 bit
drivers installed on multilib systems, so 32-bit clients get DRI. drivers installed on multilib systems, so 32-bit clients get DRI.