Sync depends with wine-staging

2 files changed, 78 insertions, 64 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4880a7d3bce9..f3a9d08ccab9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = proton-native
 	pkgdesc = Compatibility tool for Steam Play based on Wine and additional components. Monolithic distribution
 	pkgver = 6.3.4
-	pkgrel = 1
+	pkgrel = 2
 	epoch = 1
 	url = https://github.com/ValveSoftware/Proton
 	arch = x86_64
@@ -13,11 +13,17 @@ pkgbase = proton-native
 	makedepends = fontforge
 	makedepends = flex
 	makedepends = mingw-w64-gcc
+	makedepends = git
+	makedepends = rsync
 	makedepends = mingw-w64-tools
+	makedepends = lld
+	makedepends = nasm
 	makedepends = meson
-	makedepends = cargo
-	makedepends = rust
-	makedepends = lib32-rust-libs
+	makedepends = cmake
+	makedepends = python-virtualenv
+	makedepends = python-pip
+	makedepends = glslang
+	makedepends = vulkan-headers
 	makedepends = giflib
 	makedepends = lib32-giflib
 	makedepends = libpng
@@ -40,8 +46,6 @@ pkgbase = proton-native
 	makedepends = lib32-openal
 	makedepends = v4l-utils
 	makedepends = lib32-v4l-utils
-	makedepends = libpulse
-	makedepends = lib32-libpulse
 	makedepends = alsa-lib
 	makedepends = lib32-alsa-lib
 	makedepends = libxcomposite
@@ -54,25 +58,30 @@ pkgbase = proton-native
 	makedepends = lib32-opencl-icd-loader
 	makedepends = libxslt
 	makedepends = lib32-libxslt
+	makedepends = libpulse
+	makedepends = lib32-libpulse
+	makedepends = libva
+	makedepends = lib32-libva
+	makedepends = gtk3
+	makedepends = lib32-gtk3
 	makedepends = gst-plugins-base-libs
 	makedepends = lib32-gst-plugins-base-libs
 	makedepends = vulkan-icd-loader
 	makedepends = lib32-vulkan-icd-loader
 	makedepends = sdl2
 	makedepends = lib32-sdl2
-	makedepends = libgphoto2
+	makedepends = libcups
+	makedepends = lib32-libcups
+	makedepends = rust
+	makedepends = lib32-rust-libs
 	makedepends = sane
+	makedepends = libgphoto2
 	makedepends = gsm
-	makedepends = vulkan-headers
+	makedepends = ffmpeg
 	makedepends = samba
 	makedepends = opencl-headers
-	makedepends = git
-	makedepends = rsync
-	makedepends = cmake
-	makedepends = python-virtualenv
-	makedepends = python-pip
-	makedepends = nasm
-	makedepends = glslang
+	makedepends = attr
+	makedepends = lib32-attr
 	makedepends = fontconfig
 	makedepends = lib32-fontconfig
 	makedepends = lcms2
@@ -85,10 +94,6 @@ pkgbase = proton-native
 	makedepends = lib32-libxrandr
 	makedepends = libxdamage
 	makedepends = lib32-libxdamage
-	makedepends = libpulse
-	makedepends = lib32-libpulse
-	makedepends = gsm
-	makedepends = lib32-gsm
 	makedepends = libxi
 	makedepends = lib32-libxi
 	makedepends = gettext
@@ -106,6 +111,8 @@ pkgbase = proton-native
 	makedepends = desktop-file-utils
 	makedepends = python
 	makedepends = steam-native-runtime
+	depends = attr
+	depends = lib32-attr
 	depends = fontconfig
 	depends = lib32-fontconfig
 	depends = lcms2
@@ -118,10 +125,6 @@ pkgbase = proton-native
 	depends = lib32-libxrandr
 	depends = libxdamage
 	depends = lib32-libxdamage
-	depends = libpulse
-	depends = lib32-libpulse
-	depends = gsm
-	depends = lib32-gsm
 	depends = libxi
 	depends = lib32-libxi
 	depends = gettext
@@ -153,6 +156,8 @@ pkgbase = proton-native
 	optdepends = lib32-openal
 	optdepends = v4l-utils
 	optdepends = lib32-v4l-utils
+	optdepends = libpulse
+	optdepends = lib32-libpulse
 	optdepends = alsa-plugins
 	optdepends = lib32-alsa-plugins
 	optdepends = alsa-lib
@@ -163,27 +168,33 @@ pkgbase = proton-native
 	optdepends = lib32-libxcomposite
 	optdepends = libxinerama
 	optdepends = lib32-libxinerama
+	optdepends = ncurses
+	optdepends = lib32-ncurses
 	optdepends = opencl-icd-loader
 	optdepends = lib32-opencl-icd-loader
 	optdepends = libxslt
 	optdepends = lib32-libxslt
+	optdepends = libva
+	optdepends = lib32-libva
+	optdepends = gtk3
+	optdepends = lib32-gtk3
 	optdepends = gst-plugins-base-libs
 	optdepends = lib32-gst-plugins-base-libs
+	optdepends = vulkan-icd-loader
+	optdepends = lib32-vulkan-icd-loader
 	optdepends = sdl2
 	optdepends = lib32-sdl2
-	optdepends = speex
-	optdepends = lib32-speex
-	optdepends = opus
-	optdepends = lib32-opus
-	optdepends = libgphoto2
 	optdepends = sane
+	optdepends = libgphoto2
 	optdepends = gsm
+	optdepends = ffmpeg
 	optdepends = cups
 	optdepends = samba
 	optdepends = dosbox
 	noextract = wine-gecko-2.47.2-x86.tar.xz
 	noextract = wine-gecko-2.47.2-x86_64.tar.xz
 	noextract = wine-mono-6.1.2-x86.tar.xz
+	options = staticlibs
 	source = proton::git+https://github.com/ValveSoftware/Proton.git#tag=proton-6.3-4
 	source = wine-valve::git+https://github.com/ValveSoftware/wine.git
 	source = vkd3d-proton::git+https://github.com/HansKristian-Work/vkd3d-proton.git
diff --git a/PKGBUILD b/PKGBUILD
index c6822eedc33f..c9ec67f3aa2e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,37 +6,37 @@ _commit=
 pkgver=${_srctag//-/.}
 _geckover=2.47.2
 _monover=6.1.2
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="Compatibility tool for Steam Play based on Wine and additional components. Monolithic distribution"
-arch=(x86_64)
 url="https://github.com/ValveSoftware/Proton"
+arch=(x86_64)
+options=(staticlibs)
 license=('custom')
+
 depends=(
-  fontconfig      lib32-fontconfig
-  lcms2           lib32-lcms2
-  libxml2         lib32-libxml2
-  libxcursor      lib32-libxcursor
-  libxrandr       lib32-libxrandr
-  libxdamage      lib32-libxdamage
-  libpulse        lib32-libpulse
-  gsm             lib32-gsm
-  libxi           lib32-libxi
-  gettext         lib32-gettext
-  freetype2       lib32-freetype2
-  glu             lib32-glu
-  libsm           lib32-libsm
-  gcc-libs        lib32-gcc-libs
-  libpcap         lib32-libpcap
+  attr             lib32-attr
+  fontconfig       lib32-fontconfig
+  lcms2            lib32-lcms2
+  libxml2          lib32-libxml2
+  libxcursor       lib32-libxcursor
+  libxrandr        lib32-libxrandr
+  libxdamage       lib32-libxdamage
+  libxi            lib32-libxi
+  gettext          lib32-gettext
+  freetype2        lib32-freetype2
+  glu              lib32-glu
+  libsm            lib32-libsm
+  gcc-libs         lib32-gcc-libs
+  libpcap          lib32-libpcap
   desktop-file-utils
   python
   steam-native-runtime
 )
+
 makedepends=(autoconf ncurses bison perl fontforge flex mingw-w64-gcc
-  mingw-w64-tools
-  meson
-  cargo
-  rust                  lib32-rust-libs
+  git rsync mingw-w64-tools lld nasm meson cmake python-virtualenv python-pip
+  glslang vulkan-headers
   giflib                lib32-giflib
   libpng                lib32-libpng
   gnutls                lib32-gnutls
@@ -48,30 +48,28 @@ makedepends=(autoconf ncurses bison perl fontforge flex mingw-w64-gcc
   mpg123                lib32-mpg123
   openal                lib32-openal
   v4l-utils             lib32-v4l-utils
-  libpulse              lib32-libpulse
   alsa-lib              lib32-alsa-lib
   libxcomposite         lib32-libxcomposite
   mesa                  lib32-mesa
   mesa-libgl            lib32-mesa-libgl
   opencl-icd-loader     lib32-opencl-icd-loader
   libxslt               lib32-libxslt
+  libpulse              lib32-libpulse
+  libva                 lib32-libva
+  gtk3                  lib32-gtk3
   gst-plugins-base-libs lib32-gst-plugins-base-libs
   vulkan-icd-loader     lib32-vulkan-icd-loader
   sdl2                  lib32-sdl2
-  libgphoto2
+  libcups               lib32-libcups
+  rust                  lib32-rust-libs
   sane
+  libgphoto2
   gsm
-  vulkan-headers
+  ffmpeg
   samba
   opencl-headers
-  git
-  rsync
-  cmake
-  python-virtualenv
-  python-pip
-  nasm
-  glslang
 )
+
 optdepends=(
   giflib                lib32-giflib
   libpng                lib32-libpng
@@ -80,23 +78,28 @@ optdepends=(
   mpg123                lib32-mpg123
   openal                lib32-openal
   v4l-utils             lib32-v4l-utils
+  libpulse              lib32-libpulse
   alsa-plugins          lib32-alsa-plugins
   alsa-lib              lib32-alsa-lib
   libjpeg-turbo         lib32-libjpeg-turbo
   libxcomposite         lib32-libxcomposite
   libxinerama           lib32-libxinerama
+  ncurses               lib32-ncurses
   opencl-icd-loader     lib32-opencl-icd-loader
   libxslt               lib32-libxslt
+  libva                 lib32-libva
+  gtk3                  lib32-gtk3
   gst-plugins-base-libs lib32-gst-plugins-base-libs
+  vulkan-icd-loader     lib32-vulkan-icd-loader
   sdl2                  lib32-sdl2
-  speex                 lib32-speex
-  opus                  lib32-opus
-  libgphoto2
   sane
+  libgphoto2
   gsm
+  ffmpeg
   cups
   samba           dosbox
 )
+
 makedepends=(${makedepends[@]} ${depends[@]})
 #install=${pkgname}.install
 source=(
@@ -131,8 +134,8 @@ prepare() {
     # I know this is fugly and it should NOT be done
     # but the afdko package from AUR breaks regularly.
     # Install it from pip in a virtualenv
-    virtualenv --app-data "$srcdir"/afdko/cache --no-wheel afdko
-    source afdko/bin/activate
+    virtualenv --app-data "$srcdir"/build_venv/cache --no-wheel build_venv
+    source build_venv/bin/activate
     pip install --no-cache-dir afdko
 
     [ ! -d gecko ] && mkdir gecko