Version 5.13-6

author: Stelios Tsampas 2021-02-11 00:46:11 +0200
committer: Stelios Tsampas 2021-02-11 00:46:11 +0200
commit: 4d0fff2a32c2c81b1cff5317ec6b025118dfd7d2 (patch)
tree: 059cc92979cc2cb1b92ba22b996e05513dc7cb2f
parent: fcc4ba0b3d2eb0b0f6c0aecace007d6faee64d1d (diff)
download: aur-4d0fff2a32c2c81b1cff5317ec6b025118dfd7d2.tar.gz
3 files changed, 92 insertions, 111 deletions
diff --git a/.SRCINFO b/.SRCINFO
index fed7d7bf8c43..627ceb4ad217 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 = 5.13.5
-	pkgrel = 4
+	pkgver = 5.13.6
+	pkgrel = 1
 	epoch = 1
 	url = https://github.com/ValveSoftware/Proton
 	arch = x86_64
@@ -170,6 +170,10 @@ pkgbase = proton-native
 	optdepends = lib32-gst-plugins-base-libs
 	optdepends = sdl2
 	optdepends = lib32-sdl2
+	optdepends = speex
+	optdepends = lib32-speex
+	optdepends = opus
+	optdepends = lib32-opus
 	optdepends = libgphoto2
 	optdepends = sane
 	optdepends = gsm
@@ -179,7 +183,7 @@ pkgbase = proton-native
 	noextract = wine-gecko-2.47.1-x86.tar.bz2
 	noextract = wine-gecko-2.47.1-x86_64.tar.bz2
 	noextract = wine-mono-5.1.1-x86.tar.xz
-	source = proton::git+https://github.com/ValveSoftware/Proton.git#tag=proton-5.13-5
+	source = proton::git+https://github.com/ValveSoftware/Proton.git#tag=proton-5.13-6
 	source = wine-valve::git+https://github.com/ValveSoftware/wine.git
 	source = vkd3d-proton::git+https://github.com/HansKristian-Work/vkd3d-proton.git
 	source = dxvk-valve::git+https://github.com/ValveSoftware/dxvk.git
@@ -221,7 +225,7 @@ pkgbase = proton-native
 	sha256sums = 06a00cedf391ee07bbca0b3282e5c8ad9d950446d50648d2ff417716816fd1ab
 	sha256sums = ea5246e4c91d1aa1226658e1749b6e5d0e9353b52b14df79c4b93b6e61a3c59e
 	sha256sums = b17ac815afbf5eef768c4e8d50800be02af75c8b230d668e239bad99616caa82
-	sha256sums = 7688cbba34c7e47252f6ab6341b6b5ec25ffcea9f68af65fcceaa9a8073e32ef
+	sha256sums = 1e6dc8c12191ff7866b156d270918e79826583c21ef216ce63a0f8de4076604a
 	sha256sums = 8263a3ffb7f8e7a5d81bfbffe1843d6f84502d3443fe40f065bcae02b36ba954
 	sha256sums = 20f7cd3e70fad6f48d2f1a26a485906a36acf30903bf0eefbf82a7c400e248f3
 	sha256sums = 36aaba6847e4577df4a496d88c11b4b7049773f1f2b90aa4545093e16d5c6066
diff --git a/PKGBUILD b/PKGBUILD
index b5b83d13ee08..49e3ec0cce0f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,12 @@
 # Maintainer: loathingkernel <loathingkernel _a_ gmail _d_ com>
 
 pkgname=proton-native
-_srctag=5.13-5
+_srctag=5.13-6
 _commit=
 pkgver=${_srctag//-/.}
 _geckover=2.47.1
 _monover=5.1.1
-pkgrel=4
+pkgrel=1
 epoch=1
 pkgdesc="Compatibility tool for Steam Play based on Wine and additional components. Monolithic distribution"
 arch=(x86_64)
@@ -88,6 +88,8 @@ optdepends=(
   libxslt               lib32-libxslt
   gst-plugins-base-libs lib32-gst-plugins-base-libs
   sdl2                  lib32-sdl2
+  speex                 lib32-speex
+  opus                  lib32-opus
   libgphoto2
   sane
   gsm
@@ -173,20 +175,21 @@ prepare() {
     popd
     popd
 
+
     patch -p1 -i "$srcdir"/proton-unfuck_makefile.patch
     patch -p1 -i "$srcdir"/proton-disable_lock.patch
     patch -p1 -i "$srcdir"/proton-user_compat_data.patch
 
     # Export CFLAGS used by upstream if building for redistribution
     # -O2 is adjusted to -O3 since AVX is disabled
-    #export CFLAGS="-O3 -march=nocona -mtune=core-avx2"
-    #export CXXFLAGS="-O3 -march=nocona -mtune=core-avx2"
+#    export CFLAGS="-O3 -march=nocona -mtune=core-avx2"
+#    export CXXFLAGS="-O3 -march=nocona -mtune=core-avx2"
 
     # Uncomment to enable dxvk async patch.
     # Enable at your own risk. If you don't know what it is,
     # and its implications, leave it as is. You have been warned.
     # I am not liable if anything happens to you by using it.
-    #patch -p1 -i "$srcdir"/dxvk-async.patch
+#    patch -p1 -i "$srcdir"/dxvk-async.patch
     # Uncomment to enable extra optimizations
     # Patch crossfiles with extra optimizations from makepkg.conf
     patch -p1 -i "$srcdir"/dxvk-extraopts.patch
@@ -235,8 +238,8 @@ prepare() {
 build() {
     cd build
     ../proton/configure.sh \
+        --steam-runtime=native \
         --no-steam-runtime \
-        --with-ffmpeg \
         --build-name="${pkgname}"
 
     # Use -mno-avx for wine too
@@ -256,7 +259,6 @@ build() {
     export WINEFSYNC=0
     export CARGO_HOME="$srcdir/build/cargo"
     SUBMAKE_JOBS="${MAKEFLAGS/-j/}" \
-        NO_DXVK=0 \
         SYSTEM_GECKO=0 \
         SYSTEM_MONO=0 \
         make -j1 dist
@@ -266,53 +268,34 @@ package() {
     cd build
 
     local _compatdir="$pkgdir/usr/share/steam/compatibilitytools.d"
-
     mkdir -p "$_compatdir"
-    mv dist "$_compatdir/${pkgname}"
+    cp -rf --no-dereference --preserve=mode,links dist "$_compatdir/${pkgname}"
 
+    mkdir -p "$pkgdir/usr/share/licenses/${pkgname}"
+    mv "$_compatdir/${pkgname}"/LICENSE{,.OFL} \
+        "$pkgdir/usr/share/licenses/${pkgname}"
+
+    cd "$_compatdir/${pkgname}/dist"
     i686-w64-mingw32-strip --strip-unneeded \
-        "$_compatdir/${pkgname}"/dist/lib/wine/{,fakedlls/,dxvk/,vkd3d-proton/}*.dll
-    i686-w64-mingw32-strip --strip-unneeded \
-        "$_compatdir/${pkgname}"/dist/lib/wine/{,fakedlls/}*.exe
-    x86_64-w64-mingw32-strip --strip-unneeded \
-        "$_compatdir/${pkgname}"/dist/lib64/wine/{,fakedlls/,dxvk/,vkd3d-proton/}*.dll
+        $(find lib/wine -iname "*.dll" -or -iname "*.exe")
     x86_64-w64-mingw32-strip --strip-unneeded \
-        "$_compatdir/${pkgname}"/dist/lib64/wine/{,fakedlls/}*.exe
-
-    local _geckodir="$_compatdir/${pkgname}/dist/share/wine/gecko/wine-gecko-${_geckover}"
-    for ext in "dll" "exe"; do
-      find "$_geckodir"-x86/ \
-        -iname "*.$ext" \
-        -execdir i686-w64-mingw32-strip --strip-unneeded {} \;
-    done
-    for ext in "dll" "exe"; do
-      find "$_geckodir"-x86_64/ \
-        -iname "*.$ext" \
-        -execdir x86_64-w64-mingw32-strip --strip-unneeded {} \;
-    done
+        $(find lib64/wine -iname "*.dll" -or -iname "*.exe")
 
-    local _monodir="$_compatdir/${pkgname}/dist/share/wine/mono/wine-mono-${_monover}"
-    for ext in "dll" "exe"; do
-      find "$_monodir"/lib/mono/ \
-        -iname "*.$ext" \
-        -execdir i686-w64-mingw32-strip --strip-unneeded {} \;
-    done
-    for ext in "x86.dll" "x86.exe"; do
-      find "$_monodir"/ \
-        -iname "*$ext" \
-        -execdir i686-w64-mingw32-strip --strip-unneeded {} \;
-    done
-    i686-w64-mingw32-strip --strip-unneeded "$_monodir"/lib/x86/*.dll
-    for ext in "x86_64.dll" "x86_64.exe"; do
-      find "$_monodir"/ \
-        -iname "*$ext" \
-        -execdir x86_64-w64-mingw32-strip --strip-unneeded {} \;
-    done
-    x86_64-w64-mingw32-strip --strip-unneeded "$_monodir"/lib/x86_64/*.dll
+    local _geckodir="share/wine/gecko/wine-gecko-${_geckover}"
+    i686-w64-mingw32-strip --strip-unneeded \
+        $(find "$_geckodir"-x86 -iname "*.dll" -or -iname "*.exe")
+    x86_64-w64-mingw32-strip --strip-unneeded \
+        $(find "$_geckodir"-x86_64 -iname "*.dll" -or -iname "*.exe")
 
-    mkdir -p "$pkgdir/usr/share/licenses/${pkgname}"
-    mv "$_compatdir/${pkgname}"/LICENSE{,.OFL} \
-        "$pkgdir/usr/share/licenses/${pkgname}"
+    local _monodir="share/wine/mono/wine-mono-${_monover}"
+    i686-w64-mingw32-strip --strip-unneeded \
+        $(find "$_monodir"/lib/mono -iname "*.dll" -or -iname "*.exe")
+    i686-w64-mingw32-strip --strip-unneeded \
+        "$_monodir"/lib/x86/*.dll \
+        $(find "$_monodir" -iname "*x86.dll" -or -iname "*x86.exe")
+    x86_64-w64-mingw32-strip --strip-unneeded \
+        "$_monodir"/lib/x86_64/*.dll \
+        $(find "$_monodir" -iname "*x86_64.dll" -or -iname "*x86_64.exe")
 }
 
 sha256sums=('SKIP'
@@ -333,7 +316,7 @@ sha256sums=('SKIP'
             '06a00cedf391ee07bbca0b3282e5c8ad9d950446d50648d2ff417716816fd1ab'
             'ea5246e4c91d1aa1226658e1749b6e5d0e9353b52b14df79c4b93b6e61a3c59e'
             'b17ac815afbf5eef768c4e8d50800be02af75c8b230d668e239bad99616caa82'
-            '7688cbba34c7e47252f6ab6341b6b5ec25ffcea9f68af65fcceaa9a8073e32ef'
+            '1e6dc8c12191ff7866b156d270918e79826583c21ef216ce63a0f8de4076604a'
             '8263a3ffb7f8e7a5d81bfbffe1843d6f84502d3443fe40f065bcae02b36ba954'
             '20f7cd3e70fad6f48d2f1a26a485906a36acf30903bf0eefbf82a7c400e248f3'
             '36aaba6847e4577df4a496d88c11b4b7049773f1f2b90aa4545093e16d5c6066'
diff --git a/proton-unfuck_makefile.patch b/proton-unfuck_makefile.patch
index 90fec11d0f32..86f76f29e02a 100644
--- a/proton-unfuck_makefile.patch
+++ b/proton-unfuck_makefile.patch
@@ -1,27 +1,32 @@
 diff --git a/build/makefile_base.mak b/build/makefile_base.mak
-index 8d2554b..08b6336 100644
+index 91f8673..9d7b47a 100644
 --- a/build/makefile_base.mak
 +++ b/build/makefile_base.mak
-@@ -68,7 +68,7 @@ endif
+@@ -65,7 +65,7 @@ endif
  
- CC32 := gcc -m32 -mstackrealign
- CXX32 := g++ -m32 -mstackrealign
+ CC32 := $(CC) -m32 -mstackrealign
+ CXX32 := $(CXX) -m32 -mstackrealign
 -PKG_CONFIG32 := i686-linux-gnu-pkg-config
 +PKG_CONFIG32 := i686-pc-linux-gnu-pkg-config
  
  cc-option = $(shell if test -z "`echo 'void*p=1;' | \
                $(1) $(2) -S -o /dev/null -xc - 2>&1 | grep -- $(2) -`"; \
-@@ -108,8 +108,8 @@ SELECT_DOCKER_IMAGE :=
- # controllable by SUBMAKE_JOBS.  Not ideal.
- ifneq ($(CONTAINER_SHELL32)$(CONTAINER_SHELL64),)
- 	SUBMAKE_JOBS ?= 36
--	MAKE := make -j$(SUBMAKE_JOBS)
+@@ -88,13 +88,13 @@ endif
+ 
+ ifneq ($(STEAMRT_IMAGE),)
+ SUBMAKE_JOBS ?= 36
+-MAKE := make -j$(SUBMAKE_JOBS)
+ CONTAINER_SHELL := $(DOCKER_BASE) /bin/bash
+ STEAM_RUNTIME_RUNSH := $(DOCKER_BASE)
+ else
+ CONTAINER_SHELL := $(SHELL)
+ STEAM_RUNTIME_RUNSH :=
  endif
 +MAKE := make -j$(SUBMAKE_JOBS)
  
- # Use default shell if no STEAMRT_ variables setup a container to invoke.  Commands will just run natively.
- ifndef CONTAINER_SHELL64
-@@ -171,7 +171,8 @@ else
+ .PHONY: test-container
+ test-container:
+@@ -141,7 +141,8 @@ else
      MESON_STRIP_ARG := --strip
  endif
  
@@ -31,28 +36,7 @@ index 8d2554b..08b6336 100644
  SANITY_FLAGS   := -fwrapv -fno-strict-aliasing
  COMMON_FLAGS   := $(OPTIMIZE_FLAGS) $(SANITY_FLAGS)
  CARGO_BUILD_ARG := --release
-@@ -263,9 +264,11 @@ WINE_OUT_SERVER := $(DST_DIR)/bin/wineserver
- WINE_OUT := $(WINE_OUT_BIN) $(WINE_OUT_SERVER)
- # Tool-only build outputs needed for other projects
- WINEGCC32 := $(TOOLS_DIR32)/bin/winegcc
-+WINEGXX32 := $(TOOLS_DIR32)/bin/wineg++
- WINEBUILD32 := $(TOOLS_DIR32)/bin/winebuild
- WINE_BUILDTOOLS32 := $(WINEGCC32) $(WINEBUILD32)
- WINEGCC64 := $(TOOLS_DIR64)/bin/winegcc
-+WINEGXX64 := $(TOOLS_DIR64)/bin/wineg++
- WINEBUILD64 := $(TOOLS_DIR64)/bin/winebuild
- WINE_BUILDTOOLS64 := $(WINEGCC64) $(WINEBUILD64)
- 
-@@ -346,7 +349,7 @@ downloads: $(SHARED_GECKO64_TARBALL) $(SHARED_GECKO32_TARBALL) $(SHARED_MONO_TAR
- $(DST_DIR):
- 	mkdir -p $@
- 
--STEAM_DIR := $(HOME)/.steam/root
-+STEAM_DIR ?= $(HOME)/.steam/root
- 
- FILELOCK_TARGET := $(addprefix $(DST_BASE)/,filelock.py)
- $(FILELOCK_TARGET): $(addprefix $(SRCDIR)/,filelock.py)
-@@ -381,9 +384,17 @@ DIST_WINEOPENXR_JSON64 := $(DIST_PREFIX)/drive_c/openxr/wineopenxr64.json
+@@ -353,9 +354,17 @@ DIST_WINEOPENXR_JSON64 := $(DIST_PREFIX)/drive_c/openxr/wineopenxr64.json
  DIST_WINEOPENXR64 := $(DIST_PREFIX)/drive_c/windows/system32/wineopenxr.dll
  
  DIST_TARGETS := $(DIST_COPY_TARGETS) $(DIST_OVR32) $(DIST_OVR64) \
@@ -71,7 +55,7 @@ index 8d2554b..08b6336 100644
  DEPLOY_COPY_TARGETS := $(DIST_COPY_TARGETS) $(DIST_VERSION) $(DIST_LICENSE) $(DIST_TOOLMANIFEST) $(DIST_OFL_LICENSE)
  REDIST_COPY_TARGETS := $(DEPLOY_COPY_TARGETS) $(DIST_COMPAT_MANIFEST)
  
-@@ -471,8 +482,8 @@ ALL_TARGETS += dist
+@@ -443,8 +452,8 @@ ALL_TARGETS += dist
  GOAL_TARGETS += dist
  
  dist_prefix: wine gst_good
@@ -82,7 +66,7 @@ index 8d2554b..08b6336 100644
  	rm -rf $(abspath $(DIST_PREFIX))
  	python3 $(SRCDIR)/default_pfx.py $(abspath $(DIST_PREFIX)) $(abspath $(DST_DIR)) $(STEAM_RUNTIME_RUNSH)
  
-@@ -514,6 +525,8 @@ module64:
+@@ -486,6 +495,8 @@ module64:
  module: module32 module64
  
  GST_COMMON_MESON_ARGS := \
@@ -91,7 +75,15 @@ index 8d2554b..08b6336 100644
  	-Dexamples=disabled \
  	-Dtests=disabled \
  	-Dgtk_doc=disabled \
-@@ -581,14 +594,14 @@ gst_orc64: SHELL = $(CONTAINER_SHELL64)
+@@ -502,6 +513,7 @@ GST_COMMON_MESON_ARGS := \
+ 
+ GST_ORC_MESON_ARGS := \
+ 	$(GST_COMMON_MESON_ARGS) \
++	-Dpackage-name="GStreamer Orc (Proton)" \
+ 	-Dorc-test=disabled
+ 
+ 
+@@ -553,14 +565,14 @@ gst_orc64: SHELL = $(CONTAINER_SHELL)
  gst_orc64: $(GST_ORC_CONFIGURE_FILES64)
  	PATH="$(abspath $(TOOLS_DIR64))/bin:$(PATH)" \
  	LD_LIBRARY_PATH="$(abspath $(TOOLS_DIR64))/lib:$(LD_LIBRARY_PATH)" \
@@ -99,7 +91,7 @@ index 8d2554b..08b6336 100644
 +	ninja -v -C "$(GST_ORC_OBJ64)" install
  	cp -a $(TOOLS_DIR64)/lib/liborc* $(DST_DIR)/lib64/
  
- gst_orc32: SHELL = $(CONTAINER_SHELL32)
+ gst_orc32: SHELL = $(CONTAINER_SHELL)
  gst_orc32: $(GST_ORC_CONFIGURE_FILES32)
  	PATH="$(abspath $(TOOLS_DIR32))/bin:$(PATH)" \
  	LD_LIBRARY_PATH="$(abspath $(TOOLS_DIR32))/lib:$(LD_LIBRARY_PATH)" \
@@ -108,7 +100,7 @@ index 8d2554b..08b6336 100644
  	cp -a $(TOOLS_DIR32)/lib/liborc* $(DST_DIR)/lib/
  
  ##
-@@ -600,6 +613,9 @@ GSTREAMER_MESON_ARGS := \
+@@ -572,6 +584,9 @@ GSTREAMER_MESON_ARGS := \
  	-Dbenchmarks=disabled \
  	-Dtools=disabled \
  	-Dbash-completion=disabled \
@@ -118,7 +110,7 @@ index 8d2554b..08b6336 100644
  	$(GST_COMMON_MESON_ARGS)
  
  GSTREAMER_CONFIGURE_FILES32 := $(GSTREAMER_OBJ32)/build.ninja
-@@ -650,7 +666,7 @@ gstreamer64: SHELL = $(CONTAINER_SHELL64)
+@@ -622,7 +637,7 @@ gstreamer64: SHELL = $(CONTAINER_SHELL)
  gstreamer64: $(GSTREAMER_CONFIGURE_FILES64)
  	PATH="$(abspath $(TOOLS_DIR64))/bin:$(PATH)" \
  	LD_LIBRARY_PATH="$(abspath $(TOOLS_DIR64))/lib:$(LD_LIBRARY_PATH)" \
@@ -127,7 +119,7 @@ index 8d2554b..08b6336 100644
  	cp -a $(TOOLS_DIR64)/lib/libgst* $(DST_DIR)/lib64/ && \
  	cp -a $(TOOLS_DIR64)/lib/gstreamer-1.0 $(DST_DIR)/lib64/
  
-@@ -658,7 +674,7 @@ gstreamer32: SHELL = $(CONTAINER_SHELL32)
+@@ -630,7 +645,7 @@ gstreamer32: SHELL = $(CONTAINER_SHELL)
  gstreamer32: $(GSTREAMER_CONFIGURE_FILES32)
  	PATH="$(abspath $(TOOLS_DIR32))/bin:$(PATH)" \
  	LD_LIBRARY_PATH="$(abspath $(TOOLS_DIR32))/lib:$(LD_LIBRARY_PATH)" \
@@ -136,7 +128,7 @@ index 8d2554b..08b6336 100644
  	cp -a $(TOOLS_DIR32)/lib/libgst* $(DST_DIR)/lib/ && \
  	cp -a $(TOOLS_DIR32)/lib/gstreamer-1.0 $(DST_DIR)/lib/
  
-@@ -692,6 +708,7 @@ GST_BASE_MESON_ARGS := \
+@@ -664,6 +679,7 @@ GST_BASE_MESON_ARGS := \
  	-Dxshm=disabled \
  	-Dxvideo=disabled \
  	-Dtools=disabled \
@@ -144,7 +136,7 @@ index 8d2554b..08b6336 100644
  	$(GST_COMMON_MESON_ARGS)
  
  GST_BASE_CONFIGURE_FILES32 := $(GST_BASE_OBJ32)/build.ninja
-@@ -742,7 +759,7 @@ gst_base64: SHELL = $(CONTAINER_SHELL64)
+@@ -714,7 +730,7 @@ gst_base64: SHELL = $(CONTAINER_SHELL)
  gst_base64: $(GST_BASE_CONFIGURE_FILES64)
  	PATH="$(abspath $(TOOLS_DIR64))/bin:$(PATH)" \
  	LD_LIBRARY_PATH="$(abspath $(TOOLS_DIR64))/lib:$(LD_LIBRARY_PATH)" \
@@ -153,7 +145,7 @@ index 8d2554b..08b6336 100644
  	cp -a $(TOOLS_DIR64)/lib/libgst* $(DST_DIR)/lib64/ && \
  	cp -a $(TOOLS_DIR64)/lib/gstreamer-1.0 $(DST_DIR)/lib64/
  
-@@ -750,7 +767,7 @@ gst_base32: SHELL = $(CONTAINER_SHELL32)
+@@ -722,7 +738,7 @@ gst_base32: SHELL = $(CONTAINER_SHELL)
  gst_base32: $(GST_BASE_CONFIGURE_FILES32)
  	PATH="$(abspath $(TOOLS_DIR32))/bin:$(PATH)" \
  	LD_LIBRARY_PATH="$(abspath $(TOOLS_DIR32))/lib:$(LD_LIBRARY_PATH)" \
@@ -162,7 +154,7 @@ index 8d2554b..08b6336 100644
  	cp -a $(TOOLS_DIR32)/lib/libgst* $(DST_DIR)/lib/ && \
  	cp -a $(TOOLS_DIR32)/lib/gstreamer-1.0 $(DST_DIR)/lib/
  
-@@ -808,6 +825,7 @@ GST_GOOD_MESON_ARGS := \
+@@ -780,6 +796,7 @@ GST_GOOD_MESON_ARGS := \
  	-Dximagesrc=disabled \
  	-Dy4m=disabled \
  	-Dtools=disabled \
@@ -170,7 +162,7 @@ index 8d2554b..08b6336 100644
  	$(GST_COMMON_MESON_ARGS)
  
  GST_GOOD_CONFIGURE_FILES32 := $(GST_GOOD_OBJ32)/build.ninja
-@@ -858,7 +876,7 @@ gst_good64: SHELL = $(CONTAINER_SHELL64)
+@@ -830,7 +847,7 @@ gst_good64: SHELL = $(CONTAINER_SHELL)
  gst_good64: $(GST_GOOD_CONFIGURE_FILES64)
  	PATH="$(abspath $(TOOLS_DIR64))/bin:$(PATH)" \
  	LD_LIBRARY_PATH="$(abspath $(TOOLS_DIR64))/lib:$(LD_LIBRARY_PATH)" \
@@ -179,7 +171,7 @@ index 8d2554b..08b6336 100644
  	cp -a $(TOOLS_DIR64)/lib/libgst* $(DST_DIR)/lib64/ && \
  	cp -a $(TOOLS_DIR64)/lib/gstreamer-1.0 $(DST_DIR)/lib64/
  
-@@ -866,7 +884,7 @@ gst_good32: SHELL = $(CONTAINER_SHELL32)
+@@ -838,7 +855,7 @@ gst_good32: SHELL = $(CONTAINER_SHELL)
  gst_good32: $(GST_GOOD_CONFIGURE_FILES32)
  	PATH="$(abspath $(TOOLS_DIR32))/bin:$(PATH)" \
  	LD_LIBRARY_PATH="$(abspath $(TOOLS_DIR32))/lib:$(LD_LIBRARY_PATH)" \
@@ -188,7 +180,7 @@ index 8d2554b..08b6336 100644
  	cp -a $(TOOLS_DIR32)/lib/libgst* $(DST_DIR)/lib/ && \
  	cp -a $(TOOLS_DIR32)/lib/gstreamer-1.0 $(DST_DIR)/lib/
  
-@@ -896,6 +914,7 @@ $(FAUDIO_CONFIGURE_FILES32): $(FAUDIO)/CMakeLists.txt $(MAKEFILE_DEP) gst_base32
+@@ -868,6 +885,7 @@ $(FAUDIO_CONFIGURE_FILES32): $(FAUDIO)/CMakeLists.txt $(MAKEFILE_DEP) gst_base32
  		CC="$(CC32)" \
  		CXX="$(CXX32)" \
  		PKG_CONFIG="$(PKG_CONFIG32)" \
@@ -196,13 +188,14 @@ index 8d2554b..08b6336 100644
  		cmake $(abspath $(FAUDIO)) \
  			-DCMAKE_INSTALL_PREFIX="$(abspath $(TOOLS_DIR32))" \
  			$(FAUDIO_CMAKE_FLAGS)
-@@ -1255,7 +1274,13 @@ $(WINE_CONFIGURE_FILES64): SHELL = $(CONTAINER_SHELL64)
+@@ -1227,7 +1245,14 @@ $(WINE_CONFIGURE_FILES64): SHELL = $(CONTAINER_SHELL)
  $(WINE_CONFIGURE_FILES64): $(MAKEFILE_DEP) | faudio64 jxrlib64 gst_base64 $(WINE_OBJ64)
  	cd $(dir $@) && \
  		../$(WINE)/configure \
 +			--with-x \
 +			--with-gstreamer \
 +			--with-faudio \
++			--with-mingw \
  			--without-curses \
 +			--without-vkd3d \
 +			--without-oss \
@@ -210,13 +203,14 @@ index 8d2554b..08b6336 100644
  			--enable-win64 \
  			--disable-tests \
  			--prefix=$(abspath $(DST_DIR)) \
-@@ -1275,7 +1300,13 @@ $(WINE_CONFIGURE_FILES32): SHELL = $(CONTAINER_SHELL32)
+@@ -1248,7 +1273,14 @@ $(WINE_CONFIGURE_FILES32): SHELL = $(CONTAINER_SHELL)
  $(WINE_CONFIGURE_FILES32): $(MAKEFILE_DEP) | faudio32 jxrlib32 gst_base32 $(WINE_OBJ32)
  	cd $(dir $@) && \
  		../$(WINE)/configure \
 +			--with-x \
 +			--with-gstreamer \
 +			--with-faudio \
++			--with-mingw \
  			--without-curses \
 +			--without-vkd3d \
 +			--without-oss \
@@ -224,25 +218,25 @@ index 8d2554b..08b6336 100644
  			--disable-tests \
  			--prefix=$(abspath $(WINE_DST32)) \
  			LD_LIBRARY_PATH=$(abspath $(TOOLS_DIR32))/lib \
-@@ -1479,7 +1510,7 @@ dxvk_configure32: $(DXVK_CONFIGURE_FILES32)
- dxvk: dxvk32 dxvk64
+@@ -1454,7 +1486,7 @@ dxvk: dxvk32 dxvk64
  
+ dxvk64: SHELL = $(CONTAINER_SHELL)
  dxvk64: $(DXVK_CONFIGURE_FILES64)
 -	env PATH="$(abspath $(SRCDIR))/glslang/bin/:$(PATH)" ninja -C "$(DXVK_OBJ64)" install
 +	env PATH="$(abspath $(SRCDIR))/glslang/bin/:$(PATH)" ninja -v -C "$(DXVK_OBJ64)" install
  	mkdir -p "$(DST_DIR)/lib64/wine/dxvk"
  	cp -f "$(DXVK_OBJ64)"/bin/dxgi.dll "$(DST_DIR)"/lib64/wine/dxvk
  	cp -f "$(DXVK_OBJ64)"/bin/d3d11.dll "$(DST_DIR)"/lib64/wine/dxvk
-@@ -1492,7 +1523,7 @@ dxvk64: $(DXVK_CONFIGURE_FILES64)
- 
+@@ -1468,7 +1500,7 @@ dxvk64: $(DXVK_CONFIGURE_FILES64)
  
+ dxvk32: SHELL = $(CONTAINER_SHELL)
  dxvk32: $(DXVK_CONFIGURE_FILES32)
 -	env PATH="$(abspath $(SRCDIR))/glslang/bin/:$(PATH)" ninja -C "$(DXVK_OBJ32)" install
 +	env PATH="$(abspath $(SRCDIR))/glslang/bin/:$(PATH)" ninja -v -C "$(DXVK_OBJ32)" install
  	mkdir -p "$(DST_DIR)"/lib/wine/dxvk
  	cp -f "$(DXVK_OBJ32)"/bin/dxgi.dll "$(DST_DIR)"/lib/wine/dxvk/
  	cp -f "$(DXVK_OBJ32)"/bin/d3d11.dll "$(DST_DIR)"/lib/wine/dxvk/
-@@ -1517,12 +1548,12 @@ $(VKD3D_CONFIGURE_FILES32): $(VKD3D)/meson.build $(VKD3D)/build-win32.txt | $(VK
+@@ -1491,12 +1523,12 @@ $(VKD3D_CONFIGURE_FILES32): $(VKD3D)/meson.build $(VKD3D)/build-win32.txt | $(VK
  			meson --prefix="$(abspath $(VKD3D_OBJ32))" \
  				--cross-file "$(abspath $(VKD3D))/build-win32.txt" \
  				$(MESON_STRIP_ARG) \
@@ -250,14 +244,14 @@ index 8d2554b..08b6336 100644
 +				--buildtype=release -Denable_d3d12=true \
  				"$(abspath $(VKD3D))"
  
- vkd3d32: SHELL = $(CONTAINER_SHELL32)
+ vkd3d32: SHELL = $(CONTAINER_SHELL)
  vkd3d32: $(VKD3D_CONFIGURE_FILES32)
 -	ninja -C "$(VKD3D_OBJ32)" install
 +	ninja -v -C "$(VKD3D_OBJ32)" install
  	mkdir -p "$(DST_DIR)"/lib/wine/vkd3d-proton
  	cp -af "$(VKD3D_OBJ32)/bin/d3d12.dll" "$(DST_DIR)"/lib/wine/vkd3d-proton/
  	rm -f "$(DST_DIR)"/lib/wine/vkd3d-proton/version && if test -e $(SRCDIR)/.git; then ( cd $(SRCDIR) && git submodule status -- vkd3d-proton ) > "$(DST_DIR)"/lib/wine/vkd3d-proton/version; fi
-@@ -1534,12 +1565,12 @@ $(VKD3D_CONFIGURE_FILES64): $(VKD3D)/meson.build $(VKD3D)/build-win64.txt | $(VK
+@@ -1508,12 +1540,12 @@ $(VKD3D_CONFIGURE_FILES64): $(VKD3D)/meson.build $(VKD3D)/build-win64.txt | $(VK
  			meson --prefix="$(abspath $(VKD3D_OBJ64))" \
  				--cross-file "$(abspath $(VKD3D))/build-win64.txt" \
  				$(MESON_STRIP_ARG) \
@@ -265,7 +259,7 @@ index 8d2554b..08b6336 100644
 +				--buildtype=release -Denable_d3d12=true \
  				"$(abspath $(VKD3D))"
  
- vkd3d64: SHELL = $(CONTAINER_SHELL64)
+ vkd3d64: SHELL = $(CONTAINER_SHELL)
  vkd3d64: $(VKD3D_CONFIGURE_FILES64)
 -	ninja -C "$(VKD3D_OBJ64)" install
 +	ninja -v -C "$(VKD3D_OBJ64)" install
author	Stelios Tsampas	2021-02-11 00:46:11 +0200
committer	Stelios Tsampas	2021-02-11 00:46:11 +0200
commit	4d0fff2a32c2c81b1cff5317ec6b025118dfd7d2 (patch)
tree	059cc92979cc2cb1b92ba22b996e05513dc7cb2f
parent	fcc4ba0b3d2eb0b0f6c0aecace007d6faee64d1d (diff)
download	aur-4d0fff2a32c2c81b1cff5317ec6b025118dfd7d2.tar.gz