Hello community, here is the log from the commit of package Mesa for openSUSE:Leap:15.2 checked in at 2020-01-30 14:50:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/Mesa (Old) and /work/SRC/openSUSE:Leap:15.2/.Mesa.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "Mesa" Thu Jan 30 14:50:20 2020 rev:80 rq:761225 version:unknown Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/Mesa/Mesa-drivers.changes 2020-01-15 14:45:21.373204721 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.Mesa.new.26092/Mesa-drivers.changes 2020-01-30 14:51:24.694934731 +0100 @@ -2 +2,371 @@ -Thu Sep 19 12:02:59 UTC 2019 - Michael Gorse <[email protected]> +Sun Jan 5 20:16:13 UTC 2020 - Stefan Dirsch <[email protected]> + +- n_drirc-disable-rgb10-for-chromium-on-amd.patch + * fixes patch (boo#1145188) + +------------------------------------------------------------------- +Fri Nov 22 11:06:45 UTC 2019 - Stefan Dirsch <[email protected]> + +- Update to version 19.2.6 + * fixes build on PPC + * couple of additional stable patches + +------------------------------------------------------------------- +Thu Nov 21 11:40:59 UTC 2019 - Stefan Dirsch <[email protected]> + +- Update to version 19.2.5 + * There's a little bit over everything in here, with anv and + radeonsi standing out as the two biggest components getting + changes, but core mesa, core gallium, llvmpipe, nir, egl, + i965, tgsi, st/mesa, spirv, and the Intel compiler also + fixes in this release. +- supersedes u_call-shmget-with-permission-0600-instead-of-0777.patch + +------------------------------------------------------------------- +Thu Nov 14 14:36:08 UTC 2019 - Stefan Dirsch <[email protected]> + +- u_call-shmget-with-permission-0600-instead-of-0777.patch + * CVE-2019-5068 (bsc#1156015) + +------------------------------------------------------------------- +Thu Nov 14 10:15:13 UTC 2019 - Stefan Dirsch <[email protected]> + +- Update to version 19.2.4 + * This is an emergency release, to fix a critical bug found in + the 19.2.3 release which causes incomplete rendering on all + mesa drivers. This release contains a single patch to fix + that bug. + +------------------------------------------------------------------- +Wed Nov 13 14:01:29 UTC 2019 - Frederic Crozat <[email protected]> + +- Update _contraints, Mesa-drivers needs 7GB of disk to build + safely. + +------------------------------------------------------------------- +Thu Nov 7 11:20:41 UTC 2019 - Stefan Dirsch <[email protected]> + +- Update to version 19.2.3 + In this release: iris, meson, radv, anv, turnip, 965, svga, + utils, core mesa, glsl, etanviv, and gallium/rbug +- This Mesa release includes support for latest GPUs including Intel + (jsc#SLE-7962, jsc#SLE-8024, jsc#SLE-8022, jsc#SLE-10182, jsc#SLE-4983, + bsc#1137515) and fixes for boo#1127672, bsc#1117365 + +------------------------------------------------------------------- +Tue Nov 5 07:45:37 UTC 2019 - Martin Pluskal <[email protected]> + +- Dont conflict with vulkan-devel anymore as there is no file + conflict + +------------------------------------------------------------------- +Fri Nov 1 17:07:44 UTC 2019 - Aaron Puchert <[email protected]> + +- Use %pkg_vcmp macro instead of llvm-config to detect LLVM 9. + +------------------------------------------------------------------- +Fri Oct 25 19:35:23 UTC 2019 - Stefan Dirsch <[email protected]> + +- Update to version 19.2.2 + * assortment of fixes in this release, notably a bunch of work + to get Solaris and illumos working with mesa, as well as more + work fixing issues in the migration of package-config and + headers being handled by libglvnd instead of mesa when mesa + is built with support for glvnd. + There's bunch of other changes here, with radv and intel + leading the pack, otherwise just a few things here and there. +- n_add-Mesa-headers-again.patch + * add Mesa headers again despite of building it against libglvnd; + those headers turned out not to be usable; in addition packaging + headers with libglvnd make dependancies problematic ... + +------------------------------------------------------------------- +Mon Oct 14 10:23:51 UTC 2019 - Stefan Dirsch <[email protected]> + +- let Mesa-libEGL-devel require libX11 devel via "pkgconfig(x11)" + since EGL/eglplatform.h includes X11/Xlib.h + +------------------------------------------------------------------- +Wed Oct 9 22:16:18 UTC 2019 - Stefan Dirsch <[email protected]> + +- Update to version 19.2.1 + * fixes all over the tree: intel, amd, nine, nir, egl, gallium, + scons, meson, glsl, haiku, android, and nouveau all got fixes. + +------------------------------------------------------------------- +Mon Oct 7 21:50:32 UTC 2019 - Stefan Dirsch <[email protected]> + +- pickup gl, egl, glesv1_cm and glesv2 pkgconfig files from + libglvnd build and add them to the appropriate devel subpackages + +------------------------------------------------------------------- +Mon Oct 7 16:20:49 UTC 2019 - Stefan Dirsch <[email protected]> + +- reintroduce GL, EGL, GLES* devel subpackages since corresponding + header and pkgconfig files from libglvnd didn't work out ... + +------------------------------------------------------------------- +Mon Sep 30 11:42:12 UTC 2019 - Aaron Puchert <[email protected]> + +- Rebase n_opencl_dep_libclang.patch after update. + +------------------------------------------------------------------- +Mon Sep 30 09:02:03 UTC 2019 - Stefan Dirsch <[email protected]> + +- Update to version 19.2.0 including changes to + * release-infastructure + * the build + * drivers: turnip, radv, android, intel and amd common code + * new features: check Phoronix + https://www.phoronix.com/scan.php?page=news_item&px=Mesa-19.2-Released +- supersedes U_llvmpipe-Don-t-use-u_ringbuffer-for-lp_scene_queue.patch +- adjusted n_drirc-disable-rgb10-for-chromium-on-amd.patch +- supersedes n_glesv1_cm-glesv2.patch + +------------------------------------------------------------------- +Sat Sep 28 13:42:30 UTC 2019 - Stefan Dirsch <[email protected]> + +- no longer build + * Mesa-libGL-devel + * Mesa-libEGL-devel + * Mesa-libGLESv1_CM-devel + * Mesa-libGLESv2-devel + * Mesa-libGLESv3-devel + Instead of requiring these let Mesa-devel package require + libglvnd-devel >= 1.2.0, which provides the contents of these + packages now (header files for OpenGL, GLES, EGL, and GLX). + Adjusted baselibs.conf accordingly. +- modified check for llvm version in a way so it works also with + older llvm packages (by making use of "llvm-config -version"), + where there is %{_llvm_sonum} macro defined yet +- moved manual pages to Mesa-devel package + +------------------------------------------------------------------- +Wed Sep 25 18:34:34 UTC 2019 - Aaron Puchert <[email protected]> + +- n_opencl_dep_libclang.patch + * Link OpenCL library with libclang-cpp.so instead of the + component libraries for LLVM >= 9. + +------------------------------------------------------------------- +Wed Sep 18 06:59:29 UTC 2019 - Stefan Dirsch <[email protected]> + +- Update to version 19.1.7 + * another bugfix release .... + +------------------------------------------------------------------- +Mon Sep 9 10:51:49 UTC 2019 - Michel Normand <[email protected]> + +- Add ppc64 for radeonsi to avoid build error + +------------------------------------------------------------------- +Wed Sep 4 09:08:57 UTC 2019 - Stefan Dirsch <[email protected]> + +- Update to version 19.1.6 + * bugfix release + +------------------------------------------------------------------- +Mon Aug 26 08:12:29 UTC 2019 - Stefan Dirsch <[email protected]> + +- Update to version 19.1.5 + * bugfix release + +------------------------------------------------------------------- +Wed Aug 14 18:51:18 UTC 2019 - Jonathan Brielmaier <[email protected]> + +- Build radeonsi and libvdpau_radeonsi on ppc64le + +------------------------------------------------------------------- +Mon Aug 12 08:42:27 UTC 2019 - Bjørn Lie <[email protected]> + +- Update to version 19.1.4: + * Mostly, as usual, in fixes for different drivers (anv, radv, + radeon, nv50, nvc0) as well as in backend parts (egl, spirv, + nir, ...). + * Of those fixes, we could highlight several ones: + - Vulkan 24/48 bit formats are now not supported on Ivybridge. + - R8G8B8_UNORM_SRGB is not supported on Haswell. + - A fix for hair artifacts in Max Payne 3 on AMD/RADV. + - Vulkan transform feedback extension is disabled on Intel + gen7. + +------------------------------------------------------------------- +Tue Jul 23 19:50:48 UTC 2019 - Bjørn Lie <[email protected]> + +- Update to version 19.1.3: + * Mostly fixes for ANV and RADV drivers, as well as NIR backend ++++ 259 more lines (skipped) ++++ between /work/SRC/openSUSE:Leap:15.2/Mesa/Mesa-drivers.changes ++++ and /work/SRC/openSUSE:Leap:15.2/.Mesa.new.26092/Mesa-drivers.changes Mesa.changes: same change Old: ---- U_intel-Add-support-for-Comet-Lake.patch archlinux_0001-Fix-linkage-against-shared-glapi.patch mesa-18.3.2.tar.xz mesa-18.3.2.tar.xz.sig n_Disable-Xshm-for-now-since-it-results-in-render-erro.patch n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch u_wayland_egl-Ensure-EGL-surface.patch New: ---- mesa-19.2.6.tar.xz mesa-19.2.6.tar.xz.sig n_add-Mesa-headers-again.patch n_opencl_dep_libclang.patch u_dep_xcb.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Mesa-drivers.spec ++++++ --- /var/tmp/diff_new_pack.sMNUgS/_old 2020-01-30 14:51:26.662935778 +0100 +++ /var/tmp/diff_new_pack.sMNUgS/_new 2020-01-30 14:51:26.662935778 +0100 @@ -1,7 +1,7 @@ # # spec file for package Mesa-drivers # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -42,12 +42,12 @@ %define glamor 1 %define _name_archive mesa -%define _version 18.3.2 +%define _version 19.2.6 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 -%ifarch %{ix86} x86_64 %{arm} aarch64 ppc ppc64 ppc64le s390x +%ifarch %{ix86} x86_64 %{arm} aarch64 ppc64 ppc64le %define gallium_loader 1 %else %define gallium_loader 0 @@ -68,9 +68,7 @@ %endif %if 0%{gallium_loader} - %ifnarch ppc %define with_opencl 1 - %endif %ifarch %{ix86} x86_64 %define with_vulkan 1 %endif @@ -112,42 +110,33 @@ %endif Name: Mesa-drivers -Version: 18.3.2 +Version: 19.2.6 Release: 0 Summary: System for rendering 3-D graphics License: MIT Group: System/Libraries URL: http://www.mesa3d.org #Git-Clone: git://anongit.freedesktop.org/mesa/mesa -# For now directory structure of Mesa's ftp changed -# Source: ftp://ftp.freedesktop.org/pub/mesa/%%{version}/%%{_name_archive}-%%{_version}.tar.xz -Source: ftp://ftp.freedesktop.org/pub/mesa/%{_name_archive}-%{_version}.tar.xz -# Source1: ftp://ftp.freedesktop.org/pub/mesa/%%{version}/%%{_name_archive}-%%{_version}.tar.xz.sig -Source1: ftp://ftp.freedesktop.org/pub/mesa/%{_name_archive}-%{_version}.tar.xz.sig -# Source1: %%{_name_archive}-%%{_version}.tar.xz.sha1sum +Source: https://mesa.freedesktop.org/archive/%{_name_archive}-%{_version}.tar.xz +Source1: https://mesa.freedesktop.org/archive/%{_name_archive}-%{_version}.tar.xz.sig Source2: baselibs.conf Source3: README.updates Source4: manual-pages.tar.bz2 Source6: %{name}-rpmlintrc Source7: Mesa.keyring +Patch1: n_opencl_dep_libclang.patch +Patch2: n_add-Mesa-headers-again.patch # never to be upstreamed -Patch18: n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch -# currently needed for libglvnd support -Patch31: archlinux_0001-Fix-linkage-against-shared-glapi.patch - Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch -Patch57: u_wayland_egl-Ensure-EGL-surface.patch - -Patch60: n_Disable-Xshm-for-now-since-it-results-in-render-erro.patch +Patch58: u_dep_xcb.patch -Patch61: U_intel-Add-support-for-Comet-Lake.patch - -BuildRequires: autoconf >= 2.60 -BuildRequires: automake +BuildRequires: bison BuildRequires: fdupes +BuildRequires: flex BuildRequires: gcc-c++ BuildRequires: imake BuildRequires: libtool +BuildRequires: meson BuildRequires: pkgconfig BuildRequires: python3-base %if 0%{?suse_version} > 1320 @@ -221,7 +210,7 @@ BuildRequires: pkgconfig(wayland-server) >= 1.11 %endif %if 0%{with_llvm} -BuildRequires: llvm-devel >= 6.0.0 +BuildRequires: llvm-devel >= 7.0.0 %endif %if 0%{with_opencl} @@ -272,6 +261,7 @@ Requires: libgbm-devel Provides: Mesa-devel-static = %{version} Provides: xorg-x11-Mesa-devel = %{version} +Requires: libglvnd-devel >= 1.2.0 Obsoletes: Mesa-devel-static < %{version} Obsoletes: xorg-x11-Mesa-devel < %{version} Provides: Mesa-libIndirectGL-devel = %{version} @@ -320,6 +310,7 @@ Group: Development/Libraries/C and C++ Requires: Mesa-KHR-devel = %{version} Requires: Mesa-libEGL1 = %{version} +Requires: pkgconfig(x11) %if 0%{?libglvnd} Requires: libglvnd-devel >= 0.1.0 %endif @@ -594,7 +585,7 @@ Summary: Mesa Direct3D9 state tracker # Manually provide d3d library (bnc#918294) Group: System/Libraries -%ifarch x86_64 s390x ppc64le aarch64 riscv64 +%ifarch x86_64 s390x ppc64 ppc64le aarch64 riscv64 Provides: d3dadapter9.so.1()(64bit) %else Provides: d3dadapter9.so.1 @@ -699,7 +690,6 @@ Group: Development/Libraries/C and C++ Requires: libvulkan_intel = %{version} Requires: libvulkan_radeon = %{version} -Conflicts: vulkan-devel %description -n Mesa-libVulkan-devel This package contains the development files for Mesa's Vulkan implementation. @@ -736,17 +726,15 @@ %setup -q -n %{_name_archive}-%{_version} -b4 # remove some docs rm -rf docs/README.{VMS,WIN32,OS2} -%patch18 -p1 -%if 0%{?libglvnd} -%patch31 -p1 +%if 0%{with_llvm} +%if %{pkg_vcmp llvm-devel >= 9.0} +%patch1 -p1 %endif - +%endif +%patch2 -p1 %patch54 -p1 -%patch57 -p1 -%patch60 -p1 - -%patch61 -p1 +%patch58 -p1 # Remove requires to libglvnd/libglvnd-devel from baselibs.conf when # disabling libglvnd build; ugly ... @@ -768,83 +756,84 @@ %else egl_platforms=x11,drm,surfaceless %endif -autoreconf -fvi -export PYTHON2=%{_bindir}/python3 -%configure \ +%meson \ + --auto-features=disabled \ %if %{drivers} - --disable-gles1 \ - --disable-gles2 \ - --disable-egl \ - --disable-glx \ - --disable-osmesa \ + -Dgles1=false \ + -Dgles2=false \ + -Degl=true \ + -Dglx=disabled \ + -Dosmesa=none \ %else %if 0%{?libglvnd} - --enable-libglvnd \ + -Dglvnd=true \ %endif - --enable-gles1 \ - --enable-gles2 \ - --enable-egl \ - --enable-osmesa \ -%endif - --with-platforms=$egl_platforms \ - --enable-dri \ - --enable-texture-float \ - --enable-dri3 \ - --enable-shared-glapi \ + -Dgles1=true \ + -Dgles2=true \ + -Degl=true \ + -Dosmesa=classic \ + -Dglx=auto \ + -Dllvm=false \ + -Dvulkan-drivers= \ +%endif + -Dplatforms=$egl_platforms \ + -Ddri3=true \ + -Dshared-glapi=true \ %if 0%{?with_nine} - --enable-nine \ + -Dgallium-nine=true \ %endif %if %{glamor} - --enable-gbm \ - --enable-glx-tls \ + -Dgbm=true \ %endif %if 0%{with_opencl} - --enable-opencl \ - --enable-opencl-icd \ + -Dgallium-opencl=icd \ %endif - --with-dri-searchpath=%{_libdir}/dri \ + -Ddri-search-path=%{_libdir}/dri \ %if 0%{with_llvm} - --enable-llvm \ - --enable-llvm-shared-libs \ + -Dllvm=true \ + -Dshared-llvm=true \ %endif %if %{drivers} - --enable-vdpau \ +%if %{gallium_loader} + -Dgallium-vdpau=true \ + -Dgallium-xvmc=true \ + -Dgallium-va=true \ + -Dgallium-xa=true \ %endif - --enable-va \ - --enable-xvmc \ %if 0%{with_vulkan} - --with-vulkan-drivers=intel,radeon \ + -Dvulkan-drivers=intel,amd \ +%else + -Dvulkan-drivers= \ %endif -%if %{drivers} %ifarch %{ix86} x86_64 - --enable-xa \ - --with-dri-drivers=i915,i965,nouveau,r200,radeon \ - --with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast,svga,virgl \ - %endif + -Ddri-drivers=i915,i965,nouveau,r100,r200 \ + -Dgallium-drivers=r300,r600,radeonsi,nouveau,swrast,svga,virgl,iris \ + %else %ifarch %{arm} aarch64 - --enable-xa \ - --with-dri-drivers=nouveau \ - --with-gallium-drivers=r300,r600,nouveau,swrast,virgl,freedreno,vc4,etnaviv,imx \ - %endif + -Ddri-drivers=nouveau \ + -Dgallium-drivers=r300,r600,nouveau,swrast,virgl,freedreno,vc4,etnaviv,lima,panfrost,kmsro,v3d \ + %else %ifarch ppc64 ppc64le - --enable-xa \ - --with-dri-drivers=nouveau \ - --with-gallium-drivers=r300,r600,nouveau,swrast \ + -Ddri-drivers=nouveau \ + -Dgallium-drivers=r300,r600,radeonsi,nouveau,swrast \ + %else + -Ddri-drivers=swrast \ + -Dgallium-drivers= \ + %endif %endif - %ifarch ia64 ppc hppa s390 s390x riscv64 - --with-dri-drivers=swrast \ - --with-gallium-drivers=swrast \ %endif %else - --with-dri-drivers= \ - --with-gallium-drivers= \ + -Ddri-drivers=swrast \ + -Dgallium-drivers= \ %endif - CFLAGS="%{optflags} -DNDEBUG" -make %{?_smp_mflags} V=1 + -Db_ndebug=true \ + -Dc_args="%{optflags}" + +%meson_build %install -%make_install +%meson_install find %{buildroot} -type f -name "*.la" -delete -print # libwayland-egl is provided by wayland itself @@ -858,6 +847,15 @@ # in Mesa rm -rf %{buildroot}/%{_datadir}/drirc.d +rm -f %{buildroot}/%{_libdir}/libEGL.so* +# in Mesa-libEGL-devel +rm %{buildroot}/%{_includedir}/EGL/egl.h +rm %{buildroot}/%{_includedir}/EGL/eglext.h +rm %{buildroot}/%{_includedir}/EGL/eglextchromium.h +rm %{buildroot}/%{_includedir}/EGL/eglmesaext.h +rm %{buildroot}/%{_includedir}/EGL/eglplatform.h +rm %{buildroot}/%{_libdir}/pkgconfig/egl.pc + # in Mesa-libGL-devel rm -rf %{buildroot}/%{_includedir}/GL @@ -879,7 +877,13 @@ # in KHR-devel rm -rf %{buildroot}/%{_includedir}/KHR +# workaround needed since Mesa 19.0.2 +rm -f %{buildroot}/%{_libdir}/vdpau/libvdpau_gallium.so + %else + +rm -rf %{buildroot}/%{_libdir}/dri/swrast_dri.so + %if 0%{?libglvnd} == 0 # Make a symlink to libGL.so.1.2 for compatibility (bnc#809359, bnc#831306) test -f %{buildroot}%{_libdir}/libGL.so.1.2 || \ @@ -891,6 +895,11 @@ ln -s %{_libdir}/libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_indirect.so.0 %endif +# pickup pkgconfig files from libglvnd build +rm -f %{buildroot}/%{_libdir}/pkgconfig/{gl,egl,glesv1_cm,glesv2}.pc +install -m 0644 /usr/share/doc/packages/libglvnd/pkgconfig/{gl,egl,glesv1_cm,glesv2}.pc \ + %{buildroot}/%{_libdir}/pkgconfig/ + for dir in ../xc/doc/man/{GL/gl,GL/glx}; do pushd $dir xmkmf -a @@ -1019,8 +1028,6 @@ %files libGLESv3-devel %{_includedir}/GLES3 -#%%_libdir/libGLESv3.so -#%%_libdir/pkgconfig/glesv3.pc %files -n libOSMesa8 %{_libdir}/libOSMesa.so.8.0.0 @@ -1054,15 +1061,9 @@ %if %{xvmc_support} %files -n libXvMC_nouveau %{_libdir}/libXvMCnouveau.so -%{_libdir}/libXvMCnouveau.so.1 -%{_libdir}/libXvMCnouveau.so.1.0 -%{_libdir}/libXvMCnouveau.so.1.0.0 %files -n libXvMC_r600 %{_libdir}/libXvMCr600.so -%{_libdir}/libXvMCr600.so.1 -%{_libdir}/libXvMCr600.so.1.0 -%{_libdir}/libXvMCr600.so.1.0.0 %endif %if %{vdpau_nouveau} @@ -1087,7 +1088,7 @@ %{_libdir}/vdpau/libvdpau_r600.so.1.0.0 %endif -%ifarch %{ix86} x86_64 +%ifarch %{ix86} x86_64 ppc64 ppc64le %files -n libvdpau_radeonsi %{_libdir}/vdpau/libvdpau_radeonsi.so %{_libdir}/vdpau/libvdpau_radeonsi.so.1 @@ -1144,6 +1145,9 @@ %files devel %doc docs/*.html +%if 0%{?libglvnd} >= 120 +/usr/share/man/man3/* +%endif # !drivers %endif @@ -1152,7 +1156,6 @@ %files -n Mesa-libd3d %dir %{_libdir}/d3d/ %{_libdir}/d3d/*.so.* -#%%{_sysconfdir}/OpenCL/vendors/mesa.icd %files -n Mesa-libd3d-devel %{_libdir}/pkgconfig/d3d.pc ++++++ Mesa.spec ++++++ --- /var/tmp/diff_new_pack.sMNUgS/_old 2020-01-30 14:51:26.678935786 +0100 +++ /var/tmp/diff_new_pack.sMNUgS/_new 2020-01-30 14:51:26.678935786 +0100 @@ -1,7 +1,7 @@ # # spec file for package Mesa # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -41,12 +41,12 @@ %define glamor 1 %define _name_archive mesa -%define _version 18.3.2 +%define _version 19.2.6 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 -%ifarch %{ix86} x86_64 %{arm} aarch64 ppc ppc64 ppc64le s390x +%ifarch %{ix86} x86_64 %{arm} aarch64 ppc64 ppc64le %define gallium_loader 1 %else %define gallium_loader 0 @@ -67,9 +67,7 @@ %endif %if 0%{gallium_loader} - %ifnarch ppc %define with_opencl 1 - %endif %ifarch %{ix86} x86_64 %define with_vulkan 1 %endif @@ -111,42 +109,33 @@ %endif Name: Mesa -Version: 18.3.2 +Version: 19.2.6 Release: 0 Summary: System for rendering 3-D graphics License: MIT Group: System/Libraries URL: http://www.mesa3d.org #Git-Clone: git://anongit.freedesktop.org/mesa/mesa -# For now directory structure of Mesa's ftp changed -# Source: ftp://ftp.freedesktop.org/pub/mesa/%%{version}/%%{_name_archive}-%%{_version}.tar.xz -Source: ftp://ftp.freedesktop.org/pub/mesa/%{_name_archive}-%{_version}.tar.xz -# Source1: ftp://ftp.freedesktop.org/pub/mesa/%%{version}/%%{_name_archive}-%%{_version}.tar.xz.sig -Source1: ftp://ftp.freedesktop.org/pub/mesa/%{_name_archive}-%{_version}.tar.xz.sig -# Source1: %%{_name_archive}-%%{_version}.tar.xz.sha1sum +Source: https://mesa.freedesktop.org/archive/%{_name_archive}-%{_version}.tar.xz +Source1: https://mesa.freedesktop.org/archive/%{_name_archive}-%{_version}.tar.xz.sig Source2: baselibs.conf Source3: README.updates Source4: manual-pages.tar.bz2 Source6: %{name}-rpmlintrc Source7: Mesa.keyring +Patch1: n_opencl_dep_libclang.patch +Patch2: n_add-Mesa-headers-again.patch # never to be upstreamed -Patch18: n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch -# currently needed for libglvnd support -Patch31: archlinux_0001-Fix-linkage-against-shared-glapi.patch - Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch -Patch57: u_wayland_egl-Ensure-EGL-surface.patch - -Patch60: n_Disable-Xshm-for-now-since-it-results-in-render-erro.patch +Patch58: u_dep_xcb.patch -Patch61: U_intel-Add-support-for-Comet-Lake.patch - -BuildRequires: autoconf >= 2.60 -BuildRequires: automake +BuildRequires: bison BuildRequires: fdupes +BuildRequires: flex BuildRequires: gcc-c++ BuildRequires: imake BuildRequires: libtool +BuildRequires: meson BuildRequires: pkgconfig BuildRequires: python3-base %if 0%{?suse_version} > 1320 @@ -220,7 +209,7 @@ BuildRequires: pkgconfig(wayland-server) >= 1.11 %endif %if 0%{with_llvm} -BuildRequires: llvm-devel >= 6.0.0 +BuildRequires: llvm-devel >= 7.0.0 %endif %if 0%{with_opencl} @@ -271,6 +260,7 @@ Requires: libgbm-devel Provides: Mesa-devel-static = %{version} Provides: xorg-x11-Mesa-devel = %{version} +Requires: libglvnd-devel >= 1.2.0 Obsoletes: Mesa-devel-static < %{version} Obsoletes: xorg-x11-Mesa-devel < %{version} Provides: Mesa-libIndirectGL-devel = %{version} @@ -319,6 +309,7 @@ Group: Development/Libraries/C and C++ Requires: Mesa-KHR-devel = %{version} Requires: Mesa-libEGL1 = %{version} +Requires: pkgconfig(x11) %if 0%{?libglvnd} Requires: libglvnd-devel >= 0.1.0 %endif @@ -593,7 +584,7 @@ Summary: Mesa Direct3D9 state tracker # Manually provide d3d library (bnc#918294) Group: System/Libraries -%ifarch x86_64 s390x ppc64le aarch64 riscv64 +%ifarch x86_64 s390x ppc64 ppc64le aarch64 riscv64 Provides: d3dadapter9.so.1()(64bit) %else Provides: d3dadapter9.so.1 @@ -698,7 +689,6 @@ Group: Development/Libraries/C and C++ Requires: libvulkan_intel = %{version} Requires: libvulkan_radeon = %{version} -Conflicts: vulkan-devel %description -n Mesa-libVulkan-devel This package contains the development files for Mesa's Vulkan implementation. @@ -735,17 +725,15 @@ %setup -q -n %{_name_archive}-%{_version} -b4 # remove some docs rm -rf docs/README.{VMS,WIN32,OS2} -%patch18 -p1 -%if 0%{?libglvnd} -%patch31 -p1 +%if 0%{with_llvm} +%if %{pkg_vcmp llvm-devel >= 9.0} +%patch1 -p1 %endif - +%endif +%patch2 -p1 %patch54 -p1 -%patch57 -p1 -%patch60 -p1 - -%patch61 -p1 +%patch58 -p1 # Remove requires to libglvnd/libglvnd-devel from baselibs.conf when # disabling libglvnd build; ugly ... @@ -767,83 +755,84 @@ %else egl_platforms=x11,drm,surfaceless %endif -autoreconf -fvi -export PYTHON2=%{_bindir}/python3 -%configure \ +%meson \ + --auto-features=disabled \ %if %{drivers} - --disable-gles1 \ - --disable-gles2 \ - --disable-egl \ - --disable-glx \ - --disable-osmesa \ + -Dgles1=false \ + -Dgles2=false \ + -Degl=true \ + -Dglx=disabled \ + -Dosmesa=none \ %else %if 0%{?libglvnd} - --enable-libglvnd \ + -Dglvnd=true \ %endif - --enable-gles1 \ - --enable-gles2 \ - --enable-egl \ - --enable-osmesa \ -%endif - --with-platforms=$egl_platforms \ - --enable-dri \ - --enable-texture-float \ - --enable-dri3 \ - --enable-shared-glapi \ + -Dgles1=true \ + -Dgles2=true \ + -Degl=true \ + -Dosmesa=classic \ + -Dglx=auto \ + -Dllvm=false \ + -Dvulkan-drivers= \ +%endif + -Dplatforms=$egl_platforms \ + -Ddri3=true \ + -Dshared-glapi=true \ %if 0%{?with_nine} - --enable-nine \ + -Dgallium-nine=true \ %endif %if %{glamor} - --enable-gbm \ - --enable-glx-tls \ + -Dgbm=true \ %endif %if 0%{with_opencl} - --enable-opencl \ - --enable-opencl-icd \ + -Dgallium-opencl=icd \ %endif - --with-dri-searchpath=%{_libdir}/dri \ + -Ddri-search-path=%{_libdir}/dri \ %if 0%{with_llvm} - --enable-llvm \ - --enable-llvm-shared-libs \ + -Dllvm=true \ + -Dshared-llvm=true \ %endif %if %{drivers} - --enable-vdpau \ +%if %{gallium_loader} + -Dgallium-vdpau=true \ + -Dgallium-xvmc=true \ + -Dgallium-va=true \ + -Dgallium-xa=true \ %endif - --enable-va \ - --enable-xvmc \ %if 0%{with_vulkan} - --with-vulkan-drivers=intel,radeon \ + -Dvulkan-drivers=intel,amd \ +%else + -Dvulkan-drivers= \ %endif -%if %{drivers} %ifarch %{ix86} x86_64 - --enable-xa \ - --with-dri-drivers=i915,i965,nouveau,r200,radeon \ - --with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast,svga,virgl \ - %endif + -Ddri-drivers=i915,i965,nouveau,r100,r200 \ + -Dgallium-drivers=r300,r600,radeonsi,nouveau,swrast,svga,virgl,iris \ + %else %ifarch %{arm} aarch64 - --enable-xa \ - --with-dri-drivers=nouveau \ - --with-gallium-drivers=r300,r600,nouveau,swrast,virgl,freedreno,vc4,etnaviv,imx \ - %endif + -Ddri-drivers=nouveau \ + -Dgallium-drivers=r300,r600,nouveau,swrast,virgl,freedreno,vc4,etnaviv,lima,panfrost,kmsro,v3d \ + %else %ifarch ppc64 ppc64le - --enable-xa \ - --with-dri-drivers=nouveau \ - --with-gallium-drivers=r300,r600,nouveau,swrast \ + -Ddri-drivers=nouveau \ + -Dgallium-drivers=r300,r600,radeonsi,nouveau,swrast \ + %else + -Ddri-drivers=swrast \ + -Dgallium-drivers= \ + %endif %endif - %ifarch ia64 ppc hppa s390 s390x riscv64 - --with-dri-drivers=swrast \ - --with-gallium-drivers=swrast \ %endif %else - --with-dri-drivers= \ - --with-gallium-drivers= \ + -Ddri-drivers=swrast \ + -Dgallium-drivers= \ %endif - CFLAGS="%{optflags} -DNDEBUG" -make %{?_smp_mflags} V=1 + -Db_ndebug=true \ + -Dc_args="%{optflags}" + +%meson_build %install -%make_install +%meson_install find %{buildroot} -type f -name "*.la" -delete -print # libwayland-egl is provided by wayland itself @@ -857,6 +846,15 @@ # in Mesa rm -rf %{buildroot}/%{_datadir}/drirc.d +rm -f %{buildroot}/%{_libdir}/libEGL.so* +# in Mesa-libEGL-devel +rm %{buildroot}/%{_includedir}/EGL/egl.h +rm %{buildroot}/%{_includedir}/EGL/eglext.h +rm %{buildroot}/%{_includedir}/EGL/eglextchromium.h +rm %{buildroot}/%{_includedir}/EGL/eglmesaext.h +rm %{buildroot}/%{_includedir}/EGL/eglplatform.h +rm %{buildroot}/%{_libdir}/pkgconfig/egl.pc + # in Mesa-libGL-devel rm -rf %{buildroot}/%{_includedir}/GL @@ -878,7 +876,13 @@ # in KHR-devel rm -rf %{buildroot}/%{_includedir}/KHR +# workaround needed since Mesa 19.0.2 +rm -f %{buildroot}/%{_libdir}/vdpau/libvdpau_gallium.so + %else + +rm -rf %{buildroot}/%{_libdir}/dri/swrast_dri.so + %if 0%{?libglvnd} == 0 # Make a symlink to libGL.so.1.2 for compatibility (bnc#809359, bnc#831306) test -f %{buildroot}%{_libdir}/libGL.so.1.2 || \ @@ -890,6 +894,11 @@ ln -s %{_libdir}/libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_indirect.so.0 %endif +# pickup pkgconfig files from libglvnd build +rm -f %{buildroot}/%{_libdir}/pkgconfig/{gl,egl,glesv1_cm,glesv2}.pc +install -m 0644 /usr/share/doc/packages/libglvnd/pkgconfig/{gl,egl,glesv1_cm,glesv2}.pc \ + %{buildroot}/%{_libdir}/pkgconfig/ + for dir in ../xc/doc/man/{GL/gl,GL/glx}; do pushd $dir xmkmf -a @@ -1018,8 +1027,6 @@ %files libGLESv3-devel %{_includedir}/GLES3 -#%%_libdir/libGLESv3.so -#%%_libdir/pkgconfig/glesv3.pc %files -n libOSMesa8 %{_libdir}/libOSMesa.so.8.0.0 @@ -1053,15 +1060,9 @@ %if %{xvmc_support} %files -n libXvMC_nouveau %{_libdir}/libXvMCnouveau.so -%{_libdir}/libXvMCnouveau.so.1 -%{_libdir}/libXvMCnouveau.so.1.0 -%{_libdir}/libXvMCnouveau.so.1.0.0 %files -n libXvMC_r600 %{_libdir}/libXvMCr600.so -%{_libdir}/libXvMCr600.so.1 -%{_libdir}/libXvMCr600.so.1.0 -%{_libdir}/libXvMCr600.so.1.0.0 %endif %if %{vdpau_nouveau} @@ -1086,7 +1087,7 @@ %{_libdir}/vdpau/libvdpau_r600.so.1.0.0 %endif -%ifarch %{ix86} x86_64 +%ifarch %{ix86} x86_64 ppc64 ppc64le %files -n libvdpau_radeonsi %{_libdir}/vdpau/libvdpau_radeonsi.so %{_libdir}/vdpau/libvdpau_radeonsi.so.1 @@ -1143,6 +1144,9 @@ %files devel %doc docs/*.html +%if 0%{?libglvnd} >= 120 +/usr/share/man/man3/* +%endif # !drivers %endif @@ -1151,7 +1155,6 @@ %files -n Mesa-libd3d %dir %{_libdir}/d3d/ %{_libdir}/d3d/*.so.* -#%%{_sysconfdir}/OpenCL/vendors/mesa.icd %files -n Mesa-libd3d-devel %{_libdir}/pkgconfig/d3d.pc ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.sMNUgS/_old 2020-01-30 14:51:26.734935816 +0100 +++ /var/tmp/diff_new_pack.sMNUgS/_new 2020-01-30 14:51:26.734935816 +0100 @@ -7,7 +7,7 @@ </conditions> <hardware> <disk> - <size unit="G">6</size> + <size unit="G">7</size> </disk> </hardware> </overwrite> ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.sMNUgS/_old 2020-01-30 14:51:26.750935824 +0100 +++ /var/tmp/diff_new_pack.sMNUgS/_new 2020-01-30 14:51:26.750935824 +0100 @@ -78,13 +78,11 @@ targetarch aarch64 +/usr/share/vulkan/icd.d/intel_icd.*.json targetarch ppc64 +/usr/share/vulkan/icd.d/intel_icd.*.json targetarch ppc64le +/usr/share/vulkan/icd.d/intel_icd.*.json - targetarch s390x +/usr/share/vulkan/icd.d/intel_icd.*.json targetarch x86_64 +/usr/share/vulkan/icd.d/intel_icd.*.json libvulkan_radeon targetarch aarch64 +/usr/share/vulkan/icd.d/radeon_icd.*.json targetarch ppc64 +/usr/share/vulkan/icd.d/radeon_icd.*.json targetarch ppc64le +/usr/share/vulkan/icd.d/radeon_icd.*.json - targetarch s390x +/usr/share/vulkan/icd.d/radeon_icd.*.json targetarch x86_64 +/usr/share/vulkan/icd.d/radeon_icd.*.json Mesa-libVulkan-devel targetarch aarch64 requires "libvulkan_intel-<targettype> = <version>" @@ -93,8 +91,6 @@ targetarch ppc64 requires "libvulkan_radeon-<targettype> = <version>" targetarch ppc64le requires "libvulkan_intel-<targettype> = <version>" targetarch ppc64le requires "libvulkan_radeon-<targettype> = <version>" - targetarch s390x requires "libvulkan_intel-<targettype> = <version>" - targetarch s390x requires "libvulkan_radeon-<targettype> = <version>" targetarch x86_64 requires "libvulkan_intel-<targettype> = <version>" targetarch x86_64 requires "libvulkan_radeon-<targettype> = <version>" libXvMC_nouveau ++++++ mesa-18.3.2.tar.xz -> mesa-19.2.6.tar.xz ++++++ /work/SRC/openSUSE:Leap:15.2/Mesa/mesa-18.3.2.tar.xz /work/SRC/openSUSE:Leap:15.2/.Mesa.new.26092/mesa-19.2.6.tar.xz differ: char 25, line 1 ++++++ n_add-Mesa-headers-again.patch ++++++ diff -u -r mesa-19.2.2.orig/include/meson.build mesa-19.2.2/include/meson.build --- mesa-19.2.2.orig/include/meson.build 2019-10-25 21:55:51.441084000 +0200 +++ mesa-19.2.2/include/meson.build 2019-10-25 21:58:07.781272000 +0200 @@ -22,7 +22,6 @@ inc_d3d9 = include_directories('D3D9') inc_haikugl = include_directories('HaikuGL') -if not glvnd_has_headers_and_pc_files if with_gles1 or with_gles2 or with_opengl or with_egl install_headers('KHR/khrplatform.h', subdir : 'KHR') endif @@ -78,7 +77,6 @@ subdir : 'EGL', ) endif -endif # Non-upstream headers if with_egl ++++++ n_drirc-disable-rgb10-for-chromium-on-amd.patch ++++++ --- /var/tmp/diff_new_pack.sMNUgS/_old 2020-01-30 14:51:26.774935837 +0100 +++ /var/tmp/diff_new_pack.sMNUgS/_new 2020-01-30 14:51:26.774935837 +0100 @@ -1,15 +1,19 @@ -Index: mesa-18.3.0-rc2/src/util/00-mesa-defaults.conf +Index: mesa-19.3.1/src/util/00-mesa-defaults.conf =================================================================== ---- mesa-18.3.0-rc2.orig/src/util/00-mesa-defaults.conf -+++ mesa-18.3.0-rc2/src/util/00-mesa-defaults.conf -@@ -334,5 +334,10 @@ TODO: document the other workarounds. - <application name="No Mans Sky" executable="NMS.exe"> - <option name="radeonsi_zerovram" value="true" /> +--- mesa-19.3.1.orig/src/util/00-mesa-defaults.conf ++++ mesa-19.3.1/src/util/00-mesa-defaults.conf +@@ -523,6 +523,14 @@ TODO: document the other workarounds. + <application name="DiRT Rally" executable="DirtRally"> + <option name="radeonsi_prim_restart_tri_strips_only" value="true"/> </application> -+ + <!-- This is workaround to prevent distorted colors on hardware accelerated video in Chromium. https://bugzilla.opensuse.org/show_bug.cgi?id=1113211 --> + <application name="Chromium" executable="chromium"> + <option name="allow_rgb10_configs" value="false" /> + </application> ++ <!-- This is workaround to prevent distorted colors on hardware accelerated video in Totem. https://bugzilla.opensuse.org/show_bug.cgi?id=1142270 --> ++ <application name="Totem" executable="totem"> ++ <option name="allow_rgb10_configs" value="false" /> ++ </application> </device> - </driconf> + <device driver="virtio_gpu"> + <!-- Some Valve games do a final blit to a BRGA_sRGB surface. On a GLES ++++++ n_opencl_dep_libclang.patch ++++++ >From d63e1627c0ead6165f382765ea3b9a4eba6aa8d7 Mon Sep 17 00:00:00 2001 From: Aaron Puchert <[email protected]> Date: Wed, 25 Sep 2019 18:34:34 +0000 Subject: [PATCH] Link with clang-cpp instead of Clang component libraries Since LLVM 9, the Clang C++ API is exposed via the new clang-cpp target, and the component libraries need no longer be packaged [1]. [1] https://releases.llvm.org/9.0.0/tools/clang/docs/ReleaseNotes.html#build-system-changes --- src/gallium/targets/opencl/meson.build | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build index 907cc74337d..031d35b9716 100644 --- a/src/gallium/targets/opencl/meson.build +++ b/src/gallium/targets/opencl/meson.build @@ -43,19 +43,7 @@ libopencl = shared_library( dependencies : [ idep_mesautil, dep_clock, dep_dl, dep_unwind, dep_elf, - cpp.find_library('clangCodeGen', dirs : llvm_libdir), - cpp.find_library('clangFrontendTool', dirs : llvm_libdir), - cpp.find_library('clangFrontend', dirs : llvm_libdir), - cpp.find_library('clangDriver', dirs : llvm_libdir), - cpp.find_library('clangSerialization', dirs : llvm_libdir), - cpp.find_library('clangParse', dirs : llvm_libdir), - cpp.find_library('clangSema', dirs : llvm_libdir), - cpp.find_library('clangAnalysis', dirs : llvm_libdir), - cpp.find_library('clangAST', dirs : llvm_libdir), - cpp.find_library('clangASTMatchers', dirs : llvm_libdir), - cpp.find_library('clangEdit', dirs : llvm_libdir), - cpp.find_library('clangLex', dirs : llvm_libdir), - cpp.find_library('clangBasic', dirs : llvm_libdir), + cpp.find_library('clang-cpp', dirs : llvm_libdir), ], version : '@[email protected]'.format(opencl_version), install : true, -- 2.23.0 ++++++ u_dep_xcb.patch ++++++ Index: mesa-19.2.1/meson.build =================================================================== --- mesa-19.2.1.orig/meson.build +++ mesa-19.2.1/meson.build @@ -1422,10 +1422,12 @@ if with_platform_x11 endif endif if with_any_vk or with_egl or (with_glx == 'dri' and with_dri_platform == 'drm') + dep_x11_xcb = dependency('x11-xcb') dep_xcb_dri2 = dependency('xcb-dri2', version : '>= 1.8') if with_dri3 pre_args += '-DHAVE_DRI3' + dep_xcb = dependency('xcb') dep_xcb_dri3 = dependency('xcb-dri3') dep_xcb_present = dependency('xcb-present') # until xcb-dri3 has been around long enough to make a hard-dependency: Index: mesa-19.2.1/src/loader/meson.build =================================================================== --- mesa-19.2.1.orig/src/loader/meson.build +++ mesa-19.2.1/src/loader/meson.build @@ -28,6 +28,7 @@ if with_platform_x11 and with_dri3 include_directories : [inc_include, inc_src], dependencies : [ dep_libdrm, dep_xcb_dri3, dep_xcb_present, dep_xcb_sync, dep_xshmfence, + dep_xcb, ], build_by_default : false, )
