From 22df2b2ba8089dddf50a63ba6edee397ef0f2e2b Mon Sep 17 00:00:00 2001
From: Marko Semet <marko10_000@gmx.de>
Date: Mon, 10 Feb 2020 23:17:54 +0100
Subject: [PATCH] Port dxvk

---
 Platform-v2.0/DXVK/build_amd64.sh     |  2 +-
 Platform-v2.0/DXVK/build_extension.sh | 14 --------------
 Platform-v2.0/DXVK/dxvk.yaml          | 12 +++++-------
 3 files changed, 6 insertions(+), 22 deletions(-)
 delete mode 100755 Platform-v2.0/DXVK/build_extension.sh

diff --git a/Platform-v2.0/DXVK/build_amd64.sh b/Platform-v2.0/DXVK/build_amd64.sh
index 773253d..3fa5d55 100755
--- a/Platform-v2.0/DXVK/build_amd64.sh
+++ b/Platform-v2.0/DXVK/build_amd64.sh
@@ -1,4 +1,4 @@
 #! /usr/bin/env bash
 # Args: <file> <build-args> [<repo>]
 
-exec "$(dirname "$0")/build_extension.sh" "$1" x86_64 "$2" "$3"
\ No newline at end of file
+exec "$(dirname "$0")/../../tools/build_when_required.sh" "$1" x86_64 "$2" "$3"
\ No newline at end of file
diff --git a/Platform-v2.0/DXVK/build_extension.sh b/Platform-v2.0/DXVK/build_extension.sh
deleted file mode 100755
index 13c0100..0000000
--- a/Platform-v2.0/DXVK/build_extension.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /usr/bin/env bash
-# Args: <file> <arch> <builder-args> [<repo>]
-
-if [ -z "VERBOSE" ]; then
-    HASH_MODULE_ARGS="-v"
-else
-    HASH_MODULE_ARGS=""
-fi
-
-CONF_PATH="$(dirname "$0")" &&
-"$CONF_PATH/../../../tools/hash_modules.py" $HASH_MODULE_ARGS --require-build "$1" "$2" &&
-exec "$CONF_PATH/../../../tools/build.sh" "$1" "$2" "$3" "$4"
-
-echo 'No build required.'
\ No newline at end of file
diff --git a/Platform-v2.0/DXVK/dxvk.yaml b/Platform-v2.0/DXVK/dxvk.yaml
index 627e6f4..d756486 100644
--- a/Platform-v2.0/DXVK/dxvk.yaml
+++ b/Platform-v2.0/DXVK/dxvk.yaml
@@ -4,10 +4,8 @@ branch: "v2.0"
 
 sdk: de.marko10_000.winebarrels.WineSdk
 runtime: de.marko10_000.winebarrels.Wine
-runtime-version: "5.0-rc5"
+runtime-version: "stable"
 separate-locales: false
-sdk-extensions:
-    - de.marko10_000.winebarrels.Platform.ExtensionsV2.MinGW
 
 build-options:
     prefix: /usr/wine_extensions/v2/DXVK_{{VERSION}}
@@ -50,12 +48,12 @@ modules:
         build-options:
             prefix: /usr/wine_extensions/v2/DXVK_{{VERSION}}/tmp
             env:
-                PATH: "/usr/wine_extensions/v2/DXVK_{{VERSION}}/bin:/usr/wine_extensions/v2/MinGW/bin:/usr/bin"
+                PATH: "/usr/wine_extensions/v2/DXVK_{{VERSION}}/bin:/usr/bin"
         post-install:
             - mkdir /usr/wine_extensions/v2/DXVK_{{VERSION}}/x32
             - cp -rav /usr/wine_extensions/v2/DXVK_{{VERSION}}/tmp/bin/. /usr/wine_extensions/v2/DXVK_{{VERSION}}/x32
             - rm -rf /usr/wine_extensions/v2/DXVK_{{VERSION}}/tmp
-            - /usr/wine_extensions/v2/MinGW/bin/i686-w64-mingw32-strip --strip-debug /usr/wine_extensions/v2/DXVK_{{VERSION}}/x32/*
+            - strip -v --strip-debug /usr/wine_extensions/v2/DXVK_{{VERSION}}/x32/*
             - cp -av ../setup_dxvk.sh /usr/wine_extensions/v2/DXVK_{{VERSION}}
         only-arches:
             - x86_64
@@ -72,12 +70,12 @@ modules:
         build-options:
             prefix: /usr/wine_extensions/v2/DXVK_{{VERSION}}/tmp
             env:
-                PATH: "/usr/wine_extensions/v2/DXVK_{{VERSION}}/bin:/usr/wine_extensions/v2/MinGW/bin:/usr/bin"
+                PATH: "/usr/wine_extensions/v2/DXVK_{{VERSION}}/bin:/usr/bin"
         post-install:
             - mkdir /usr/wine_extensions/v2/DXVK_{{VERSION}}/x64
             - cp -rav /usr/wine_extensions/v2/DXVK_{{VERSION}}/tmp/bin/. /usr/wine_extensions/v2/DXVK_{{VERSION}}/x64
             - rm -rf /usr/wine_extensions/v2/DXVK_{{VERSION}}/tmp
-            - /usr/wine_extensions/v2/MinGW/bin/x86_64-w64-mingw32-strip --strip-debug /usr/wine_extensions/v2/DXVK_{{VERSION}}/x64/*
+            - strip -v --strip-debug /usr/wine_extensions/v2/DXVK_{{VERSION}}/x64/*
             - cp -av ../setup_dxvk.sh /usr/wine_extensions/v2/DXVK_{{VERSION}}
         only-arches:
             - x86_64
\ No newline at end of file