Merge branch 'master' into develop

4 years ago · 9d1b548f69
parent 3f4949f593 7601adc2e0
commit 9d1b548f69
7 changed files with 41 additions and 24 deletions
--- a/.gitignore
+++ b/.gitignore
@ -6,7 +6,6 @@ MangoHud*.tar.gz
 pkg
 mangohud*.tar.*
 lib32-mangohud*.tar.*
-v*.tar.gz

 # Prerequisites
 *.d
--- a/README.md
+++ b/README.md
@ -94,6 +94,8 @@ MangoHud comes with a config file which can be used to set configuration options

 You can find an example config in /usr/share/doc/mangohud

+[GOverlay](https://github.com/benjamimgois/goverlay) is a GUI application that can be used to manage the config
+
 ---

 ### `MANGOHUD_CONFIG` and `MANGOHUD_CONFIGFILE` environment variables
@ -108,6 +110,7 @@ A partial list of parameters are below. See the config file for a complete list.
 |------------------------------------|---------------------------------------------------------------------------------------|
 | `cpu_temp`<br>`gpu_temp`           | Displays current CPU/GPU temperature                                                  |
 | `core_load`                        | Displays load & frequency per core                                                    |
+| `gpu_core_clock`<br>`gpu_mem_clock`| Displays GPU core/memory frequency                                                    |
 | `ram`<br>`vram`                    | Displays system RAM/VRAM usage                                                        |
 | `full`                             | Enables all of the above config options                                               |
 | `crosshair`                        | Adds a crosshair overlay at the centre of the screen                                  |
@ -131,6 +134,8 @@ A partial list of parameters are below. See the config file for a complete list.
 | `io_read`<br> `io_write`           | Show non-cached IO read/write, in MiB/s                                               |
 | `pci_dev`                          | Select GPU device in multi-gpu setups                                                 |
 | `version`                          | Shows current mangohud version                                                        |
+| `fps_limit=`                       | Limit the application's FPS                                                           |
+| `arch`                             | Show if the application is 32 or 64 bit                                               |

 Example: `MANGOHUD_CONFIG=cpu_temp,gpu_temp,position=top-right,height=500,font_size=32`

--- a/bin/mangohud-setup.sh
+++ b/bin/mangohud-setup.sh
@ -1,5 +1,11 @@
 XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
 MANGOHUD_CONFIG_DIR="$XDG_CONFIG_HOME/MangoHud"
+SU_CMD=$(command -v sudo || command -v doas)
+
+# doas requires a double dash if the command it runs will include any dashes,
+# so append a double dash to the command
+[[ $SU_CMD == *doas ]] && SU_CMD="$SU_CMD -- "
+

 mangohud_usage() {
    echo 'Accepted arguments: "install", "uninstall".'
@ -20,7 +26,7 @@ mangohud_install() {

    [ "$UID" -eq 0 ] || mangohud_config
    [ "$UID" -eq 0 ] || tar xf MangoHud-package.tar
-    [ "$UID" -eq 0 ] || exec sudo bash "$0" install
+    [ "$UID" -eq 0 ] || exec $SU_CMD bash "$0" install

    install -vm644 -D ./usr/lib/mangohud/lib32/libMangoHud.so /usr/lib/mangohud/lib32/libMangoHud.so
    install -vm644 -D ./usr/lib/mangohud/lib64/libMangoHud.so /usr/lib/mangohud/lib64/libMangoHud.so
@ -35,7 +41,7 @@ mangohud_install() {
 }

 mangohud_uninstall() {
-    [ "$UID" -eq 0 ] || exec sudo bash "$0" uninstall
+    [ "$UID" -eq 0 ] || exec $SU_CMD bash "$0" uninstall
    rm -rfv "/usr/lib/mangohud"
    rm -fv "/usr/share/vulkan/implicit_layer.d/MangoHud.x86.json"
    rm -fv "/usr/share/vulkan/implicit_layer.d/MangoHud.x86_64.json"
@ -56,4 +62,4 @@ done

 if [ -z $@ ]; then
    mangohud_usage
-fi
+fi
--- a/build-source.sh
+++ b/build-source.sh
@ -1,8 +1,10 @@
 #!/bin/sh

-VERSION=$(git describe --long --tags --always | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//')
+VERSION=$(git describe --tags)

-EXCLUDE_PATTERN="--exclude-vcs --exclude-vcs-ignores"
+FILE_PATTERN="--exclude-vcs --exclude-vcs-ignores ."

-tar -cf v$VERSION.tar.gz $EXCLUDE_PATTERN .
-tar -cf v$VERSION-DFSG.tar.gz $EXCLUDE_PATTERN --exclude=include/nvml.h .
+# default version
+tar -czf MangoHud-$VERSION-Source.tar.gz $FILE_PATTERN
+# DFSG compliant version, excludes NVML
+tar -czf MangoHud-$VERSION-Source-DFSG.tar.gz --exclude=include/nvml.h $FILE_PATTERN
--- a/build.sh
+++ b/build.sh
@ -10,13 +10,18 @@ LAYER="build/release/usr/share/vulkan/implicit_layer.d/mangohud.json"
 INSTALL_DIR="build/package/"
 IMPLICIT_LAYER_DIR="$XDG_DATA_HOME/vulkan/implicit_layer.d"
 VERSION=$(git describe --long --tags --always | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//')
+SU_CMD=$(command -v sudo || command -v doas)
+
+# doas requires a double dash if the command it runs will include any dashes,
+# so append a double dash to the command
+[[ $SU_CMD == *doas ]] && SU_CMD="$SU_CMD -- "

 # Correctly identify the os-release file.
 for os_release in ${OS_RELEASE_FILES[@]} ; do
    if [[ ! -e "${os_release}" ]]; then
        continue
    fi
-    DISTRO=$(sed 1q ${os_release} | sed 's/NAME=//g' | sed 's/"//g')
+    DISTRO=$(sed -rn 's/^NAME="(.+)"/\1/p' ${os_release})
 done

 dependencies() {
@ -40,7 +45,7 @@ dependencies() {
            if [[ ! -z "$INSTALL" ]]; then
                missing_deps
                if [[ "$PERMISSION" == "Y" || "$PERMISSION" == "y" ]]; then
-                    sudo $MANAGER_INSTALL $INSTALL
+                    $SU_CMD $MANAGER_INSTALL $INSTALL
                fi
            fi
            set -e
@ -64,19 +69,19 @@ dependencies() {
                DEPS="{glibc-devel.i686,libstdc++-devel.i686,libX11-devel.i686}"
                install
            ;;
-            *"buntu"|"Linux Mint"|"Debian"|"Zorin OS"|"Pop!_OS"|"elementary OS")
+            *"buntu"|"Linux Mint"|"Debian GNU/Linux"|"Zorin OS"|"Pop!_OS"|"elementary OS")
                MANAGER_QUERY="dpkg-query -s"
                MANAGER_INSTALL="apt install"
                DEPS="{gcc,g++,gcc-multilib,g++-multilib,ninja-build,python3-pip,python3-setuptools,python3-wheel,pkg-config,mesa-common-dev,libx11-dev,libxnvctrl-dev,libdbus-1-dev}"
                install
                
-                if [[ $(sudo pip3 show meson; echo $?) == 1 || $(sudo pip3 show mako; echo $?) == 1 ]]; then
-                    sudo pip3 install 'meson>=0.54' mako
+                if [[ $($SU_CMD pip3 show meson; echo $?) == 1 || $($SU_CMD pip3 show mako; echo $?) == 1 ]]; then
+                    $SU_CMD pip3 install 'meson>=0.54' mako
                fi
                if [[ ! -f /usr/local/bin/glslangValidator ]]; then
                    wget https://github.com/KhronosGroup/glslang/releases/download/master-tot/glslang-master-linux-Release.zip
                    unzip glslang-master-linux-Release.zip bin/glslangValidator
-                    sudo install -m755 bin/glslangValidator /usr/local/bin/
+                    $SU_CMD install -m755 bin/glslangValidator /usr/local/bin/
                    rm bin/glslangValidator glslang-master-linux-Release.zip
                fi
            ;;
@ -181,7 +186,7 @@ install() {
    rm -f "$HOME/.local/share/vulkan/implicit_layer.d/"{mangohud32.json,mangohud64.json}

    [ "$UID" -eq 0 ] || mkdir -pv "${CONFIG_DIR}"
-    [ "$UID" -eq 0 ] || exec sudo bash "$0" install
+    [ "$UID" -eq 0 ] || exec $SU_CMD bash "$0" install

    /usr/bin/install -vm644 -D ./build/release/usr/lib/mangohud/lib32/libMangoHud.so /usr/lib/mangohud/lib32/libMangoHud.so
    /usr/bin/install -vm644 -D ./build/release/usr/lib/mangohud/lib64/libMangoHud.so /usr/lib/mangohud/lib64/libMangoHud.so
@ -202,7 +207,7 @@ clean() {
 }

 uninstall() {
-    [ "$UID" -eq 0 ] || exec sudo bash "$0" uninstall
+    [ "$UID" -eq 0 ] || exec $SU_CMD bash "$0" uninstall
    rm -rfv "/usr/lib/mangohud"
    rm -rfv "/usr/share/doc/mangohud"
    rm -fv "/usr/share/vulkan/implicit_layer.d/mangohud.json"
--- a/src/meson.build
+++ b/src/meson.build
@ -89,12 +89,12 @@ endif

 vklayer_mesa_overlay = shared_library(
  'MangoHud',
+  mangohud_version,
  util_files,
  vk_enum_to_str,
  vklayer_files,
  opengl_files,
  overlay_spv,
-  vk_enum_to_str,
  c_args : [
    pre_args,
    c_vis_args, 
--- a/subprojects/vulkanheaders.wrap
+++ b/subprojects/vulkanheaders.wrap
@ -1,10 +1,10 @@
 [wrap-file]
-directory = Vulkan-Headers-1.2.136
+directory = Vulkan-Headers-1.2.139

-source_url = https://github.com/KhronosGroup/Vulkan-Headers/archive/v1.2.136.tar.gz
-source_filename = vulkanheaders-1.2.136.tar.gz
-source_hash = d67e61ade037906d76ae4f1a6d5adf38008b30783774a5957a84527f3a5ebdb4
+source_url = https://github.com/KhronosGroup/Vulkan-Headers/archive/v1.2.139.tar.gz
+source_filename = vulkanheaders-1.2.139.tar.gz
+source_hash = 1d12b73e6459b8c26a21a084a8a65b2edcdb79e6d892da96735d932424403456

-patch_url = https://github.com/stephanlachnit/vulkanheaders-wrap/releases/download/v1.2.136/v1.2.136.zip
-patch_filename = vulkanheaders-1.2.136-wrap.zip
-patch_hash = 4b0e8ba1f37458b660f4d3ed3f5259ca5b0bd46ef309cc3ccaf22a2a203bda49
+patch_url = https://github.com/stephanlachnit/vulkanheaders-wrap/releases/download/v1.2.139/v1.2.139.zip
+patch_filename = vulkanheaders-1.2.139-wrap.zip
+patch_hash = 4fcdc3971d952515f21e59e185e35525b4db656de75f9fc61f6699056185808c