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

dropping DRI1 is premature, fix swrastg upstream first.

Browse Source
This commit is contained in:
Dave Airlie 2011-06-20 13:47:11 +10:00
parent d48bd270dd
commit 15630b359e
1 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
mesa.spec
View File

@ -15,7 +15,7 @@
Summary: Mesa graphics libraries
Name: mesa
Version: 7.11
Release: 0.11.%{gitdate}.0%{?dist}
Release: 0.12.%{gitdate}.0%{?dist}
License: MIT
Group: System Environment/Libraries
URL: http://www.mesa3d.org
@ -112,11 +112,17 @@ Summary: Mesa-based DRI drivers
Group: User Interface/X Hardware Support
Requires: mesa-dri-filesystem%{?_isa}
Obsoletes: mesa-dri-drivers-experimental < 0:7.10-0.24
Obsoletes: mesa-dri-llvmcore <= %{version}-%{release}
Obsoletes: mesa-dri-drivers-dri1 <= %{version}-%{release}
Obsoletes: mesa-dri-llvmcore <= 7.11-0.8
%description dri-drivers
Mesa-based DRI drivers.
%package dri-drivers-dri1
Summary: Mesa-based DRI1 drivers
Group: User Interface/X Hardware Support
Requires: mesa-dri-filesystem%{?isa}
%description dri-drivers-dri1
Mesa-based DRI1 drivers.
%package libGL-devel
Summary: Mesa libGL development package
Group: Development/Libraries
@ -224,7 +230,6 @@ export CXXFLAGS="$RPM_OPT_FLAGS"
--with-driver=dri \
--with-osmesa-bits=8 \
--with-dri-driverdir=%{_libdir}/dri \
--with-dri-drivers=i915,i965 \
--with-state-trackers=dri,glx \
--enable-egl \
--enable-gles1 \
@ -266,9 +271,9 @@ install -d $RPM_BUILD_ROOT%{_libdir}/dri
# use gallium driver iff built
[ -f %{_lib}/gallium/r300_dri.so ] && cp %{_lib}/gallium/r300_dri.so %{_lib}/r300_dri.so
[ -f %{_lib}/gallium/r600_dri.so ] && cp %{_lib}/gallium/r600_dri.so %{_lib}/r600_dri.so
[ -f %{_lib}/gallium/swrastg_dri.so ] && cp %{_lib}/gallium/swrastg_dri.so %{_lib}/swrastg_dri.so
[ -f %{_lib}/gallium/swrastg_dri.so ] && mv %{_lib}/gallium/swrastg_dri.so %{_lib}/swrast_dri.so
for f in i915 i965 gallium/vmwgfx ; do
for f in i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon savage sis swrast tdfx unichrome nouveau_vieux gallium/vmwgfx ; do
so=%{_lib}/${f}_dri.so
test -e $so && echo $so
done | xargs install -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/dri >& /dev/null || :
@ -340,6 +345,8 @@ rm -rf $RPM_BUILD_ROOT
%files dri-drivers
%defattr(-,root,root,-)
%if %{with_hardware}
%{_libdir}/dri/radeon_dri.so
%{_libdir}/dri/r200_dri.so
%{_libdir}/dri/r300_dri.so
%{_libdir}/dri/r600_dri.so
%ifarch %{ix86} x86_64 ia64
@ -349,8 +356,28 @@ rm -rf $RPM_BUILD_ROOT
%endif
%endif
%{_libdir}/dri/nouveau_dri.so
%{_libdir}/dri/nouveau_vieux_dri.so
%endif
%{_libdir}/dri/swrast_dri.so
%exclude %{_libdir}/dri/swrastg_dri.so
%files dri-drivers-dri1
%defattr(-,root,root,-)
%doc docs/COPYING
%if %{with_hardware}
%ifarch %{ix86}
%{_libdir}/dri/i810_dri.so
%{_libdir}/dri/sis_dri.so
%endif
%{_libdir}/dri/r128_dri.so
%ifnarch %{sparc}
# we no much hardware....
%{_libdir}/dri/mga_dri.so
%{_libdir}/dri/savage_dri.so
%{_libdir}/dri/tdfx_dri.so
%{_libdir}/dri/unichrome_dri.so
%endif
%endif
%{_libdir}/dri/swrastg_dri.so
%files libGL-devel
%defattr(-,root,root,-)
@ -417,6 +444,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/osmesa.pc
%changelog
* Mon Jun 20 2011 Dave Airlie <airlied@redhat.com> 7.11-0.12.20110412.0
- dropping DRI1 is premature, fix swrastg upstream first.
* Tue May 10 2011 Dan Horák <dan[at]danny.cz> 7.11-0.11.20110412.0
- r300 needs to be explicitely disabled when with_hardware == 0