Changes - SailfishOS Open Build Service

Changes of Revision 78

[-] [+]	Changed	_service:tar_git:mesa.spec
@@ -1,3 +1,4 @@ + %ifarch %{ix86} x86_64 %global with_intel 1 %endif @@ -15,7 +16,7 @@ Name: mesa Summary: Mesa graphics libraries -Version: 19.1.99+bisect.20191004181718.30.gf2ed473 +Version: 19.2.90+master.20191211135246.1.g25bf31d Release: git5 Group: System/Libraries License: MIT @@ -23,7 +24,6 @@ Source0: %{name}-%{version}.tar.bz2 Patch1: disable-avx-support.diff -BuildRequires: opt-gcc6 gcc-c++ BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(talloc) @@ -103,16 +103,6 @@ %description libEGL Mesa libEGL runtime library. -%package libosmesa -Summary: Mesa library fpr offscreen rendering -Group: System/Libraries -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig -Provides: libosmesa = %{version}-%{release} - -%description libosmesa -Mesa library fpr offscreen rendering - %package libglapi-devel Summary: Mesa libglapi development package Group: System/Libraries @@ -158,15 +148,6 @@ %description libGL-devel Mesa libGL development packages -%package libosmesa-devel -Summary: Mesa offscreen rendering development package -Group: Development/Libraries -Requires: %{name}-libosmesa = %{version}-%{release} -Provides: libosmesa-devel - -%description libosmesa-devel -Mesa offscreen rendering development package - %package dri-drivers Summary: Mesa-based DRI drivers Group: Graphics/Display and Graphics Adaptation @@ -190,21 +171,21 @@ %patch1 -p1 %build -%meson -Ddri-drivers=%{?with_intel:,i915,i965} \ - -Dosmesa=gallium \ +CC=/usr/bin/gcc %meson -Ddri-drivers=%{?with_intel:,i915,i965} \ + -Dosmesa=none \ + -Ddri3=false \ -Dllvm=false \ -Dshared-llvm=false \ -Dgallium-drivers=swrast,nouveau,%{?with_freedreno:,freedreno}%{?with_etnaviv:,etnaviv}%{?with_tegra:,tegra}%{?with_vc4:,vc4}%{?with_kmsro:,kmsro}%{?with_lima:,lima}%{?with_panfrost:,panfrost} \ -Dvulkan-drivers= \ - -Dplatforms=drm,wayland,surfaceless \ + -Dplatforms=drm,wayland \ -Dglx=disabled \ -Degl=true \ -Dgles1=true \ -Dgles2=true \ - -Dgallium-xa=false \ - -Ddri3=true + -Dgallium-xa=false -CXX=/opt/gcc6/bin/g++ CC=/opt/gcc6/bin/gcc LINK=/opt/gcc6/bin/g++ CCACHE_DISABLE=1 %meson_build +CC=/usr/bin/gcc %meson_build %install %meson_install @@ -236,9 +217,6 @@ %postun dri-drivers -p /sbin/ldconfig -%post libosmesa -p /sbin/ldconfig - -%postun libosmesa -p /sbin/ldconfig %files libgbm %defattr(-,root,root,-) @@ -247,7 +225,7 @@ %files libgbm-devel %defattr(-,root,root,-) -%{_includedir}/gbm.h +/usr/include/gbm.h %{_libdir}/libgbm.so %{_libdir}/pkgconfig/gbm.pc @@ -311,7 +289,6 @@ %defattr(-,root,root,-) %{_includedir}/GL/gl.h %{_includedir}/GL/glcorearb.h -%{_includedir}/GL/gl_mangle.h %{_includedir}/GL/glext.h %dir %{_includedir}/GL/internal %{_includedir}/GL/internal/dri_interface.h @@ -369,14 +346,3 @@ %{_libdir}/dri/mxsfb-drm_dri.so %{_libdir}/dri/stm_dri.so %endif - -%files libosmesa -%defattr(-,root,root,-) -%{_libdir}/libOSMesa.so.8 -%{_libdir}/libOSMesa.so.8.0.0 - -%files libosmesa-devel -%defattr(-,root,root,-) -%{_libdir}/pkgconfig/osmesa.pc -%{_includedir}/GL/osmesa.h -%{_libdir}/libOSMesa.so
[-] [+]	Changed	_service ^
@@ -1,7 +1,7 @@ <services> <service name="tar_git"> <param name="url">https://git.merproject.org/piggz/mesa.git</param> - <param name="branch">bisect</param> + <param name="branch">master</param> <param name="revision"></param> <param name="token"/> <param name="debian">N</param>
	Deleted	_service:tar_git:mesa-19.1.99+bisect.20191004181718.30.gf2ed473.tar.bz2 ^
	Added	_service:tar_git:mesa-19.2.90+master.20191211135246.1.g25bf31d.tar.bz2 ^