diff --git a/.abf.yml b/.abf.yml index a9ce392..31fe6d1 100644 --- a/.abf.yml +++ b/.abf.yml @@ -2,7 +2,7 @@ sources: icons-4.0.tar.xz: 3063b6fcf8d9aeedcb9ecaab9c522bed88a21c0a rosa-wine-desktop-4.4.1.tar.xz: 299d6a589af1e4db705f0e09190a8b388bb74b95 wine-4.0.2.tar.xz: af82cb438cc892273bedda5ae6166510fc8fe902 - wine-4.15.tar.xz: 470a8101ff1046d0278f57785d7857a6170ae905 - wine-nine-standalone-0.4.tar.gz: 68f0dac73205650f839189c676183e5c4dff7cf5 - wine-staging-4.15.tar.gz: b7f64bc7e2b9bde8221ac2e030ec3d714a7aab40 - winetricks-20190615.tar.gz: 2ab46b79706c27ceea048d7c769f092d3753c5e2 + wine-4.18.tar.xz: 87eed9c362324efbb6a299abcd03ef06292d578c + wine-nine-standalone-0.5.tar.gz: 7d24bac66d34493a725b1c47d7570daf60788532 + wine-staging-4.18.tar.gz: fdf9ae70d3c0d45f89a337a46bb522dc06e22147 + winetricks-20190912.tar.gz: a0c16b95757bbe67c23ddcf5cb22b1ada69ac914 diff --git a/README.urpmi b/README.urpmi index 6a3813c..6b21fbd 100644 --- a/README.urpmi +++ b/README.urpmi @@ -5,6 +5,8 @@ or (latest, untested): winetricks --force dxvk To configure Gallium Nine D3D9 run in a terminal: wine ninewinecfg +or (for disable) +wine ninewinecfg -d === Russian === @@ -15,3 +17,5 @@ winetricks --force dxvk96 winetricks --force dxvk Для настройки Gallium Nine D3D9 запустите в терминале: wine ninewinecfg +или (для выключения) +wine ninewinecfg -d diff --git a/wine.spec b/wine.spec index 059a122..23f1b8f 100644 --- a/wine.spec +++ b/wine.spec @@ -8,15 +8,15 @@ %bcond_without systemd # wine and staging tarballs version -%define stagver 4.15 +%define stagver 4.18 %define stagpver 4.x # wine-stable tarball version %define stabver 4.0.2 %define stabpver 4.0 -%define winetricks_ver 20190615 -%define winenine_ver 0.4 +%define winetricks_ver 20190912 +%define winenine_ver 0.5 %if %{with unstable} %define wine wine @@ -523,7 +523,8 @@ Group: Development/C Requires: %{wine64} = %{EVRD} %rename %{devname} Conflicts: %{wine}-devel -Conflicts: %{owine64}-devel %{owine64} +Conflicts: %{owine64}-devel +Conflicts: %{owine64} %description -n %{wine64}-devel Wine is a program which allows running Microsoft Windows programs (including @@ -577,7 +578,8 @@ Group: Emulators Requires: %{wine} = %{EVRD} Requires(post): rpm-helper Requires(post): %{wine} = %{EVRD} -Conflicts: %{owine}-binfmt %{owine64}-binfmt +Conflicts: %{owine}-binfmt +Conflicts: %{owine64}-binfmt %if %{with systemd} Requires(pre,post,preun,postun): systemd %endif @@ -602,7 +604,6 @@ systemctl stop systemd-binfmt.service %post -n %{wine}-binfmt %binfmt_apply wine.conf %postun -n %{wine}-binfmt -echo %_postun_unit systemd-binfmt.service %else # Old sysvinit diff --git a/winetricks-20181203-add-various-verbs.patch b/winetricks-20181203-add-various-verbs.patch deleted file mode 100644 index e1ec21c..0000000 --- a/winetricks-20181203-add-various-verbs.patch +++ /dev/null @@ -1,182 +0,0 @@ ---- winetricks.old 2018-12-04 06:38:39.000000000 +0100 -+++ winetricks 2018-12-23 17:50:01.473268958 +0100 -@@ -545,6 +545,13 @@ w_try_regsvr() - w_try "$WINE" regsvr32 $W_UNATTENDED_SLASH_S "$@" - } - -+w_try_regsvr64() -+{ -+ # shellcheck disable=SC2086 -+ w_try "$WINE64" regsvr32 $W_UNATTENDED_SLASH_S "$@" -+} -+ -+ - w_try_unrar() - { - # $1 - zipfile to extract (keeping internal paths, in cwd) -@@ -5687,14 +5694,14 @@ load_amstream() - { - helper_win7sp1 x86_microsoft-windows-directshow-other_31bf3856ad364e35_6.1.7601.17514_none_0f58f1e53efca91e/amstream.dll - w_try cp "$W_TMP/x86_microsoft-windows-directshow-other_31bf3856ad364e35_6.1.7601.17514_none_0f58f1e53efca91e/amstream.dll" "$W_SYSTEM32_DLLS/amstream.dll" -+ w_try_regsvr amstream.dll - - if [ "$W_ARCH" = "win64" ]; then - helper_win7sp1_x64 amd64_microsoft-windows-directshow-other_31bf3856ad364e35_6.1.7601.17514_none_6b778d68f75a1a54/amstream.dll - w_try cp "$W_TMP/amd64_microsoft-windows-directshow-other_31bf3856ad364e35_6.1.7601.17514_none_6b778d68f75a1a54/amstream.dll" "$W_SYSTEM64_DLLS/amstream.dll" -+ w_try_regsvr64 amstream.dll - fi - -- w_try_regsvr amstream.dll -- - w_override_dlls native,builtin amstream - } - -@@ -7106,6 +7113,26 @@ load_dxvk93() - } - - -+w_metadata dxvk94 dlls \ -+ title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.94)" \ -+ publisher="Philip Rebohle" \ -+ year="2018" \ -+ media="download" \ -+ file1="dxvk-0.94.tar.gz" \ -+ installed_file1="$W_SYSTEM32_DLLS_WIN/d3d10.dll" \ -+ installed_file2="$W_SYSTEM32_DLLS_WIN/d3d10_1.dll" \ -+ installed_file3="$W_SYSTEM32_DLLS_WIN/d3d10core.dll" \ -+ installed_file4="$W_SYSTEM32_DLLS_WIN/d3d11.dll" \ -+ installed_file5="$W_SYSTEM32_DLLS_WIN/dxgi.dll" -+ -+load_dxvk94() -+{ -+ # https://github.com/doitsujin/dxvk -+ w_download "https://github.com/doitsujin/dxvk/releases/download/v0.94/dxvk-0.94.tar.gz" 1f06bfac5b435b62b972806fb3bbd86f7ccae2399b4451e85ae414e03d3712a3 -+ helper_dxvk "$file1" "d3d10_enabled" "3.19" "1.1.88" -+} -+ -+ - #---------------------------------------------------------------- - - w_metadata dxvk dlls \ -@@ -8343,10 +8370,12 @@ load_dxdiagn() - { - helper_win7sp1 x86_microsoft-windows-d..x-directxdiagnostic_31bf3856ad364e35_6.1.7601.17514_none_25cb021dbc0611db/dxdiagn.dll - w_try cp "$W_TMP/x86_microsoft-windows-d..x-directxdiagnostic_31bf3856ad364e35_6.1.7601.17514_none_25cb021dbc0611db/dxdiagn.dll" "$W_SYSTEM32_DLLS/dxdiagn.dll" -+ w_try_regsvr dxdiagn.dll - - if [ "$W_ARCH" = "win64" ]; then - helper_win7sp1_x64 amd64_microsoft-windows-d..x-directxdiagnostic_31bf3856ad364e35_6.1.7601.17514_none_81e99da174638311/dxdiagn.dll - w_try cp "$W_TMP/amd64_microsoft-windows-d..x-directxdiagnostic_31bf3856ad364e35_6.1.7601.17514_none_81e99da174638311/dxdiagn.dll" "$W_SYSTEM64_DLLS/dxdiagn.dll" -+ w_try_regsvr64 dxdiagn.dll - fi - - w_override_dlls native,builtin dxdiagn -@@ -8369,6 +8398,7 @@ load_dxdiagn_feb2010() - - w_try_cabextract -d "$W_TMP" -L -F dxnt.cab "$W_CACHE"/directx9/$DIRECTX_NAME - w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'dxdiagn.dll' "$W_TMP/dxnt.cab" -+ w_try_regsvr dxdiagn.dll - w_override_dlls native dxdiagn - } - -@@ -9424,7 +9454,14 @@ load_msxml3() - rm "$W_SYSTEM32_DLLS"/msxml3.dll - w_override_dlls native msxml3 - w_try_cd "$W_CACHE/$W_PACKAGE" -- w_try "$WINE" msiexec /i msxml3.msi $W_UNATTENDED_SLASH_Q -+ -+ # See https://github.com/Winetricks/winetricks/issues/1086 -+ # and https://bugs.winehq.org/show_bug.cgi?id=26925 -+ if w_workaround_wine_bug 26925 "Forcing quiet install"; then -+ w_try "$WINE" msiexec /i msxml3.msi /q -+ else -+ w_try "$WINE" msiexec /i msxml3.msi $W_UNATTENDED_SLASH_Q -+ fi - } - - #---------------------------------------------------------------- -@@ -9634,23 +9671,27 @@ load_python26() - #---------------------------------------------------------------- - - w_metadata qasf dlls \ -- title="qasf.dll (from Directx 9 user redistributable)" \ -+ title="qasf.dll" \ - publisher="Microsoft" \ -- year="2010" \ -+ year="2011" \ - media="download" \ -- file1="../directx9/directx_feb2010_redist.exe" \ -+ file1="../win7sp1/windows6.1-KB976932-X86.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/qasf.dll" - - load_qasf() - { -- helper_directx_dl -- -- w_try_cabextract -d "$W_TMP" -L -F dxnt.cab "$W_CACHE"/directx9/$DIRECTX_NAME -- w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F qasf.dll "$W_TMP/dxnt.cab" -+ helper_win7sp1 x86_microsoft-windows-directshow-asf_31bf3856ad364e35_6.1.7601.17514_none_1cc4e9c15ccc8ae8/qasf.dll -+ w_try cp "$W_TMP/x86_microsoft-windows-directshow-asf_31bf3856ad364e35_6.1.7601.17514_none_1cc4e9c15ccc8ae8/qasf.dll" "$W_SYSTEM32_DLLS/qasf.dll" - - w_try_regsvr qasf.dll - -- w_override_dlls native qasf -+ if [ "$W_ARCH" = "win64" ]; then -+ helper_win7sp1_x64 amd64_microsoft-windows-directshow-asf_31bf3856ad364e35_6.1.7601.17514_none_78e385451529fc1e/qasf.dll -+ w_try cp "$W_TMP/amd64_microsoft-windows-directshow-asf_31bf3856ad364e35_6.1.7601.17514_none_78e385451529fc1e/qasf.dll" "$W_SYSTEM64_DLLS/qasf.dll" -+ w_try_regsvr64 qasf.dll -+ fi -+ -+ w_override_dlls native,builtin qasf - } - - #---------------------------------------------------------------- -@@ -9690,10 +9731,12 @@ load_qedit() - { - helper_win7sp1 x86_microsoft-windows-qedit_31bf3856ad364e35_6.1.7601.17514_none_5ca34698a5a970d2/qedit.dll - w_try cp "$W_TMP/x86_microsoft-windows-qedit_31bf3856ad364e35_6.1.7601.17514_none_5ca34698a5a970d2/qedit.dll" "$W_SYSTEM32_DLLS/qedit.dll" -+ w_try_regsvr qedit.dll - - if [ "$W_ARCH" = "win64" ]; then - helper_win7sp1_x64 amd64_microsoft-windows-qedit_31bf3856ad364e35_6.1.7601.17514_none_b8c1e21c5e06e208/qedit.dll - w_try cp "$W_TMP/amd64_microsoft-windows-qedit_31bf3856ad364e35_6.1.7601.17514_none_b8c1e21c5e06e208/qedit.dll" "$W_SYSTEM64_DLLS/qedit.dll" -+ w_try_regsvr64 qedit.dll - fi - - w_override_dlls native,builtin qedit -@@ -9702,23 +9745,27 @@ load_qedit() - #---------------------------------------------------------------- - - w_metadata quartz dlls \ -- title="quartz.dll (from Directx 9 user redistributable)" \ -+ title="quartz.dll" \ - publisher="Microsoft" \ -- year="2010" \ -+ year="2011" \ - media="download" \ -- file1="../directx9/directx_feb2010_redist.exe" \ -+ file1="../win7sp1/windows6.1-KB976932-X86.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/quartz.dll" - - load_quartz() - { -- helper_directx_dl -- -- w_try_cabextract -d "$W_TMP" -L -F dxnt.cab "$W_CACHE"/directx9/$DIRECTX_NAME -- w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F quartz.dll "$W_TMP/dxnt.cab" -+ helper_win7sp1 x86_microsoft-windows-directshow-core_31bf3856ad364e35_6.1.7601.17514_none_a877a1cc4c284497/quartz.dll -+ w_try cp "$W_TMP/x86_microsoft-windows-directshow-core_31bf3856ad364e35_6.1.7601.17514_none_a877a1cc4c284497/quartz.dll" "$W_SYSTEM32_DLLS/quartz.dll" - - w_try_regsvr quartz.dll - -- w_override_dlls native quartz -+ if [ "$W_ARCH" = "win64" ]; then -+ helper_win7sp1_x64 amd64_microsoft-windows-directshow-core_31bf3856ad364e35_6.1.7601.17514_none_04963d500485b5cd/quartz.dll -+ w_try cp "$W_TMP/amd64_microsoft-windows-directshow-core_31bf3856ad364e35_6.1.7601.17514_none_04963d500485b5cd/quartz.dll" "$W_SYSTEM64_DLLS/quartz.dll" -+ w_try_regsvr64 quartz.dll -+ fi -+ -+ w_override_dlls native,builtin quartz - } - - #----------------------------------------------------------------