Hello community, here is the log from the commit of package Mesa for openSUSE:Factory checked in at 2020-01-24 13:07:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/Mesa (Old) and /work/SRC/openSUSE:Factory/.Mesa.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "Mesa" Fri Jan 24 13:07:27 2020 rev:365 rq:766379 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/Mesa/Mesa-drivers.changes 2020-01-16 18:18:53.676895182 +0100 +++ /work/SRC/openSUSE:Factory/.Mesa.new.26092/Mesa-drivers.changes 2020-01-24 13:09:59.801404970 +0100 @@ -1,0 +2,11 @@ +Wed Jan 22 13:47:07 UTC 2020 - Stefan Dirsch <[email protected]> + +- U_0001-gallium-Fix-a-couple-of-multiple-definition-warnings.patch + U_0002-r600-Move-get_pic_param-to-radeon_vce.c.patch + U_0003-radeon-Move-si_get_pic_param-to-radeon_vce.c.patch + U_0004-radeon-Fix-multiple-definition-error-with-radeon_deb.patch + U_0005-radv-Remove-syncobj_handle-variable-in-header.patch + U_0006-nouveau-nvc0-add-extern-keyword-to-nvc0_miptree_vtbl.patch + * fixes build with gcc10 using -fno-common as default now (boo#1160578) + +------------------------------------------------------------------- Mesa.changes: same change New: ---- U_0001-gallium-Fix-a-couple-of-multiple-definition-warnings.patch U_0002-r600-Move-get_pic_param-to-radeon_vce.c.patch U_0003-radeon-Move-si_get_pic_param-to-radeon_vce.c.patch U_0004-radeon-Fix-multiple-definition-error-with-radeon_deb.patch U_0005-radv-Remove-syncobj_handle-variable-in-header.patch U_0006-nouveau-nvc0-add-extern-keyword-to-nvc0_miptree_vtbl.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Mesa-drivers.spec ++++++ --- /var/tmp/diff_new_pack.uMlyfj/_old 2020-01-24 13:10:11.985409863 +0100 +++ /var/tmp/diff_new_pack.uMlyfj/_new 2020-01-24 13:10:11.985409863 +0100 @@ -1,7 +1,7 @@ # # spec file for package Mesa-drivers # -# Copyright (c) 2020 SUSE LLC +# 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 @@ -129,7 +129,12 @@ # never to be upstreamed Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch Patch58: u_dep_xcb.patch - +Patch61: U_0001-gallium-Fix-a-couple-of-multiple-definition-warnings.patch +Patch62: U_0002-r600-Move-get_pic_param-to-radeon_vce.c.patch +Patch63: U_0003-radeon-Move-si_get_pic_param-to-radeon_vce.c.patch +Patch64: U_0004-radeon-Fix-multiple-definition-error-with-radeon_deb.patch +Patch65: U_0005-radv-Remove-syncobj_handle-variable-in-header.patch +Patch66: U_0006-nouveau-nvc0-add-extern-keyword-to-nvc0_miptree_vtbl.patch BuildRequires: bison BuildRequires: fdupes BuildRequires: flex @@ -466,8 +471,8 @@ %package -n libOSMesa8 Summary: Mesa Off-screen rendering extension -Group: System/Libraries # Wrongly named package shipped .so.8 +Group: System/Libraries Obsoletes: libOSMesa9 < %{version} Provides: libOSMesa9 = %{version} @@ -583,8 +588,8 @@ %package -n Mesa-libd3d Summary: Mesa Direct3D9 state tracker -Group: System/Libraries # Manually provide d3d library (bnc#918294) +Group: System/Libraries %ifarch x86_64 s390x ppc64 ppc64le aarch64 riscv64 Provides: d3dadapter9.so.1()(64bit) %else @@ -735,6 +740,12 @@ %patch2 -p1 %patch54 -p1 %patch58 -p1 +%patch61 -p1 +%patch62 -p1 +%patch63 -p1 +%patch64 -p1 +%patch65 -p1 +%patch66 -p1 # Remove requires to libglvnd/libglvnd-devel from baselibs.conf when # disabling libglvnd build; ugly ... ++++++ Mesa.spec ++++++ --- /var/tmp/diff_new_pack.uMlyfj/_old 2020-01-24 13:10:11.997409867 +0100 +++ /var/tmp/diff_new_pack.uMlyfj/_new 2020-01-24 13:10:12.001409870 +0100 @@ -1,7 +1,7 @@ # # spec file for package Mesa # -# Copyright (c) 2020 SUSE LLC +# 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 @@ -128,7 +128,12 @@ # never to be upstreamed Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch Patch58: u_dep_xcb.patch - +Patch61: U_0001-gallium-Fix-a-couple-of-multiple-definition-warnings.patch +Patch62: U_0002-r600-Move-get_pic_param-to-radeon_vce.c.patch +Patch63: U_0003-radeon-Move-si_get_pic_param-to-radeon_vce.c.patch +Patch64: U_0004-radeon-Fix-multiple-definition-error-with-radeon_deb.patch +Patch65: U_0005-radv-Remove-syncobj_handle-variable-in-header.patch +Patch66: U_0006-nouveau-nvc0-add-extern-keyword-to-nvc0_miptree_vtbl.patch BuildRequires: bison BuildRequires: fdupes BuildRequires: flex @@ -465,8 +470,8 @@ %package -n libOSMesa8 Summary: Mesa Off-screen rendering extension -Group: System/Libraries # Wrongly named package shipped .so.8 +Group: System/Libraries Obsoletes: libOSMesa9 < %{version} Provides: libOSMesa9 = %{version} @@ -582,8 +587,8 @@ %package -n Mesa-libd3d Summary: Mesa Direct3D9 state tracker -Group: System/Libraries # Manually provide d3d library (bnc#918294) +Group: System/Libraries %ifarch x86_64 s390x ppc64 ppc64le aarch64 riscv64 Provides: d3dadapter9.so.1()(64bit) %else @@ -734,6 +739,12 @@ %patch2 -p1 %patch54 -p1 %patch58 -p1 +%patch61 -p1 +%patch62 -p1 +%patch63 -p1 +%patch64 -p1 +%patch65 -p1 +%patch66 -p1 # Remove requires to libglvnd/libglvnd-devel from baselibs.conf when # disabling libglvnd build; ugly ... ++++++ U_0001-gallium-Fix-a-couple-of-multiple-definition-warnings.patch ++++++ >From 8e22df3aec9190518a23818be7690ac345f0bc20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timur=20Krist=C3=B3f?= <[email protected]> Date: Tue, 21 Jan 2020 16:12:16 +0100 Subject: [PATCH] gallium: Fix a couple of multiple definition warnings. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Timur Kristóf <[email protected]> Reviewed-by: Marek Olšák <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3488> --- src/gallium/auxiliary/target-helpers/drm_helper_public.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gallium/auxiliary/target-helpers/drm_helper_public.h b/src/gallium/auxiliary/target-helpers/drm_helper_public.h index 82dfe9e2575..ab0fc8d1b1a 100644 --- a/src/gallium/auxiliary/target-helpers/drm_helper_public.h +++ b/src/gallium/auxiliary/target-helpers/drm_helper_public.h @@ -4,10 +4,10 @@ struct pipe_screen; struct pipe_screen_config; -const char *iris_driconf_xml; -const char *radeonsi_driconf_xml; -const char *v3d_driconf_xml; -const char *virgl_driconf_xml; +extern const char *iris_driconf_xml; +extern const char *radeonsi_driconf_xml; +extern const char *v3d_driconf_xml; +extern const char *virgl_driconf_xml; struct pipe_screen * pipe_i915_create_screen(int fd, const struct pipe_screen_config *config); -- 2.16.4 ++++++ U_0002-r600-Move-get_pic_param-to-radeon_vce.c.patch ++++++ >From a134ac5ee9355779e015f8d7f9fe3e2ab22cdb86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timur=20Krist=C3=B3f?= <[email protected]> Date: Tue, 21 Jan 2020 16:08:21 +0100 Subject: [PATCH] r600: Move get_pic_param to radeon_vce.c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Timur Kristóf <[email protected]> Reviewed-by: Marek Olšák <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3488> --- src/gallium/drivers/r600/radeon_vce.c | 4 ++++ src/gallium/drivers/r600/radeon_vce.h | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/r600/radeon_vce.c b/src/gallium/drivers/r600/radeon_vce.c index 4051d73533d..16f48c69456 100644 --- a/src/gallium/drivers/r600/radeon_vce.c +++ b/src/gallium/drivers/r600/radeon_vce.c @@ -54,6 +54,10 @@ #define FW_52_8_3 ((52 << 24) | (8 << 16) | (3 << 8)) #define FW_53 (53 << 24) +/* version specific function for getting parameters */ +static void (*get_pic_param)(struct rvce_encoder *enc, + struct pipe_h264_enc_picture_desc *pic) = NULL; + /** * flush commands to the hardware */ diff --git a/src/gallium/drivers/r600/radeon_vce.h b/src/gallium/drivers/r600/radeon_vce.h index 71f028721b4..c5e05477763 100644 --- a/src/gallium/drivers/r600/radeon_vce.h +++ b/src/gallium/drivers/r600/radeon_vce.h @@ -443,10 +443,6 @@ void radeon_vce_50_init(struct rvce_encoder *enc); /* init vce fw 52 specific callbacks */ void radeon_vce_52_init(struct rvce_encoder *enc); -/* version specific function for getting parameters */ -void (*get_pic_param)(struct rvce_encoder *enc, - struct pipe_h264_enc_picture_desc *pic); - /* get parameters for vce 40.2.2 */ void radeon_vce_40_2_2_get_param(struct rvce_encoder *enc, struct pipe_h264_enc_picture_desc *pic); -- 2.16.4 ++++++ U_0003-radeon-Move-si_get_pic_param-to-radeon_vce.c.patch ++++++ >From b7f975980916d670dcfc280af1678f4439a59d2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timur=20Krist=C3=B3f?= <[email protected]> Date: Tue, 21 Jan 2020 16:04:33 +0100 Subject: [PATCH] radeon: Move si_get_pic_param to radeon_vce.c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Timur Kristóf <[email protected]> Reviewed-by: Marek Olšák <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3488> --- src/gallium/drivers/radeon/radeon_vce.c | 4 ++++ src/gallium/drivers/radeon/radeon_vce.h | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/radeon/radeon_vce.c b/src/gallium/drivers/radeon/radeon_vce.c index 84d3c1e2fa4..652b4250654 100644 --- a/src/gallium/drivers/radeon/radeon_vce.c +++ b/src/gallium/drivers/radeon/radeon_vce.c @@ -48,6 +48,10 @@ #define FW_52_8_3 ((52 << 24) | (8 << 16) | (3 << 8)) #define FW_53 (53 << 24) +/* version specific function for getting parameters */ +static void (*si_get_pic_param)(struct rvce_encoder *enc, + struct pipe_h264_enc_picture_desc *pic) = NULL; + /** * flush commands to the hardware */ diff --git a/src/gallium/drivers/radeon/radeon_vce.h b/src/gallium/drivers/radeon/radeon_vce.h index cf625e6fed7..b5cfe178061 100644 --- a/src/gallium/drivers/radeon/radeon_vce.h +++ b/src/gallium/drivers/radeon/radeon_vce.h @@ -437,10 +437,6 @@ void si_vce_50_init(struct rvce_encoder *enc); /* init vce fw 52 specific callbacks */ void si_vce_52_init(struct rvce_encoder *enc); -/* version specific function for getting parameters */ -void (*si_get_pic_param)(struct rvce_encoder *enc, - struct pipe_h264_enc_picture_desc *pic); - /* get parameters for vce 40.2.2 */ void si_vce_40_2_2_get_param(struct rvce_encoder *enc, struct pipe_h264_enc_picture_desc *pic); -- 2.16.4 ++++++ U_0004-radeon-Fix-multiple-definition-error-with-radeon_deb.patch ++++++ >From 75e5720e1a64fac116e19cd9a7682b1d0f530149 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timur=20Krist=C3=B3f?= <[email protected]> Date: Tue, 21 Jan 2020 16:36:54 +0100 Subject: [PATCH] radeon: Fix multiple definition error with radeon_debug MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Timur Kristóf <[email protected]> Reviewed-by: Marek Olšák <[email protected]> Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3488> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3488> --- src/mesa/drivers/dri/radeon/radeon_debug.c | 10 +++++++--- src/mesa/drivers/dri/radeon/radeon_debug.h | 14 ++++++++++---- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/mesa/drivers/dri/radeon/radeon_debug.c b/src/mesa/drivers/dri/radeon/radeon_debug.c index 91f86a96b52..4ac974473e2 100644 --- a/src/mesa/drivers/dri/radeon/radeon_debug.c +++ b/src/mesa/drivers/dri/radeon/radeon_debug.c @@ -57,13 +57,17 @@ static const struct debug_control debug_control[] = { {NULL, 0} }; -radeon_debug_type_t radeon_enabled_debug_types; +#if defined(RADEON_R200) +radeon_debug_type_t r200_enabled_debug_types; +#elif defined(RADEON_R100) +radeon_debug_type_t r100_enabled_debug_types; +#endif void radeon_init_debug(void) { - radeon_enabled_debug_types = parse_debug_string(getenv("RADEON_DEBUG"), debug_control); + RADEON_DEBUG = parse_debug_string(getenv("RADEON_DEBUG"), debug_control); - radeon_enabled_debug_types |= RADEON_GENERAL; + RADEON_DEBUG |= RADEON_GENERAL; } void _radeon_debug_add_indent(void) diff --git a/src/mesa/drivers/dri/radeon/radeon_debug.h b/src/mesa/drivers/dri/radeon/radeon_debug.h index df2f1abfbf2..8f56ec6769b 100644 --- a/src/mesa/drivers/dri/radeon/radeon_debug.h +++ b/src/mesa/drivers/dri/radeon/radeon_debug.h @@ -81,18 +81,24 @@ struct radeon_debug { char indent[RADEON_MAX_INDENT]; }; -extern radeon_debug_type_t radeon_enabled_debug_types; - /** * Compabibility layer for old debug code **/ -#define RADEON_DEBUG radeon_enabled_debug_types +#if defined(RADEON_R200) +extern radeon_debug_type_t r200_enabled_debug_types; +#define RADEON_DEBUG r200_enabled_debug_types +#elif defined(RADEON_R100) +extern radeon_debug_type_t r100_enabled_debug_types; +#define RADEON_DEBUG r100_enabled_debug_types +#else +#error "Neither RADEON_R100 nor RADEON_R200 are defined." +#endif static inline int radeon_is_debug_enabled(const radeon_debug_type_t type, const radeon_debug_level_t level) { return RADEON_DEBUG_LEVEL >= level - && (type & radeon_enabled_debug_types); + && (type & RADEON_DEBUG); } extern void _radeon_print(const radeon_debug_type_t type, -- 2.16.4 ++++++ U_0005-radv-Remove-syncobj_handle-variable-in-header.patch ++++++ >From bd4380c63c3b8b8b5f60dc840809dbe96a222fd7 Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen <[email protected]> Date: Tue, 21 Jan 2020 11:49:55 +0100 Subject: [PATCH] radv: Remove syncobj_handle variable in header. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I strongly suspect it was supposed to be a typedef. However, used nowhere, we should remove it. Fixes: eaa56eab6da "radv: initial support for shared semaphores (v2)" Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/2385 Reviewed-by: Michel Dänzer <[email protected]> Reviewed-by: Samuel Pitoiset <[email protected]> Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3479> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3479> --- src/amd/vulkan/radv_radeon_winsys.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/amd/vulkan/radv_radeon_winsys.h b/src/amd/vulkan/radv_radeon_winsys.h index c8790917bcc..5c7b1ab5118 100644 --- a/src/amd/vulkan/radv_radeon_winsys.h +++ b/src/amd/vulkan/radv_radeon_winsys.h @@ -156,7 +156,6 @@ struct radeon_bo_metadata { uint32_t metadata[64]; }; -uint32_t syncobj_handle; struct radeon_winsys_fence; struct radeon_winsys_bo { -- 2.16.4 ++++++ U_0006-nouveau-nvc0-add-extern-keyword-to-nvc0_miptree_vtbl.patch ++++++ >From 28eb481bc2156ccc07c106ab517c2a3a42a53de1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timur=20Krist=C3=B3f?= <[email protected]> Date: Tue, 21 Jan 2020 17:11:22 +0100 Subject: [PATCH] nouveau/nvc0: add extern keyword to nvc0_miptree_vtbl. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Timur Kristóf <[email protected]> Reviewed-by: Karol Herbst <[email protected]> --- src/gallium/drivers/nouveau/nvc0/nvc0_resource.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_resource.h b/src/gallium/drivers/nouveau/nvc0/nvc0_resource.h index b24fca004ca..78a1d79261e 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_resource.h +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_resource.h @@ -38,7 +38,7 @@ nvc0_miptree_create(struct pipe_screen *pscreen, const struct pipe_resource *tmp, const uint64_t *modifiers, unsigned int count); -const struct u_resource_vtbl nvc0_miptree_vtbl; +extern const struct u_resource_vtbl nvc0_miptree_vtbl; struct pipe_surface * nvc0_miptree_surface_new(struct pipe_context *, -- 2.16.4
