Merge pull request #48 from survolog/wine:rosa2016.1

Updated to 3.14

.abf.yml

@@ -1,5 +1,6 @@
 sources:
-  wine-3.13.tar.xz: 6ff3ea7942d998b076ff7c89abdfcb95b55e039e
+  wine-3.14.tar.xz: e4daf8ade36814cc672e78a42bb1744355ef7167
-  wine-3.13.tar.xz.sign: c97f3093e7d321887eccc87b6d3a80a9435cfee3
+  wine-3.14.tar.xz.sign: 67d78d62731c7d038069a27aac435a2cdd577881
-  wine-staging-3.13.1.tar.gz: 989516e9566fae0a2d551bdbd66f7e7961f6aa41
+  wine-staging-3.14.tar.gz: d9ca78cc5cb106a21c72c31dc4b63730df27c13d
-  wine-d3d9-patches-wine-d3d9-3.13.tar.gz: f11ef3d1d421c8eeffd02dd1c37a3b87778e3098
+  wine-d3d9-patches-wine-d3d9-3.14.tar.gz: 741789fab608006415cdeecfb7e5c0707cbf56e1
+  winetricks-20180815.tar.gz: e927590ecedce4ace13c6a721fa449d8c8386496

wine.spec

@@ -19,14 +19,13 @@
 # Switch between systemd-binfmt and sysvinit support
 %define	with_systemd 1
 
-%define winetricks_ver 20180603
+%define winetricks_ver 20180815
 %define d3d9_ver %{version}
-%define stag_mver 1
 
 Summary:	WINE Is Not An Emulator - runs MS Windows programs
 Name:		wine
-Version:	3.13
+Version:	3.14
-Release:	4
+Release:	1
 Epoch:		2
 License:	LGPLv2+
 Group:		Emulators
@@ -40,14 +39,13 @@ Source2:	wine.init
 Source3:	wine.systemd
 # Forked from wine-compholio/wine-staging
 # https://github.com/wine-staging/wine-staging
-Source4:	https://github.com/wine-staging/wine-staging/archive/v%{version}.%{stag_mver}.tar.gz?/wine-staging-%{version}.%{stag_mver}.tar.gz
+Source4:	https://github.com/wine-staging/wine-staging/archive/v%{version}.tar.gz?/wine-staging-%{version}.tar.gz
 # Wine Gallium Nine patches for wine-staging %%{version}
 # from https://github.com/sarnex/wine-d3d9-patches.
 # Install staging-helper before wine-d3d9
 Source5:	https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-%{version}.tar.gz?/wine-d3d9-patches-wine-d3d9-%{d3d9_ver}.tar.gz
-Source6:	https://github.com/Winetricks/winetricks/blob/%{winetricks_ver}/src/winetricks
+Source6:	https://github.com/Winetricks/winetricks/archive/%{winetricks_ver}.tar.gz?/winetricks-%{winetricks_ver}.tar.gz
 Source7:	http://kegel.com/wine/wisotool
-Source9:	winetricks-20180603-add-dxvk.patch
 Source10:	wine.rpmlintrc
 
 # (Anssi 05/2008) Adds:
@@ -236,6 +234,7 @@ Requires:	libXi.so.6
 Requires:	libXrender.so.1
 # This one is in Restricted repository so only suggest it
 Suggests:	libtxc_dxtn.so
+Suggests:	libvulkan1
 # wine.1 manpage was moved to wine32 package
 Conflicts:	wine < 2:1.8
 Conflicts:	wine64 < 2:1.8
@@ -344,7 +343,7 @@ Wine is often updated.
 #----------------------------------------------------------------------------
 
 %prep
-%setup -qn %{name}-%{version} -a5
+%setup -qn %{name}-%{version} -a5 -a6
 %patch0 -p1 -b .conf
 %patch1 -p1 -b .staging-localization
 %patch2 -p1 -b .crossover_hack
@@ -390,10 +389,11 @@ autoreconf -vfi
 %install
 %makeinstall_std LDCONFIG=/bin/true
 
-install -m 0755 %{SOURCE6} %{buildroot}%{_bindir}/
-patch %{buildroot}%{_bindir}/winetricks %{SOURCE9}
 install -m 0755 %{SOURCE7} %{buildroot}%{_bindir}/
 
+# Add winetricks
+install -m 0755 winetricks-%{winetricks_ver}/src/winetricks %{buildroot}%{_bindir}/
+
 # Note: binfmt is insecure (see https://nixtux.ru/450), 
 # so we will put it in a separate package
 # Allow users to launch Windows programs by just clicking on the .exe file...

winetricks-20180603-add-dxvk.patch

@@ -1,208 +0,0 @@
---- winetricks	2018-07-14 14:05:52.308515666 +0300
-+++ winetricks_patched	2018-08-10 20:13:44.612957764 +0300
-@@ -6475,6 +6475,167 @@
- 
- #----------------------------------------------------------------
- 
-+# $1 - dxvk archive name (required)
-+# $2 - minimum Wine version (optional)
-+# $3 - minimum Vulkan API version (optional, requires $2 be set)
-+helper_dxvk()
-+{
-+    _W_dxvk_archive="${1}"
-+    _W_min_wine_version="${2}"
-+    _W_min_vulkan_version="${3}"
-+
-+    _W_dxvk_dir="${_W_dxvk_archive%.tar.gz}"
-+    _W_dxvk_version="${_W_dxvk_dir#*-}"
-+
-+    w_warn "Please refer to dxvk version ${_W_dxvk_version} release notes... See: https://github.com/doitsujin/dxvk/releases/tag/v${_W_dxvk_version}"
-+    if [ ! -z "$_W_min_wine_version" ] && ! w_wine_version_in ",${_W_min_wine_version}" ; then
-+        [ -z "$_W_min_vulkan_version" ] || _W_vulkan_info=" The base requirement is Vulkan $_W_min_vulkan_version API support."
-+        w_warn "dxvk ${_W_dxvk_version} does not support wine version ${_wine_version_stripped}. dxvk ${_W_dxvk_version} requires wine version ${_W_min_wine_version} (or newer).${_W_vulkan_info}"
-+        unset _W_vulkan_info
-+    fi
-+    w_warn "Please refer to current dxvk base graphics driver requirements... See: https://github.com/doitsujin/dxvk/wiki/Driver-support"
-+
-+    w_try_cd "$W_TMP"
-+    w_try tar -zxf "$W_CACHE/$W_PACKAGE/$_W_dxvk_archive"
-+    w_try mv "$W_TMP/$_W_dxvk_dir/x32/d3d11.dll" "$W_SYSTEM32_DLLS/"
-+    w_try mv "$W_TMP/$_W_dxvk_dir/x32/dxgi.dll" "$W_SYSTEM32_DLLS/"
-+    if test "$W_ARCH" = "win64"; then
-+        w_try mv "$W_TMP/$_W_dxvk_dir/x64/d3d11.dll" "$W_SYSTEM64_DLLS/"
-+        w_try mv "$W_TMP/$_W_dxvk_dir/x64/dxgi.dll" "$W_SYSTEM64_DLLS/"
-+    fi
-+    w_override_dlls native d3d11 dxgi
-+
-+    unset _W_dxvk_archive _W_dxvk_dir _W_dxvk_version _W_min_vulkan_version _W_min_wine_version
-+}
-+
-+#----------------------------------------------------------------
-+
-+w_metadata dxvk54 dlls \
-+    title="Vulkan-based D3D11 implementation for Linux / Wine (0.54)" \
-+    publisher="Philip Rebohle" \
-+    year="2018" \
-+    media="download" \
-+    file1="dxvk-0.54.tar.gz" \
-+    installed_file1="$W_SYSTEM32_DLLS_WIN/d3d11.dll" \
-+    installed_file2="$W_SYSTEM32_DLLS_WIN/dxgi.dll"
-+
-+load_dxvk54()
-+{
-+    # https://github.com/doitsujin/dxvk
-+    w_download "https://github.com/doitsujin/dxvk/releases/download/v0.54/dxvk-0.54.tar.gz" 1c2f186baaa01d2de7b832f6f05021bdd29eccb65fc197c8b15adfd4e08f9640
-+    helper_dxvk "$file1" "3.6"
-+}
-+
-+#----------------------------------------------------------------
-+
-+w_metadata dxvk60 dlls \
-+    title="Vulkan-based D3D11 implementation for Linux / Wine (0.60)" \
-+    publisher="Philip Rebohle" \
-+    year="2018" \
-+    media="download" \
-+    file1="dxvk-0.60.tar.gz" \
-+    installed_file1="$W_SYSTEM32_DLLS_WIN/d3d11.dll" \
-+    installed_file2="$W_SYSTEM32_DLLS_WIN/dxgi.dll"
-+
-+load_dxvk60()
-+{
-+    # https://github.com/doitsujin/dxvk
-+    w_download "https://github.com/doitsujin/dxvk/releases/download/v0.60/dxvk-0.60.tar.gz" 27d6f700241d3ec3b6c002c3d739bb0e3f210ec916ecb5a62d9204e9e50f2c4a
-+    helper_dxvk "$file1" "3.10" "1.0.76"
-+}
-+
-+#----------------------------------------------------------------
-+
-+w_metadata dxvk61 dlls \
-+    title="Vulkan-based D3D11 implementation for Linux / Wine (0.61)" \
-+    publisher="Philip Rebohle" \
-+    year="2018" \
-+    media="download" \
-+    file1="dxvk-0.61.tar.gz" \
-+    installed_file1="$W_SYSTEM32_DLLS_WIN/d3d11.dll" \
-+    installed_file2="$W_SYSTEM32_DLLS_WIN/dxgi.dll"
-+
-+load_dxvk61()
-+{
-+    # https://github.com/doitsujin/dxvk
-+    w_download "https://github.com/doitsujin/dxvk/releases/download/v0.61/dxvk-0.61.tar.gz" d04388f026dc0d8b276b08f7db74fb3556cbbc8f762401eb5ef52629ee39ded1
-+    helper_dxvk "$file1" "3.10" "1.0.76"
-+}
-+
-+#----------------------------------------------------------------
-+
-+w_metadata dxvk62 dlls \
-+    title="Vulkan-based D3D11 implementation for Linux / Wine (0.62)" \
-+    publisher="Philip Rebohle" \
-+    year="2018" \
-+    media="download" \
-+    file1="dxvk-0.62.tar.gz" \
-+    installed_file1="$W_SYSTEM32_DLLS_WIN/d3d11.dll" \
-+    installed_file2="$W_SYSTEM32_DLLS_WIN/dxgi.dll"
-+
-+load_dxvk62()
-+{
-+    # https://github.com/doitsujin/dxvk
-+    w_download "https://github.com/doitsujin/dxvk/releases/download/v0.62/dxvk-0.62.tar.gz" b9dbb57908e24b094b68f665ad729b6ee277eecc8ba04a6e6e4f8a4d2dfd94e3
-+    helper_dxvk "$file1" "3.10" "1.0.76"
-+}
-+
-+w_metadata dxvk63 dlls \
-+    title="Vulkan-based D3D11 implementation for Linux / Wine (0.63)" \
-+    publisher="Philip Rebohle" \
-+    year="2018" \
-+    media="download" \
-+    file1="dxvk-0.63.tar.gz" \
-+    installed_file1="$W_SYSTEM32_DLLS_WIN/d3d11.dll" \
-+    installed_file2="$W_SYSTEM32_DLLS_WIN/dxgi.dll"
-+
-+load_dxvk63()
-+{
-+    # https://github.com/doitsujin/dxvk
-+    w_download "https://github.com/doitsujin/dxvk/releases/download/v0.63/dxvk-0.63.tar.gz" 696df816bd9640770dee14f932bc641a16261fccf76be7c28d812a64ca6040fa
-+    helper_dxvk "$file1" "3.10" "1.0.76"
-+}
-+
-+w_metadata dxvk64 dlls \
-+    title="Vulkan-based D3D11 implementation for Linux / Wine (0.64)" \
-+    publisher="Philip Rebohle" \
-+    year="2018" \
-+    media="download" \
-+    file1="dxvk-0.64.tar.gz" \
-+    installed_file1="$W_SYSTEM32_DLLS_WIN/d3d11.dll" \
-+    installed_file2="$W_SYSTEM32_DLLS_WIN/dxgi.dll"
-+
-+load_dxvk64()
-+{
-+    # https://github.com/doitsujin/dxvk
-+    w_download "https://github.com/doitsujin/dxvk/releases/download/v0.64/dxvk-0.64.tar.gz" 2e03e40ff0a9d36f96a06137f3fa9110ebaea230d0bf6c22cf6399e16e97fb9c
-+    helper_dxvk "$file1" "3.10" "1.0.76"
-+}
-+
-+
-+#----------------------------------------------------------------
-+
-+w_metadata dxvk dlls \
-+    title="Vulkan-based D3D11 implementation for Linux / Wine (latest)" \
-+    publisher="Philip Rebohle" \
-+    year="2018" \
-+    media="download" \
-+    installed_file1="$W_SYSTEM32_DLLS_WIN/d3d11.dll" \
-+    installed_file2="$W_SYSTEM32_DLLS_WIN/dxgi.dll"
-+
-+load_dxvk()
-+{
-+    # https://github.com/doitsujin/dxvk
-+    # There's no stable exe URL, but they do provide a RELEASE file that lets us build one:
-+    w_download_to "$W_TMP" "https://raw.githubusercontent.com/doitsujin/dxvk/master/RELEASE"
-+    dxvk_version="$(cat "${W_TMP}/RELEASE")"
-+    w_linkcheck=1_ignore w_download "https://github.com/doitsujin/dxvk/releases/download/v${dxvk_version}/dxvk-${dxvk_version}.tar.gz"
-+    helper_dxvk "dxvk-${dxvk_version}.tar.gz" "3.10" "1.0.76"
-+    unset dxvk_version
-+}
-+
-+#----------------------------------------------------------------
-+
- w_metadata dmusic32 dlls \
-     title="MS dmusic32.dll from DirectX user redistributable" \
-     publisher="Microsoft" \
-@@ -9919,14 +10080,36 @@
-     year="2018" \
-     media="download" \
-     file1="VulkanSDK-1.1.73.0-Installer.exe" \
--    installed_file1="C:/VulkanSDK/1.1.73.0/Vulkan.ico"
-+    installed_file1="C:/VulkanSDK/1.1.73.0/Vulkan.ico" \
-+    installed_file2="C:/windows/winevulkan.json"
- 
- load_vulkansdk()
- {
-+    _W_vulkan_version="${file1%-*.exe}"
-+    _W_vulkan_version="${_W_vulkan_version#*-}"
-     # https://vulkan.lunarg.com/sdk/home
-     w_download "https://sdk.lunarg.com/sdk/download/1.1.73.0/windows/VulkanSDK-1.1.73.0-Installer.exe?Human=true;u=" a5d193f97db4de97e6b4fdd81f00ff6a603f66bb17dc3cf8ac0fe9aec58497c7 VulkanSDK-1.1.73.0-Installer.exe
-     w_try_cd "$W_CACHE/$W_PACKAGE"
-     w_try "$WINE" "$file1" $W_UNATTENDED_SLASH_S
-+    echo "Creating C:\\windows\\winevulkan.json winevulkan json file"
-+    cat > "$W_WINDIR_UNIX"/winevulkan.json <<_EOF_
-+{
-+    "file_format_version": "1.0.0",
-+    "ICD": {
-+        "library_path": "c:\\\\windows\\\\system32\\\\winevulkan.dll",
-+        "api_version": "$_W_vulkan_version"
-+    }
-+}
-+_EOF_
-+    echo "Creating winevulkan registry settings"
-+    cat > "$W_TMP"/winevulkan.reg <<_EOF_
-+REGEDIT4
-+
-+[HKEY_LOCAL_MACHINE\\SOFTWARE\\Khronos\\Vulkan\\Drivers\\]
-+"C:\\\\Windows\\\\winevulkan.json"=dword:00000000
-+
-+_EOF_
-+    w_try_regedit "$W_TMP_WIN"\\winevulkan.reg
- }
- 
- #----------------------------------------------------------------