From a3daf61619a68bfd15a617b4c0ce11285c91ab66 Mon Sep 17 00:00:00 2001 From: FrantiĊĦek Zatloukal Date: Mar 24 2020 11:20:27 +0000 Subject: Release 1.6 --- diff --git a/.gitignore b/.gitignore index d096c01..f2bdba0 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /dxvk-1.5.3.tar.gz /dxvk-1.5.4.tar.gz /dxvk-1.5.5.tar.gz +/dxvk-1.6.tar.gz diff --git a/0001-d3d11-Fix-winelib-build.patch b/0001-d3d11-Fix-winelib-build.patch new file mode 100644 index 0000000..7499fb4 --- /dev/null +++ b/0001-d3d11-Fix-winelib-build.patch @@ -0,0 +1,26 @@ +From 3104192af717f309068d2c20fd51b339511f6552 Mon Sep 17 00:00:00 2001 +From: Philip Rebohle +Date: Fri, 20 Mar 2020 17:01:46 +0100 +Subject: [PATCH 1/2] [d3d11] Fix winelib build + +Closes #1521. +--- + src/util/sync/sync_signal_win32.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/util/sync/sync_signal_win32.h b/src/util/sync/sync_signal_win32.h +index e89bec86..8ddc5aa6 100644 +--- a/src/util/sync/sync_signal_win32.h ++++ b/src/util/sync/sync_signal_win32.h +@@ -2,6 +2,8 @@ + + #include + ++#include "../com/com_include.h" ++ + #include "sync_signal.h" + + namespace dxvk::sync { +-- +2.26.0.rc2 + diff --git a/sources b/sources index fc83b42..36d4912 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dxvk-1.5.5.tar.gz) = b0a71dc6383aadfe55d30d73c3aefa63785882056d53d484e6d81b4bd85d40a1cf1840b61ecb03e21a3e8ed4e9a2c2d3d8ccbbadb956752f0356fe7e1a59ab10 +SHA512 (dxvk-1.6.tar.gz) = 5b1ba21515e5f7a75baba1e182a0b15285712c2a6e8946fcc0eadb82b64d43122e1c211304af2c890e368098fd2a69d174f86c05f9b0de0b417b0f2390d4a0ca diff --git a/wine-dxvk.spec b/wine-dxvk.spec index 282c035..9e57e67 100644 --- a/wine-dxvk.spec +++ b/wine-dxvk.spec @@ -9,13 +9,14 @@ %endif Name: wine-dxvk -Version: 1.5.5 +Version: 1.6 Release: 1%{?dist} Summary: Vulkan-based D3D11 and D3D10 implementation for Linux / Wine License: zlib URL: https://github.com/doitsujin/dxvk Source0: %{url}/archive/v%{version}/dxvk-%{version}.tar.gz +Patch01: 0001-d3d11-Fix-winelib-build.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -82,6 +83,7 @@ Requires: wine-dxvk-d3d9(x86-32) = %{version}-%{release} %prep %setup -q -n dxvk-%{version} +%patch01 -p1 %build /usr/bin/meson --buildtype=plain --wrap-mode=nodownload --auto-features=enabled . %{platform_identificator} \ @@ -164,6 +166,9 @@ mv %{buildroot}%{_libdir}/wine/d3d9.dll %{buildroot}%{_libdir}/wine/dxvk-d3d9.dl %changelog +* Tue Mar 24 2020 Frantisek Zatloukal - 1.6-1 +- Release 1.6 + * Sat Mar 07 2020 Frantisek Zatloukal - 1.5.5-1 - Release 1.5.5