mirror of
https://abf.rosa.ru/djam/wine.git
synced 2025-02-24 14:52:46 +00:00
Updated to 3.13
This commit is contained in:
parent
f62be000bb
commit
4ca11ca249
3 changed files with 110 additions and 36 deletions
8
.abf.yml
8
.abf.yml
|
@ -1,5 +1,5 @@
|
||||||
sources:
|
sources:
|
||||||
wine-3.12.tar.xz: 79ce06feb7096ace87b8d9d72e6f1e167c17f96c
|
wine-3.13.tar.xz: 6ff3ea7942d998b076ff7c89abdfcb95b55e039e
|
||||||
wine-3.12.tar.xz.sign: 67bf44107fea7cfbc5ed175b360d9088ad859c2a
|
wine-3.13.tar.xz.sign: c97f3093e7d321887eccc87b6d3a80a9435cfee3
|
||||||
wine-staging-3.12.tar.gz: a013bbdac1b7fd2c9b2f3a0f4c65e35dbe3497e5
|
wine-staging-3.13.1.tar.gz: 989516e9566fae0a2d551bdbd66f7e7961f6aa41
|
||||||
wine-d3d9-patches-wine-d3d9-3.12.tar.gz: 4350e26f0791de369baee8b10fc72dc05b8c35bd
|
wine-d3d9-patches-wine-d3d9-3.13.tar.gz: f11ef3d1d421c8eeffd02dd1c37a3b87778e3098
|
||||||
|
|
|
@ -21,10 +21,11 @@
|
||||||
|
|
||||||
%define winetricks_ver 20180603
|
%define winetricks_ver 20180603
|
||||||
%define d3d9_ver %{version}
|
%define d3d9_ver %{version}
|
||||||
|
%define stag_mver 1
|
||||||
|
|
||||||
Summary: WINE Is Not An Emulator - runs MS Windows programs
|
Summary: WINE Is Not An Emulator - runs MS Windows programs
|
||||||
Name: wine
|
Name: wine
|
||||||
Version: 3.12
|
Version: 3.13
|
||||||
Release: 1
|
Release: 1
|
||||||
Epoch: 2
|
Epoch: 2
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
|
@ -39,7 +40,7 @@ Source2: wine.init
|
||||||
Source3: wine.systemd
|
Source3: wine.systemd
|
||||||
# Forked from wine-compholio/wine-staging
|
# Forked from wine-compholio/wine-staging
|
||||||
# https://github.com/wine-staging/wine-staging
|
# https://github.com/wine-staging/wine-staging
|
||||||
Source4: https://github.com/wine-staging/wine-staging/archive/v%{version}.tar.gz?/wine-staging-%{version}.tar.gz
|
Source4: https://github.com/wine-staging/wine-staging/archive/v%{version}.%{stag_mver}.tar.gz?/wine-staging-%{version}.%{stag_mver}.tar.gz
|
||||||
# Wine Gallium Nine patches for wine-staging %%{version}
|
# Wine Gallium Nine patches for wine-staging %%{version}
|
||||||
# from https://github.com/sarnex/wine-d3d9-patches.
|
# from https://github.com/sarnex/wine-d3d9-patches.
|
||||||
# Install staging-helper before wine-d3d9
|
# Install staging-helper before wine-d3d9
|
||||||
|
@ -218,6 +219,8 @@ Requires: wine-bin
|
||||||
# start proposing to download wine-gecko from sourceforge, while recommending
|
# start proposing to download wine-gecko from sourceforge, while recommending
|
||||||
# to use distribution packages instead. Therefore suggest wine-gecko here:
|
# to use distribution packages instead. Therefore suggest wine-gecko here:
|
||||||
Suggests: wine-gecko
|
Suggests: wine-gecko
|
||||||
|
# This one need for steam-magazine and certificate in wine
|
||||||
|
Suggests: libgnutls30
|
||||||
Suggests: libncursesw.so.5
|
Suggests: libncursesw.so.5
|
||||||
Suggests: libncurses.so.5
|
Suggests: libncurses.so.5
|
||||||
Suggests: libncursesw.so.6
|
Suggests: libncursesw.so.6
|
||||||
|
|
|
@ -1,27 +1,6 @@
|
||||||
--- winetricks 2018-07-04 19:17:43.787798000 +0300
|
--- winetricks 2018-07-14 14:05:52.308515666 +0300
|
||||||
+++ winetricks_patched 2018-07-04 19:31:41.167702118 +0300
|
+++ winetricks_patched 2018-08-10 20:13:44.612957764 +0300
|
||||||
@@ -4821,10 +4821,16 @@
|
@@ -6475,6 +6475,167 @@
|
||||||
# WINE64 = wine64, available on 64-bit prefixes
|
|
||||||
# WINE_ARCH = the native wine for the prefix (wine for 32-bit, wine64 for 64-bit)
|
|
||||||
# WINE_MULTI = generic wine, new name
|
|
||||||
- case "$WINE" in
|
|
||||||
- *64) WINE64="${WINE}" ;;
|
|
||||||
- *) WINE64="${WINE}64" ;;
|
|
||||||
- esac
|
|
||||||
+ if [ "${WINE%??}64" = "$WINE" ]; then
|
|
||||||
+ WINE64="${WINE}"
|
|
||||||
+ elif which "${WINE}64" >/dev/null 2>&1; then
|
|
||||||
+ WINE64="${WINE}64"
|
|
||||||
+ else
|
|
||||||
+ # Handle case where wine binaries (or binary wrappers) have a suffix
|
|
||||||
+ WINE64="$(dirname "$WINE")/"
|
|
||||||
+ [ "$WINE64" = "./" ] && WINE64=""
|
|
||||||
+ WINE64="${WINE64}$(basename "$WINE" | sed 's/^wine/wine64/')"
|
|
||||||
+ fi
|
|
||||||
WINE_ARCH="${WINE64}"
|
|
||||||
WINE_MULTI="${WINE}"
|
|
||||||
|
|
||||||
@@ -6475,6 +6481,75 @@
|
|
||||||
|
|
||||||
#----------------------------------------------------------------
|
#----------------------------------------------------------------
|
||||||
|
|
||||||
|
@ -73,23 +52,115 @@
|
||||||
+{
|
+{
|
||||||
+ # https://github.com/doitsujin/dxvk
|
+ # https://github.com/doitsujin/dxvk
|
||||||
+ w_download "https://github.com/doitsujin/dxvk/releases/download/v0.54/dxvk-0.54.tar.gz" 1c2f186baaa01d2de7b832f6f05021bdd29eccb65fc197c8b15adfd4e08f9640
|
+ w_download "https://github.com/doitsujin/dxvk/releases/download/v0.54/dxvk-0.54.tar.gz" 1c2f186baaa01d2de7b832f6f05021bdd29eccb65fc197c8b15adfd4e08f9640
|
||||||
+ helper_dxvk "$file1"
|
+ helper_dxvk "$file1" "3.6"
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+#----------------------------------------------------------------
|
+#----------------------------------------------------------------
|
||||||
+
|
+
|
||||||
+w_metadata dxvk dlls \
|
+w_metadata dxvk60 dlls \
|
||||||
+ title="Vulkan-based D3D11 implementation for Linux / Wine (checked)" \
|
+ 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" \
|
+ publisher="Philip Rebohle" \
|
||||||
+ year="2018" \
|
+ year="2018" \
|
||||||
+ media="download" \
|
+ media="download" \
|
||||||
+ file1="dxvk-0.54.tar.gz" \
|
|
||||||
+ installed_file1="$W_SYSTEM32_DLLS_WIN/d3d11.dll" \
|
+ installed_file1="$W_SYSTEM32_DLLS_WIN/d3d11.dll" \
|
||||||
+ installed_file2="$W_SYSTEM32_DLLS_WIN/dxgi.dll"
|
+ installed_file2="$W_SYSTEM32_DLLS_WIN/dxgi.dll"
|
||||||
+
|
+
|
||||||
+load_dxvk()
|
+load_dxvk()
|
||||||
+{
|
+{
|
||||||
+ w_call dxvk54
|
+ # 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
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+#----------------------------------------------------------------
|
+#----------------------------------------------------------------
|
||||||
|
@ -97,7 +168,7 @@
|
||||||
w_metadata dmusic32 dlls \
|
w_metadata dmusic32 dlls \
|
||||||
title="MS dmusic32.dll from DirectX user redistributable" \
|
title="MS dmusic32.dll from DirectX user redistributable" \
|
||||||
publisher="Microsoft" \
|
publisher="Microsoft" \
|
||||||
@@ -9919,14 +9994,36 @@
|
@@ -9919,14 +10080,36 @@
|
||||||
year="2018" \
|
year="2018" \
|
||||||
media="download" \
|
media="download" \
|
||||||
file1="VulkanSDK-1.1.73.0-Installer.exe" \
|
file1="VulkanSDK-1.1.73.0-Installer.exe" \
|
||||||
|
|
Loading…
Add table
Reference in a new issue