Merge pull request #23 from rankynbass/wine-9.13-update

Wine 9.13 update

.dir-locals.el

@@ -0,0 +1,8 @@
+;;; Directory Local Variables            -*- no-byte-compile: t -*-
+;;; For more information see (info "(emacs) Directory Variables")
+
+
+(
+ ;; Open mypatch files in diff-mode
+ (auto-mode-alist . (("\\.mypatch\\'" . diff-mode)))
+ (shell-script-mode . ((sh-indentation . 2))))

.github/workflows/proton-arch-nopackage.yml

@@ -9,7 +9,7 @@ jobs:
     container: archlinux:latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Compile
         run: |
           echo -e "[multilib]\nInclude = /etc/pacman.d/mirrorlist" >> /etc/pacman.conf
@@ -25,10 +25,11 @@ jobs:
           sed -i 's/LOCAL_PRESET=""/LOCAL_PRESET="none"/' proton-tkg.cfg
           sed -i 's/build_gstreamer="false"/build_gstreamer="true"/' proton-tkg.cfg
           sed -i 's/lib32_gstreamer="false"/lib32_gstreamer="true"/' proton-tkg.cfg
+          sed -i 's/wayland_driver="false"/wayland_driver="true"/' proton-tkg.cfg
           touch tarplz
           yes|./proton-tkg.sh
       - name: Archive the artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: proton-tkg-build
           path: proton-tkg/built/*.tar

.github/workflows/proton-ubuntu-nopackage.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Compile
         run: |
           sudo dpkg --add-architecture i386
@@ -24,7 +24,7 @@ jobs:
           touch tarplz
           yes|./proton-tkg.sh
       - name: Archive the artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: proton-tkg-build
           path: proton-tkg/built/*.tar

.github/workflows/proton-valvexbe-arch-nopackage.yml

@@ -9,7 +9,7 @@ jobs:
     container: archlinux:latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Compile
         run: |
           echo -e "[multilib]\nInclude = /etc/pacman.d/mirrorlist" >> /etc/pacman.conf
@@ -24,10 +24,11 @@ jobs:
           sed -i 's/autoinstall="false"/autoinstall="true"/' proton-tkg.cfg
           sed -i 's/build_gstreamer="false"/build_gstreamer="true"/' proton-tkg.cfg
           sed -i 's/lib32_gstreamer="false"/lib32_gstreamer="true"/' proton-tkg.cfg
+          sed -i 's/wayland_driver="false"/wayland_driver="true"/' proton-tkg.cfg
           touch tarplz
           yes|./proton-tkg.sh
       - name: Archive the artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: proton-tkg-build
           path: proton-tkg/built/*.tar

.github/workflows/wine-arch-ow2test.yml

@@ -9,7 +9,7 @@ jobs:
     container: archlinux:latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Compile
         run: |
           echo -e "[multilib]\nInclude = /etc/pacman.d/mirrorlist" >> /etc/pacman.conf
@@ -23,7 +23,7 @@ jobs:
           su user -c "yes|PKGDEST=/tmp/wine-tkg makepkg --noconfirm -s"
 
       - name: Archive the artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: wine-tkg-build
           path: /tmp/wine-tkg

.github/workflows/wine-arch.yml

@@ -10,7 +10,7 @@ jobs:
     container: archlinux:latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Compile
         run: |
           echo -e "[multilib]\nInclude = /etc/pacman.d/mirrorlist" >> /etc/pacman.conf
@@ -20,10 +20,11 @@ jobs:
           # Workaround for jack&jack2 conflict https://github.com/Frogging-Family/wine-tkg-git/issues/237
           sed -i "/'jack2'                 'lib32-jack2'/d" PKGBUILD
           sed -i "/'gst-plugins-good'      'lib32-gst-plugins-good'/d" PKGBUILD 
+          sed -i 's/wayland_driver="false"/wayland_driver="true"/' customization.cfg
           su user -c "yes|PKGDEST=/tmp/wine-tkg makepkg --noconfirm -s"
 
       - name: Archive the artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: wine-tkg-build
           path: /tmp/wine-tkg

.github/workflows/wine-fedora.yml

@@ -10,16 +10,18 @@ jobs:
     container: fedora:latest
     steps:
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Compilation
         run: |
           sudo dnf -y -q upgrade --refresh
           cd wine-tkg-git 
           sed -i 's/distro=""/distro="fedora"/' customization.cfg
+          sed -i 's/_NOLIB32="false"/_NOLIB32="wow64"/' wine-tkg-profiles/advanced-customization.cfg
+          echo '_ci_build="true"' >> customization.cfg
           touch tarplz
           yes|./non-makepkg-build.sh
       - name: Archive the artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: wine-tkg-build
           path: wine-tkg-git/non-makepkg-builds

.github/workflows/wine-ubuntu.yml

@@ -10,7 +10,7 @@ jobs:
 
     steps:
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Compilation
         run: |
           sudo dpkg --add-architecture i386 && sudo apt update
@@ -23,7 +23,7 @@ jobs:
           touch tarplz
           yes|./non-makepkg-build.sh
       - name: Archive the artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: wine-tkg-build
           path: wine-tkg-git/non-makepkg-builds

.github/workflows/wine-valvexbe-pacman.yml

@@ -9,7 +9,7 @@ jobs:
     container: archlinux:latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Compile
         run: |
           echo -e "[multilib]\nInclude = /etc/pacman.d/mirrorlist" >> /etc/pacman.conf
@@ -20,10 +20,11 @@ jobs:
           sed -i "/'jack2'                 'lib32-jack2'/d" PKGBUILD
           sed -i "/'gst-plugins-good'      'lib32-gst-plugins-good'/d" PKGBUILD
           sed -i 's/LOCAL_PRESET=""/LOCAL_PRESET="valve-exp-bleeding"/' customization.cfg
+          sed -i 's/wayland_driver="false"/wayland_driver="true"/' customization.cfg
           su user -c "yes|PKGDEST=/tmp/wine-tkg makepkg --noconfirm -s"
 
       - name: Archive the artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: wine-tkg-build
           path: /tmp/wine-tkg

.github/workflows/wine-valvexbe.yml

@@ -5,11 +5,11 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     steps:
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Compilation
         run: |
           sudo dpkg --add-architecture i386 && sudo apt update
@@ -23,7 +23,7 @@ jobs:
           touch tarplz
           yes|./non-makepkg-build.sh
       - name: Archive the artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: wine-tkg-build
           path: wine-tkg-git/non-makepkg-builds

proton-tkg/proton-tkg-profiles/advanced-customization.cfg

@@ -62,9 +62,9 @@ CUSTOM_MINGW_PATH=""
 CUSTOM_GCC_PATH=""
 
 _LOCAL_OPTIMIZED="true"
-_GCC_FLAGS="-O2 -ftree-vectorize"
+_GCC_FLAGS="-O2 -ftree-vectorize -Wno-error=implicit-function-declaration -Wno-error=incompatible-pointer-types"
 _LD_FLAGS="-Wl,-O1,--sort-common,--as-needed"
-_CROSS_FLAGS="-O2 -ftree-vectorize"
+_CROSS_FLAGS="-O2 -ftree-vectorize -Wno-error=implicit-function-declaration -Wno-error=incompatible-pointer-types"
 _CROSS_LD_FLAGS="-Wl,-O1,--sort-common,--as-needed"
 _NUKR="true"
 _NOCOMPILE="false"

proton-tkg/proton-tkg-profiles/sample-external-config.cfg

@@ -97,9 +97,9 @@ CUSTOM_MINGW_PATH=""
 CUSTOM_GCC_PATH=""
 
 _LOCAL_OPTIMIZED="true"
-_GCC_FLAGS="-O2 -ftree-vectorize"
+_GCC_FLAGS="-O2 -ftree-vectorize -Wno-error=implicit-function-declaration -Wno-error=incompatible-pointer-types"
 _LD_FLAGS="-Wl,-O1,--sort-common,--as-needed"
-_CROSS_FLAGS="-O2 -ftree-vectorize"
+_CROSS_FLAGS="-O2 -ftree-vectorize -Wno-error=implicit-function-declaration -Wno-error=incompatible-pointer-types"
 _CROSS_LD_FLAGS="-Wl,-O1,--sort-common,--as-needed"
 _NUKR="true"
 _NOCOMPILE="false"

proton-tkg/proton-tkg.cfg

@@ -14,8 +14,10 @@
 # This is a workaround for distros shipping broken devel packages that can't coexist as multilib
 _nomakepkg_midbuild_prompt="false"
 
-# Set to the distro of your choice to attempt dependency resolution. Valid options are "debuntu" (for debian, ubuntu and similar), "fedora" or "archlinux".
-_nomakepkg_dep_resolution_distro=""
+# Enable dependency autoresolver for non-makepkg builds - Set to true to automatically install missing dependencies for your distro.
+# This will autodetect your OS and install the required dependencies for building wine-tkg using the appropriate package manager.
+# The autoresolver will also attempt to use the best available privileged escalation method for your system (sudo, doas, etc.)
+_nomakepkg_dependency_autoresolver="true"
 
 # Set to true if you want to skip the uninstaller at the end of proton-tkg building
 _skip_uninstaller="false"
@@ -76,9 +78,19 @@ _use_GE_patches="true"
 # !! For plain Wine required disabling esync and fsync patches applying !!
 _use_fastsync="false"
 
+# NTsync5 - https://repo.or.cz/wine/zf.git/shortlog/refs/heads/ntsync5
+# !! For building and using requires ntsync module and headers (see the three packages https://aur.archlinux.org/pkgbase/ntsync) !!
+# !! Not compatible with _use_esync, _use_fsync or _use_fastsync options !!
+# !! Not compatible with Valve trees !!
+_use_ntsync="false"
+
 _use_esync="true"
 _use_fsync="true"
 
+# Set to true to pass --with-wayland --with-vulkan configure arguments
+# !! Requires a compatible wine tree (9.0+ recommended) !!
+_wayland_driver="false"
+
 _plain_version=""
 _use_staging="true"
 _staging_version=""