Hello community, here is the log from the commit of package wine for openSUSE:Factory checked in at 2018-07-24 17:25:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wine (Old) and /work/SRC/openSUSE:Factory/.wine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wine" Tue Jul 24 17:25:49 2018 rev:258 rq:624968 version:3.13 Changes: -------- --- /work/SRC/openSUSE:Factory/wine/wine.changes 2018-07-12 09:21:56.722651875 +0200 +++ /work/SRC/openSUSE:Factory/.wine.new/wine.changes 2018-07-24 17:26:13.379593689 +0200 @@ -1,0 +2,21 @@ +Mon Jul 23 14:54:27 UTC 2018 - [email protected] + +- Switch to using pkgconfig for dri2proto as dri2proto-devel does + not exist in "Factory" anymore, it is now provided by + xorgproto-devel, yet using pkgconfig is more robust + +------------------------------------------------------------------- +Sat Jul 21 08:15:41 UTC 2018 - [email protected] + +- Update to 3.13 development release + - Vulkan support on macOS using MoltenVK. + - Initial support for performance data in the registry. + - Mono engine updated with some bug fixes. + - Support for fetching BIOS information on Linux. + - GnuTLS also used on macOS when available. + - Improvements in the standard Task Dialog. + - Various bug fixes. +- updated staging to 3.13 +- updated winetricks + +------------------------------------------------------------------- Old: ---- wine-3.12.tar.xz wine-3.12.tar.xz.sign wine-d3d9-patches-3.11.tar.xz wine-staging-3.12.tar.xz New: ---- wine-3.13.tar.xz wine-3.13.tar.xz.sign wine-d3d9-patches-3.12.tar.xz wine-staging-3.13.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wine.spec ++++++ --- /var/tmp/diff_new_pack.clNOo8/_old 2018-07-24 17:26:15.407596269 +0200 +++ /var/tmp/diff_new_pack.clNOo8/_new 2018-07-24 17:26:15.411596274 +0200 @@ -107,8 +107,8 @@ BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(xxf86vm) BuildRequires: pkgconfig(zlib) -%define realver 3.12 -Version: 3.12 +%define realver 3.13 +Version: 3.13 Release: 0 Summary: An MS Windows Emulator License: LGPL-2.1-or-later @@ -146,7 +146,7 @@ ExclusiveArch: %{ix86} x86_64 ppc %arm aarch64 %if %{staging} # upstream patch target version -%define staging_version 3.12 +%define staging_version 3.13 Source100: wine-staging-%{staging_version}.tar.xz BuildRequires: gtk3-devel BuildRequires: libOSMesa-devel @@ -154,10 +154,10 @@ %endif %if %{nine} # upstream patch target version -%define nine_version 3.11 +%define nine_version 3.12 BuildRequires: Mesa-libd3d-devel -BuildRequires: dri2proto-devel BuildRequires: libOSMesa-devel +BuildRequires: pkgconfig(dri2proto) Source110: wine-d3d9-patches-%{nine_version}.tar.xz %endif @@ -169,6 +169,15 @@ penalties of other methods and allowing you to cleanly integrate Windows applications into your desktop. +%if %{staging} +This WINE flavor contains the "staging" development patchset +on top of the regular Wine release. +%endif + +%if %{nine} +This WINE flavor contains Direct3D9 enhancements patches for Gallium Nine support. +%endif + You can run your Windows executables with it and write your Windows programs under Linux and link against the WINE libraries. It is not necessary to have a Windows installation to run WINE. @@ -180,7 +189,6 @@ You can invoke wine by entering 'wine program.exe'. Configure it by running 'winecfg'. - %package devel Summary: Files for Wine development Group: Development/Libraries/C and C++ ++++++ _service ++++++ --- /var/tmp/diff_new_pack.clNOo8/_old 2018-07-24 17:26:15.463596340 +0200 +++ /var/tmp/diff_new_pack.clNOo8/_new 2018-07-24 17:26:15.463596340 +0200 @@ -3,7 +3,7 @@ <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">v(.*)</param> <param name="url">https://github.com/wine-staging/wine-staging.git</param> - <param name="revision">refs/tags/v3.12</param> + <param name="revision">refs/tags/v3.13</param> <param name="match-tag">v*.*</param> <param name="scm">git</param> </service> @@ -11,7 +11,7 @@ <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">wined3d9(.*)</param> <param name="url">https://github.com/sarnex/wine-d3d9-patches.git</param> - <param name="revision">refs/tags/wine-d3d9-3.11</param> + <param name="revision">refs/tags/wine-d3d9-3.12</param> <param name="scm">git</param> </service> <service name="recompress" mode="disabled"> ++++++ wine-3.12.tar.xz -> wine-3.13.tar.xz ++++++ /work/SRC/openSUSE:Factory/wine/wine-3.12.tar.xz /work/SRC/openSUSE:Factory/.wine.new/wine-3.13.tar.xz differ: char 26, line 1 ++++++ wine-d3d9-patches-3.11.tar.xz -> wine-d3d9-patches-3.12.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wine-d3d9-patches-3.11/d3d9-helper.patch new/wine-d3d9-patches-3.12/d3d9-helper.patch --- old/wine-d3d9-patches-3.11/d3d9-helper.patch 2018-06-24 19:54:47.000000000 +0200 +++ new/wine-d3d9-patches-3.12/d3d9-helper.patch 2018-07-14 04:28:43.000000000 +0200 @@ -1,6 +1,6 @@ -From 6ccba02d4f144a415394642dcd37a88ed29a40a4 Mon Sep 17 00:00:00 2001 +From b578d33f7ec1a08c69cdcc6f1b179144e39a23a2 Mon Sep 17 00:00:00 2001 From: Nick Sarnie <[email protected]> -Date: Sun, 24 Jun 2018 13:53:50 -0400 +Date: Fri, 13 Jul 2018 22:26:10 -0400 Subject: [PATCH] D3D9 Helper Signed-off-by: Nick Sarnie <[email protected]> @@ -18,10 +18,10 @@ create mode 100644 programs/winecfg/staging.c diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c -index 3e00ec6314..e026581352 100644 +index df206e848d..d208c124d3 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c -@@ -100,6 +100,7 @@ struct builtin_load_info +@@ -110,6 +110,7 @@ struct builtin_load_info { const WCHAR *load_path; const WCHAR *filename; @@ -29,7 +29,7 @@ NTSTATUS status; WINE_MODREF *wm; }; -@@ -125,7 +126,8 @@ static WINE_MODREF *cached_modref; +@@ -135,7 +136,8 @@ static WINE_MODREF *cached_modref; static WINE_MODREF *current_modref; static WINE_MODREF *last_failed_modref; @@ -39,7 +39,7 @@ static NTSTATUS process_attach( WINE_MODREF *wm, LPVOID lpReserved ); static FARPROC find_ordinal_export( HMODULE module, const IMAGE_EXPORT_DIRECTORY *exports, DWORD exp_size, DWORD ordinal, LPCWSTR load_path ); -@@ -478,7 +480,7 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS +@@ -511,7 +513,7 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS if (!(wm = find_basename_module( mod_name ))) { TRACE( "delay loading %s for '%s'\n", debugstr_w(mod_name), forward ); @@ -48,7 +48,7 @@ !(wm->ldr.Flags & LDR_DONT_RESOLVE_REFS)) { if (!imports_fixup_done && current_modref) -@@ -649,7 +651,7 @@ static BOOL import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *descr, LP +@@ -682,7 +684,7 @@ static BOOL import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *descr, LP { ascii_to_unicode( buffer, name, len ); buffer[len] = 0; @@ -57,7 +57,7 @@ } else /* need to allocate a larger buffer */ { -@@ -657,7 +659,7 @@ static BOOL import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *descr, LP +@@ -690,7 +692,7 @@ static BOOL import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *descr, LP if (!ptr) return FALSE; ascii_to_unicode( ptr, name, len ); ptr[len] = 0; @@ -66,7 +66,7 @@ RtlFreeHeap( GetProcessHeap(), 0, ptr ); } -@@ -943,7 +945,7 @@ static NTSTATUS fixup_imports_ilonly( WINE_MODREF *wm, LPCWSTR load_path, void * +@@ -976,7 +978,7 @@ static NTSTATUS fixup_imports_ilonly( WINE_MODREF *wm, LPCWSTR load_path, void * prev = current_modref; current_modref = wm; @@ -75,7 +75,7 @@ current_modref = prev; if (status) { -@@ -1031,7 +1033,7 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) +@@ -1064,7 +1066,7 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) * Allocate a WINE_MODREF structure and add it to the process list * The loader_section must be locked while calling this function. */ @@ -84,7 +84,7 @@ { WINE_MODREF *wm; const WCHAR *p; -@@ -1045,7 +1047,7 @@ static WINE_MODREF *alloc_module( HMODULE hModule, LPCWSTR filename ) +@@ -1078,7 +1080,7 @@ static WINE_MODREF *alloc_module( HMODULE hModule, LPCWSTR filename ) wm->ldr.TlsIndex = -1; wm->ldr.LoadCount = 1; @@ -93,7 +93,7 @@ if ((p = strrchrW( wm->ldr.FullDllName.Buffer, '\\' ))) p++; else p = wm->ldr.FullDllName.Buffer; RtlInitUnicodeString( &wm->ldr.BaseDllName, p ); -@@ -1676,7 +1678,7 @@ static void load_builtin_callback( void *module, const char *filename ) +@@ -1745,7 +1747,7 @@ static void load_builtin_callback( void *module, const char *filename ) return; } @@ -102,7 +102,7 @@ RtlFreeHeap( GetProcessHeap(), 0, fullname ); if (!wm) { -@@ -1886,8 +1888,8 @@ static BOOL is_valid_binary( HMODULE module, const pe_image_info_t *info ) +@@ -1955,8 +1957,8 @@ static BOOL is_valid_binary( HMODULE module, const pe_image_info_t *info ) /****************************************************************************** * load_native_dll (internal) */ @@ -113,7 +113,7 @@ { void *module; HANDLE mapping; -@@ -1930,7 +1932,7 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, +@@ -1999,7 +2001,7 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, /* create the MODREF */ @@ -122,7 +122,7 @@ { if (module) NtUnmapViewOfSection( NtCurrentProcess(), module ); return STATUS_NO_MEMORY; -@@ -1998,8 +2000,8 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, +@@ -2067,8 +2069,8 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, /*********************************************************************** * load_builtin_dll */ @@ -133,7 +133,7 @@ { char error[256], dllname[MAX_PATH]; const WCHAR *name, *p; -@@ -2019,6 +2021,7 @@ static NTSTATUS load_builtin_dll( LPCWSTR load_path, LPCWSTR path, HANDLE file, +@@ -2088,6 +2090,7 @@ static NTSTATUS load_builtin_dll( LPCWSTR load_path, LPCWSTR path, HANDLE file, */ info.load_path = load_path; info.filename = NULL; @@ -141,7 +141,7 @@ info.status = STATUS_SUCCESS; info.wm = NULL; -@@ -2217,6 +2220,108 @@ done: +@@ -2286,6 +2289,108 @@ done: return status; } @@ -250,7 +250,7 @@ /*********************************************************************** * open_dll_file -@@ -2263,7 +2368,7 @@ static HANDLE open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, struct +@@ -2332,7 +2437,7 @@ static HANDLE open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, struct */ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, WCHAR *filename, ULONG *size, WINE_MODREF **pwm, @@ -259,7 +259,7 @@ { UNICODE_STRING nt_name; WCHAR *file_part, *ext, *dllname; -@@ -2308,20 +2413,41 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, +@@ -2377,20 +2482,41 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, if (RtlDetermineDosPathNameType_U( libname ) == RELATIVE_PATH) { @@ -305,7 +305,7 @@ } /* not found */ -@@ -2369,8 +2495,10 @@ overflow: +@@ -2438,8 +2564,10 @@ overflow: * Load a PE style module according to the load order. * The loader_section must be locked while calling this function. */ @@ -317,7 +317,7 @@ enum loadorder loadorder; WCHAR buffer[64]; WCHAR *filename; -@@ -2387,7 +2515,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ +@@ -2456,7 +2584,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ size = sizeof(buffer); for (;;) { @@ -326,7 +326,7 @@ if (nts == STATUS_SUCCESS) break; if (filename != buffer) RtlFreeHeap( GetProcessHeap(), 0, filename ); if (nts != STATUS_BUFFER_TOO_SMALL) return nts; -@@ -2407,6 +2535,25 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ +@@ -2476,6 +2604,25 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ } main_exe = get_modref( NtCurrentTeb()->Peb->ImageBaseAddress ); @@ -352,7 +352,7 @@ loadorder = get_load_order( main_exe ? main_exe->ldr.BaseDllName.Buffer : NULL, filename ); if (handle && is_fake_dll( handle )) -@@ -2429,22 +2576,22 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ +@@ -2498,22 +2645,22 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ if (!handle) nts = STATUS_DLL_NOT_FOUND; else { @@ -380,7 +380,7 @@ if (nts == STATUS_SUCCESS && loadorder == LO_DEFAULT && (MODULE_InitDLL( *pwm, DLL_WINE_PREATTACH, NULL ) != STATUS_SUCCESS)) { -@@ -2454,7 +2601,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ +@@ -2523,7 +2670,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ nts = STATUS_DLL_NOT_FOUND; } if (nts == STATUS_DLL_NOT_FOUND && loadorder != LO_BUILTIN) @@ -389,7 +389,7 @@ break; } -@@ -2487,7 +2634,7 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH LdrLoadDll(LPCWSTR path_name, DWORD flags, +@@ -2556,7 +2703,7 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH LdrLoadDll(LPCWSTR path_name, DWORD flags, RtlEnterCriticalSection( &loader_section ); if (!path_name) path_name = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer; @@ -398,7 +398,7 @@ if (nts == STATUS_SUCCESS && !(wm->ldr.Flags & LDR_DONT_RESOLVE_REFS)) { -@@ -2526,7 +2673,7 @@ NTSTATUS WINAPI LdrGetDllHandle( LPCWSTR load_path, ULONG flags, const UNICODE_S +@@ -2595,7 +2742,7 @@ NTSTATUS WINAPI LdrGetDllHandle( LPCWSTR load_path, ULONG flags, const UNICODE_S size = sizeof(buffer); for (;;) { @@ -407,7 +407,7 @@ if (handle) NtClose( handle ); if (filename != buffer) RtlFreeHeap( GetProcessHeap(), 0, filename ); if (status != STATUS_BUFFER_TOO_SMALL) break; -@@ -3448,7 +3595,7 @@ void __wine_process_init(void) +@@ -3517,7 +3664,7 @@ void __wine_process_init(void) /* setup the load callback and create ntdll modref */ wine_dll_set_callback( load_builtin_callback ); @@ -985,10 +985,10 @@ + return FALSE; +} diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h -index f2c24a2012..bbe60e4c5c 100644 +index 110856a536..a94947439c 100644 --- a/programs/winecfg/winecfg.h +++ b/programs/winecfg/winecfg.h -@@ -89,6 +89,7 @@ INT_PTR CALLBACK AppDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +@@ -87,6 +87,7 @@ INT_PTR CALLBACK AppDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK LibrariesDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK AudioDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK ThemeDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wine-d3d9-patches-3.11/staging-helper.patch new/wine-d3d9-patches-3.12/staging-helper.patch --- old/wine-d3d9-patches-3.11/staging-helper.patch 2018-06-24 19:54:47.000000000 +0200 +++ new/wine-d3d9-patches-3.12/staging-helper.patch 2018-07-14 04:28:43.000000000 +0200 @@ -1,6 +1,6 @@ -From 540970725a10bcb1545cb845c3f12413cd3fc835 Mon Sep 17 00:00:00 2001 +From 0daab7cb68d61c0293d88d62e8be63c3817e3cd1 Mon Sep 17 00:00:00 2001 From: Nick Sarnie <[email protected]> -Date: Sun, 24 Jun 2018 13:53:00 -0400 +Date: Fri, 13 Jul 2018 22:25:07 -0400 Subject: [PATCH] Staging Helper Signed-off-by: Nick Sarnie <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wine-d3d9-patches-3.11/wine-d3d9.patch new/wine-d3d9-patches-3.12/wine-d3d9.patch --- old/wine-d3d9-patches-3.11/wine-d3d9.patch 2018-06-24 19:54:47.000000000 +0200 +++ new/wine-d3d9-patches-3.12/wine-d3d9.patch 2018-07-14 04:28:43.000000000 +0200 @@ -1,6 +1,6 @@ -From b735ed6c096569575dd0c62aeeeb2a6bb6979339 Mon Sep 17 00:00:00 2001 +From cdbf59b3087cdc2addbff02c0c0f0ef333644a48 Mon Sep 17 00:00:00 2001 From: Nick Sarnie <[email protected]> -Date: Sun, 24 Jun 2018 13:53:17 -0400 +Date: Fri, 13 Jul 2018 22:25:21 -0400 Subject: [PATCH] Wine D3D9 Signed-off-by: Nick Sarnie <[email protected]> @@ -41,10 +41,10 @@ create mode 100644 dlls/d3d9-nine/wndproc.h diff --git a/configure.ac b/configure.ac -index e8dc9f2694..4a29c72224 100644 +index 539abd225a..089e5acc37 100644 --- a/configure.ac +++ b/configure.ac -@@ -69,6 +69,14 @@ AC_ARG_WITH(openal, AS_HELP_STRING([--without-openal],[do not use OpenAL]), +@@ -70,6 +70,14 @@ AC_ARG_WITH(openal, AS_HELP_STRING([--without-openal],[do not use OpenAL]), AC_ARG_WITH(opencl, AS_HELP_STRING([--without-opencl],[do not use OpenCL]), [if test "x$withval" = "xno"; then ac_cv_header_CL_cl_h=no; ac_cv_header_OpenCL_opencl_h=no; fi]) AC_ARG_WITH(opengl, AS_HELP_STRING([--without-opengl],[do not use OpenGL])) @@ -59,7 +59,7 @@ AC_ARG_WITH(osmesa, AS_HELP_STRING([--without-osmesa],[do not use the OSMesa library])) AC_ARG_WITH(oss, AS_HELP_STRING([--without-oss],[do not use the OSS sound support])) AC_ARG_WITH(pcap, AS_HELP_STRING([--without-pcap],[do not use the Packet Capture library]), -@@ -423,6 +431,8 @@ AC_CHECK_LIB(ossaudio,_oss_ioctl) +@@ -424,6 +432,8 @@ AC_CHECK_LIB(ossaudio,_oss_ioctl) AC_SUBST(OPENGL_LIBS,"") @@ -252,7 +252,7 @@ CPPFLAGS="$ac_save_CPPFLAGS" else X_CFLAGS="" -@@ -3216,6 +3403,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3d8) +@@ -3248,6 +3435,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3d8) WINE_CONFIG_MAKEFILE(dlls/d3d8/tests) WINE_CONFIG_MAKEFILE(dlls/d3d9) WINE_CONFIG_MAKEFILE(dlls/d3d9/tests) ++++++ wine-staging-3.12.tar.xz -> wine-staging-3.13.tar.xz ++++++ /work/SRC/openSUSE:Factory/wine/wine-staging-3.12.tar.xz /work/SRC/openSUSE:Factory/.wine.new/wine-staging-3.13.tar.xz differ: char 26, line 1 ++++++ winetricks ++++++ --- /var/tmp/diff_new_pack.clNOo8/_old 2018-07-24 17:26:15.591596503 +0200 +++ /var/tmp/diff_new_pack.clNOo8/_new 2018-07-24 17:26:15.595596508 +0200 @@ -6653,7 +6653,7 @@ { # 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" + helper_dxvk "$file1" "3.6" } #---------------------------------------------------------------- @@ -6692,6 +6692,24 @@ 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" +} + #---------------------------------------------------------------- @@ -10809,6 +10827,7 @@ load_corefonts() { + w_download "https://mirrors.kernel.org/gentoo/distfiles/andale32.exe"; 0524fe42951adc3a7eb870e32f0920313c71f170c859b5f770d82b4ee111e970 w_download "https://mirrors.kernel.org/gentoo/distfiles/arial32.exe"; 85297a4d146e9c87ac6f74822734bdee5f4b2a722d7eaa584b7f2cbf76f478f6 w_download "https://mirrors.kernel.org/gentoo/distfiles/arialb32.exe"; a425f0ffb6a1a5ede5b979ed6177f4f4f4fdef6ae7c302a7b7720ef332fec0a8 w_download "https://mirrors.kernel.org/gentoo/distfiles/comic32.exe"; 9c6df3feefde26d4e41d4a4fe5db2a89f9123a772594d7f59afd062625cd204e @@ -10825,6 +10844,10 @@ # files being present in the Windows font directory we use cabextract # to obtain the files and register the fonts by hand. + w_try_cabextract -d "$W_TMP" "$W_CACHE"/corefonts/andale32.exe + w_try_cp_font_files "$W_TMP" "$W_FONTSDIR_UNIX" "AndaleMo.TTF" + w_register_font andalemo.ttf "Andale Mono" + w_try_cabextract -d "$W_TMP" "$W_CACHE"/corefonts/arial32.exe w_try_cp_font_files "$W_TMP" "$W_FONTSDIR_UNIX" "Arial*.TTF" w_register_font arialbd.ttf "Arial Bold" @@ -13299,19 +13322,26 @@ winwait, Visual Studio, Setup is loading if ( w_opt_unattended > 0 ) { winwait, Visual Studio, Loading completed + sleep 1000 controlclick, button2 winwait, Visual Studio, Select features + sleep 1000 controlclick, button38 + sleep 1000 controlclick, button40 winwait, Visual Studio, You have chosen + sleep 1000 controlclick, button1 winwait, Visual Studio, Select features + sleep 1000 controlclick, button11 } - ;this can take a while + ; this can take a while winwait, Finish Page - if ( w_opt_unattended > 0 ) + if ( w_opt_unattended > 0 ) { + sleep 1000 controlclick, button2 + } winwaitclose, Finish Page " }
