Page MenuHomeSolus
Files F11049406

D5297.id12841.diff
No OneTemporary
Actions

D5297.id12841.diff
View Options

diff --git a/files/d3d9-helper.patch b/files/d3d9-helper.patch
--- a/files/d3d9-helper.patch
+++ b/files/d3d9-helper.patch
@@ -1,6 +1,6 @@
-From b2754287c16240b4d46da8ef89df9f471ad31ac0 Mon Sep 17 00:00:00 2001
+From 6c098bfed3f441e9b3a15ca82d52a3327fd2eb77 Mon Sep 17 00:00:00 2001
From: Nick Sarnie <sarnex@gentoo.org>
-Date: Sun, 11 Nov 2018 12:24:29 -0500
+Date: Wed, 23 Jan 2019 21:23:56 -0500
Subject: [PATCH] D3D9 Helper
Signed-off-by: Nick Sarnie <sarnex@gentoo.org>
@@ -18,7 +18,7 @@
create mode 100644 programs/winecfg/staging.c
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
-index c5e8d0d7c1..4aa342ac74 100644
+index 631e8bd998..72c0dd4b2a 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -110,6 +110,7 @@ struct builtin_load_info
@@ -102,7 +102,7 @@
RtlFreeHeap( GetProcessHeap(), 0, fullname );
if (!wm)
{
-@@ -1999,8 +2001,8 @@ static BOOL is_valid_binary( HMODULE module, const pe_image_info_t *info )
+@@ -1995,8 +1997,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;
-@@ -2043,7 +2045,7 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file,
+@@ -2039,7 +2041,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;
-@@ -2111,8 +2113,8 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file,
+@@ -2107,8 +2109,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;
-@@ -2132,6 +2134,7 @@ static NTSTATUS load_builtin_dll( LPCWSTR load_path, LPCWSTR path, HANDLE file,
+@@ -2128,6 +2130,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;
-@@ -2330,6 +2333,108 @@ done:
+@@ -2326,6 +2329,108 @@ done:
return status;
}
@@ -250,7 +250,7 @@
/***********************************************************************
* open_dll_file
-@@ -2376,7 +2481,7 @@ static HANDLE open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, struct
+@@ -2372,7 +2477,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;
-@@ -2421,20 +2526,41 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname,
+@@ -2417,20 +2522,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 */
-@@ -2482,8 +2608,10 @@ overflow:
+@@ -2478,8 +2604,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;
-@@ -2500,7 +2628,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_
+@@ -2496,7 +2624,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;
-@@ -2520,6 +2648,25 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_
+@@ -2516,6 +2644,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 ))
-@@ -2542,22 +2689,22 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_
+@@ -2538,22 +2685,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))
{
-@@ -2567,7 +2714,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_
+@@ -2563,7 +2710,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;
}
-@@ -2600,7 +2747,7 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH LdrLoadDll(LPCWSTR path_name, DWORD flags,
+@@ -2596,7 +2743,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))
{
-@@ -2639,7 +2786,7 @@ NTSTATUS WINAPI LdrGetDllHandle( LPCWSTR load_path, ULONG flags, const UNICODE_S
+@@ -2635,7 +2782,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;
-@@ -3560,7 +3707,7 @@ void __wine_process_init(void)
+@@ -3570,7 +3717,7 @@ void __wine_process_init(void)
/* setup the load callback and create ntdll modref */
wine_dll_set_callback( load_builtin_callback );
@@ -805,10 +805,10 @@
+ return ret;
+}
diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
-index fdb443b45c..4edd453c52 100644
+index 1630978f0a..b24b39a8b3 100644
--- a/dlls/ntdll/ntdll_misc.h
+++ b/dlls/ntdll/ntdll_misc.h
-@@ -215,6 +215,7 @@ enum loadorder
+@@ -217,6 +217,7 @@ enum loadorder
};
extern enum loadorder get_load_order( const WCHAR *app_name, const WCHAR *path ) DECLSPEC_HIDDEN;
@@ -817,7 +817,7 @@
struct debug_info
{
diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in
-index d516778834..dd847307cd 100644
+index 4e66e04e31..1cf70310d5 100644
--- a/programs/winecfg/Makefile.in
+++ b/programs/winecfg/Makefile.in
@@ -11,6 +11,7 @@ C_SRCS = \
@@ -1025,5 +1025,5 @@
/* @makedep: winecfg.ico */
--
-2.19.1
+2.20.1
diff --git a/files/wine-d3d9.patch b/files/wine-d3d9.patch
--- a/files/wine-d3d9.patch
+++ b/files/wine-d3d9.patch
@@ -1,6 +1,6 @@
-From 0ad6d2a46e5348726fbaa8cb6cead66c7efbe2c7 Mon Sep 17 00:00:00 2001
+From dfe9f5d81dc24995568d4e6edb63d007032e2bec Mon Sep 17 00:00:00 2001
From: Nick Sarnie <sarnex@gentoo.org>
-Date: Sun, 11 Nov 2018 12:23:54 -0500
+Date: Wed, 23 Jan 2019 21:23:04 -0500
Subject: [PATCH] Wine D3D9
Signed-off-by: Nick Sarnie <sarnex@gentoo.org>
@@ -41,7 +41,7 @@
create mode 100644 dlls/d3d9-nine/wndproc.h
diff --git a/configure.ac b/configure.ac
-index 67dfb3b765..9f0e4f23ad 100644
+index 972d44eb86..5f668d44c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -70,6 +70,14 @@ AC_ARG_WITH(openal, AS_HELP_STRING([--without-openal],[do not use OpenAL]),
@@ -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]),
-@@ -429,6 +437,8 @@ AC_CHECK_LIB(ossaudio,_oss_ioctl)
+@@ -413,6 +421,8 @@ AC_CHECK_LIB(ossaudio,_oss_ioctl)
AC_SUBST(OPENGL_LIBS,"")
@@ -252,7 +252,7 @@
CPPFLAGS="$ac_save_CPPFLAGS"
else
X_CFLAGS=""
-@@ -3269,6 +3456,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3d8)
+@@ -3262,6 +3449,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3d8)
WINE_CONFIG_MAKEFILE(dlls/d3d8/tests)
WINE_CONFIG_MAKEFILE(dlls/d3d9)
WINE_CONFIG_MAKEFILE(dlls/d3d9/tests)
@@ -5781,5 +5781,5 @@
+
+#endif
--
-2.19.1
+2.20.1
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,8 +1,8 @@
name : wine
-version : '4.0'
-release : 56
+version : 4.1
+release : 57
source :
- - https://dl.winehq.org/wine/source/4.0/wine-4.0.tar.xz : 6736cdee95b2b8bb021ec0c19497ed8cad5ae2c8bfdb7ab5dc687ff92a480d4d
+ - https://dl.winehq.org/wine/source/4.x/wine-4.1.tar.xz : cef775be05245ebd0f8a5fd50920c6c7d0a6539b781d8185d6c16b8e5ae41bad
license : LGPL-2.1-or-later
component : virt
summary : Wine compatibility layer for Windows emulation
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -1440,6 +1440,7 @@
<Path fileType="library">/usr/lib64/wine/libgdi32.def</Path>
<Path fileType="library">/usr/lib64/wine/libgdiplus.def</Path>
<Path fileType="library">/usr/lib64/wine/libglu32.def</Path>
+ <Path fileType="library">/usr/lib64/wine/libhal.def</Path>
<Path fileType="library">/usr/lib64/wine/libhid.def</Path>
<Path fileType="library">/usr/lib64/wine/libhidclass.def</Path>
<Path fileType="library">/usr/lib64/wine/libhlink.def</Path>
@@ -1457,6 +1458,7 @@
<Path fileType="library">/usr/lib64/wine/libmapi32.def</Path>
<Path fileType="library">/usr/lib64/wine/libmf.def</Path>
<Path fileType="library">/usr/lib64/wine/libmfplat.def</Path>
+ <Path fileType="library">/usr/lib64/wine/libmfreadwrite.def</Path>
<Path fileType="library">/usr/lib64/wine/libmfuuid.a</Path>
<Path fileType="library">/usr/lib64/wine/libmlang.def</Path>
<Path fileType="library">/usr/lib64/wine/libmpr.def</Path>
@@ -2033,7 +2035,7 @@
</Description>
<PartOf>emul32</PartOf>
<RuntimeDependencies>
- <Dependency release="56">wine</Dependency>
+ <Dependency release="57">wine</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin/wine</Path>
@@ -3509,6 +3511,7 @@
<Path fileType="library">/usr/lib32/wine/libgdi32.def</Path>
<Path fileType="library">/usr/lib32/wine/libgdiplus.def</Path>
<Path fileType="library">/usr/lib32/wine/libglu32.def</Path>
+ <Path fileType="library">/usr/lib32/wine/libhal.def</Path>
<Path fileType="library">/usr/lib32/wine/libhid.def</Path>
<Path fileType="library">/usr/lib32/wine/libhidclass.def</Path>
<Path fileType="library">/usr/lib32/wine/libhlink.def</Path>
@@ -3527,6 +3530,7 @@
<Path fileType="library">/usr/lib32/wine/libmapi32.def</Path>
<Path fileType="library">/usr/lib32/wine/libmf.def</Path>
<Path fileType="library">/usr/lib32/wine/libmfplat.def</Path>
+ <Path fileType="library">/usr/lib32/wine/libmfreadwrite.def</Path>
<Path fileType="library">/usr/lib32/wine/libmfuuid.a</Path>
<Path fileType="library">/usr/lib32/wine/libmlang.def</Path>
<Path fileType="library">/usr/lib32/wine/libmpr.def</Path>
@@ -4066,8 +4070,8 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="56">wine-32bit</Dependency>
- <Dependency release="56">wine-devel</Dependency>
+ <Dependency release="57">wine-32bit</Dependency>
+ <Dependency release="57">wine-devel</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib32/libwine.so</Path>
@@ -4080,7 +4084,7 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="56">wine</Dependency>
+ <Dependency release="57">wine</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/wine/debug.h</Path>
@@ -5035,12 +5039,12 @@
</Files>
</Package>
<History>
- <Update release="56">
- <Date>2019-01-23</Date>
- <Version>4.0</Version>
+ <Update release="57">
+ <Date>2019-02-05</Date>
+ <Version>4.1</Version>
<Comment>Packaging update</Comment>
<Name>Pierre-Yves</Name>
<Email>pyu@riseup.net</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 11, 5:42 PM (2 h, 46 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5794230
Default Alt Text
D5297.id12841.diff (13 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.