[proton-experimental] Reduce deps

4 files changed, 15 insertions, 83 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 44abd5cf1ed2..de325f461526 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = proton-experimental
 	pkgdesc = Compatibility tool for Steam Play based on Wine and additional components, experimental branch
-	pkgver = 7.0.20230313
+	pkgver = 7.0.20230322
 	pkgrel = 1
 	epoch = 1
 	url = https://github.com/ValveSoftware/Proton
@@ -11,7 +11,6 @@ pkgbase = proton-experimental
 	makedepends = autoconf
 	makedepends = bison
 	makedepends = perl
-	makedepends = fontforge
 	makedepends = flex
 	makedepends = mingw-w64-gcc
 	makedepends = git
@@ -22,6 +21,7 @@ pkgbase = proton-experimental
 	makedepends = nasm
 	makedepends = meson
 	makedepends = cmake
+	makedepends = fontforge
 	makedepends = afdko
 	makedepends = python-pefile
 	makedepends = glslang
@@ -29,22 +29,16 @@ pkgbase = proton-experimental
 	makedepends = clang
 	makedepends = giflib
 	makedepends = lib32-giflib
-	makedepends = libpng
-	makedepends = lib32-libpng
 	makedepends = gnutls
 	makedepends = lib32-gnutls
 	makedepends = libxinerama
 	makedepends = lib32-libxinerama
 	makedepends = libxcomposite
 	makedepends = lib32-libxcomposite
-	makedepends = libxmu
-	makedepends = lib32-libxmu
 	makedepends = libxxf86vm
 	makedepends = lib32-libxxf86vm
 	makedepends = libldap
 	makedepends = lib32-libldap
-	makedepends = mpg123
-	makedepends = lib32-mpg123
 	makedepends = openal
 	makedepends = lib32-openal
 	makedepends = v4l-utils
@@ -59,8 +53,6 @@ pkgbase = proton-experimental
 	makedepends = lib32-mesa-libgl
 	makedepends = opencl-icd-loader
 	makedepends = lib32-opencl-icd-loader
-	makedepends = libxslt
-	makedepends = lib32-libxslt
 	makedepends = libpulse
 	makedepends = lib32-libpulse
 	makedepends = libva
@@ -76,33 +68,21 @@ pkgbase = proton-experimental
 	makedepends = rust
 	makedepends = lib32-rust-libs
 	makedepends = libgphoto2
-	makedepends = gsm
-	makedepends = lib32-gsm
 	makedepends = opencl-headers
 	makedepends = attr
 	makedepends = lib32-attr
 	makedepends = fontconfig
 	makedepends = lib32-fontconfig
-	makedepends = lcms2
-	makedepends = lib32-lcms2
-	makedepends = libxml2
-	makedepends = lib32-libxml2
 	makedepends = libxcursor
 	makedepends = lib32-libxcursor
 	makedepends = libxrandr
 	makedepends = lib32-libxrandr
-	makedepends = libxdamage
-	makedepends = lib32-libxdamage
 	makedepends = libxi
 	makedepends = lib32-libxi
 	makedepends = gettext
 	makedepends = lib32-gettext
 	makedepends = freetype2
 	makedepends = lib32-freetype2
-	makedepends = glu
-	makedepends = lib32-glu
-	makedepends = libsm
-	makedepends = lib32-libsm
 	makedepends = gcc-libs
 	makedepends = lib32-gcc-libs
 	makedepends = libpcap
@@ -126,26 +106,16 @@ pkgbase = proton-experimental
 	depends = lib32-attr
 	depends = fontconfig
 	depends = lib32-fontconfig
-	depends = lcms2
-	depends = lib32-lcms2
-	depends = libxml2
-	depends = lib32-libxml2
 	depends = libxcursor
 	depends = lib32-libxcursor
 	depends = libxrandr
 	depends = lib32-libxrandr
-	depends = libxdamage
-	depends = lib32-libxdamage
 	depends = libxi
 	depends = lib32-libxi
 	depends = gettext
 	depends = lib32-gettext
 	depends = freetype2
 	depends = lib32-freetype2
-	depends = glu
-	depends = lib32-glu
-	depends = libsm
-	depends = lib32-libsm
 	depends = gcc-libs
 	depends = lib32-gcc-libs
 	depends = libpcap
@@ -167,14 +137,10 @@ pkgbase = proton-experimental
 	depends = steam-native-runtime
 	optdepends = giflib
 	optdepends = lib32-giflib
-	optdepends = libpng
-	optdepends = lib32-libpng
 	optdepends = libldap
 	optdepends = lib32-libldap
 	optdepends = gnutls
 	optdepends = lib32-gnutls
-	optdepends = mpg123
-	optdepends = lib32-mpg123
 	optdepends = openal
 	optdepends = lib32-openal
 	optdepends = v4l-utils
@@ -185,16 +151,12 @@ pkgbase = proton-experimental
 	optdepends = lib32-alsa-plugins
 	optdepends = alsa-lib
 	optdepends = lib32-alsa-lib
-	optdepends = libjpeg-turbo
-	optdepends = lib32-libjpeg-turbo
 	optdepends = libxcomposite
 	optdepends = lib32-libxcomposite
 	optdepends = libxinerama
 	optdepends = lib32-libxinerama
 	optdepends = opencl-icd-loader
 	optdepends = lib32-opencl-icd-loader
-	optdepends = libxslt
-	optdepends = lib32-libxslt
 	optdepends = libva
 	optdepends = lib32-libva
 	optdepends = gtk3
@@ -204,8 +166,6 @@ pkgbase = proton-experimental
 	optdepends = vulkan-icd-loader
 	optdepends = lib32-vulkan-icd-loader
 	optdepends = libgphoto2
-	optdepends = gsm
-	optdepends = lib32-gsm
 	optdepends = dosbox
 	provides = proton
 	noextract = wine-gecko-2.47.3-x86.tar.xz
@@ -214,7 +174,7 @@ pkgbase = proton-experimental
 	options = !staticlibs
 	options = !lto
 	options = emptydirs
-	source = proton::git+https://github.com/ValveSoftware/Proton.git#tag=experimental-7.0-20230313
+	source = proton::git+https://github.com/ValveSoftware/Proton.git#tag=experimental-7.0-20230322
 	source = wine-valve::git+https://github.com/ValveSoftware/wine.git
 	source = dxvk::git+https://github.com/doitsujin/dxvk.git
 	source = openvr::git+https://github.com/ValveSoftware/openvr.git
diff --git a/PKGBUILD b/PKGBUILD
index bee1904bbd3f..98244b009322 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: loathingkernel <loathingkernel _a_ gmail _d_ com>
 
 pkgname=proton-experimental
-_srctag=7.0-20230313
+_srctag=7.0-20230322
 _commit=
 pkgver=${_srctag//-/.}
 _geckover=2.47.3
@@ -17,16 +17,11 @@ license=('custom')
 depends=(
   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
   lzo              lib32-lzo
@@ -40,19 +35,17 @@ depends=(
   steam-native-runtime
 )
 
-makedepends=(autoconf bison perl fontforge flex mingw-w64-gcc
-  git wget rsync mingw-w64-tools lld nasm meson cmake afdko python-pefile
+makedepends=(autoconf bison perl flex mingw-w64-gcc
+  git wget rsync mingw-w64-tools lld nasm
+  meson cmake fontforge afdko python-pefile
   glslang vulkan-headers
   clang
   giflib                lib32-giflib
-  libpng                lib32-libpng
   gnutls                lib32-gnutls
   libxinerama           lib32-libxinerama
   libxcomposite         lib32-libxcomposite
-  libxmu                lib32-libxmu
   libxxf86vm            lib32-libxxf86vm
   libldap               lib32-libldap
-  mpg123                lib32-mpg123
   openal                lib32-openal
   v4l-utils             lib32-v4l-utils
   alsa-lib              lib32-alsa-lib
@@ -60,7 +53,6 @@ makedepends=(autoconf bison perl fontforge flex mingw-w64-gcc
   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
@@ -69,32 +61,26 @@ makedepends=(autoconf bison perl fontforge flex mingw-w64-gcc
   'sdl2>=2.0.16'        'lib32-sdl2>=2.0.16'
   rust                  lib32-rust-libs
   libgphoto2
-  gsm                   lib32-gsm
   opencl-headers
 )
 
 optdepends=(
   giflib                lib32-giflib
-  libpng                lib32-libpng
   libldap               lib32-libldap
   gnutls                lib32-gnutls
-  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
   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
   libgphoto2
-  gsm                   lib32-gsm
   dosbox
 )
 
diff --git a/PKGBUILD.testing b/PKGBUILD.testing
index 7b9caecda895..0a5c7c33c956 100644
--- a/PKGBUILD.testing
+++ b/PKGBUILD.testing
@@ -1,7 +1,7 @@
 # Maintainer: loathingkernel <loathingkernel _a_ gmail _d_ com>
 
 pkgname=proton-experimental
-_srctag=7.0-20230313
+_srctag=7.0-20230322
 _commit=
 pkgver=${_srctag//-/.}
 _geckover=2.47.3
@@ -17,16 +17,11 @@ license=('custom')
 depends=(
   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
   lzo              lib32-lzo
@@ -40,19 +35,17 @@ depends=(
   steam-native-runtime
 )
 
-makedepends=(autoconf bison perl fontforge flex mingw-w64-gcc
-  git wget rsync mingw-w64-tools lld nasm meson cmake afdko python-pefile
+makedepends=(autoconf bison perl flex mingw-w64-gcc
+  git wget rsync mingw-w64-tools lld nasm
+  meson cmake fontforge afdko python-pefile
   glslang vulkan-headers
   clang
   giflib                lib32-giflib
-  libpng                lib32-libpng
   gnutls                lib32-gnutls
   libxinerama           lib32-libxinerama
   libxcomposite         lib32-libxcomposite
-  libxmu                lib32-libxmu
   libxxf86vm            lib32-libxxf86vm
   libldap               lib32-libldap
-  mpg123                lib32-mpg123
   openal                lib32-openal
   v4l-utils             lib32-v4l-utils
   alsa-lib              lib32-alsa-lib
@@ -60,7 +53,6 @@ makedepends=(autoconf bison perl fontforge flex mingw-w64-gcc
   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
@@ -69,32 +61,26 @@ makedepends=(autoconf bison perl fontforge flex mingw-w64-gcc
   'sdl2>=2.0.16'        'lib32-sdl2>=2.0.16'
   rust                  lib32-rust-libs
   libgphoto2
-  gsm                   lib32-gsm
   opencl-headers
 )
 
 optdepends=(
   giflib                lib32-giflib
-  libpng                lib32-libpng
   libldap               lib32-libldap
   gnutls                lib32-gnutls
-  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
   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
   libgphoto2
-  gsm                   lib32-gsm
   dosbox
 )
 
@@ -294,9 +280,9 @@ build() {
     # This overrides FLAGS from makepkg.conf, if you comment these you are on your own
     # If you want the "best" possible optimizations for your system you can use
     # `-march=native` and remove the `-mtune=core-avx2` option.
-    export CFLAGS="-O3 -march=haswell -mtune=haswell -pipe -fno-semantic-interposition"
-    export CXXFLAGS="-O3 -march=haswell -mtune=haswell -pipe -fno-semantic-interposition"
-    export RUSTFLAGS="-C opt-level=3 -C target-cpu=haswell"
+    export CFLAGS="-O2 -march=haswell -mtune=haswell -pipe -ftree-vectorize -fno-semantic-interposition"
+    export CXXFLAGS="-O2 -march=haswell -mtune=haswell -pipe -ftree-vectorize -fno-semantic-interposition"
+    export RUSTFLAGS="-C opt-level=2 -C target-cpu=haswell"
     export LDFLAGS="-Wl,-O1,--sort-common,--as-needed"
 
     # If using -march=native and the CPU supports AVX, launching a d3d9
diff --git a/proton-experimental.install b/proton-experimental.install
index 462b81d0fe8d..7fa3b8b599f8 100644
--- a/proton-experimental.install
+++ b/proton-experimental.install
@@ -8,7 +8,7 @@ post_install() {
   echo "   the AUR comment section."
   echo "   "
   echo "   This version of Proton is meant to be used with \"steam-native\" from the"
-  echo "   \"steam-native-rutime\" package on Arch Linux"
+  echo "   \"steam-native-runtime\" package on Arch Linux"
 }
 
 post_upgrade() {