!18 fix build error
From: @zhouwenpei Reviewed-by: @yanan-rock Signed-off-by: @yanan-rock
This commit is contained in:
commit
be735a3d7a
29
backport-compositor-vulkan-fix-build.patch
Normal file
29
backport-compositor-vulkan-fix-build.patch
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
From 99361f28c8763ea4569b5ae9876028d53ac9a234 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= <alberts.muktupavels@gmail.com>
|
||||||
|
Date: Sun, 24 May 2020 13:58:51 +0300
|
||||||
|
Subject: [PATCH] compositor-vulkan: fix build
|
||||||
|
|
||||||
|
VK_PHYSICAL_DEVICE_TYPE_RANGE_SIZE enum was removed in 1.2.140.
|
||||||
|
|
||||||
|
https://gitlab.gnome.org/GNOME/metacity/-/issues/10
|
||||||
|
---
|
||||||
|
src/compositor/meta-compositor-vulkan.c | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/src/compositor/meta-compositor-vulkan.c b/src/compositor/meta-compositor-vulkan.c
|
||||||
|
index b87b5194d..53b7b3ffc 100644
|
||||||
|
--- a/src/compositor/meta-compositor-vulkan.c
|
||||||
|
+++ b/src/compositor/meta-compositor-vulkan.c
|
||||||
|
@@ -810,7 +810,9 @@ device_type_to_string (VkPhysicalDeviceType type)
|
||||||
|
return "cpu";
|
||||||
|
break;
|
||||||
|
|
||||||
|
+#if VK_HEADER_VERSION < 140
|
||||||
|
case VK_PHYSICAL_DEVICE_TYPE_RANGE_SIZE:
|
||||||
|
+#endif
|
||||||
|
case VK_PHYSICAL_DEVICE_TYPE_MAX_ENUM:
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
--
|
||||||
|
GitLab
|
||||||
|
|
||||||
@ -1,6 +1,6 @@
|
|||||||
Name: metacity
|
Name: metacity
|
||||||
Version: 3.37.1
|
Version: 3.37.1
|
||||||
Release: 3
|
Release: 4
|
||||||
Summary: Window Manager for the MATE and GNOME Flashback desktops
|
Summary: Window Manager for the MATE and GNOME Flashback desktops
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: https://download.gnome.org/sources/metacity/
|
URL: https://download.gnome.org/sources/metacity/
|
||||||
@ -21,6 +21,8 @@ BuildRequires: pkgconfig(xdamage) pkgconfig(xrender) pkgconfig(xcursor) pkgconf
|
|||||||
Requires: startup-notification gsettings-desktop-schemas zenity
|
Requires: startup-notification gsettings-desktop-schemas zenity
|
||||||
Provides: firstboot(windowmanager) = metacity
|
Provides: firstboot(windowmanager) = metacity
|
||||||
|
|
||||||
|
Patch6000: backport-compositor-vulkan-fix-build.patch
|
||||||
|
|
||||||
%if !0%{?openEuler}
|
%if !0%{?openEuler}
|
||||||
Patch9000: huawei-remove-XResQueryClientIds-to-get-pid.patch
|
Patch9000: huawei-remove-XResQueryClientIds-to-get-pid.patch
|
||||||
%endif
|
%endif
|
||||||
@ -86,6 +88,9 @@ make CPPFLAGS="$CPPFLAGS" LIBS="$LIBS" %{?_smp_mflags}
|
|||||||
%{_mandir}/man1/*.gz
|
%{_mandir}/man1/*.gz
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Aug 07 2023 zhouwenpei <zhouwenpei1@h-partners.com> - 3.37.1-4
|
||||||
|
- fix build error
|
||||||
|
|
||||||
* Fri Apr 1 2022 wuchaochao <wuchaochao4@h-partres.com> - 3.37.1-3
|
* Fri Apr 1 2022 wuchaochao <wuchaochao4@h-partres.com> - 3.37.1-3
|
||||||
- remove XResQueryClientIds to get pid and remove BuildRequires:vulkan-devel
|
- remove XResQueryClientIds to get pid and remove BuildRequires:vulkan-devel
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user