The package rpms/wine-dxvk.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/wine-dxvk.git/commit/?id=fd3a0513....
Change:
+%ifarch x86_64
Thanks.
Full change:
============
commit d52e515f88c88a658f16dfb39c65ada03600d0cd
Author: Matias Zuniga <matias.nicolas.zc(a)gmail.com>
Date: Sun Apr 26 13:59:53 2020 -0400
Remove winelib build and fix mingw build dll names
diff --git a/wine-dxvk.spec b/wine-dxvk.spec
index ceb2406..95ada5e 100644
--- a/wine-dxvk.spec
+++ b/wine-dxvk.spec
@@ -90,36 +90,26 @@ Requires: wine-dxvk-d3d9(x86-32) = %{version}-%{release}
%setup -q -n dxvk-%{version}
%build
-/usr/bin/meson -Denable_dxgi=false --buildtype=plain --wrap-mode=nodownload
--auto-features=enabled . %{platform_identificator} \
---cross-file build-wine%{target_x86_type}.txt --buildtype release --prefix
/builddir/build/BUILD/dxvk-%{version}/build
-%meson_build
-
-# Copy compiled .so files aside before cleaning up the build directory
-cp /builddir/build/BUILD/dxvk-%{version}/%{platform_identificator}/src/d3d9/d3d9.dll.so
/builddir/build/BUILD/dxvk-%{version}/d3d9.dll.so
-cp /builddir/build/BUILD/dxvk-%{version}/%{platform_identificator}/src/d3d10/d3d10.dll.so
/builddir/build/BUILD/dxvk-%{version}/d3d10.dll.so
-cp
/builddir/build/BUILD/dxvk-%{version}/%{platform_identificator}/src/d3d10/d3d10_1.dll.so
/builddir/build/BUILD/dxvk-%{version}/d3d10_1.dll.so
-cp
/builddir/build/BUILD/dxvk-%{version}/%{platform_identificator}/src/d3d10/d3d10core.dll.so
/builddir/build/BUILD/dxvk-%{version}/d3d10core.dll.so
-cp /builddir/build/BUILD/dxvk-%{version}/%{platform_identificator}/src/d3d11/d3d11.dll.so
/builddir/build/BUILD/dxvk-%{version}/d3d11.dll.so
-
-/usr/bin/meson --wipe -Denable_dxgi=true --buildtype=plain --wrap-mode=nodownload
--auto-features=enabled . %{platform_identificator} \
+/usr/bin/meson --buildtype=plain --wrap-mode=nodownload --auto-features=enabled .
%{platform_identificator} \
--cross-file build-win%{target_x86_type}.txt --buildtype release --prefix
/builddir/build/BUILD/dxvk-%{version}/build
%meson_build
%install
%meson_install
+#winebuild --builtin
%%buildroot/builddir/build/BUILD/dxvk-%%{version}/build/bin/dxgi.dll
+winebuild --builtin %buildroot/builddir/build/BUILD/dxvk-%{version}/build/bin/d3d9.dll
+winebuild --builtin %buildroot/builddir/build/BUILD/dxvk-%{version}/build/bin/d3d10.dll
+winebuild --builtin
%buildroot/builddir/build/BUILD/dxvk-%{version}/build/bin/d3d10core.dll
+winebuild --builtin
%buildroot/builddir/build/BUILD/dxvk-%{version}/build/bin/d3d10_1.dll
+winebuild --builtin %buildroot/builddir/build/BUILD/dxvk-%{version}/build/bin/d3d11.dll
+
mkdir -p %{buildroot}%{_libdir}/wine/
-install -p -m 755 /builddir/build/BUILD/dxvk-%{version}/d3d9.dll.so
%{buildroot}%{_libdir}/wine/
-install -p -m 755 /builddir/build/BUILD/dxvk-%{version}/d3d10.dll.so
%{buildroot}%{_libdir}/wine/
-install -p -m 755 /builddir/build/BUILD/dxvk-%{version}/d3d10_1.dll.so
%{buildroot}%{_libdir}/wine/
-install -p -m 755 /builddir/build/BUILD/dxvk-%{version}/d3d10core.dll.so
%{buildroot}%{_libdir}/wine/
-install -p -m 755 /builddir/build/BUILD/dxvk-%{version}/d3d11.dll.so
%{buildroot}%{_libdir}/wine/
-
-install -p -m 755 %buildroot/builddir/build/BUILD/dxvk-%{version}/build/bin/dxgi.dll
%{buildroot}%{_libdir}/wine/
-install -p -m 755 %buildroot/builddir/build/BUILD/dxvk-%{version}/build/bin/d3d9.dll
%{buildroot}%{_libdir}/wine/
-install -p -m 755 %buildroot/builddir/build/BUILD/dxvk-%{version}/build/bin/d3d10.dll
%{buildroot}%{_libdir}/wine/
-install -p -m 755 %buildroot/builddir/build/BUILD/dxvk-%{version}/build/bin/d3d10core.dll
%{buildroot}%{_libdir}/wine/
-install -p -m 755 %buildroot/builddir/build/BUILD/dxvk-%{version}/build/bin/d3d10_1.dll
%{buildroot}%{_libdir}/wine/
-install -p -m 755 %buildroot/builddir/build/BUILD/dxvk-%{version}/build/bin/d3d11.dll
%{buildroot}%{_libdir}/wine/
+install -p -m 644 %buildroot/builddir/build/BUILD/dxvk-%{version}/build/bin/dxgi.dll
%{buildroot}%{_libdir}/wine/
+install -p -m 644 %buildroot/builddir/build/BUILD/dxvk-%{version}/build/bin/d3d9.dll
%{buildroot}%{_libdir}/wine/
+install -p -m 644 %buildroot/builddir/build/BUILD/dxvk-%{version}/build/bin/d3d10.dll
%{buildroot}%{_libdir}/wine/
+install -p -m 644 %buildroot/builddir/build/BUILD/dxvk-%{version}/build/bin/d3d10core.dll
%{buildroot}%{_libdir}/wine/
+install -p -m 644 %buildroot/builddir/build/BUILD/dxvk-%{version}/build/bin/d3d10_1.dll
%{buildroot}%{_libdir}/wine/
+install -p -m 644 %buildroot/builddir/build/BUILD/dxvk-%{version}/build/bin/d3d11.dll
%{buildroot}%{_libdir}/wine/
rm -rf %buildroot/builddir/build/BUILD/dxvk-%{version}/build
mv %{buildroot}%{_libdir}/wine/dxgi.dll %{buildroot}%{_libdir}/wine/dxvk-dxgi.dll
@@ -152,15 +142,10 @@ mv %{buildroot}%{_libdir}/wine/d3d11.dll
%{buildroot}%{_libdir}/wine/dxvk-d3d11.
%{_libdir}/wine/dxvk-d3d10_1.dll
%{_libdir}/wine/dxvk-d3d10core.dll
%{_libdir}/wine/dxvk-d3d11.dll
-%{_libdir}/wine/d3d10.dll.so
-%{_libdir}/wine/d3d10_1.dll.so
-%{_libdir}/wine/d3d10core.dll.so
-%{_libdir}/wine/d3d11.dll.so
%files d3d9
%license LICENSE
%{_libdir}/wine/dxvk-d3d9.dll
-%{_libdir}/wine/d3d9.dll.so
%files dxgi
%license LICENSE
commit fd3a051321b4070f89c6fa282bedc798f18ae84d
Author: Matias Zuniga <matias.nicolas.zc(a)gmail.com>
Date: Sun Apr 26 13:40:35 2020 -0400
Exclude DXGI from winelib build
diff --git a/wine-dxvk.spec b/wine-dxvk.spec
index 3e95224..ceb2406 100644
--- a/wine-dxvk.spec
+++ b/wine-dxvk.spec
@@ -42,7 +42,7 @@ BuildRequires: mingw32-winpthreads-static
%endif
Requires: wine >= 4.13
-Requires: wine-dxvk-dxgi%{?_isa} = %{version}-%{release}
+Recommends: wine-dxvk-dxgi%{?_isa} = %{version}-%{release}
Requires: vulkan-loader%{?_isa}
# We want x86_64 users to always have also 32 bit lib, it's the same what wine does
@@ -63,10 +63,16 @@ ExclusiveArch: %{ix86} x86_64
%package dxgi
Summary: DXVK DXGI implementation
+%ifarch x86_64
+Requires: wine-dxvk-dxgi(x86-32) = %{version}-%{release}
+%endif
%description dxgi
%{summary}
+This package doesn't enable the use of this DXGI implementation,
+it should be installed and overridden per prefix.
+
%package d3d9
Summary: DXVK D3D9 implementation
@@ -84,32 +90,31 @@ Requires: wine-dxvk-d3d9(x86-32) = %{version}-%{release}
%setup -q -n dxvk-%{version}
%build
-/usr/bin/meson --buildtype=plain --wrap-mode=nodownload --auto-features=enabled .
%{platform_identificator} \
+/usr/bin/meson -Denable_dxgi=false --buildtype=plain --wrap-mode=nodownload
--auto-features=enabled . %{platform_identificator} \
--cross-file build-wine%{target_x86_type}.txt --buildtype release --prefix
/builddir/build/BUILD/dxvk-%{version}/build
%meson_build
# Copy compiled .so files aside before cleaning up the build directory
-cp /builddir/build/BUILD/dxvk-%{version}/%{platform_identificator}/src/dxgi/dxgi.dll.so
/builddir/build/BUILD/dxvk-%{version}/dxgi.dll.so
-cp /builddir/build/BUILD/dxvk-%{version}/%{platform_identificator}/src/d3d11/d3d11.dll.so
/builddir/build/BUILD/dxvk-%{version}/d3d11.dll.so
+cp /builddir/build/BUILD/dxvk-%{version}/%{platform_identificator}/src/d3d9/d3d9.dll.so
/builddir/build/BUILD/dxvk-%{version}/d3d9.dll.so
cp /builddir/build/BUILD/dxvk-%{version}/%{platform_identificator}/src/d3d10/d3d10.dll.so
/builddir/build/BUILD/dxvk-%{version}/d3d10.dll.so
cp
/builddir/build/BUILD/dxvk-%{version}/%{platform_identificator}/src/d3d10/d3d10_1.dll.so
/builddir/build/BUILD/dxvk-%{version}/d3d10_1.dll.so
cp
/builddir/build/BUILD/dxvk-%{version}/%{platform_identificator}/src/d3d10/d3d10core.dll.so
/builddir/build/BUILD/dxvk-%{version}/d3d10core.dll.so
-cp /builddir/build/BUILD/dxvk-%{version}/%{platform_identificator}/src/d3d9/d3d9.dll.so
/builddir/build/BUILD/dxvk-%{version}/d3d9.dll.so
+cp /builddir/build/BUILD/dxvk-%{version}/%{platform_identificator}/src/d3d11/d3d11.dll.so
/builddir/build/BUILD/dxvk-%{version}/d3d11.dll.so
-/usr/bin/meson --wipe --buildtype=plain --wrap-mode=nodownload --auto-features=enabled .
%{platform_identificator} \
+/usr/bin/meson --wipe -Denable_dxgi=true --buildtype=plain --wrap-mode=nodownload
--auto-features=enabled . %{platform_identificator} \
--cross-file build-win%{target_x86_type}.txt --buildtype release --prefix
/builddir/build/BUILD/dxvk-%{version}/build
%meson_build
%install
%meson_install
mkdir -p %{buildroot}%{_libdir}/wine/
-install -p -m 755 /builddir/build/BUILD/dxvk-%{version}/dxgi.dll.so
%{buildroot}%{_libdir}/wine/
-install -p -m 755 /builddir/build/BUILD/dxvk-%{version}/d3d11.dll.so
%{buildroot}%{_libdir}/wine/
+install -p -m 755 /builddir/build/BUILD/dxvk-%{version}/d3d9.dll.so
%{buildroot}%{_libdir}/wine/
install -p -m 755 /builddir/build/BUILD/dxvk-%{version}/d3d10.dll.so
%{buildroot}%{_libdir}/wine/
install -p -m 755 /builddir/build/BUILD/dxvk-%{version}/d3d10_1.dll.so
%{buildroot}%{_libdir}/wine/
install -p -m 755 /builddir/build/BUILD/dxvk-%{version}/d3d10core.dll.so
%{buildroot}%{_libdir}/wine/
-install -p -m 755 /builddir/build/BUILD/dxvk-%{version}/d3d9.dll.so
%{buildroot}%{_libdir}/wine/
+install -p -m 755 /builddir/build/BUILD/dxvk-%{version}/d3d11.dll.so
%{buildroot}%{_libdir}/wine/
+install -p -m 755 %buildroot/builddir/build/BUILD/dxvk-%{version}/build/bin/dxgi.dll
%{buildroot}%{_libdir}/wine/
install -p -m 755 %buildroot/builddir/build/BUILD/dxvk-%{version}/build/bin/d3d9.dll
%{buildroot}%{_libdir}/wine/
install -p -m 755 %buildroot/builddir/build/BUILD/dxvk-%{version}/build/bin/d3d10.dll
%{buildroot}%{_libdir}/wine/
install -p -m 755 %buildroot/builddir/build/BUILD/dxvk-%{version}/build/bin/d3d10core.dll
%{buildroot}%{_libdir}/wine/
@@ -117,15 +122,14 @@ install -p -m 755
%buildroot/builddir/build/BUILD/dxvk-%{version}/build/bin/d3d1
install -p -m 755 %buildroot/builddir/build/BUILD/dxvk-%{version}/build/bin/d3d11.dll
%{buildroot}%{_libdir}/wine/
rm -rf %buildroot/builddir/build/BUILD/dxvk-%{version}/build
-mv %{buildroot}%{_libdir}/wine/dxgi.dll.so %{buildroot}%{_libdir}/wine/dxvk-dxgi.dll.so
+mv %{buildroot}%{_libdir}/wine/dxgi.dll %{buildroot}%{_libdir}/wine/dxvk-dxgi.dll
+mv %{buildroot}%{_libdir}/wine/d3d9.dll %{buildroot}%{_libdir}/wine/dxvk-d3d9.dll
mv %{buildroot}%{_libdir}/wine/d3d10.dll %{buildroot}%{_libdir}/wine/dxvk-d3d10.dll
mv %{buildroot}%{_libdir}/wine/d3d10core.dll
%{buildroot}%{_libdir}/wine/dxvk-d3d10core.dll
mv %{buildroot}%{_libdir}/wine/d3d10_1.dll %{buildroot}%{_libdir}/wine/dxvk-d3d10_1.dll
mv %{buildroot}%{_libdir}/wine/d3d11.dll %{buildroot}%{_libdir}/wine/dxvk-d3d11.dll
-mv %{buildroot}%{_libdir}/wine/d3d9.dll %{buildroot}%{_libdir}/wine/dxvk-d3d9.dll
%posttrans
-%{_sbindir}/alternatives --install %{_libdir}/wine/dxgi.dll.so
'wine-dxgi%{?_isa}' %{_libdir}/wine/dxvk-dxgi.dll.so 20
%{_sbindir}/alternatives --install %{_libdir}/wine/d3d10.dll 'wine-d3d10%{?_isa}'
%{_libdir}/wine/dxvk-d3d10.dll 20 \
--slave %{_libdir}/wine/d3d10_1.dll 'wine-d3d10_1%{?_isa}'
%{_libdir}/wine/dxvk-d3d10_1.dll \
--slave %{_libdir}/wine/d3d10core.dll 'wine-d3d10core%{?_isa}'
%{_libdir}/wine/dxvk-d3d10core.dll
@@ -135,7 +139,6 @@ mv %{buildroot}%{_libdir}/wine/d3d9.dll
%{buildroot}%{_libdir}/wine/dxvk-d3d9.dl
%{_sbindir}/alternatives --install %{_libdir}/wine/d3d9.dll 'wine-d3d9%{?_isa}'
%{_libdir}/wine/dxvk-d3d9.dll 20
%postun
-%{_sbindir}/alternatives --remove 'wine-dxgi%{?_isa}'
%{_libdir}/wine/dxvk-dxgi.dll.so
%{_sbindir}/alternatives --remove 'wine-d3d10%{?_isa}'
%{_libdir}/wine/dxvk-d3d10.dll
%{_sbindir}/alternatives --remove 'wine-d3d11%{?_isa}'
%{_libdir}/wine/dxvk-d3d11.dll
@@ -155,12 +158,13 @@ mv %{buildroot}%{_libdir}/wine/d3d9.dll
%{buildroot}%{_libdir}/wine/dxvk-d3d9.dl
%{_libdir}/wine/d3d11.dll.so
%files d3d9
+%license LICENSE
%{_libdir}/wine/dxvk-d3d9.dll
%{_libdir}/wine/d3d9.dll.so
%files dxgi
%license LICENSE
-%{_libdir}/wine/dxvk-dxgi.dll.so
+%{_libdir}/wine/dxvk-dxgi.dll
%changelog