From 7d31b71a6c43cd15ac737321801bfc9b79790bdc Mon Sep 17 00:00:00 2001 From: Michael Cronenworth Date: Tue, 29 Mar 2022 20:21:59 -0500 Subject: [PATCH] Update to 7.5 - Needing compiling fix for multi-process compile. - Upstream now bundles libvkd3d source and compiles into in DLL form - Cannot build libvkd3d in Fedora as DLL at this time (32-bit issue) --- sources | 6 +++--- wine.spec | 34 +++++++++++++++++++++++----------- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/sources b/sources index e41c724..def955e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (wine-7.3.tar.xz) = afadf96311e08fe5427276030ccad6b8decccc9727a3522711c237a9595318b05757d7390218b8614ded415b7b8c483f6501040efd8a7376e9909fa6e0e5140a -SHA512 (wine-7.3.tar.xz.sign) = 246116f446d788c3f3fb2f2b51ee8809e9a367bacaa05b38c771cb3e4788cd571b61e8d56f372d3ca02766c81f77ca7694e4150c24b32da2075ebbc6aa60bb94 -SHA512 (wine-staging-7.3.tar.gz) = 8f574bf89968d3c30944f9ba365b1ec4c4c9a662b3a54cf153d5a18be6957d8a5c2597c241ddd8a3e62cce866902e1df36594db6342b7432074e28c0e918935b +SHA512 (wine-7.5.tar.xz) = 70458d702e04075915a97a12c5ebd33ec50cbb094f5f837e6bb498e24ee48630359d819d9689e84d29708398162ca7b8f7737216fb31c350701b66733da98616 +SHA512 (wine-7.5.tar.xz.sign) = 8a0ae360cc23260dbe79d1aa683ddfec45a579a9704fb10b9b8cb0ac28c79c8a79141dae683e21f3d8efd6f228504401c59b1b3cab825ef89fbe6e37f934f808 +SHA512 (wine-staging-7.5.tar.gz) = 138456d1fd76fa433afe01cd1d2cadb88c631277f69734641f1136795f0761a68fdfc564b9da90a342ff42e82f04436b70bb57913f92417b14e24cd7720a7b90 diff --git a/wine.spec b/wine.spec index ca12c16..4a382c4 100644 --- a/wine.spec +++ b/wine.spec @@ -1,6 +1,12 @@ # Compiling the preloader fails with hardening enabled %undefine _hardened_build +# Parallel build broken (fails with +# /usr/bin/x86_64-w64-mingw32-dlltool: dlls/winmm/libwinmm.{cross,delay}.a: No such file or directory +# /usr/bin/x86_64-w64-mingw32-dlltool: dlls/oleaut32/liboleaut32.{cross,delay}.a: No such file or directory +# /usr/bin/x86_64-w64-mingw32-dlltool: dlls/oleaut32/libwintrust.{cross,delay}.a: No such file or directory +%global _smp_mflags -j1 + %global no64bit 0 %global winegecko 2.47.2 %global winemono 7.1.1 @@ -37,8 +43,8 @@ %endif Name: wine -Version: 7.3 -Release: 2%{?dist} +Version: 7.5 +Release: 1%{?dist} Summary: A compatibility layer for windows applications License: LGPLv2+ @@ -362,6 +368,8 @@ Requires: libva %endif %endif +Provides: bundled(libvkd3d) = 1.3 + # removed as of 1.7.35 Obsoletes: wine-wow < 1.7.35 Provides: wine-wow = %{version}-%{release} @@ -764,14 +772,12 @@ touch %{buildroot}%{_bindir}/wine touch %{buildroot}%{_bindir}/wine-preloader touch %{buildroot}%{_bindir}/wineserver mv %{buildroot}%{_libdir}/wine/%{winepedir}/dxgi.dll %{buildroot}%{_libdir}/wine/%{winepedir}/wine-dxgi.dll -mv %{buildroot}%{_libdir}/wine/%{winesodir}/dxgi.dll.so %{buildroot}%{_libdir}/wine/%{winesodir}/wine-dxgi.dll.so mv %{buildroot}%{_libdir}/wine/%{winepedir}/d3d9.dll %{buildroot}%{_libdir}/wine/%{winepedir}/wine-d3d9.dll mv %{buildroot}%{_libdir}/wine/%{winepedir}/d3d10.dll %{buildroot}%{_libdir}/wine/%{winepedir}/wine-d3d10.dll mv %{buildroot}%{_libdir}/wine/%{winepedir}/d3d10_1.dll %{buildroot}%{_libdir}/wine/%{winepedir}/wine-d3d10_1.dll mv %{buildroot}%{_libdir}/wine/%{winepedir}/d3d10core.dll %{buildroot}%{_libdir}/wine/%{winepedir}/wine-d3d10core.dll mv %{buildroot}%{_libdir}/wine/%{winepedir}/d3d11.dll %{buildroot}%{_libdir}/wine/%{winepedir}/wine-d3d11.dll touch %{buildroot}%{_libdir}/wine/%{winepedir}/dxgi.dll -touch %{buildroot}%{_libdir}/wine/%{winesodir}/dxgi.dll.so touch %{buildroot}%{_libdir}/wine/%{winepedir}/d3d9.dll touch %{buildroot}%{_libdir}/wine/%{winepedir}/d3d10.dll touch %{buildroot}%{_libdir}/wine/%{winepedir}/d3d10_1.dll @@ -1022,7 +1028,7 @@ fi %posttrans core # handle upgrades for a few package updates -%{_sbindir}/alternatives --remove 'wine-dxgi%{?_isa}' %{_libdir}/wine/wine-dxgi.dll.so 2>/dev/null +%{_sbindir}/alternatives --remove 'wine-dxgi%{?_isa}' %{_libdir}/wine/wine-dxgi.dll 2>/dev/null %{_sbindir}/alternatives --remove 'wine-d3d9%{?_isa}' %{_libdir}/wine/wine-d3d9.dll 2>/dev/null %{_sbindir}/alternatives --remove 'wine-d3d10%{?_isa}' %{_libdir}/wine/wine-d3d10.dll 2>/dev/null %{_sbindir}/alternatives --remove 'wine-d3d11%{?_isa}' %{_libdir}/wine/wine-d3d11.dll 2>/dev/null @@ -1040,8 +1046,7 @@ fi wineserver %{_bindir}/wineserver32 10 %endif %{_sbindir}/alternatives --install %{_libdir}/wine/%{winepedir}/dxgi.dll \ - 'wine-dxgi%{?_isa}' %{_libdir}/wine/%{winepedir}/wine-dxgi.dll 10 \ - --slave %{_libdir}/wine/%{winesodir}/dxgi.dll.so 'wine-dxgi-so%{?_isa}' %{_libdir}/wine/%{winesodir}/wine-dxgi.dll.so + 'wine-dxgi%{?_isa}' %{_libdir}/wine/%{winepedir}/wine-dxgi.dll 10 %{_sbindir}/alternatives --install %{_libdir}/wine/%{winepedir}/d3d9.dll \ 'wine-d3d9%{?_isa}' %{_libdir}/wine/%{winepedir}/wine-d3d9.dll 10 %{_sbindir}/alternatives --install %{_libdir}/wine/%{winepedir}/d3d10.dll \ @@ -1144,6 +1149,7 @@ fi %{_libdir}/wine/%{winepedir}/conhost.exe %{_libdir}/wine/%{winepedir}/cscript.exe %{_libdir}/wine/%{winepedir}/dism.exe +%{_libdir}/wine/%{winepedir}/dllhost.exe %{_libdir}/wine/%{winepedir}/dplaysvr.exe %{_libdir}/wine/%{winepedir}/dpnsvr.exe %{_libdir}/wine/%{winepedir}/dpvsetup.exe @@ -1268,7 +1274,6 @@ fi %ghost %{_libdir}/wine/%{winepedir}/d3d11.dll %{_libdir}/wine/%{winepedir}/wine-d3d11.dll %{_libdir}/wine/%{winepedir}/d3d12.dll -%{_libdir}/wine/%{winesodir}/d3d12.dll.so %{_libdir}/wine/%{winepedir}/d3dcompiler_*.dll %{_libdir}/wine/%{winepedir}/d3dim.dll %{_libdir}/wine/%{winepedir}/d3dim700.dll @@ -1327,8 +1332,6 @@ fi %{_libdir}/wine/%{winepedir}/dxdiagn.dll %ghost %{_libdir}/wine/%{winepedir}/dxgi.dll %{_libdir}/wine/%{winepedir}/wine-dxgi.dll -%ghost %{_libdir}/wine/%{winesodir}/dxgi.dll.so -%{_libdir}/wine/%{winesodir}/wine-dxgi.dll.so %{_libdir}/wine/%{winepedir}/dxgkrnl.sys %{_libdir}/wine/%{winepedir}/dxgmms1.sys %{_libdir}/wine/%{winepedir}/dxtrans.dll @@ -1769,7 +1772,6 @@ fi %{_libdir}/wine/%{winepedir}/opengl32.dll %{_libdir}/wine/%{winesodir}/opengl32.dll.so %{_libdir}/wine/%{winepedir}/wined3d.dll -%{_libdir}/wine/%{winesodir}/wined3d.dll.so %{_libdir}/wine/%{winepedir}/dnsapi.dll %{_libdir}/wine/%{winesodir}/dnsapi.so %{_libdir}/wine/%{winepedir}/iexplore.exe @@ -1937,6 +1939,7 @@ fi %{_libdir}/wine/%{winesodir}/conhost.exe.so %{_libdir}/wine/%{winesodir}/cscript.exe.so %{_libdir}/wine/%{winesodir}/dism.exe.so +%{_libdir}/wine/%{winesodir}/dllhost.exe.so %{_libdir}/wine/%{winesodir}/dplaysvr.exe.so %{_libdir}/wine/%{winesodir}/dpnsvr.exe.so %{_libdir}/wine/%{winesodir}/dpvsetup.exe.so @@ -2046,6 +2049,7 @@ fi %{_libdir}/wine/%{winesodir}/d3d10_1.dll.so %{_libdir}/wine/%{winesodir}/d3d10core.dll.so %{_libdir}/wine/%{winesodir}/d3d11.dll.so +%{_libdir}/wine/%{winesodir}/d3d12.dll.so %{_libdir}/wine/%{winesodir}/d3dcompiler_*.dll.so %{_libdir}/wine/%{winesodir}/d3dim.dll.so %{_libdir}/wine/%{winesodir}/d3dim700.dll.so @@ -2101,6 +2105,8 @@ fi %{_libdir}/wine/%{winesodir}/dwrite.dll.so %{_libdir}/wine/%{winesodir}/dx8vb.dll.so %{_libdir}/wine/%{winesodir}/dxdiagn.dll.so +%ghost %{_libdir}/wine/%{winesodir}/dxgi.dll.so +%{_libdir}/wine/%{winesodir}/wine-dxgi.dll.so %{_libdir}/wine/%{winesodir}/dxgkrnl.sys.so %{_libdir}/wine/%{winesodir}/dxgmms1.sys.so %{_libdir}/wine/%{winesodir}/dxtrans.dll.so @@ -2445,6 +2451,7 @@ fi %{_libdir}/wine/%{winesodir}/windowscodecs.dll.so %{_libdir}/wine/%{winesodir}/windowscodecsext.dll.so %{_libdir}/wine/%{winesodir}/winebus.sys.so +%{_libdir}/wine/%{winesodir}/wined3d.dll.so %{_libdir}/wine/%{winesodir}/winegstreamer.dll.so %{_libdir}/wine/%{winesodir}/winehid.sys.so %{_libdir}/wine/%{winesodir}/winemapi.dll.so @@ -2761,7 +2768,9 @@ fi %files alsa %{_libdir}/wine/%{winepedir}/winealsa.drv %{_libdir}/wine/%{winesodir}/winealsa.so +%ifarch %{arm} aarch64 %{_libdir}/wine/%{winesodir}/winealsa.drv.so +%endif %if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 %files openal @@ -2779,6 +2788,9 @@ fi %endif %changelog +* Tue Mar 29 2022 Michael Cronenworth - 7.5-1 +- version update + * Fri Mar 25 2022 Sandro Mani - 7.3-2 - Rebuild with mingw-gcc-12