diff --git a/Mesa.spec b/Mesa.spec index 4af30ec..090ec44 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -10,8 +10,8 @@ Name: Mesa Epoch: 1 -Version: 18.3.4 -Release: 2mamba +Version: 19.1.3 +Release: 1mamba Summary: A 3-D graphics library with an API which is very similar to that of OpenGL Group: System/Libraries Vendor: openmamba @@ -56,6 +56,7 @@ BuildRequires: lm_sensors-devel ## AUTOBUILDREQ-END BuildRequires: libdrm BuildRequires: libllvm-devel >= 5.0.0 +BuildRequires: clang-devel BuildRequires: xproto-devel >= 7.1 BuildRequires: dri2proto-devel BuildRequires: glproto-devel @@ -65,6 +66,7 @@ BuildRequires: liblesstif-devel BuildRequires: libvdpau-devel BuildRequires: dri3proto-devel BuildRequires: presentproto-devel +BuildRequires: python-mako-py36 %ifnarch arm BuildRequires: libclc-devel %endif @@ -336,10 +338,10 @@ Mesa vulkan drivers. %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 -%endif +#%ifarch arm +## Force libglx dri backend using swrast on non-DRI accelerated platforms +#sed -i 's|default_driver="xlib"|default_driver="dri"|' configure +#%endif #%patch2 -p1 #%patch3 -p1 @@ -349,85 +351,51 @@ sed -i 's|default_driver="xlib"|default_driver="dri"|' configure #export CXXFLAGS="%{optflags} -std=c++11" -%configure \ - --enable-egl \ - --enable-gles1 \ - --enable-gles2 \ - --enable-dri3 \ - --with-glx=dri \ - --with-platforms=x11,drm,wayland,surfaceless \ - --enable-driglx-direct \ - --enable-dri \ - --enable-gbm \ - --enable-glx \ - --enable-glx-tls \ - --enable-omx-bellagio \ - --enable-nine \ - --enable-shared-glapi \ - --enable-vdpau \ - --enable-xvmc \ - --enable-libunwind \ - --enable-lmsensors \ - --enable-gallium-osmesa \ +%ifnarch arm +export CC=clang +export CXX=clang++ +%endif +export PYTHON=%{__python36} + +%meson \ + -Degl=true \ + -Dgles1=true \ + -Dgles2=true \ + -Ddri3=true \ + -Dglx=dri \ + -Dplatforms=x11,drm,wayland,surfaceless \ + -Dglx-direct=true \ + -Dgbm=true \ + -Dshared-glapi=true \ + -Dlibunwind=true \ + -Dlmsensors=true \ %ifarch arm - --with-dri-drivers=swrast \ - --with-gallium-drivers=swrast,freedreno \ - --enable-gallium-egl \ - --disable-llvm \ + -Ddri-drivers=swrast \ + -Dgallium-drivers=freedreno \ + -Dgallium-egl=true \ + -Dllvm=false \ %else - --enable-llvm \ - --enable-llvm-shared-libs \ - --with-gallium-drivers=nouveau,r300,r600,radeonsi,svga,swrast,virgl \ - --with-dri-drivers=i915,i965,nouveau,r200,radeon,swrast \ - --with-dri-driverdir=%{_libdir}/dri \ - --with-vulkan-drivers=intel,radeon \ - --enable-gallium-extra-hud \ - --enable-texture-float \ - --enable-xa \ - --enable-opencl \ - --enable-opencl-icd \ - CXX=clang++ CC=clang \ -%ifarch %{ix86} - LDFLAGS="-lm" -%endif -%endif + -Dllvm=true \ + -Dshared-llvm=true \ + -Dgallium-vdpau=true \ + -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 \ + -Ddri-drivers-path=%{_libdir}/dri \ + -Dvulkan-drivers=intel,amd \ + -Dgallium-extra-hud=true \ + -Dgallium-xa=true \ + -Dgallium-opencl=icd +%endif -# 18.1.8: --with-gallium-driver=swr disabled due to crashes on swrast - -# --with-clang-libdir=%{_libdir}/llvm -# --enable-r600-llvm-compiler \ - -# FIXME: (since llvm 5.0.0) -# --disable-llvm-shared-libs \ - -# --enable-libglvnd \ - -#_EOF - -%make -# -j1 - -#linux-dri-x86 DRI_DRIVER_INSTALL_DIR=%{_libdir}/dri/ +%meson_build %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -#install -d %{buildroot}%{_libdir} %{buildroot}%{_bindir} -##cp -a lib/libOSMesa.* preserve/libGL.* %{buildroot}%{_libdir} -#install -m 755 \ -# ../preserve/libGL-indirect.a ../preserve/libGLU-indirect.a \ -# ../preserve/libglut-indirect.a ../preserve/libGLw-indirect.a \ -# %{buildroot}%{_libdir}/ - -%makeinstall - -#\ -# INSTALL_DIR=%{_prefix} \ -# DRI_DRIVER_INSTALL_DIR=%{_libdir}/dri/ - -#install -m 755 progs/xdemos/glxgears progs/xdemos/glxinfo %{buildroot}%{_bindir} - -#mv %{buildroot}%{_libdir}/libGL.so.%{dri_libglver} \ -# %{buildroot}%{_libdir}/libGL_so.%{dri_libglver} +%meson_install # move libGL.so.1.2* under %{_libdir}/mesa to prevent # libGL.so.1 from being overwritten by ldconfig @@ -550,17 +518,11 @@ sed -i "s|%{_prefix}/lib/libGL.la||" %{_libdir}/*.la %dir %{_libdir}/gallium-pipe #%{_libdir}/gallium-pipe/pipe_i965.la #%{_libdir}/gallium-pipe/pipe_i965.so -%{_libdir}/gallium-pipe/pipe_nouveau.la %{_libdir}/gallium-pipe/pipe_nouveau.so -%{_libdir}/gallium-pipe/pipe_r300.la %{_libdir}/gallium-pipe/pipe_r300.so -%{_libdir}/gallium-pipe/pipe_r600.la %{_libdir}/gallium-pipe/pipe_r600.so -%{_libdir}/gallium-pipe/pipe_radeonsi.la %{_libdir}/gallium-pipe/pipe_radeonsi.so -%{_libdir}/gallium-pipe/pipe_swrast.la %{_libdir}/gallium-pipe/pipe_swrast.so -%{_libdir}/gallium-pipe/pipe_vmwgfx.la %{_libdir}/gallium-pipe/pipe_vmwgfx.so %endif @@ -574,14 +536,12 @@ sed -i "s|%{_prefix}/lib/libGL.la||" %{_libdir}/*.la #%{_sysconfdir}/drirc %dir %{_libdir}/mesa %{_libdir}/mesa/libGL.so.* -%{_libdir}/bellagio/libomx_mesa.la +#%{_libdir}/bellagio/libomx_mesa.la +%ifnarch arm %{_libdir}/bellagio/libomx_mesa.so -#%ifnarch arm -#%{_libdir}/libswrAVX.so.* -#%{_libdir}/libswrAVX2.so.* -#%endif %dir %{_libdir}/d3d %{_libdir}/d3d/d3dadapter9.so.* +%endif #%{_libdir}/bellagio/libomx_nouveau.la #%{_libdir}/bellagio/libomx_nouveau.so #%{_libdir}/bellagio/libomx_r600.la @@ -610,22 +570,18 @@ sed -i "s|%{_prefix}/lib/libGL.la||" %{_libdir}/*.la %dir %{_includedir}/GL/internal %{_includedir}/GL/internal/dri_interface.h #%{_includedir}/GL/wglext.h -%dir %{_includedir}/d3dadapter -%{_includedir}/d3dadapter/*.h -#%{_libdir}/libGL.la %{_libdir}/libGL.so %{_libdir}/libEGL.so %{_libdir}/libglapi.so -%{_libdir}/d3d/d3dadapter9.la -%{_libdir}/d3d/d3dadapter9.so %ifnarch arm +%dir %{_includedir}/d3dadapter +%{_includedir}/d3dadapter/*.h +%{_libdir}/d3d/d3dadapter9.so %{_includedir}/vulkan/vulkan_intel.h -#%{_libdir}/libswrAVX.so -#%{_libdir}/libswrAVX2.so +%{_libdir}/pkgconfig/d3d.pc %endif #%{_libdir}/libdricore%{version}*.so #%{_libdir}/dri/gallium_drv_video.la -%{_libdir}/pkgconfig/d3d.pc %{_libdir}/pkgconfig/dri.pc %{_libdir}/pkgconfig/gl.pc @@ -661,11 +617,11 @@ sed -i "s|%{_prefix}/lib/libGL.la||" %{_libdir}/*.la %defattr(-,root,root) %ifarch %{ix86} x86_64 %{_libdir}/libXvMCnouveau.so -%{_libdir}/libXvMCnouveau.so.* +#%{_libdir}/libXvMCnouveau.so.* #%{_libdir}/libXvMCr300.so #%{_libdir}/libXvMCr300.so.* %{_libdir}/libXvMCr600.so -%{_libdir}/libXvMCr600.so.* +#%{_libdir}/libXvMCr600.so.* %endif #%{_libdir}/libXvMCsoftpipe.so #%{_libdir}/libXvMCsoftpipe.so.* @@ -699,6 +655,7 @@ sed -i "s|%{_prefix}/lib/libGL.la||" %{_libdir}/*.la %defattr(-,root,root) %{_libdir}/libglapi.so.* +%ifnarch arm %files -n libOSMesa %defattr(-,root,root) %{_libdir}/libOSMesa.so.* @@ -708,6 +665,7 @@ 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) @@ -729,7 +687,6 @@ sed -i "s|%{_prefix}/lib/libGL.la||" %{_libdir}/*.la #%{_libdir}/libwayland-egl.so #%{_libdir}/pkgconfig/wayland-egl.pc -%ifnarch arm %files -n libxatracker %defattr(-,root,root) %{_libdir}/libxatracker.so.* @@ -740,6 +697,7 @@ sed -i "s|%{_prefix}/lib/libGL.la||" %{_libdir}/*.la %{_libdir}/libxatracker.so %{_libdir}/pkgconfig/xatracker.pc +%ifnarch arm %files -n libMesaOpenCL %defattr(-,root,root) %{_sysconfdir}/OpenCL/vendors/mesa.icd @@ -748,6 +706,30 @@ sed -i "s|%{_prefix}/lib/libGL.la||" %{_libdir}/*.la %endif %changelog +* Tue Jul 23 2019 Automatic Build System 19.1.3-1mamba +- automatic version update by autodist + +* Tue Jul 09 2019 Automatic Build System 19.1.2-1mamba +- automatic version update by autodist + +* Tue Jun 25 2019 Automatic Build System 19.1.1-1mamba +- automatic version update by autodist + +* Wed Jun 12 2019 Automatic Build System 19.1.0-1mamba +- automatic version update by autodist + +* Thu Jun 06 2019 Automatic Build System 19.0.6-1mamba +- automatic version update by autodist + +* Wed May 22 2019 Automatic Build System 19.0.5-1mamba +- automatic version update by autodist + +* Fri May 10 2019 Automatic Build System 19.0.4-1mamba +- automatic version update by autodist + +* Thu Apr 25 2019 Automatic Build System 19.0.3-1mamba +- automatic version update by autodist + * Sun Mar 03 2019 Silvan Calarco 18.3.4-2mamba - added enable-dri3 and checked other configuration settings