Hello community, here is the log from the commit of package Mesa for openSUSE:Factory checked in at 2019-03-08 12:00:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/Mesa (Old) and /work/SRC/openSUSE:Factory/.Mesa.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "Mesa" Fri Mar 8 12:00:22 2019 rev:341 rq:681542 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/Mesa/Mesa-drivers.changes 2019-02-24 18:37:30.543360372 +0100 +++ /work/SRC/openSUSE:Factory/.Mesa.new.28833/Mesa-drivers.changes 2019-03-08 12:00:26.831964591 +0100 @@ -1,0 +2,13 @@ +Mon Mar 4 15:48:51 UTC 2019 - Andreas Schwab <[email protected]> + +- Don't enable gallium_loader on ppc and s390x +- Fix configuration on non-gallium archs +- u_dep_xcb.patch: fix missing xcb dependencies + +------------------------------------------------------------------- +Mon Mar 4 10:25:40 UTC 2019 - [email protected] + +- avoid Mesa-drivers build failure for ppc64le reported by + (boo#1127672) + +------------------------------------------------------------------- Mesa.changes: same change New: ---- u_dep_xcb.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Mesa-drivers.spec ++++++ --- /var/tmp/diff_new_pack.3AMZkm/_old 2019-03-08 12:00:28.991964226 +0100 +++ /var/tmp/diff_new_pack.3AMZkm/_new 2019-03-08 12:00:28.999964224 +0100 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -47,7 +47,7 @@ %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 @@ -137,6 +135,7 @@ Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch Patch57: u_wayland_egl-Ensure-EGL-surface.patch +Patch58: u_dep_xcb.patch BuildRequires: bison BuildRequires: fdupes @@ -471,8 +470,8 @@ %package -n libOSMesa8 Summary: Mesa Off-screen rendering extension -# Wrongly named package shipped .so.8 Group: System/Libraries +# Wrongly named package shipped .so.8 Obsoletes: libOSMesa9 < %{version} Provides: libOSMesa9 = %{version} @@ -588,8 +587,8 @@ %package -n Mesa-libd3d Summary: Mesa Direct3D9 state tracker -# Manually provide d3d library (bnc#918294) Group: System/Libraries +# Manually provide d3d library (bnc#918294) %ifarch x86_64 s390x ppc64le aarch64 riscv64 Provides: d3dadapter9.so.1()(64bit) %else @@ -740,6 +739,7 @@ %patch54 -p1 %patch57 -p1 +%patch58 -p1 # Remove requires to libglvnd/libglvnd-devel from baselibs.conf when # disabling libglvnd build; ugly ... @@ -800,32 +800,33 @@ -Dshared-llvm=true \ %endif %if %{drivers} +%if %{gallium_loader} -Dgallium-vdpau=true \ -Dgallium-xvmc=true \ -Dgallium-va=true \ + -Dgallium-xa=true \ +%endif %if 0%{with_vulkan} -Dvulkan-drivers=intel,amd \ +%else + -Dvulkan-drivers= \ %endif -%endif -%if %{drivers} %ifarch %{ix86} x86_64 - -Dgallium-xa=true \ -Ddri-drivers=i915,i965,nouveau,r100,r200 \ -Dgallium-drivers=r300,r600,radeonsi,nouveau,swrast,svga,virgl \ - %endif + %else %ifarch %{arm} aarch64 - -Dgallium-xa=true \ -Ddri-drivers=nouveau \ -Dgallium-drivers=r300,r600,nouveau,swrast,virgl,freedreno,vc4,etnaviv,imx \ - %endif + %else %ifarch ppc64 ppc64le - -Dgallium-xa=true \ -Ddri-drivers=nouveau \ -Dgallium-drivers=r300,r600,nouveau,swrast \ - %endif - %ifarch ia64 ppc hppa s390 s390x riscv64 + %else -Ddri-drivers=swrast \ - -Dgallium-drivers=swrast \ + -Dgallium-drivers= \ + %endif + %endif %endif %else -Ddri-drivers=swrast \ ++++++ Mesa.spec ++++++ --- /var/tmp/diff_new_pack.3AMZkm/_old 2019-03-08 12:00:29.031964219 +0100 +++ /var/tmp/diff_new_pack.3AMZkm/_new 2019-03-08 12:00:29.039964217 +0100 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -46,7 +46,7 @@ %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 @@ -136,6 +134,7 @@ Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch Patch57: u_wayland_egl-Ensure-EGL-surface.patch +Patch58: u_dep_xcb.patch BuildRequires: bison BuildRequires: fdupes @@ -470,8 +469,8 @@ %package -n libOSMesa8 Summary: Mesa Off-screen rendering extension -# Wrongly named package shipped .so.8 Group: System/Libraries +# Wrongly named package shipped .so.8 Obsoletes: libOSMesa9 < %{version} Provides: libOSMesa9 = %{version} @@ -587,8 +586,8 @@ %package -n Mesa-libd3d Summary: Mesa Direct3D9 state tracker -# Manually provide d3d library (bnc#918294) Group: System/Libraries +# Manually provide d3d library (bnc#918294) %ifarch x86_64 s390x ppc64le aarch64 riscv64 Provides: d3dadapter9.so.1()(64bit) %else @@ -739,6 +738,7 @@ %patch54 -p1 %patch57 -p1 +%patch58 -p1 # Remove requires to libglvnd/libglvnd-devel from baselibs.conf when # disabling libglvnd build; ugly ... @@ -799,32 +799,33 @@ -Dshared-llvm=true \ %endif %if %{drivers} +%if %{gallium_loader} -Dgallium-vdpau=true \ -Dgallium-xvmc=true \ -Dgallium-va=true \ + -Dgallium-xa=true \ +%endif %if 0%{with_vulkan} -Dvulkan-drivers=intel,amd \ +%else + -Dvulkan-drivers= \ %endif -%endif -%if %{drivers} %ifarch %{ix86} x86_64 - -Dgallium-xa=true \ -Ddri-drivers=i915,i965,nouveau,r100,r200 \ -Dgallium-drivers=r300,r600,radeonsi,nouveau,swrast,svga,virgl \ - %endif + %else %ifarch %{arm} aarch64 - -Dgallium-xa=true \ -Ddri-drivers=nouveau \ -Dgallium-drivers=r300,r600,nouveau,swrast,virgl,freedreno,vc4,etnaviv,imx \ - %endif + %else %ifarch ppc64 ppc64le - -Dgallium-xa=true \ -Ddri-drivers=nouveau \ -Dgallium-drivers=r300,r600,nouveau,swrast \ - %endif - %ifarch ia64 ppc hppa s390 s390x riscv64 + %else -Ddri-drivers=swrast \ - -Dgallium-drivers=swrast \ + -Dgallium-drivers= \ + %endif + %endif %endif %else -Ddri-drivers=swrast \ ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.3AMZkm/_old 2019-03-08 12:00:29.159964197 +0100 +++ /var/tmp/diff_new_pack.3AMZkm/_new 2019-03-08 12:00:29.159964197 +0100 @@ -77,13 +77,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>" @@ -92,8 +90,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 ++++++ u_dep_xcb.patch ++++++ Index: mesa-18.3.4/meson.build =================================================================== --- mesa-18.3.4.orig/meson.build +++ mesa-18.3.4/meson.build @@ -1379,10 +1379,12 @@ if with_platform_x11 dep_x11_xcb = dependency('x11-xcb') 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-18.3.4/src/loader/meson.build =================================================================== --- mesa-18.3.4.orig/src/loader/meson.build +++ mesa-18.3.4/src/loader/meson.build @@ -28,6 +28,7 @@ if with_platform_x11 and with_dri3 include_directories : [inc_include, inc_src, inc_drm_uapi], dependencies : [ dep_libdrm, dep_xcb_dri3, dep_xcb_present, dep_xcb_sync, dep_xshmfence, + dep_xcb, ], build_by_default : false, )
