Merge tag 'v0.5.7.1'

Makefile

@@ -38,10 +38,10 @@ pgp-renew:
 	osc rebuildpac home:strycore --all
 
 changelog-add:
-	dch -i
+	EDITOR=vim dch -i
 
 changelog-edit:
-	dch -e
+	EDITOR=vim dch -e
 
 upload:
 	scp build/lutris_${VERSION}.tar.xz anaheim:~/volumes/releases/

lutris.spec

@@ -6,7 +6,7 @@
 %global appid net.lutris.Lutris
 
 Name:           lutris
-Version:        0.5.7
+Version:        0.5.7.1
 Release:        7%{?dist}
 Summary:        Install and play any video game easily
 

lutris/__init__.py

@@ -1,3 +1,3 @@
 """Main Lutris package"""
 
-__version__ = "0.5.7"
+__version__ = "0.5.7.1"

lutris/runners/wine.py

@@ -219,16 +219,16 @@ class wine(Runner):
             },
             {
                 "option": "dxvk",
-                "label": _("Enable DXVK"),
+                "label": _("Enable DXVK/VKD3D"),
                 "type": "extended_bool",
                 "callback": dxvk_vulkan_callback,
                 "callback_on": True,
                 "default": True,
                 "active": True,
                 "help": _(
-                    "Use DXVK to increase compatibility and performance "
-                    "in Direct3D 11 and 10 applications by translating "
-                    "their calls to Vulkan."),
+                    "Use DXVK and VKD3D to enable support for Direct3D 12 and "
+                    "increase compatibility and performance in Direct3D 11, 10 "
+                    "and 9 applications by translating their calls to Vulkan."),
             },
             {
                 "option": "dxvk_version",
@@ -246,13 +246,6 @@ class wine(Runner):
             #     "default": True,
             #     "help": _("Use DXVK to handle DirectX9 games")
             # },
-            {
-                "option": "vkd3d",
-                "label": _("Enable VKD3D"),
-                "type": "bool",
-                "default": False,
-                "help": _("Enable DX12 support with VKD3D. This requires a compatible Wine build.")
-            },
             {
                 "option": "esync",
                 "label": _("Enable Esync"),
@@ -849,12 +842,7 @@ class wine(Runner):
         self.sandbox(prefix_manager)
         self.set_regedit_keys()
         self.setup_x360ce(self.runner_config.get("x360ce-path"))
-        if self.runner_config.get("vkd3d"):
-            dxvk_manager = dxvk.VKD3DManager
-        elif not self.runner_config.get("dxvk_d3d9", True):
-            dxvk_manager = dxvk.DXVKManagerNoD3D9
-        else:
-            dxvk_manager = dxvk.DXVKManager
+        dxvk_manager = dxvk.DXVKManager
         self.setup_dxvk(
             "dxvk",
             dxvk_manager=dxvk_manager(

lutris/util/wine/dxvk.py

@@ -79,7 +79,7 @@ class DXVKManager:
     """Utility class to install DXVK dlls to a Wine prefix"""
 
     DXVK_TAGS_URL = "https://api.github.com/repos/lutris/dxvk/releases"
-    DXVK_VERSIONS = ["1.6"]
+    DXVK_VERSIONS = ["1.7L-84bb768"]
     DXVK_LATEST, DXVK_PAST_RELEASES = DXVK_VERSIONS[0], DXVK_VERSIONS[1:9]
 
     init_started = False
@@ -88,7 +88,7 @@ class DXVKManager:
     base_url = "https://github.com/lutris/dxvk/releases/download/v{}/dxvk-{}.tar.gz"
     base_name = "dxvk"
     base_dir = os.path.join(RUNTIME_DIR, base_name)
-    dxvk_dlls = ("dxgi", "d3d11", "d3d10core", "d3d9")
+    dxvk_dlls = ("dxgi", "d3d11", "d3d10core", "d3d9", "d3d12")
     latest_version = DXVK_LATEST
 
     def __init__(self, prefix, arch="win64", version=None):
@@ -223,12 +223,6 @@ class DXVKManager:
             self.disable_dxvk_dll(system_dir, dxvk_arch, dll)
 
 
-class VKD3DManager(DXVKManager):
-
-    """Modified DXVKManager for supporting VKD3D"""
-    dxvk_dlls = ("d3d11", "d3d10core", "d3d9", "dxvk_config")
-
-
 class DXVKManagerNoD3D9(DXVKManager):
 
     """Modified DXVKManager without D3D9 support"""

packaging/debian/changelog

@@ -1,3 +1,12 @@
+lutris (0.5.7.1) focal; urgency=medium
+
+  * Provide D3D12.DLL, based on vkd3d3-proton project
+    (https://github.com/HansKristian-Work/vkd3d-proton),
+    as part of our DXVK runtime. This will help push updates faster and provide better compatibility for
+    Direct3D 12 titles such as World of Warcraft.
+
+ -- Mathieu Comandon <strider@strycore.com>  Sat, 18 Jul 2020 14:35:23 -0700
+
 lutris (0.5.7) focal; urgency=medium
 
   * Use Meson and Ninja to build translation files

packaging/debian/compat

@@ -1 +1 @@
-12
+12

share/metainfo/net.lutris.Lutris.metainfo.xml

@@ -26,7 +26,7 @@
   <url type="bugtracker">https://github.com/lutris/lutris/issues</url>
   <launchable type="desktop-id">net.lutris.Lutris.desktop</launchable>
   <releases>
-    <release date="2020-06-30" version="0.5.7" />
+    <release date="2020-07-18" version="0.5.7.1" />
   </releases>
   <content_rating type="oars-1.1" />
 </component>