diff --git a/.gitignore b/.gitignore index fbd913d..f35c8bd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/vkd3d-*.tar.xz -/vkd3d-*.tar.xz.sign +/vkd3d-1.1.tar.xz +/vkd3d-1.1.tar.xz.sign diff --git a/sources b/sources index 6162712..250f221 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (vkd3d-1.19.tar.xz) = 97502ee4340648feaf19919710310db5fe87909bb4e71150987595cd7fa85031d7eadfd5cb09285d2a41dd8a0e4664813631b636e4ccd561f4ed818ce9bc8682 -SHA512 (vkd3d-1.19.tar.xz.sign) = 219373021f2e21665e4aebfad87a8d08f33b7f880898ae088e2b7e573837970f9eaea40ffd7c9a93efef9790bd211bc2c86bc7d4234fdae6d1f646f2e81dbd50 +SHA512 (vkd3d-1.1.tar.xz) = e107612bdca95e998f9d819bdf74e4ffe1b4d400d250ab855c4ebf94b7d3f088b3221591fef03b1c6b8ecb030feb1673f74831bd8bd8edda2989d09a8846b0f7 +SHA512 (vkd3d-1.1.tar.xz.sign) = bad3f5a08f0e49f502352f2768cf8a5c170788ec85608f1ba1555833d9f8f9f2ea34eb0cf7a4280a855ea4d66d5aa2b3f14997909105d2b344f6aef4cf9e210d diff --git a/vkd3d.spec b/vkd3d.spec index 6c82ef5..4ac1653 100644 --- a/vkd3d.spec +++ b/vkd3d.spec @@ -1,51 +1,28 @@ Name: vkd3d -Version: 1.19 +Version: 1.1 Release: 2%{?dist} Summary: D3D12 to Vulkan translation library -# Automatically converted from old format: LGPLv2+ - review is highly recommended. -License: LicenseRef-Callaway-LGPLv2+ +License: LGPLv2+ URL: https://source.winehq.org/git/vkd3d.git Source0: https://dl.winehq.org/vkd3d/source/%{name}-%{version}.tar.xz Source1: https://dl.winehq.org/vkd3d/source/%{name}-%{version}.tar.xz.sign -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: libtool -BuildRequires: make -BuildRequires: bison -BuildRequires: flex BuildRequires: gcc BuildRequires: libxcb-devel -BuildRequires: perl-JSON -BuildRequires: perl-open BuildRequires: spirv-headers-devel BuildRequires: spirv-tools-devel -BuildRequires: vulkan-loader-devel +BuildRequires: vulkan-devel 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 -ExclusiveArch: %{ix86} x86_64 %{arm} +# vulkan is not available in RHEL 7 for aarch64 either +%if 0%{?rhel} == 7 +ExclusiveArch: %{ix86} x86_64 %{arm} %else -ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 +ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %endif %description @@ -71,32 +48,6 @@ Requires: libvkd3d%{?_isa} = %{version}-%{release} Development files for vkd3d -%package -n vkd3d-compiler -Summary: Compiler tool for vkd3d - - -%description -n vkd3d-compiler -Compiler tool for vkd3d - - -%package -n libvkd3d-shader -Summary: Shader library for vkd3d - - -%description -n libvkd3d-shader -Shader library for vkd3d - - -%package -n libvkd3d-shader-devel -Summary: Development files for libvkd3d-shader -Requires: libvkd3d-devel%{?_isa} = %{version}-%{release} -Requires: libvkd3d-shader%{?_isa} = %{version}-%{release} - - -%description -n libvkd3d-shader-devel -Development files for libvkd3d-shader - - %package -n libvkd3d-utils Summary: Utility library for vkd3d @@ -116,53 +67,20 @@ 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}. - - -%{?mingw_debug_package} - - %prep -%autosetup -p1 -mkdir ../mingw-build -cp -rp . ../mingw-build +%setup -q %build -%configure +%configure --with-spirv-tools %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 -%mingw_debug_install_post -popd #Remove libtool files and static libraries -find %{buildroot} -regextype egrep -regex '.*\.a$|.*\.la$' ! -iname '*.dll.a' -delete +find %{buildroot} -regextype egrep -regex '.*\.a$|.*\.la$' -delete %files -n libvkd3d @@ -174,40 +92,16 @@ find %{buildroot} -regextype egrep -regex '.*\.a$|.*\.la$' ! -iname '*.dll.a' -d %files -n libvkd3d-devel %dir %{_includedir}/vkd3d -%{_includedir}/vkd3d/vkd3d.h %{_includedir}/vkd3d/vkd3d_d3d12.h -%{_includedir}/vkd3d/vkd3d_d3d12sdklayers.h -%{_includedir}/vkd3d/vkd3d_d3d9types.h %{_includedir}/vkd3d/vkd3d_d3dcommon.h -%{_includedir}/vkd3d/vkd3d_d3dcompiler.h -%{_includedir}/vkd3d/vkd3d_d3dcompiler_types.h -%{_includedir}/vkd3d/vkd3d_d3dx9shader.h -%{_includedir}/vkd3d/vkd3d_d3d12shader.h %{_includedir}/vkd3d/vkd3d_dxgibase.h %{_includedir}/vkd3d/vkd3d_dxgiformat.h -%{_includedir}/vkd3d/vkd3d_types.h +%{_includedir}/vkd3d/vkd3d.h %{_includedir}/vkd3d/vkd3d_windows.h %{_libdir}/libvkd3d.so %{_libdir}/pkgconfig/libvkd3d.pc -%files -n vkd3d-compiler -%{_bindir}/vkd3d-compiler -%{_bindir}/vkd3d-dxbc - - -%files -n libvkd3d-shader -%license COPYING LICENSE -%{_libdir}/libvkd3d-shader.so.1 -%{_libdir}/libvkd3d-shader.so.1.* - - -%files -n libvkd3d-shader-devel -%{_includedir}/vkd3d/vkd3d_shader.h -%{_libdir}/libvkd3d-shader.so -%{_libdir}/pkgconfig/libvkd3d-shader.pc - - %files -n libvkd3d-utils %{_libdir}/libvkd3d-utils.so.1 %{_libdir}/libvkd3d-utils.so.1.* @@ -219,133 +113,7 @@ find %{buildroot} -regextype egrep -regex '.*\.a$|.*\.la$' ! -iname '*.dll.a' -d %{_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_bindir}/vkd3d-dxbc.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_bindir}/vkd3d-dxbc.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 -* Fri Jul 17 2026 Fedora Release Engineering - 1.19-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Sun Apr 26 2026 Zephyr Lykos - 1.19-1 -- new version - -* Sat Jan 17 2026 Fedora Release Engineering - 1.17-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Aug 29 2025 - Michael Cronenworth - 1.17-1 -- version update - -* Fri Jul 25 2025 Fedora Release Engineering - 1.14-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Fedora Release Engineering - 1.14-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Dec 06 2024 - Michael Cronenworth - 1.14-1 -- version update - -* Wed Sep 04 2024 Miroslav Suchý - 1.12-2 -- convert license to SPDX - -* Sat Jul 20 2024 Fedora Release Engineering - 1.11-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Mar 28 2024 - Michael Cronenworth - 1.11-1 -- version update - -* Sat Jan 27 2024 Fedora Release Engineering - 1.10-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Jan 18 2024 - Michael Cronenworth - 1.10-1 -- version update - -* Mon Dec 18 2023 Florian Weimer - 1.9-2 -- Fix C compatibility issue in configure script, run autoconf - -* Sun Oct 01 2023 - Michael Cronenworth - 1.9-1 -- version update - -* Sat Jul 22 2023 Fedora Release Engineering - 1.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Mon Jul 10 2023 - Michael Cronenworth - 1.8-1 -- version update - -* Sat Apr 01 2023 - Michael Cronenworth - 1.7-1 -- version update - -* Sat Jan 21 2023 Fedora Release Engineering - 1.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jan 12 2023 - Michael Cronenworth - 1.6-1 -- version update - -* Mon Oct 24 2022 - Michael Cronenworth - 1.5-1 -- version update - -* Thu Aug 25 2022 - Michael Cronenworth - 1.4-3 -- Include MinGW debuginfo packages - -* Sat Jul 23 2022 Fedora Release Engineering - 1.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jun 25 2022 - Michael Cronenworth - 1.4-1 -- version update -- Initial MinGW package - -* Fri Mar 11 2022 - Michael Cronenworth - 1.3-1 -- version update - -* Sat Jan 22 2022 Fedora Release Engineering - 1.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 1.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 1.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Sep 22 2020 - Michael Cronenworth - 1.2-1 -- version update - -* Wed Jul 29 2020 Fedora Release Engineering - 1.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 1.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 1.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - * Sun Feb 03 2019 Fedora Release Engineering - 1.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild