From 1320f8d7415fcc15b9e70bfab63080eda1521562 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Wed, 4 Jun 2014 18:19:27 +0200 Subject: [PATCH] - fix build without hardware drivers --- mesa.spec | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/mesa.spec b/mesa.spec index c6e9160..4e4eb83 100644 --- a/mesa.spec +++ b/mesa.spec @@ -59,7 +59,7 @@ Summary: Mesa graphics libraries Name: mesa Version: 10.2 -Release: 0.9.rc5.%{gitdate}%{?dist} +Release: 0.10.rc5.%{gitdate}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -390,7 +390,9 @@ export CXXFLAGS="$RPM_OPT_FLAGS %{?with_opencl:-frtti -fexceptions} %{!?with_ope --enable-egl \ --disable-gles1 \ --enable-gles2 \ +%if %{with_hardware} --enable-gallium-egl \ +%endif --disable-xvmc \ %{?with_vdpau:--enable-vdpau} \ --with-egl-platforms=x11,drm%{?with_wayland:,wayland} \ @@ -490,8 +492,10 @@ rm -rf $RPM_BUILD_ROOT %doc docs/COPYING %{_libdir}/libEGL.so.1 %{_libdir}/libEGL.so.1.* +%if %{with_hardware} %dir %{_libdir}/egl %{_libdir}/egl/egl_gallium.so +%endif %files libGLES %defattr(-,root,root,-) @@ -541,10 +545,10 @@ rm -rf $RPM_BUILD_ROOT %if 0%{?with_vmware} %{_libdir}/dri/vmwgfx_dri.so %endif -%endif -%{_libdir}/dri/swrast_dri.so %dir %{_libdir}/gallium-pipe %{_libdir}/gallium-pipe/*.so +%endif +%{_libdir}/dri/swrast_dri.so %if %{with_hardware} %if 0%{?with_omx} @@ -624,8 +628,10 @@ rm -rf $RPM_BUILD_ROOT %doc docs/COPYING %{_libdir}/libgbm.so.1 %{_libdir}/libgbm.so.1.* +%if %{with_hardware} %dir %{_libdir}/gbm %{_libdir}/gbm/gbm_gallium_drm.so +%endif %files libgbm-devel %defattr(-,root,root,-) @@ -676,6 +682,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Wed Jun 04 2014 Dan HorĂ¡k - 10.2-0.10.rc5.20140531 +- fix build without hardware drivers + * Sat May 31 2014 Igor Gnatenko - 10.2-0.9.rc5.20140531 - 10.2-rc5 upstream release