diff --git a/Mesa.spec b/Mesa.spec index 4c76aaf..1fcc97c 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -10,7 +10,7 @@ Name: Mesa Epoch: 1 -Version: 20.2.3 +Version: 20.3.2 Release: 1mamba Summary: A 3-D graphics library with an API which is very similar to that of OpenGL Group: System/Libraries @@ -69,9 +69,9 @@ BuildRequires: presentproto-devel BuildRequires: python-mako-py3 BuildRequires: glslang BuildRequires: wayland-protocols -%ifnarch arm aarch64 +#%ifnarch arm aarch64 BuildRequires: libclc-devel -%endif +#%endif Provides: libgl BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -337,9 +337,8 @@ Mesa vulkan drivers. %debug_package %prep -%setup -q -n mesa-%{version} -#-D -T -#:<< _EOF +%setup -q -n mesa-%{version} -D -T +:<< _EOF #%ifarch arm ## Force libglx dri backend using swrast on non-DRI accelerated platforms #sed -i 's|default_driver="xlib"|default_driver="dri"|' configure @@ -353,46 +352,51 @@ Mesa vulkan drivers. #export CXXFLAGS="%{optflags} -std=c++11" -%ifnarch arm +#%ifnarch arm export CC=clang export CXX=clang++ -%endif +#%endif export PYTHON=%{__python3} %meson \ - -Degl=true \ - -Dgles1=true \ - -Dgles2=true \ - -Ddri3=true \ + -Degl=enabled \ + -Dgles1=enabled \ + -Dgles2=enabled \ + -Ddri3=enabled \ -Dglx=dri \ - -Dplatforms=x11,drm,wayland,surfaceless \ + -Dplatforms=x11,wayland \ -Dglx-direct=true \ - -Dgbm=true \ - -Dshared-glapi=true \ - -Dlmsensors=true \ + -Dgbm=enabled \ + -Dshared-glapi=enabled \ + -Dlmsensors=enabled \ -Dlibunwind=true \ -%ifarch arm aarch64 - -Ddri-drivers=swrast \ - -Dgallium-drivers=freedreno \ - -Dgallium-egl=true \ - -Dllvm=false \ +%ifarch arm + -Ddri-drivers=auto \ + -Dgallium-drivers=swrast,freedreno \ %else - -Dllvm=true \ - -Dshared-llvm=true \ - -Dgallium-vdpau=true \ + -Ddri-drivers=auto \ + -Dgallium-drivers=auto \ + -Dgallium-vdpau=enabled \ -Dgallium-xvmc=true \ - -Dgallium-drivers=nouveau,r300,r600,radeonsi,svga,swrast,virgl \ -Dgallium-omx=bellagio \ -Dgallium-nine=true \ - -Dosmesa=gallium \ - -Ddri-drivers=i915,i965,nouveau,r100,r200 \ + -Dgallium-opencl=icd \ +%endif -Ddri-drivers-path=%{_libdir}/dri \ - -Dvulkan-drivers=intel,amd \ + -Dvulkan-drivers=auto \ -Dvulkan-overlay-layer=true \ + -Dllvm=enabled \ + -Dshared-llvm=enabled \ + -Dosmesa=gallium \ -Dgallium-extra-hud=true \ - -Dgallium-xa=true \ - -Dgallium-opencl=icd -%endif + -Dgallium-xa=enabled + +# -Dgallium-egl=true \ +# -Ddri-drivers=swrast \ +# -Ddri-drivers=i915,i965,nouveau,r100,r200 \ +# -Dgallium-drivers=freedreno \ +# -Dgallium-drivers=nouveau,r300,r600,radeonsi,svga,swrast,virgl \ +# -Dvulkan-drivers=intel,amd \ %meson_build @@ -514,17 +518,24 @@ sed -i "s|%{_prefix}/lib/libGL.la||" %{_libdir}/*.la %{_libdir}/libEGL.so.* #%dir %{_libdir}/egl #%{_libdir}/egl/egl_gallium.so -%ifarch %{ix86} x86_64 +%ifnarch arm %dir %{_libdir}/gallium-pipe +%{_libdir}/gallium-pipe/pipe_nouveau.so +%{_libdir}/gallium-pipe/pipe_swrast.so +%endif #%{_libdir}/gallium-pipe/pipe_i965.la #%{_libdir}/gallium-pipe/pipe_i965.so -%{_libdir}/gallium-pipe/pipe_nouveau.so +%ifarch %{ix86} x86_64 +%{_libdir}/gallium-pipe/pipe_iris.so %{_libdir}/gallium-pipe/pipe_r300.so %{_libdir}/gallium-pipe/pipe_r600.so %{_libdir}/gallium-pipe/pipe_radeonsi.so -%{_libdir}/gallium-pipe/pipe_swrast.so %{_libdir}/gallium-pipe/pipe_vmwgfx.so %endif +%ifarch aarch64 +%{_libdir}/gallium-pipe/pipe_kmsro.so +%{_libdir}/gallium-pipe/pipe_msm.so +%endif %files -n libEGL-devel %defattr(-,root,root) @@ -536,8 +547,8 @@ sed -i "s|%{_prefix}/lib/libGL.la||" %{_libdir}/*.la #%{_sysconfdir}/drirc %dir %{_libdir}/mesa %{_libdir}/mesa/libGL.so.* +%ifnarch arm #%{_libdir}/bellagio/libomx_mesa.la -%ifnarch arm aarch64 %{_libdir}/bellagio/libomx_mesa.so %dir %{_libdir}/d3d %{_libdir}/d3d/d3dadapter9.so.* @@ -571,36 +582,42 @@ sed -i "s|%{_prefix}/lib/libGL.la||" %{_libdir}/*.la %{_libdir}/libGL.so %{_libdir}/libEGL.so %{_libdir}/libglapi.so -%ifnarch arm aarch64 +%ifnarch arm %dir %{_includedir}/d3dadapter %{_includedir}/d3dadapter/*.h %{_libdir}/d3d/d3dadapter9.so -%{_includedir}/vulkan/vulkan_intel.h %{_libdir}/pkgconfig/d3d.pc %endif +%ifarch %{ix86} x86_64 +%{_includedir}/vulkan/vulkan_intel.h +%endif #%{_libdir}/libdricore%{version}*.so #%{_libdir}/dri/gallium_drv_video.la %{_libdir}/pkgconfig/dri.pc %{_libdir}/pkgconfig/gl.pc -%ifnarch arm aarch64 %files -n libvulkan-Mesa %defattr(-,root,root) +%ifarch %{ix86} x86_64 %{_libdir}/libvulkan_intel.so %{_libdir}/libvulkan_radeon.so -%{_libdir}/libVkLayer_MESA_overlay.so %{_datadir}/vulkan/icd.d/intel_icd.*.json %{_datadir}/vulkan/icd.d/radeon_icd.*.json +%endif +%{_libdir}/libvulkan_lvp.so +%{_libdir}/libVkLayer_MESA_overlay.so +%{_datadir}/vulkan/icd.d/lvp_icd.*.json %{_datadir}/vulkan/explicit_layer.d/VkLayer_MESA_overlay.json %{_bindir}/mesa-overlay-control.py -%endif %files -n libvdpau-Mesa %defattr(-,root,root) -%ifarch %{ix86} x86_64 #%{_libdir}/vdpau/libvdpau_nouveau.la +%ifnarch arm %{_libdir}/vdpau/libvdpau_nouveau.so %{_libdir}/vdpau/libvdpau_nouveau.so.* +%endif +%ifarch %{ix86} x86_64 #%{_libdir}/vdpau/libvdpau_r300.la %{_libdir}/vdpau/libvdpau_r300.so %{_libdir}/vdpau/libvdpau_r300.so.* @@ -614,11 +631,12 @@ sed -i "s|%{_prefix}/lib/libGL.la||" %{_libdir}/*.la #%{_libdir}/vdpau/libvdpau_softpipe.so #%{_libdir}/vdpau/libvdpau_softpipe.so.* +%ifnarch arm %files -n libXvMC-Mesa %defattr(-,root,root) -%ifarch %{ix86} x86_64 %{_libdir}/libXvMCnouveau.so %{_libdir}/libXvMCnouveau.so.* +%ifarch %{ix86} x86_64 #%{_libdir}/libXvMCr300.so #%{_libdir}/libXvMCr300.so.* %{_libdir}/libXvMCr600.so @@ -626,6 +644,7 @@ sed -i "s|%{_prefix}/lib/libGL.la||" %{_libdir}/*.la %endif #%{_libdir}/libXvMCsoftpipe.so #%{_libdir}/libXvMCsoftpipe.so.* +%endif %files -n libGLESv1 %defattr(-,root,root) @@ -656,7 +675,6 @@ sed -i "s|%{_prefix}/lib/libGL.la||" %{_libdir}/*.la %defattr(-,root,root) %{_libdir}/libglapi.so.* -%ifnarch arm aarch64 %files -n libOSMesa %defattr(-,root,root) %{_libdir}/libOSMesa.so.* @@ -666,7 +684,6 @@ sed -i "s|%{_prefix}/lib/libGL.la||" %{_libdir}/*.la %{_includedir}/GL/osmesa.h %{_libdir}/libOSMesa.so %{_libdir}/pkgconfig/osmesa.pc -%endif #%files -n libOpenVG #%defattr(-,root,root) @@ -698,7 +715,7 @@ sed -i "s|%{_prefix}/lib/libGL.la||" %{_libdir}/*.la %{_libdir}/libxatracker.so %{_libdir}/pkgconfig/xatracker.pc -%ifnarch arm aarch64 +%ifnarch arm %files -n libMesaOpenCL %defattr(-,root,root) %{_sysconfdir}/OpenCL/vendors/mesa.icd @@ -707,6 +724,12 @@ sed -i "s|%{_prefix}/lib/libGL.la||" %{_libdir}/*.la %endif %changelog +* Thu Dec 31 2020 Automatic Build System 20.3.2-1mamba +- automatic version update by autodist + +* Tue Dec 29 2020 Automatic Build System 20.3.1-1mamba +- automatic version update by autodist + * Tue Nov 24 2020 Automatic Build System 20.2.3-1mamba - automatic version update by autodist