The package rpms/mangohud.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/mangohud.git/commit/?id=b34b647e6602....
Change: +%ifnarch s390x
Thanks.
Full change: ============
commit a7ebbaf87026c57a5aacfa7e3ad7b3db11bbe01c Author: Artem Polishchuk ego.cordatus@gmail.com Date: Thu Sep 28 22:19:37 2023 +0300
build: Upload sources
diff --git a/sources b/sources index d514b96..fac5d05 100644 --- a/sources +++ b/sources @@ -1,3 +1,5 @@ SHA512 (imgui-1.81.tar.gz) = d7a2b66dea77359f78068a595607d7668e09ddd0b91910f67fc6463cb920b91b0cc1855984bd4d41e6a880b69ca7cd5e3adc064dcf461c0629b9f8c845a4fc3e SHA512 (mangohud-0.7.0.tar.gz) = 1ed43c2ba8a97c8934895450bf1ce152970031e5a5654db91df02d7b44f5eeacb32167f219735d2f0fb3c8ba24fc4386a8af4da99a3cd736af0b0d50ef2fedd7 SHA512 (Vulkan-Headers-1.2.158.tar.gz) = f7aa9222f9deb1316d22deacc2c6cd85c409f0f2b2d37ecd55e0fc8466d381bbe3bed287881b993a01c5f33736e1607014f820980b7a54a3721fab6980960c91 +SHA512 (imgui-1.81-1-wrap.zip) = c97fa4cb5ab31c040951e6da04bb1b9659f0105adf54becc35c60ad376c6d4f9e4dcd2a5a554dc5430cfc69527ef5d8570f39fbbf91a23d15f51740f06fb7c3c +SHA512 (vulkan-headers-1.2.158-1-wrap.zip) = a545c6e910a6c37589dbbe3b8b396aa9b89a4858889b5a0bcb4ce1e6a75d726ebf290d31ee49494cab298187c20cb076b6f0b0d44577279e195bf38cc374b283
commit 54445509c49f28307c1d249c69f27d8255204b30 Author: Artem Polishchuk ego.cordatus@gmail.com Date: Thu Sep 28 22:12:12 2023 +0300
build: Update to 0.7.0
diff --git a/.gitignore b/.gitignore index 9c132f7..f7e94d1 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /mangohud-0.6.9.1.tar.gz /Vulkan-Headers-1.2.158.tar.gz /vulkan-headers-1.2.158-1-wrap.zip +/mangohud-0.7.0.tar.gz diff --git a/mangohud.spec b/mangohud.spec index fb79438..d5b6309 100644 --- a/mangohud.spec +++ b/mangohud.spec @@ -5,6 +5,8 @@ %global vulkan_headers_ver 1.2.158 %global vulkan_headers_wrap_ver 1
+%global tarball_version %%(echo %{version} | tr '~' '-') + # Failed on s390x arch # [ ERROR ] --- 0x4000 != 0x40 # [ LINE ] --- ../tests/test_amdgpu.cpp:35: error: Failure! @@ -15,13 +17,13 @@ %endif
Name: mangohud -Version: 0.6.9.1 +Version: 0.7.0 Release: %autorelease Summary: Vulkan overlay layer for monitoring FPS, temperatures, CPU/GPU load and more
License: MIT URL: https://github.com/flightlessmango/MangoHud -Source0: %{url}/archive/v0.6.9-1/%{name}-%{version}.tar.gz +Source0: %{url}/archive/v%{tarball_version}/%{name}-%{tarball_version}.tar.gz # imgui Source1: https://github.com/ocornut/imgui/archive/v%%7Bimgui_ver%7D/imgui-%%7Bimgui_v... Source2: https://wrapdb.mesonbuild.com/v%%7Bimgui_wrap_ver%7D//projects/imgui/%%7Bimg... @@ -34,15 +36,6 @@ Source4: https://wrapdb.mesonbuild.com/v%%7Bvulkan_headers_wrap_ver%7D/projec # https://github.com/flightlessmango/MangoHud/commit/bc282cf300ed5b6831177cf3e... # Patch0: mangohud-0.6.9-use-system-vulkan-headers.patch
-# GCC 13 fix -# params: add cstdint header -# https://github.com/flightlessmango/MangoHud/commit/3f8f036ee8773ae1af23dd084... -Patch1: https://github.com/flightlessmango/MangoHud/commit/3f8f036ee8773ae1af23dd084... - -# https://github.com/flightlessmango/MangoHud/commit/5754ca13ee2cdf19a76b4fc79... -# vulkan manifest: set cpu_family in layer name -Patch2: https://github.com/flightlessmango/MangoHud/commit/5754ca13ee2cdf19a76b4fc79... - BuildRequires: appstream BuildRequires: dbus-devel BuildRequires: gcc-c++ @@ -88,11 +81,11 @@ To install GUI front-end:
%prep -%autosetup -n %{appname}-0.6.9-1 -p1 -%setup -qn %{appname}-0.6.9-1 -D -T -a1 -%setup -qn %{appname}-0.6.9-1 -D -T -a2 -%setup -qn %{appname}-0.6.9-1 -D -T -a3 -%setup -qn %{appname}-0.6.9-1 -D -T -a4 +%autosetup -n %{appname}-%{tarball_version} -p1 +%setup -qn %{appname}-%{tarball_version} -D -T -a1 +%setup -qn %{appname}-%{tarball_version} -D -T -a2 +%setup -qn %{appname}-%{tarball_version} -D -T -a3 +%setup -qn %{appname}-%{tarball_version} -D -T -a4
# imgui mv imgui-%{imgui_ver} subprojects/ @@ -106,6 +99,10 @@ sed -i "s/ cmocka = subproject('cmocka')//g" meson.build sed -i "s/cmocka_dep = cmocka.get_variable('cmocka_dep')/cmocka_dep = dependency('cmocka')/g" meson.build %endif
+# https://github.com/flightlessmango/MangoHud/commit/dc1761e98a435aaee6a919e21... +sed -i "s/, '-static-libstdc++'//" \ + src/meson.build +
%build %meson \ @@ -125,6 +122,10 @@ sed -i "s/cmocka_dep = cmocka.get_variable('cmocka_dep')/cmocka_dep = dependency %install %meson_install
+# ERROR: ambiguous python shebang +sed -i "s@#!/usr/bin/env python@#!/usr/bin/python3@" \ + %{buildroot}%{_bindir}/mangoplot +
%check # https://github.com/flightlessmango/MangoHud/issues/812 @@ -139,6 +140,7 @@ sed -i "s/cmocka_dep = cmocka.get_variable('cmocka_dep')/cmocka_dep = dependency %license LICENSE %doc README.md %{_bindir}/%{name}* +%{_bindir}/mangoplot %{_datadir}/icons/hicolor/scalable/*/*.svg %{_datadir}/vulkan/implicit_layer.d/*Mango*.json %{_docdir}/%{name}/%{appname}.conf.example diff --git a/params:-add-cstdint-header.patch b/params:-add-cstdint-header.patch deleted file mode 100644 index f507c8f..0000000 --- a/params:-add-cstdint-header.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 3f8f036ee8773ae1af23dd0848b6ab487b5ac7de Mon Sep 17 00:00:00 2001 -From: FlightlessMango flightlessmangoyt@gmail.com -Date: Sun, 7 May 2023 23:01:10 +0200 -Subject: [PATCH] params: add cstdint header - ---- - src/overlay_params.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/overlay_params.h b/src/overlay_params.h -index 8fa2485eb7..0878dca5b4 100644 ---- a/src/overlay_params.h -+++ b/src/overlay_params.h -@@ -5,6 +5,7 @@ - #include <string> - #include <vector> - #include <unordered_map> -+#include <cstdint> - - #ifdef __cplusplus - extern "C" { diff --git a/sources b/sources index 48f448c..d514b96 100644 --- a/sources +++ b/sources @@ -1,5 +1,3 @@ SHA512 (imgui-1.81.tar.gz) = d7a2b66dea77359f78068a595607d7668e09ddd0b91910f67fc6463cb920b91b0cc1855984bd4d41e6a880b69ca7cd5e3adc064dcf461c0629b9f8c845a4fc3e -SHA512 (mangohud-0.6.9.1.tar.gz) = 540fb4d1c5494e1305553600f76c57ba75c465df4b76ddbe1f15c418fa9a7e26c66be7ce64a13bfd7c5073bcb985cd28b2876252cdff7c43793d22a40eb78a87 +SHA512 (mangohud-0.7.0.tar.gz) = 1ed43c2ba8a97c8934895450bf1ce152970031e5a5654db91df02d7b44f5eeacb32167f219735d2f0fb3c8ba24fc4386a8af4da99a3cd736af0b0d50ef2fedd7 SHA512 (Vulkan-Headers-1.2.158.tar.gz) = f7aa9222f9deb1316d22deacc2c6cd85c409f0f2b2d37ecd55e0fc8466d381bbe3bed287881b993a01c5f33736e1607014f820980b7a54a3721fab6980960c91 -SHA512 (imgui-1.81-1-wrap.zip) = c97fa4cb5ab31c040951e6da04bb1b9659f0105adf54becc35c60ad376c6d4f9e4dcd2a5a554dc5430cfc69527ef5d8570f39fbbf91a23d15f51740f06fb7c3c -SHA512 (vulkan-headers-1.2.158-1-wrap.zip) = a545c6e910a6c37589dbbe3b8b396aa9b89a4858889b5a0bcb4ce1e6a75d726ebf290d31ee49494cab298187c20cb076b6f0b0d44577279e195bf38cc374b283 diff --git a/vulkan-manifest:-set-cpu_family-in-layer-name.patch b/vulkan-manifest:-set-cpu_family-in-layer-name.patch deleted file mode 100644 index ef05256..0000000 --- a/vulkan-manifest:-set-cpu_family-in-layer-name.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 5754ca13ee2cdf19a76b4fc79dd914a58d6371f5 Mon Sep 17 00:00:00 2001 -From: FlightlessMango flightlessmangoyt@gmail.com -Date: Sat, 20 May 2023 08:27:13 +0200 -Subject: [PATCH] vulkan manifest: set cpu_family in layer name - ---- - src/mangohud.json.in | 2 +- - src/meson.build | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/mangohud.json.in b/src/mangohud.json.in -index 3a19ef9d88..fd3dd2f4f2 100644 ---- a/src/mangohud.json.in -+++ b/src/mangohud.json.in -@@ -1,7 +1,7 @@ - { - "file_format_version" : "1.0.0", - "layer" : { -- "name": "VK_LAYER_MANGOHUD_overlay", -+ "name": "VK_LAYER_MANGOHUD_overlay_@cpu_family@", - "type": "GLOBAL", - "api_version": "1.3.0", - "library_path": "@ld_libdir_mangohud_abs@/libMangoHud.so", -diff --git a/src/meson.build b/src/meson.build -index 15c8033763..e1cdbea31f 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -13,6 +13,7 @@ conf_data = configuration_data() - - conf_data.set('ld_libdir_mangohud_abs', libdir_mangohud) - conf_data.set('ld_libdir_mangohud', ld_libdir_mangohud) -+conf_data.set('cpu_family', host_machine.cpu_family()) - - overlay_shaders = [ - 'overlay.frag',
commit be3f774f77470b6e6a3999d63eff6a88a22720f2 Author: Artem Polishchuk ego.cordatus@gmail.com Date: Sun Sep 10 21:28:52 2023 +0300
build: Backport upstream patch
vulkan manifest: set cpu_family in layer name
diff --git a/mangohud.spec b/mangohud.spec index e1aa4d6..fb79438 100644 --- a/mangohud.spec +++ b/mangohud.spec @@ -39,6 +39,10 @@ Source4: https://wrapdb.mesonbuild.com/v%%7Bvulkan_headers_wrap_ver%7D/projec # https://github.com/flightlessmango/MangoHud/commit/3f8f036ee8773ae1af23dd084... Patch1: https://github.com/flightlessmango/MangoHud/commit/3f8f036ee8773ae1af23dd084...
+# https://github.com/flightlessmango/MangoHud/commit/5754ca13ee2cdf19a76b4fc79... +# vulkan manifest: set cpu_family in layer name +Patch2: https://github.com/flightlessmango/MangoHud/commit/5754ca13ee2cdf19a76b4fc79... + BuildRequires: appstream BuildRequires: dbus-devel BuildRequires: gcc-c++ diff --git a/vulkan-manifest:-set-cpu_family-in-layer-name.patch b/vulkan-manifest:-set-cpu_family-in-layer-name.patch new file mode 100644 index 0000000..ef05256 --- /dev/null +++ b/vulkan-manifest:-set-cpu_family-in-layer-name.patch @@ -0,0 +1,35 @@ +From 5754ca13ee2cdf19a76b4fc79dd914a58d6371f5 Mon Sep 17 00:00:00 2001 +From: FlightlessMango flightlessmangoyt@gmail.com +Date: Sat, 20 May 2023 08:27:13 +0200 +Subject: [PATCH] vulkan manifest: set cpu_family in layer name + +--- + src/mangohud.json.in | 2 +- + src/meson.build | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/mangohud.json.in b/src/mangohud.json.in +index 3a19ef9d88..fd3dd2f4f2 100644 +--- a/src/mangohud.json.in ++++ b/src/mangohud.json.in +@@ -1,7 +1,7 @@ + { + "file_format_version" : "1.0.0", + "layer" : { +- "name": "VK_LAYER_MANGOHUD_overlay", ++ "name": "VK_LAYER_MANGOHUD_overlay_@cpu_family@", + "type": "GLOBAL", + "api_version": "1.3.0", + "library_path": "@ld_libdir_mangohud_abs@/libMangoHud.so", +diff --git a/src/meson.build b/src/meson.build +index 15c8033763..e1cdbea31f 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -13,6 +13,7 @@ conf_data = configuration_data() + + conf_data.set('ld_libdir_mangohud_abs', libdir_mangohud) + conf_data.set('ld_libdir_mangohud', ld_libdir_mangohud) ++conf_data.set('cpu_family', host_machine.cpu_family()) + + overlay_shaders = [ + 'overlay.frag',
commit b34b647e66020019245ae9828750b9ed9223e20a Author: Artem Polishchuk ego.cordatus@gmail.com Date: Sun Sep 10 21:13:27 2023 +0300
test: Skip for s390x arch
diff --git a/mangohud.spec b/mangohud.spec index 29a9791..e1aa4d6 100644 --- a/mangohud.spec +++ b/mangohud.spec @@ -5,7 +5,14 @@ %global vulkan_headers_ver 1.2.158 %global vulkan_headers_wrap_ver 1
+# Failed on s390x arch +# [ ERROR ] --- 0x4000 != 0x40 +# [ LINE ] --- ../tests/test_amdgpu.cpp:35: error: Failure! +# [ FAILED ] amdgpu_tests: 1 test(s), listed below: +# [ FAILED ] test_amdgpu_get_instant_metrics +%ifnarch s390x %bcond_without tests +%endif
Name: mangohud Version: 0.6.9.1
commit 4fd9b5456f7f831783491703f38178534e92df2c Author: Artem Polishchuk ego.cordatus@gmail.com Date: Sun Sep 10 20:54:14 2023 +0300
build: Drop BR: pkgconfig(vulkan)
diff --git a/mangohud.spec b/mangohud.spec index 5cfec6d..29a9791 100644 --- a/mangohud.spec +++ b/mangohud.spec @@ -46,7 +46,8 @@ BuildRequires: python3-mako BuildRequires: spdlog-devel
BuildRequires: pkgconfig(nlohmann_json) -BuildRequires: pkgconfig(vulkan) < 1.3.241 +# Tip and memo if upstream decide to unbundle vulkan-headers +# BuildRequires: pkgconfig(vulkan) < 1.3.241 BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(x11)
commit a48a5e0a3ad9d14d2cc743e7534f8c91dd0a0d29 Author: Artem Polishchuk ego.cordatus@gmail.com Date: Sun Sep 10 20:42:27 2023 +0300
test: Fix and enable tests
diff --git a/mangohud.spec b/mangohud.spec index e1c767d..5cfec6d 100644 --- a/mangohud.spec +++ b/mangohud.spec @@ -5,8 +5,7 @@ %global vulkan_headers_ver 1.2.158 %global vulkan_headers_wrap_ver 1
-# Tests requires bundled stuff. Disable for now. -%bcond_with tests +%bcond_without tests
Name: mangohud Version: 0.6.9.1 @@ -28,6 +27,11 @@ Source4: https://wrapdb.mesonbuild.com/v%%7Bvulkan_headers_wrap_ver%7D/projec # https://github.com/flightlessmango/MangoHud/commit/bc282cf300ed5b6831177cf3e... # Patch0: mangohud-0.6.9-use-system-vulkan-headers.patch
+# GCC 13 fix +# params: add cstdint header +# https://github.com/flightlessmango/MangoHud/commit/3f8f036ee8773ae1af23dd084... +Patch1: https://github.com/flightlessmango/MangoHud/commit/3f8f036ee8773ae1af23dd084... + BuildRequires: appstream BuildRequires: dbus-devel BuildRequires: gcc-c++ @@ -83,6 +87,13 @@ mv imgui-%{imgui_ver} subprojects/ # Vulkan-Headers mv Vulkan-Headers-%{vulkan_headers_ver} subprojects/
+%if %{with tests} +# Use system cmocka instead of subproject +# https://gitlab.archlinux.org/archlinux/packaging/packages/mangohud/-/blob/0.... +sed -i "s/ cmocka = subproject('cmocka')//g" meson.build +sed -i "s/cmocka_dep = cmocka.get_variable('cmocka_dep')/cmocka_dep = dependency('cmocka')/g" meson.build +%endif +
%build %meson \ @@ -107,6 +118,9 @@ mv Vulkan-Headers-%{vulkan_headers_ver} subprojects/ # https://github.com/flightlessmango/MangoHud/issues/812 # ? tag-invalid : stock icon is not valid [io.github.flightlessmango.mangohud] %dnl appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.xml +%if %{with tests} +%meson_test +%endif
%files diff --git a/params:-add-cstdint-header.patch b/params:-add-cstdint-header.patch new file mode 100644 index 0000000..f507c8f --- /dev/null +++ b/params:-add-cstdint-header.patch @@ -0,0 +1,21 @@ +From 3f8f036ee8773ae1af23dd0848b6ab487b5ac7de Mon Sep 17 00:00:00 2001 +From: FlightlessMango flightlessmangoyt@gmail.com +Date: Sun, 7 May 2023 23:01:10 +0200 +Subject: [PATCH] params: add cstdint header + +--- + src/overlay_params.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/overlay_params.h b/src/overlay_params.h +index 8fa2485eb7..0878dca5b4 100644 +--- a/src/overlay_params.h ++++ b/src/overlay_params.h +@@ -5,6 +5,7 @@ + #include <string> + #include <vector> + #include <unordered_map> ++#include <cstdint> + + #ifdef __cplusplus + extern "C" {
commit d397271defe1c28260f59c906059d4ef3f047ee8 Author: Artem Polishchuk ego.cordatus@gmail.com Date: Sun Sep 10 20:15:57 2023 +0300
style: Minor Spec file update
diff --git a/mangohud.spec b/mangohud.spec index 4a2bbe6..e1c767d 100644 --- a/mangohud.spec +++ b/mangohud.spec @@ -1,7 +1,7 @@ %global appname MangoHud
-%global imgui_ver 1.81 -%global imgui_wrap_ver 1 +%global imgui_ver 1.81 +%global imgui_wrap_ver 1 %global vulkan_headers_ver 1.2.158 %global vulkan_headers_wrap_ver 1
@@ -16,8 +16,10 @@ Summary: Vulkan overlay layer for monitoring FPS, temperatures, CPU/GPU l License: MIT URL: https://github.com/flightlessmango/MangoHud Source0: %{url}/archive/v0.6.9-1/%{name}-%{version}.tar.gz +# imgui Source1: https://github.com/ocornut/imgui/archive/v%%7Bimgui_ver%7D/imgui-%%7Bimgui_v... -Source2: https://wrapdb.mesonbuild.com/v1/projects/imgui/%%7Bimgui_ver%7D/%%7Bimgui_w... +Source2: https://wrapdb.mesonbuild.com/v%%7Bimgui_wrap_ver%7D//projects/imgui/%%7Bimg... +# Vulkan-Headers Source3: https://github.com/KhronosGroup/Vulkan-Headers/archive/v%%7Bvulkan_headers_v... Source4: https://wrapdb.mesonbuild.com/v%%7Bvulkan_headers_wrap_ver%7D/projects/vulka...
@@ -103,6 +105,7 @@ mv Vulkan-Headers-%{vulkan_headers_ver} subprojects/
%check # https://github.com/flightlessmango/MangoHud/issues/812 +# ? tag-invalid : stock icon is not valid [io.github.flightlessmango.mangohud] %dnl appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.xml
commit 16878ff6fa6ce4af9ca417d9341797364349e9f5 Author: Artem Polishchuk ego.cordatus@gmail.com Date: Sun Sep 10 20:13:02 2023 +0300
build: Bundle vulkan-headers to fix FTBFS
https://github.com/flightlessmango/MangoHud/issues/927#issuecomment-16305654...
diff --git a/.gitignore b/.gitignore index b84b36e..9c132f7 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,5 @@ /mangohud-0.6.8.tar.gz /mangohud-0.6.9.tar.gz /mangohud-0.6.9.1.tar.gz +/Vulkan-Headers-1.2.158.tar.gz +/vulkan-headers-1.2.158-1-wrap.zip diff --git a/mangohud-0.6.9-use-system-vulkan-headers.patch b/mangohud-0.6.9-use-system-vulkan-headers.patch deleted file mode 100644 index 9e68cb4..0000000 --- a/mangohud-0.6.9-use-system-vulkan-headers.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/README.md b/README.md -index 14b61ca..a3fb91f 100644 ---- a/README.md -+++ b/README.md -@@ -72,6 +72,7 @@ Install necessary development packages. - - meson >=0.54 - - ninja (ninja-build) - - glslang -+- vulkan headers if using `-Duse_system_vulkan=enabled` option with `meson` - - libGL/libEGL (libglvnd, mesa-common-dev, mesa-libGL-devel etc) - - X11 (libx11-dev) - - XNVCtrl (libxnvctrl-dev), optional, use `-Dwith_xnvctrl=disabled` option with `meson` to disable -diff --git a/meson.build b/meson.build -index a32d04d..0b6bb25 100644 ---- a/meson.build -+++ b/meson.build -@@ -165,9 +165,21 @@ else - dep_rt = null_dep - endif - --vkh_sp = subproject('vulkan-headers') --vk_api_xml = vkh_sp.get_variable('vulkan_api_xml') --dep_vulkan = vkh_sp.get_variable('vulkan_headers_dep') -+dep_vulkan = dependency('vulkan', required: get_option('use_system_vulkan')) -+if dep_vulkan.found() and not get_option('use_system_vulkan').disabled() -+ datadir = get_option('vulkan_datadir') -+ if datadir == '' -+ datadir = get_option('datadir') -+ endif -+ if not datadir.startswith('/') -+ datadir = get_option('prefix') / datadir -+ endif -+ vk_api_xml = files(datadir / 'vulkan/registry/vk.xml') -+else -+ vkh_sp = subproject('vulkan-headers') -+ vk_api_xml = vkh_sp.get_variable('vulkan_api_xml') -+ dep_vulkan = vkh_sp.get_variable('vulkan_headers_dep') -+endif - - vk_enum_to_str = custom_target( - 'vk_enum_to_str', -diff --git a/meson_options.txt b/meson_options.txt -index 5f7d11b..b474ba9 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -1,5 +1,7 @@ - option('glibcxx_asserts', type : 'boolean', value : false) -+option('use_system_vulkan', type : 'feature', value : 'disabled', description: 'Use system vulkan headers instead of the provided ones') - option('use_system_spdlog', type : 'feature', value : 'disabled', description: 'Use system spdlog library') -+option('vulkan_datadir', type : 'string', value : '', description: 'Path to the system vulkan headers data directory if different from MangoHud's datadir') - option('append_libdir_mangohud', type : 'boolean', value : true, description: 'Append "mangohud" to libdir path or not.') - option('include_doc', type : 'boolean', value : true, description: 'Include the example config, man pages, appstream files etc.') - option('with_nvml', type : 'combo', value : 'enabled', choices: ['enabled', 'system', 'disabled'], description: 'Enable NVML support') diff --git a/mangohud.spec b/mangohud.spec index a2c266e..4a2bbe6 100644 --- a/mangohud.spec +++ b/mangohud.spec @@ -2,6 +2,8 @@
%global imgui_ver 1.81 %global imgui_wrap_ver 1 +%global vulkan_headers_ver 1.2.158 +%global vulkan_headers_wrap_ver 1
# Tests requires bundled stuff. Disable for now. %bcond_with tests @@ -16,11 +18,13 @@ URL: https://github.com/flightlessmango/MangoHud Source0: %{url}/archive/v0.6.9-1/%{name}-%{version}.tar.gz Source1: https://github.com/ocornut/imgui/archive/v%%7Bimgui_ver%7D/imgui-%%7Bimgui_v... Source2: https://wrapdb.mesonbuild.com/v1/projects/imgui/%%7Bimgui_ver%7D/%%7Bimgui_w... +Source3: https://github.com/KhronosGroup/Vulkan-Headers/archive/v%%7Bvulkan_headers_v... +Source4: https://wrapdb.mesonbuild.com/v%%7Bvulkan_headers_wrap_ver%7D/projects/vulka...
# MangoHud switched to bundled vulkan-headers since 0.6.9 version. This rebased # upstream patch which reverts this change. # https://github.com/flightlessmango/MangoHud/commit/bc282cf300ed5b6831177cf3e... -Patch0: mangohud-0.6.9-use-system-vulkan-headers.patch +# Patch0: mangohud-0.6.9-use-system-vulkan-headers.patch
BuildRequires: appstream BuildRequires: dbus-devel @@ -52,6 +56,7 @@ Recommends: (mangohud(x86-32) if glibc(x86-32)) Suggests: goverlay
Provides: bundled(imgui) = %{imgui_ver} +Provides: bundled(vulkan-headers) = %{vulkan_headers_ver}
%global _description %{expand: A modification of the Mesa Vulkan overlay. Including GUI improvements, @@ -66,18 +71,21 @@ To install GUI front-end:
%prep %autosetup -n %{appname}-0.6.9-1 -p1 -%setup -qn %{appname}-0.6.9-1 -DTa1 -%setup -qn %{appname}-0.6.9-1 -DTa2 +%setup -qn %{appname}-0.6.9-1 -D -T -a1 +%setup -qn %{appname}-0.6.9-1 -D -T -a2 +%setup -qn %{appname}-0.6.9-1 -D -T -a3 +%setup -qn %{appname}-0.6.9-1 -D -T -a4
-mkdir subprojects/imgui +# imgui mv imgui-%{imgui_ver} subprojects/ +# Vulkan-Headers +mv Vulkan-Headers-%{vulkan_headers_ver} subprojects/
%build %meson \ -Dinclude_doc=true \ -Duse_system_spdlog=enabled \ - -Duse_system_vulkan=enabled \ -Dwith_wayland=enabled \ -Dwith_xnvctrl=disabled \ %if %{with tests} diff --git a/sources b/sources index 1996115..48f448c 100644 --- a/sources +++ b/sources @@ -1,3 +1,5 @@ SHA512 (imgui-1.81.tar.gz) = d7a2b66dea77359f78068a595607d7668e09ddd0b91910f67fc6463cb920b91b0cc1855984bd4d41e6a880b69ca7cd5e3adc064dcf461c0629b9f8c845a4fc3e SHA512 (mangohud-0.6.9.1.tar.gz) = 540fb4d1c5494e1305553600f76c57ba75c465df4b76ddbe1f15c418fa9a7e26c66be7ce64a13bfd7c5073bcb985cd28b2876252cdff7c43793d22a40eb78a87 +SHA512 (Vulkan-Headers-1.2.158.tar.gz) = f7aa9222f9deb1316d22deacc2c6cd85c409f0f2b2d37ecd55e0fc8466d381bbe3bed287881b993a01c5f33736e1607014f820980b7a54a3721fab6980960c91 SHA512 (imgui-1.81-1-wrap.zip) = c97fa4cb5ab31c040951e6da04bb1b9659f0105adf54becc35c60ad376c6d4f9e4dcd2a5a554dc5430cfc69527ef5d8570f39fbbf91a23d15f51740f06fb7c3c +SHA512 (vulkan-headers-1.2.158-1-wrap.zip) = a545c6e910a6c37589dbbe3b8b396aa9b89a4858889b5a0bcb4ce1e6a75d726ebf290d31ee49494cab298187c20cb076b6f0b0d44577279e195bf38cc374b283
commit af5931a4f1d81a7c251947ef44f13d3e165e4148 Author: Fedora Release Engineering releng@fedoraproject.org Date: Thu Jul 20 13:43:57 2023 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering releng@fedoraproject.org
commit 88282bd95255d93ee25fea3cd1d3a38e7c887458 Author: Artem Polishchuk ego.cordatus@gmail.com Date: Tue Jul 11 13:19:15 2023 +0300
build: mangohud relies on old Vulkan-headers < 1.3.241
diff --git a/mangohud.spec b/mangohud.spec index 3e8d993..a2c266e 100644 --- a/mangohud.spec +++ b/mangohud.spec @@ -36,7 +36,7 @@ BuildRequires: python3-mako BuildRequires: spdlog-devel
BuildRequires: pkgconfig(nlohmann_json) -BuildRequires: pkgconfig(vulkan) +BuildRequires: pkgconfig(vulkan) < 1.3.241 BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(x11)
commit be3440d864d2c52cff72cfe20bea09b689221434 Author: Vitaly Zaitsev vitaly@easycoding.org Date: Sat Jul 8 20:34:28 2023 +0200
Rebuilt due to spdlog 1.12 update.
commit d821513fa86408704047893d2c51f0ac9eb9cf03 Author: Vitaly Zaitsev vitaly@easycoding.org Date: Wed Jun 28 11:53:01 2023 +0200
Rebuilt due to fmt 10 update.
arch-excludes@lists.fedoraproject.org
-
githook-noreply＠fedoraproject.org