From 0e2a74d9ac28353e3ad76b427c15fb1fd7c70b92 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 27 Sep 2023 23:27:16 +0200 Subject: [PATCH] MangoHud: update to 0.7.0. --- srcpkgs/MangoHud/files/musl.patch | 22 ---------------------- srcpkgs/MangoHud/patches/git.patch | 11 +++++++++++ srcpkgs/MangoHud/template | 16 +++++----------- 3 files changed, 16 insertions(+), 33 deletions(-) delete mode 100644 srcpkgs/MangoHud/files/musl.patch create mode 100644 srcpkgs/MangoHud/patches/git.patch diff --git a/srcpkgs/MangoHud/files/musl.patch b/srcpkgs/MangoHud/files/musl.patch deleted file mode 100644 index c11ac1b414c2d..0000000000000 --- a/srcpkgs/MangoHud/files/musl.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- src/meson.build 2021-06-11 22:12:53.000000000 +0200 -+++ - 2021-06-14 23:32:49.677413454 +0200 -@@ -3,16 +3,16 @@ - # Needs prefix for configure_file() - if get_option('append_libdir_mangohud') - libdir_mangohud = join_paths(get_option('libdir'), 'mangohud') -- ld_libdir_mangohud = get_option('prefix') + '/\$LIB/mangohud/' -+ ld_libdir_mangohud = join_paths(get_option('prefix') ,get_option('libdir'), 'mangohud') - else - libdir_mangohud = get_option('libdir') -- ld_libdir_mangohud = get_option('prefix') + '/\$LIB/' -+ ld_libdir_mangohud = join_paths(get_option('prefix') ,get_option('libdir')) - endif - - # For build.sh - if get_option('ld_libdir_prefix') - # FIXME derive from libdir -- ld_libdir_mangohud = get_option('prefix') + '/lib/mangohud/\$LIB/' -+ ld_libdir_mangohud = get_option('prefix') + '/lib/mangohud/lib' - endif - - conf_data = configuration_data() diff --git a/srcpkgs/MangoHud/patches/git.patch b/srcpkgs/MangoHud/patches/git.patch new file mode 100644 index 0000000000000..b33b35e6274fa --- /dev/null +++ b/srcpkgs/MangoHud/patches/git.patch @@ -0,0 +1,11 @@ +--- a/src/meson.build 2023-09-26 08:29:47.000000000 +0200 ++++ - 2023-09-27 23:33:42.659590482 +0200 +@@ -14,7 +14,7 @@ + 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()) +-conf_data.set('version', run_command(['git', 'describe', '--tags', '--dirty=+']).stdout().strip()) ++conf_data.set('version', meson.project_version()) + + overlay_shaders = [ + 'overlay.frag', diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template index 4e2a01ca1ce90..91f91475a98a6 100644 --- a/srcpkgs/MangoHud/template +++ b/srcpkgs/MangoHud/template @@ -1,25 +1,19 @@ # Template file for 'MangoHud' pkgname=MangoHud -version=0.6.8 +version=0.7.0 revision=1 build_style=meson -configure_args="-Duse_system_vulkan=enabled -Dwith_xnvctrl=disabled +configure_args="-Dwith_xnvctrl=disabled -Dwith_nvml=disabled -Duse_system_spdlog=enabled" hostmakedepends="Vulkan-Headers python3-Mako glslang pkg-config" -makedepends="libglvnd-devel dbus-devel vulkan-loader Vulkan-Headers - spdlog" +makedepends="libglvnd-devel dbus-devel vulkan-loader spdlog json-c++" short_desc="Vulkan and OpenGL overlay for monitoring FPS, temperatures and more" maintainer="John " license="MIT" homepage="https://github.com/flightlessmango/MangoHud" distfiles="https://github.com/flightlessmango/MangoHud/releases/download/v${version}/MangoHud-v${version}-Source-DFSG.tar.xz" -checksum=0c4358428e6ae48d13282dec4bf4e78015b4f5e46d080a7e7588786cef63c09f - -post_patch() { - if [ "$XBPS_TARGET_LIBC" = "musl" ]; then - patch -Np0 -i ${FILESDIR}/musl.patch - fi -} +checksum=222e15d4f3e679937f7594e2e5615aaae41b97d487eb7938b96b26eeb1fbcf35 +python_version=3 post_install() { vlicense LICENSE