modrinth-enhanced, modrinth-enhanced-bin: preload vblank shim for the full refresh rate on nvidia

modrinth-enhanced/.SRCINFO

@@ -1,7 +1,7 @@
 pkgbase = modrinth-enhanced
 	pkgdesc = Modrinth App without ads or telemetry, with offline and Ely.by accounts and Linux fixes
 	pkgver = 0.21.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/Felitendo/Modrinth-Enhanced
 	arch = x86_64
 	license = GPL-3.0-only
@@ -19,6 +19,7 @@ pkgbase = modrinth-enhanced
 	depends = glibc
 	depends = gtk3
 	depends = hicolor-icon-theme
+	depends = libdrm
 	depends = libgcc
 	depends = libsoup3
 	depends = webkit2gtk-4.1
@@ -34,7 +35,11 @@ pkgbase = modrinth-enhanced
 	options = !debug
 	source = modrinth-enhanced-v0.21.2.tar.gz::https://github.com/Felitendo/Modrinth-Enhanced/archive/refs/tags/v0.21.2.tar.gz
 	source = modrinth-code-v0.21.2.tar.gz::https://github.com/modrinth/code/archive/refs/tags/v0.21.2.tar.gz
+	source = vblank-shim.c
+	source = modrinth-enhanced.sh
 	sha256sums = a87ddcef0a39ab4a2c56ece806e381c6b398c755da00a9734b0162abc377e5a6
 	sha256sums = 583e085cd7ae64a7020656af4ecc64ecfcc82fd97519f74cc3ab114d49574a5e
+	sha256sums = 0190921b8ff2fb1deec3209cba71c01541ca1f013e3ba41680f1636e185fd455
+	sha256sums = b24872f82645c52ee4804599cd678d138876fb193c754403fa9c5cf92bd745b9
 
 pkgname = modrinth-enhanced

modrinth-enhanced/PKGBUILD

@@ -4,13 +4,13 @@
 
 pkgname=modrinth-enhanced
 pkgver=0.21.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Modrinth App without ads or telemetry, with offline and Ely.by accounts and Linux fixes"
 arch=('x86_64')
 url="https://github.com/Felitendo/Modrinth-Enhanced"
 license=('GPL-3.0-only')
 depends=('cairo' 'dbus' 'gdk-pixbuf2' 'glib2' 'glibc' 'gtk3' 'hicolor-icon-theme'
-         'libgcc' 'libsoup3' 'webkit2gtk-4.1'
+         'libdrm' 'libgcc' 'libsoup3' 'webkit2gtk-4.1'
          # loaded by Minecraft, not by the launcher
          'libgl' 'libpulse' 'libx11' 'libxcursor' 'libxext' 'libxxf86vm')
 # git replays the patches the way upstream's scripts/prepare.sh does; the JDK
@@ -27,14 +27,20 @@ options=('!lto' '!debug')
 _tag="v0.21.2"
 _upstream="v0.21.2"
 _base="v0.21.2"
+# With the NVIDIA driver WebKitGTK paces the app with a 60 fps timer whatever
+# the monitor's refresh rate. vblank-shim.c, preloaded by modrinth-enhanced.sh,
+# paces it at the monitor's rate instead and keeps the app on X11, the only
+# place that works; it is not part of upstream's release.
 source=("${pkgname}-${_tag}.tar.gz::https://github.com/Felitendo/Modrinth-Enhanced/archive/refs/tags/${_tag}.tar.gz"
-        "modrinth-code-${_upstream}.tar.gz::https://github.com/modrinth/code/archive/refs/tags/${_upstream}.tar.gz")
+        "modrinth-code-${_upstream}.tar.gz::https://github.com/modrinth/code/archive/refs/tags/${_upstream}.tar.gz"
+        "vblank-shim.c"
+        "modrinth-enhanced.sh")
 noextract=("modrinth-code-${_upstream}.tar.gz")
 if [[ "$_base" != "$_upstream" ]]; then
   source+=("modrinth-code-${_base}.tar.gz::https://github.com/modrinth/code/archive/refs/tags/${_base}.tar.gz")
   noextract+=("modrinth-code-${_base}.tar.gz")
 fi
-sha256sums=('a87ddcef0a39ab4a2c56ece806e381c6b398c755da00a9734b0162abc377e5a6' '583e085cd7ae64a7020656af4ecc64ecfcc82fd97519f74cc3ab114d49574a5e')
+sha256sums=('a87ddcef0a39ab4a2c56ece806e381c6b398c755da00a9734b0162abc377e5a6' '583e085cd7ae64a7020656af4ecc64ecfcc82fd97519f74cc3ab114d49574a5e' '0190921b8ff2fb1deec3209cba71c01541ca1f013e3ba41680f1636e185fd455' 'b24872f82645c52ee4804599cd678d138876fb193c754403fa9c5cf92bd745b9')
 
 prepare() {
   # What upstream's scripts/prepare.sh does with two shallow tags: apply the
@@ -88,6 +94,10 @@ prepare() {
 }
 
 build() {
+  # GLib for its headers only: the shim looks GTK and GLib up at run time
+  gcc $CPPFLAGS $CFLAGS $LDFLAGS -shared -fPIC -o libwebkit-vblank-shim.so vblank-shim.c \
+    $(pkg-config --cflags glib-2.0) $(pkg-config --cflags --libs libdrm)
+
   cd app
 
   export RUSTUP_TOOLCHAIN=stable
@@ -106,8 +116,11 @@ build() {
 package() {
   cd app
 
-  # the same files, under the same names, as upstream's .deb
-  install -Dm755 target/release/ModrinthEnhanced -t "$pkgdir/usr/bin/"
+  # the same files, under the same names, as modrinth-enhanced-bin: the binary
+  # sits behind the script that preloads the shim
+  install -Dm755 target/release/ModrinthEnhanced -t "$pkgdir/usr/lib/modrinth-enhanced/"
+  install -Dm755 "$srcdir/libwebkit-vblank-shim.so" -t "$pkgdir/usr/lib/modrinth-enhanced/"
+  install -Dm755 "$srcdir/modrinth-enhanced.sh" "$pkgdir/usr/bin/ModrinthEnhanced"
   ln -s ModrinthEnhanced "$pkgdir/usr/bin/modrinth-enhanced"
 
   install -Dm644 apps/app/icons/128x128.png \

modrinth-enhanced/modrinth-enhanced.sh

@@ -0,0 +1 @@
+../modrinth-enhanced-bin/modrinth-enhanced.sh

modrinth-enhanced/pkg.sh

@@ -23,7 +23,7 @@ UPSTREAM_REPO="Felitendo/Modrinth-Enhanced"
 
 # Installed in CI (pacman) before the makepkg test build. makepkg runs with
 # -d there, so the libraries the binary links against are listed too.
-BUILD_DEPS=(rust git jdk17-openjdk node-gyp nodejs npm pnpm webkit2gtk-4.1 gtk3 libsoup3)
+BUILD_DEPS=(rust git jdk17-openjdk node-gyp nodejs npm pnpm webkit2gtk-4.1 gtk3 libsoup3 libdrm)
 
 latest_version() {
   gh api "repos/$UPSTREAM_REPO/releases/latest" --jq '.tag_name' | sed 's/^v//; s/-/.r/'
@@ -52,7 +52,11 @@ refresh_checksums() {
     | sha256sum | cut -d' ' -f1)"
   sha_upstream="$(curl -sfL "https://github.com/modrinth/code/archive/refs/tags/$upstream.tar.gz" \
     | sha256sum | cut -d' ' -f1)"
+  # vblank-shim.c and modrinth-enhanced.sh ship with the package, as symlinks
+  # to modrinth-enhanced-bin's copies; they come before the optional base tag
   sums="'$sha_patches' '$sha_upstream'"
+  sums+=" '$(sha256sum "$(dirname "$pkgbuild")/vblank-shim.c" | cut -d' ' -f1)'"
+  sums+=" '$(sha256sum "$(dirname "$pkgbuild")/modrinth-enhanced.sh" | cut -d' ' -f1)'"
   if [[ "$base" != "$upstream" ]]; then
     sums+=" '$(curl -sfL "https://github.com/modrinth/code/archive/refs/tags/$base.tar.gz" \
       | sha256sum | cut -d' ' -f1)'"

modrinth-enhanced/vblank-shim.c

@@ -0,0 +1 @@
+../modrinth-enhanced-bin/vblank-shim.c