From adf88e40558aa9bc46c3f69cf7c97c809ab2e4ae Mon Sep 17 00:00:00 2001 From: VHSgunzo Date: Tue, 11 Apr 2023 22:55:56 +0300 Subject: [PATCH] Change mangohud mode Update lwrap CI Remove DB Blade Assault Create GE-Proton repo Create mangohud repo --- ...notify-parent-submodules.yml => lwrap.yml} | 4 +-- PKGBUILD | 4 +-- db/BladeAssault.lwdb | 3 -- ge-proton/PKGBUILD | 20 ------------- lutris-wine | 11 +++---- lwrap/PKGBUILD | 2 +- lwrap/PKGBUILD_git | 30 ------------------- 7 files changed, 11 insertions(+), 63 deletions(-) rename .github/workflows/{notify-parent-submodules.yml => lwrap.yml} (89%) delete mode 100644 db/BladeAssault.lwdb delete mode 100644 ge-proton/PKGBUILD delete mode 100644 lwrap/PKGBUILD_git diff --git a/.github/workflows/notify-parent-submodules.yml b/.github/workflows/lwrap.yml similarity index 89% rename from .github/workflows/notify-parent-submodules.yml rename to .github/workflows/lwrap.yml index f1a5d11..1205ed4 100644 --- a/.github/workflows/notify-parent-submodules.yml +++ b/.github/workflows/lwrap.yml @@ -1,4 +1,4 @@ -name: 'Submodule Notify Parent' +name: 'Update lwrap' on: push: @@ -9,7 +9,7 @@ on: jobs: notify: - name: 'Submodule Notify Parent' + name: 'Update lwrap' runs-on: ubuntu-latest defaults: diff --git a/PKGBUILD b/PKGBUILD index e8aec76..2930785 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: VHSgunzo pkgname='lutris-wine-git' -pkgver='0.76.9' +pkgver='0.77.1' pkgrel='1' pkgdesc='Easy launch of your Windows applications and games with Wine/Proton' arch=('x86_64') @@ -9,7 +9,7 @@ license=('MIT') depends=('aria2' 'qt5-tools' 'xterm' 'xorg-fonts-100dpi' 'xorg-fonts-75dpi' 'xorg-fonts-cyrillic' 'xorg-fonts-type1' 'xorg-fonts-misc' 'cabextract' 'perl' 'unzip' 'xorg-xmessage' 'zenity' 'yad' 'xkb-switch' 'imagemagick' - 'icoutils' 'lib32-mangohud' 'lib32-vkbasalt' 'mangohud' 'mangohud-common' + 'icoutils' 'lib32-vkbasalt' 'mangohud-lw-git' 'vkbasalt' 'gamemode' 'lib32-gamemode' 'giflib' 'lib32-giflib' 'libpng' 'lib32-libpng' 'libldap' 'lib32-libldap' 'gnutls' 'lib32-gnutls' 'mpg123' 'lib32-mpg123' 'openal' 'lib32-openal' 'v4l-utils' 'lib32-v4l-utils' diff --git a/db/BladeAssault.lwdb b/db/BladeAssault.lwdb deleted file mode 100644 index cdf81bb..0000000 --- a/db/BladeAssault.lwdb +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash -check_win_version 10 -check_mangohud 0 diff --git a/ge-proton/PKGBUILD b/ge-proton/PKGBUILD deleted file mode 100644 index fad6b70..0000000 --- a/ge-proton/PKGBUILD +++ /dev/null @@ -1,20 +0,0 @@ -# Maintainer: VHSgunzo -pkgname='GE-Proton' -pkgver='7.53' -pkgrel='1' -pkgsrcname="${pkgname}${pkgver/./-}" -pkgdesc='Lutris Wine GE-Proton for Runimage container' -arch=('x86_64') -url='https://github.com/GloriousEggroll/proton-ge-custom' -license=('MIT') -provides=("$pkgname") -conflicts=("$pkgname") -source=("$pkgsrcname.tar.gz::https://github.com/GloriousEggroll/proton-ge-custom/releases/download/$pkgsrcname/$pkgsrcname.tar.gz") -sha256sums=('SKIP') - -package() { - install_dir="$pkgdir/usr/share/steam/compatibilitytools.d/$pkgsrcname" - install -dm755 "$install_dir" - cp -ar --no-preserve=ownership "$srcdir/$pkgsrcname"/* "$install_dir/" - ln -sf "$pkgdir/usr/bin/cabextract" "$install_dir/files/bin/cabextract" -} diff --git a/lutris-wine b/lutris-wine index a7875a0..5140190 100755 --- a/lutris-wine +++ b/lutris-wine @@ -1,6 +1,6 @@ #!/usr/bin/env bash -export LW_VERSION="0.76.9" +export LW_VERSION="0.77.1" export LW_DEVELOPERS="VHSgunzo" export RED='\033[1;91m' @@ -3952,12 +3952,13 @@ check_mangohud() { then if is_exe_exist mangohud then - if [ "$WINED3D" != 1 ] + if [ "$WINED3D" == 1 ] then - export RUN_MANGOHUD="mangohud" - else print_info "MANGOHUD in OpenGL mode!" export RUN_MANGOHUD="mangohud --dlsym" + else + export MANGOHUD=1 + unset RUN_MANGOHUD fi if [[ ! -n "$MANGOHUDCFG" && "$MANGOHUD_USER_CONF" != 1 ]] then @@ -3982,7 +3983,7 @@ check_fps_limit() { [ -n "$1" ] && export FPS_LIMIT="$1" if [[ -n "$FPS_LIMIT" && "$FPS_LIMIT" != 0 ]] then - if [[ "$MANGOHUD_USER_CONF" != 1 && "$DISABLE_MANGOHUD" != 1 && -n "$RUN_MANGOHUD" ]] + if [[ "$MANGOHUD_USER_CONF" != 1 && "$DISABLE_MANGOHUD" != 1 ]] && [[ -n "$RUN_MANGOHUD" || "$MANGOHUD" == 1 ]] then add_fps_limit="toggle_fps_limit=Shift_L+F1,fps_limit=$FPS_LIMIT+0" if [ -n "$MANGOHUDCFG" ] diff --git a/lwrap/PKGBUILD b/lwrap/PKGBUILD index 6d8b8ba..16c50df 100644 --- a/lwrap/PKGBUILD +++ b/lwrap/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: VHSgunzo pkgname='lwrap' gitrepo='lutris-wine' -pkgver='0.76.9' +pkgver='0.77.1' pkgrel='1' pkgdesc='Lutris Wine wrapper for Runimage container' arch=('x86_64') diff --git a/lwrap/PKGBUILD_git b/lwrap/PKGBUILD_git deleted file mode 100644 index 564abd4..0000000 --- a/lwrap/PKGBUILD_git +++ /dev/null @@ -1,30 +0,0 @@ -# Maintainer: VHSgunzo -pkgname='lwrap-git' -gitrepo='lutris-wine' -pkgver='0.76.9' -pkgrel='1' -pkgdesc='Lutris Wine wrapper for Runimage container' -arch=('x86_64') -url='https://github.com/VHSgunzo/lutris-wine' -license=('MIT') -depends=('curl' 'libnotify' 'bash' 'unzip' 'coreutils' - 'fuse' 'gawk' 'grep' 'sed' 'desktop-file-utils') -optdepends=('aria2' 'wget' 'gnu-netcat' 'iputils') -makedepends=('git') -provides=("${pkgname%-git}") -conflicts=("${pkgname%-git}" "$pkgname") -source=("${gitrepo}::git+https://github.com/VHSgunzo/${gitrepo}.git") -sha256sums=('SKIP') - -pkgver() { - cd "$srcdir/$gitrepo" - git describe --long --tags|sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' -} - -package() { - install -dm755 "$pkgdir/opt" - install -dm755 "$pkgdir/usr/bin" - (cd "$srcdir/$gitrepo" && rm -rf screenshots .git*) - cp -ar --no-preserve=ownership "$srcdir/$gitrepo" "$pkgdir/opt/${pkgname%-git}" - ln -sfr "$pkgdir/opt/${pkgname%-git}/${pkgname%-git}/${pkgname%-git}" "$pkgdir/usr/bin/${pkgname%-git}" -}