Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mangohud for openSUSE:Factory checked in at 2023-04-15 22:32:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mangohud (Old) and /work/SRC/openSUSE:Factory/.mangohud.new.19717 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mangohud" Sat Apr 15 22:32:48 2023 rev:12 rq:1079510 version:0.6.9 Changes: -------- --- /work/SRC/openSUSE:Factory/mangohud/mangohud.changes 2023-04-06 15:56:05.448346307 +0200 +++ /work/SRC/openSUSE:Factory/.mangohud.new.19717/mangohud.changes 2023-04-15 22:32:51.925440418 +0200 @@ -1,0 +2,16 @@ +Fri Apr 14 18:26:34 UTC 2023 - Simon Vogl <simon.v...@gmx.net> + +- Add 0001-fix-gcc13-build.patch to fix build with openSUSE's gcc13 +- Now package mangohudctl, now package mangoapp as a sub-package +- Drop support for openSUSE Leap 15.4 as it cannot + provide any compiler that works with mangohud >= 0.6.9 +- Update to version 0.6.9: + * Add missing division for fallback AMD CPU power calculation. + * workflow: arch release package + * gpu: amdgpuinfo: ifdef linux for windows build + * bump minhook wrap rev + * workflow: mingw: fetch git + * use minhook subproject instead of module + * workflow: mingw build test + +------------------------------------------------------------------- Old: ---- mangohud-0.6.8.tar.gz New: ---- 0001-fix-gcc13-build.patch mangohud-0.6.9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mangohud.spec ++++++ --- /var/tmp/diff_new_pack.0vAnhi/_old 2023-04-15 22:32:52.813445541 +0200 +++ /var/tmp/diff_new_pack.0vAnhi/_new 2023-04-15 22:32:52.821445587 +0200 @@ -16,12 +16,12 @@ # -%define internal_ver 0.6.8 +%define internal_ver 0.6.9 %define imgui_ver 1.81 %define imgui_wrap 1 %define vulkan_ver 1.2.158 Name: mangohud -Version: 0.6.8 +Version: 0.6.9 Release: 0 Summary: A Vulkan and OpenGL overlay for monitoring License: MIT @@ -32,7 +32,12 @@ Source3: https://wrapdb.mesonbuild.com/v2/vulkan-headers_%{vulkan_ver}-2/get_patch#/vulkan-headers-%{vulkan_ver}-2-wrap.zip Source4: https://github.com/KhronosGroup/Vulkan-Headers/archive/v%{vulkan_ver}.tar.gz Source99: baselibs.conf +# PATCH-FIX-OPENSUSE 0001-fix-gcc13-build.patch -- Fix build with openSUSE's gcc13 +Patch1: 0001-fix-gcc13-build.patch BuildRequires: AppStream +%if 0%{?suse_version} < 1550 && 0%{?sle_version} >= 150500 +BuildRequires: gcc12-c++ +%endif BuildRequires: gcc-c++ BuildRequires: git BuildRequires: glslang-devel @@ -40,10 +45,13 @@ BuildRequires: pkgconfig BuildRequires: python3-mako BuildRequires: unzip +BuildRequires: pkgconfig(cmocka) BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(glew) BuildRequires: pkgconfig(glfw3) +BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(libdrm) +BuildRequires: pkgconfig(libglvnd) BuildRequires: pkgconfig(nlohmann_json) BuildRequires: pkgconfig(spdlog) BuildRequires: pkgconfig(vulkan) @@ -55,18 +63,31 @@ %description A Vulkan and OpenGL overlay for monitoring FPS, temperatures, CPU/GPU load and more. +%package -n mangoapp +Summary: A transparent background application with a built-in MangoHud for gamescope +License: MIT +Group: Games +Requires: %{name} + +%description -n mangoapp +A transparent background OpenGL application with a built-in MangoHud designed to be run inside a gamescope instance. + %prep %autosetup -n MangoHud-%{version} -p1 -%autosetup -n MangoHud-%{version} -DTa1 -%autosetup -n MangoHud-%{version} -DTa2 -%autosetup -n MangoHud-%{version} -DTa3 -%autosetup -n MangoHud-%{version} -DTa4 +%setup -n MangoHud-%{version} -DTa1 +%setup -n MangoHud-%{version} -DTa2 +%setup -n MangoHud-%{version} -DTa3 +%setup -n MangoHud-%{version} -DTa4 sed -i -e '1d;2i#!%{_bindir}/bash' bin/mangohud.in sed -i 's,^@ld_libdir_mangohud@ ,%{_prefix}/\$LIB/mangohud/,' bin/mangohud.in mv imgui-%{imgui_ver} subprojects/ mv Vulkan-Headers-%{vulkan_ver} subprojects/ sed -i 's/0.60.0/0.59/g' meson.build +# Force system cmocka instead of bundled cmocka +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 + # Fix building with GCC 13 -- Workaround until the next release where the fix will be included sed -i -e '1i#include <cstdint>' src/control.cpp sed -i -e '1i#include <cstdint>' src/font.cpp @@ -74,10 +95,17 @@ sed -i -e '1i#include <cstdint>' src/overlay_params.cpp %build +%if 0%{?suse_version} < 1550 && 0%{?sle_version} >= 150500 +export CC=gcc-12 +export CXX=g++-12 +%endif %meson \ -Dwith_wayland=enabled \ -Dwith_xnvctrl=disabled \ - -Duse_system_spdlog=enabled + -Duse_system_spdlog=enabled \ + -Dmangoapp=true \ + -Dmangohudctl=true \ + -Dmangoapp_layer=true %meson_build @@ -88,6 +116,7 @@ %license LICENSE %doc README.md %{_bindir}/%{name} +%{_bindir}/%{name}ctl %{_libdir}/%{name}/ %{_datadir}/doc/%{name}/ %{_datadir}/vulkan/implicit_layer.d/ @@ -98,4 +127,8 @@ %{_datadir}/icons/*/*/*/*.svg %{_datadir}/metainfo/*.metainfo.xml +%files -n mangoapp +%{_bindir}/mangoapp +%{_mandir}/man1/mangoapp.1%{?ext_man} + %changelog ++++++ 0001-fix-gcc13-build.patch ++++++ From: Simon Vogl <simon.v...@gmx.net> Date: Fri, 14 Apr 2023 17:53:12 +0200 Subject: [PATCH] build: Fix building with GCC 13 --- tests/test_amdgpu.cpp | 1 + 1 file changed, 1 insertion(+) --- a/tests/test_amdgpu.cpp +++ b/tests/test_amdgpu.cpp @@ -1,3 +1,4 @@ +#include <cstdint> #include <stdarg.h> #include <stddef.h> #include <setjmp.h> ++++++ mangohud-0.6.8.tar.gz -> mangohud-0.6.9.tar.gz ++++++ /work/SRC/openSUSE:Factory/mangohud/mangohud-0.6.8.tar.gz /work/SRC/openSUSE:Factory/.mangohud.new.19717/mangohud-0.6.9.tar.gz differ: char 13, line 1
