From c15a7bb2781ed40fc7014e48c2c7b69d9e855c07695699aa4783624a3be1e476 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 4 Mar 2019 11:02:37 +0000 Subject: [PATCH 1/4] Accepting request 681292 from home:michel_mno:branches:X11:XOrg - avoid Mesa-drivers build failure for ppc64le reported by https://bugzilla.opensuse.org/show_bug.cgi?id=1127672 OBS-URL: https://build.opensuse.org/request/show/681292 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=812 --- Mesa-drivers.changes | 6 ++++++ Mesa-drivers.spec | 2 ++ Mesa.changes | 6 ++++++ Mesa.spec | 2 ++ 4 files changed, 16 insertions(+) diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index e94d67b..6c61bba 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 4 10:25:40 UTC 2019 - normand@linux.vnet.ibm.com + +- avoid Mesa-drivers build failure for ppc64le reported by + https://bugzilla.opensuse.org/show_bug.cgi?id=1127672 + ------------------------------------------------------------------- Wed Feb 20 15:40:14 UTC 2019 - sndirsch@suse.com diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index dda776f..4034ebc 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -805,6 +805,8 @@ egl_platforms=x11,drm,surfaceless -Dgallium-va=true \ %if 0%{with_vulkan} -Dvulkan-drivers=intel,amd \ +%else + -Dvulkan-drivers= \ %endif %endif %if %{drivers} diff --git a/Mesa.changes b/Mesa.changes index e94d67b..6c61bba 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 4 10:25:40 UTC 2019 - normand@linux.vnet.ibm.com + +- avoid Mesa-drivers build failure for ppc64le reported by + https://bugzilla.opensuse.org/show_bug.cgi?id=1127672 + ------------------------------------------------------------------- Wed Feb 20 15:40:14 UTC 2019 - sndirsch@suse.com diff --git a/Mesa.spec b/Mesa.spec index af2cf06..a5c1bf1 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -804,6 +804,8 @@ egl_platforms=x11,drm,surfaceless -Dgallium-va=true \ %if 0%{with_vulkan} -Dvulkan-drivers=intel,amd \ +%else + -Dvulkan-drivers= \ %endif %endif %if %{drivers} From 62d58a3bd5916137f85062d02fda334435a3b3caa1ee416d4d65e4de41ba02b0 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 4 Mar 2019 11:11:34 +0000 Subject: [PATCH 2/4] (boo#1127672) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=813 --- Mesa.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mesa.changes b/Mesa.changes index 6c61bba..b3855a4 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -2,7 +2,7 @@ Mon Mar 4 10:25:40 UTC 2019 - normand@linux.vnet.ibm.com - avoid Mesa-drivers build failure for ppc64le reported by - https://bugzilla.opensuse.org/show_bug.cgi?id=1127672 + (boo#1127672) ------------------------------------------------------------------- Wed Feb 20 15:40:14 UTC 2019 - sndirsch@suse.com From 62ce36500a925bd347432ce4f22eb8a7103b473b2083a858da1d346a0ee00572 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 4 Mar 2019 11:13:08 +0000 Subject: [PATCH 3/4] (boo#1127672) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=814 --- Mesa-drivers.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 6c61bba..b3855a4 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -2,7 +2,7 @@ Mon Mar 4 10:25:40 UTC 2019 - normand@linux.vnet.ibm.com - avoid Mesa-drivers build failure for ppc64le reported by - https://bugzilla.opensuse.org/show_bug.cgi?id=1127672 + (boo#1127672) ------------------------------------------------------------------- Wed Feb 20 15:40:14 UTC 2019 - sndirsch@suse.com From b4a9f5bd736b2d2029bf172b5ac83586dbd87aabb33831f3e2c33e7cd61c0fee Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 4 Mar 2019 20:05:54 +0000 Subject: [PATCH 4/4] Accepting request 681521 from home:Andreas_Schwab:Factory - Don't enable gallium_loader on ppc and s390x - Fix configuration on non-gallium archs - u_dep_xcb.patch: fix missing xcb dependencies OBS-URL: https://build.opensuse.org/request/show/681521 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=815 --- Mesa-drivers.changes | 7 +++++++ Mesa-drivers.spec | 33 ++++++++++++++++----------------- Mesa.changes | 7 +++++++ Mesa.spec | 33 ++++++++++++++++----------------- baselibs.conf | 4 ---- u_dep_xcb.patch | 29 +++++++++++++++++++++++++++++ 6 files changed, 75 insertions(+), 38 deletions(-) create mode 100644 u_dep_xcb.patch diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index b3855a4..1b5ced3 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Mar 4 15:48:51 UTC 2019 - Andreas Schwab + +- 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 - normand@linux.vnet.ibm.com diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index 4034ebc..29c1354 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -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 + %define with_opencl 1 %ifarch %{ix86} x86_64 %define with_vulkan 1 %endif @@ -137,6 +135,7 @@ 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 +Patch58: u_dep_xcb.patch BuildRequires: bison BuildRequires: fdupes @@ -471,8 +470,8 @@ applications using the OpenGL|ES 3.x APIs. %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 @@ programs against the GBM library. %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 @@ rm -rf docs/README.{VMS,WIN32,OS2} %patch54 -p1 %patch57 -p1 +%patch58 -p1 # Remove requires to libglvnd/libglvnd-devel from baselibs.conf when # disabling libglvnd build; ugly ... @@ -800,34 +800,33 @@ egl_platforms=x11,drm,surfaceless -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 \ diff --git a/Mesa.changes b/Mesa.changes index b3855a4..1b5ced3 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Mar 4 15:48:51 UTC 2019 - Andreas Schwab + +- 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 - normand@linux.vnet.ibm.com diff --git a/Mesa.spec b/Mesa.spec index a5c1bf1..6079d0d 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -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 + %define with_opencl 1 %ifarch %{ix86} x86_64 %define with_vulkan 1 %endif @@ -136,6 +134,7 @@ 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 +Patch58: u_dep_xcb.patch BuildRequires: bison BuildRequires: fdupes @@ -470,8 +469,8 @@ applications using the OpenGL|ES 3.x APIs. %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 @@ programs against the GBM library. %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 @@ rm -rf docs/README.{VMS,WIN32,OS2} %patch54 -p1 %patch57 -p1 +%patch58 -p1 # Remove requires to libglvnd/libglvnd-devel from baselibs.conf when # disabling libglvnd build; ugly ... @@ -799,34 +799,33 @@ egl_platforms=x11,drm,surfaceless -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 \ diff --git a/baselibs.conf b/baselibs.conf index a8a8b35..e90714c 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -77,13 +77,11 @@ libvulkan_intel 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- = " @@ -92,8 +90,6 @@ Mesa-libVulkan-devel targetarch ppc64 requires "libvulkan_radeon- = " targetarch ppc64le requires "libvulkan_intel- = " targetarch ppc64le requires "libvulkan_radeon- = " - targetarch s390x requires "libvulkan_intel- = " - targetarch s390x requires "libvulkan_radeon- = " targetarch x86_64 requires "libvulkan_intel- = " targetarch x86_64 requires "libvulkan_radeon- = " libXvMC_nouveau diff --git a/u_dep_xcb.patch b/u_dep_xcb.patch new file mode 100644 index 0000000..8a6d9b2 --- /dev/null +++ b/u_dep_xcb.patch @@ -0,0 +1,29 @@ +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, + )