From cd68832119674465d472644a2a7924e74e7ad03d Mon Sep 17 00:00:00 2001
From: Michael Cronenworth <mike@cchtml.com>
Date: Sat, 25 Jun 2022 23:39:20 -0500
Subject: [PATCH] Update to 1.4 and initial MinGW packages

---
 .gitignore |  4 +--
 sources    |  4 +--
 vkd3d.spec | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++---
 3 files changed, 85 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index c9a804e..7b6ffb3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/vkd3d-1.3.tar.xz
-/vkd3d-1.3.tar.xz.sign
+/vkd3d-1.4.tar.xz
+/vkd3d-1.4.tar.xz.sign
diff --git a/sources b/sources
index ec0fc42..85929d7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (vkd3d-1.3.tar.xz) = 3651f4d086a42af9007f3c12b5b9166e0f7686e8294fa571ee6b92e6a1a3c1fbc25e40062b31de7f8d5609c7c08a69c992cea4c951ae1f19f7df6bdf3174bc9d
-SHA512 (vkd3d-1.3.tar.xz.sign) = 681514b707ec81bc82fe7de6171abb2d8f165667b9e0d90ec484f2ffb450108a46e95f136d5649d9ea650bd81866cd58210587d370b7471c1b57b68437399302
+SHA512 (vkd3d-1.4.tar.xz) = 58535b57b0b506542f2867e9b1229682f012216b9f8913d2692d4ed64a8113248d66ea710127ec2064baf9511b7f2be7b757dffcaf95a43168d781010d007ddb
+SHA512 (vkd3d-1.4.tar.xz.sign) = ef6913302aa1a72561c9256954fdb30ed4a596dbca22217ede19efac36c547796f54289065f8257af19cb8aafe7d131fa288943c67023a9037224b96e4c7369f
diff --git a/vkd3d.spec b/vkd3d.spec
index 31fdd39..44db826 100644
--- a/vkd3d.spec
+++ b/vkd3d.spec
@@ -1,5 +1,5 @@
 Name:		vkd3d
-Version:	1.3
+Version:	1.4
 Release:	1%{?dist}
 Summary:	D3D12 to Vulkan translation library
 
@@ -20,6 +20,20 @@ BuildRequires:	xcb-util-devel
 BuildRequires:	xcb-util-keysyms-devel
 BuildRequires:	xcb-util-wm-devel
 
+BuildRequires:  mingw32-filesystem >= 95
+BuildRequires:  mingw32-gcc
+BuildRequires:  mingw32-spirv-headers
+BuildRequires:  mingw32-spirv-tools
+BuildRequires:  mingw32-vulkan-headers
+BuildRequires:  mingw32-vulkan-loader
+
+BuildRequires:  mingw64-filesystem >= 95
+BuildRequires:  mingw64-gcc
+BuildRequires:  mingw64-spirv-headers
+BuildRequires:  mingw64-spirv-tools
+BuildRequires:  mingw64-vulkan-headers
+BuildRequires:  mingw64-vulkan-loader
+
 # Wine does not build on aarch64 due to clang requires
 # vulkan is not available in RHEL 7+ for aarch64 either
 %if 0%{?rhel} >= 7
@@ -96,20 +110,49 @@ Requires:	libvkd3d-utils%{?_isa} = %{version}-%{release}
 Development files for libvkd3d-utils
 
 
+%package -n mingw32-%{name}
+Summary:	%{summary}
+BuildArch:	noarch
+
+
+%description -n mingw32-%{name}
+%{summary}
+
+
+%package -n mingw64-%{name}
+Summary:	%{summary}
+BuildArch:	noarch
+
+
+%description -n mingw64-%{name}
+%{summary}
+
+
 %prep
-%setup -q
+%autosetup
+mkdir ../mingw-build
+cp -rp . ../mingw-build
 
 
 %build
-%configure --with-spirv-tools
+%configure
 %make_build
 
+pushd ../mingw-build
+export SONAME_LIBVULKAN=lvulkan-1
+%mingw_configure
+%mingw_make %{?_smp_mflags}
+popd
+
 
 %install
 %make_install
+pushd ../mingw-build
+%mingw_make_install
+popd
 
 #Remove libtool files and static libraries
-find %{buildroot} -regextype egrep -regex '.*\.a$|.*\.la$' -delete
+find %{buildroot} -regextype egrep -regex '.*\.a$|.*\.la$' ! -iname '*.dll.a' -delete
 
 
 %files -n libvkd3d
@@ -163,7 +206,41 @@ find %{buildroot} -regextype egrep -regex '.*\.a$|.*\.la$' -delete
 %{_libdir}/pkgconfig/libvkd3d-utils.pc
 
 
+%files -n mingw32-%{name}
+%license COPYING LICENSE
+%{mingw32_bindir}/libvkd3d-1.dll
+%{mingw32_bindir}/libvkd3d-shader-1.dll
+%{mingw32_bindir}/libvkd3d-utils-1.dll
+%{mingw32_includedir}/%{name}/
+%{mingw32_bindir}/vkd3d-compiler.exe
+%{mingw32_libdir}/pkgconfig/libvkd3d.pc
+%{mingw32_libdir}/pkgconfig/libvkd3d-shader.pc
+%{mingw32_libdir}/pkgconfig/libvkd3d-utils.pc
+%{mingw32_libdir}/libvkd3d.dll.a
+%{mingw32_libdir}/libvkd3d-shader.dll.a
+%{mingw32_libdir}/libvkd3d-utils.dll.a
+
+
+%files -n mingw64-%{name}
+%license COPYING LICENSE
+%{mingw64_bindir}/libvkd3d-1.dll
+%{mingw64_bindir}/libvkd3d-shader-1.dll
+%{mingw64_bindir}/libvkd3d-utils-1.dll
+%{mingw64_bindir}/vkd3d-compiler.exe
+%{mingw64_includedir}/%{name}/
+%{mingw64_libdir}/pkgconfig/libvkd3d.pc
+%{mingw64_libdir}/pkgconfig/libvkd3d-shader.pc
+%{mingw64_libdir}/pkgconfig/libvkd3d-utils.pc
+%{mingw64_libdir}/libvkd3d.dll.a
+%{mingw64_libdir}/libvkd3d-shader.dll.a
+%{mingw64_libdir}/libvkd3d-utils.dll.a
+
+
 %changelog
+* Sat Jun 25 2022 - Michael Cronenworth <mike@cchtml.com> - 1.4-1
+- version update
+- Initial MinGW package
+
 * Fri Mar 11 2022 - Michael Cronenworth <mike@cchtml.com> - 1.3-1
 - version update