mirror of
https://github.com/lutris/lutris
synced 2024-07-20 17:34:34 +00:00
Merge branch 'master' into next
This commit is contained in:
commit
b669b80d4d
10
debian/changelog
vendored
10
debian/changelog
vendored
|
@ -1,3 +1,13 @@
|
||||||
|
lutris (0.4.18) bionic; urgency=medium
|
||||||
|
|
||||||
|
* Fix 'execute' command arguments
|
||||||
|
* Fix 'write_json' command when no file exists
|
||||||
|
* Avoid crash when wine prefix has broken symlinks
|
||||||
|
* Update DXVK latest version to 0.52
|
||||||
|
* Update winetricks
|
||||||
|
|
||||||
|
-- Mathieu Comandon <strycore@gmail.com> Thu, 24 May 2018 14:06:45 -0700
|
||||||
|
|
||||||
lutris (0.4.17) bionic; urgency=medium
|
lutris (0.4.17) bionic; urgency=medium
|
||||||
|
|
||||||
* Add DVXK version option
|
* Add DVXK version option
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
%global appid net.lutris.Lutris
|
%global appid net.lutris.Lutris
|
||||||
|
|
||||||
Name: lutris
|
Name: lutris
|
||||||
Version: 0.4.17
|
Version: 0.4.18
|
||||||
Release: 2%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: Install and play any video game easily
|
Summary: Install and play any video game easily
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ from gi.repository import GLib
|
||||||
from lutris.util.settings import SettingsIO
|
from lutris.util.settings import SettingsIO
|
||||||
|
|
||||||
PROJECT = "Lutris"
|
PROJECT = "Lutris"
|
||||||
VERSION = "0.4.17"
|
VERSION = "0.4.18"
|
||||||
COPYRIGHT = "(c) 2010-2018 Lutris Gaming Platform"
|
COPYRIGHT = "(c) 2010-2018 Lutris Gaming Platform"
|
||||||
AUTHORS = ["Mathieu Comandon <strycore@gmail.com>",
|
AUTHORS = ["Mathieu Comandon <strycore@gmail.com>",
|
||||||
"Pascal Reinhard (Xodetaetl) <dev@xod.me"]
|
"Pascal Reinhard (Xodetaetl) <dev@xod.me"]
|
||||||
|
|
|
@ -9141,7 +9141,8 @@ load_shockwave() {
|
||||||
# 2017/08/03: bebebaef1644a994179a2e491ce3f55599d768f7c6019729f21e7029b1845b9c
|
# 2017/08/03: bebebaef1644a994179a2e491ce3f55599d768f7c6019729f21e7029b1845b9c
|
||||||
# 2017/12/12: 0a9813ac55a8718440518dc2f5f410a3a065b422fe0618c073bfc631b9abf12c
|
# 2017/12/12: 0a9813ac55a8718440518dc2f5f410a3a065b422fe0618c073bfc631b9abf12c
|
||||||
# 2018/03/16: 4d7b408cf5b65a522b071d7d9ddbc5f6964911a7d55c418e31f393e6055cf796
|
# 2018/03/16: 4d7b408cf5b65a522b071d7d9ddbc5f6964911a7d55c418e31f393e6055cf796
|
||||||
w_download https://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/sw_lic_full_installer.msi 4d7b408cf5b65a522b071d7d9ddbc5f6964911a7d55c418e31f393e6055cf796
|
# 2018/05/24: 2b03fa11ff6f31b3fef9313264f0ef356ee11d5bc3642c30a2482b4ac5dd0084
|
||||||
|
w_download https://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/sw_lic_full_installer.msi 2b03fa11ff6f31b3fef9313264f0ef356ee11d5bc3642c30a2482b4ac5dd0084
|
||||||
|
|
||||||
w_try_cd "$W_CACHE/$W_PACKAGE"
|
w_try_cd "$W_CACHE/$W_PACKAGE"
|
||||||
w_try "$WINE" msiexec /i sw_lic_full_installer.msi $W_UNATTENDED_SLASH_Q
|
w_try "$WINE" msiexec /i sw_lic_full_installer.msi $W_UNATTENDED_SLASH_Q
|
||||||
|
@ -9894,18 +9895,36 @@ load_vjrun20()
|
||||||
|
|
||||||
#----------------------------------------------------------------
|
#----------------------------------------------------------------
|
||||||
|
|
||||||
w_metadata vulkansdk dlls \
|
w_metadata vulkanrt dlls \
|
||||||
title="Vulkan SDK 1.0.68 (developers only)" \
|
title="Vulkan Runtime 1.1.73.0" \
|
||||||
publisher="LunarG" \
|
publisher="LunarG" \
|
||||||
year="2018" \
|
year="2018" \
|
||||||
media="download" \
|
media="download" \
|
||||||
file1="VulkanSDK-1.0.68.0-Installer.exe" \
|
file1="VulkanRT-1.1.73.0-Installer.exe" \
|
||||||
installed_file1="C:/VulkanSDK/1.0.68.0/Vulkan.ico"
|
installed_file1="$W_SYSTEM32_DLLS_WIN/vulkan-1.dll"
|
||||||
|
|
||||||
|
load_vulkanrt()
|
||||||
|
{
|
||||||
|
# https://vulkan.lunarg.com/sdk/home
|
||||||
|
w_download "https://sdk.lunarg.com/sdk/download/1.1.73.0/windows/VulkanRT-1.1.73.0-Installer.exe?Human=true;u=" cfec461b17aff521cf06b727aa612d654d4e72de8e3c21bd219e77b87f56f20a VulkanRT-1.1.73.0-Installer.exe
|
||||||
|
w_try_cd "$W_CACHE/$W_PACKAGE"
|
||||||
|
w_try "$WINE" "$file1" $W_UNATTENDED_SLASH_S
|
||||||
|
}
|
||||||
|
|
||||||
|
#----------------------------------------------------------------
|
||||||
|
|
||||||
|
w_metadata vulkansdk dlls \
|
||||||
|
title="Vulkan SDK 1.1.73.0 (developers only)" \
|
||||||
|
publisher="LunarG" \
|
||||||
|
year="2018" \
|
||||||
|
media="download" \
|
||||||
|
file1="VulkanSDK-1.1.73.0-Installer.exe" \
|
||||||
|
installed_file1="C:/VulkanSDK/1.1.73.0/Vulkan.ico"
|
||||||
|
|
||||||
load_vulkansdk()
|
load_vulkansdk()
|
||||||
{
|
{
|
||||||
# https://vulkan.lunarg.com/sdk/home
|
# https://vulkan.lunarg.com/sdk/home
|
||||||
w_download "https://sdk.lunarg.com/sdk/download/1.0.68.0/windows/VulkanSDK-1.0.68.0-Installer.exe" 8e6401d4f90af1ab384f76cb59f1b7fe9bcd717c92b2080089f893f2de4b33bb
|
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_cd "$W_CACHE/$W_PACKAGE"
|
||||||
w_try "$WINE" "$file1" $W_UNATTENDED_SLASH_S
|
w_try "$WINE" "$file1" $W_UNATTENDED_SLASH_S
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue