Page Menu
Home
Solus
Search
Configure Global Search
Log In
Files
F11049359
D3075.id.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
14 KB
Referenced Files
None
Subscribers
None
D3075.id.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 dee2148a8c602ee534a6966032e00cb7b483f086 Mon Sep 17 00:00:00 2001
+From 801df94f3ef6e792dae55916a1fd796fec221232 Mon Sep 17 00:00:00 2001
From: Nick Sarnie <sarnex@gentoo.org>
-Date: Sun, 13 May 2018 09:51:17 -0400
+Date: Mon, 11 Jun 2018 21:09:04 -0400
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 1a3dd801a1..9276b5b17d 100644
+index 3e00ec6314..e026581352 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -100,6 +100,7 @@ struct builtin_load_info
@@ -93,7 +93,7 @@
if ((p = strrchrW( wm->ldr.FullDllName.Buffer, '\\' ))) p++;
else p = wm->ldr.FullDllName.Buffer;
RtlInitUnicodeString( &wm->ldr.BaseDllName, p );
-@@ -1657,7 +1659,7 @@ static void load_builtin_callback( void *module, const char *filename )
+@@ -1676,7 +1678,7 @@ static void load_builtin_callback( void *module, const char *filename )
return;
}
@@ -102,7 +102,7 @@
RtlFreeHeap( GetProcessHeap(), 0, fullname );
if (!wm)
{
-@@ -1867,8 +1869,8 @@ static BOOL is_valid_binary( HMODULE module, const pe_image_info_t *info )
+@@ -1886,8 +1888,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;
-@@ -1911,7 +1913,7 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file,
+@@ -1930,7 +1932,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;
-@@ -1979,8 +1981,8 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file,
+@@ -1998,8 +2000,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;
-@@ -2000,6 +2002,7 @@ static NTSTATUS load_builtin_dll( LPCWSTR load_path, LPCWSTR path, HANDLE file,
+@@ -2019,6 +2021,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;
-@@ -2198,6 +2201,108 @@ done:
+@@ -2217,6 +2220,108 @@ done:
return status;
}
@@ -250,7 +250,7 @@
/***********************************************************************
* open_dll_file
-@@ -2244,7 +2349,7 @@ static HANDLE open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, struct
+@@ -2263,7 +2368,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;
-@@ -2289,20 +2394,41 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname,
+@@ -2308,20 +2413,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 */
-@@ -2350,8 +2476,10 @@ overflow:
+@@ -2369,8 +2495,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;
-@@ -2368,7 +2496,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_
+@@ -2387,7 +2515,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;
-@@ -2388,6 +2516,25 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_
+@@ -2407,6 +2535,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 ))
-@@ -2410,22 +2557,22 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_
+@@ -2429,22 +2576,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))
{
-@@ -2435,7 +2582,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_
+@@ -2454,7 +2601,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;
}
-@@ -2468,7 +2615,7 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH LdrLoadDll(LPCWSTR path_name, DWORD flags,
+@@ -2487,7 +2634,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))
{
-@@ -2507,7 +2654,7 @@ NTSTATUS WINAPI LdrGetDllHandle( LPCWSTR load_path, ULONG flags, const UNICODE_S
+@@ -2526,7 +2673,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;
-@@ -3429,7 +3576,7 @@ void __wine_process_init(void)
+@@ -3448,7 +3595,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 110856a536..a94947439c 100644
+index f2c24a2012..bbe60e4c5c 100644
--- a/programs/winecfg/winecfg.h
+++ b/programs/winecfg/winecfg.h
-@@ -87,6 +87,7 @@ INT_PTR CALLBACK AppDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+@@ -89,6 +89,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);
@@ -1025,5 +1025,5 @@
/* @makedep: winecfg.ico */
--
-2.17.0
+2.17.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 c99a20ab12c90b735e11e92b8a4b044d8e332f45 Mon Sep 17 00:00:00 2001
+From 8b1866b25006b99b2c5823f3f25aea3b426fd5b2 Mon Sep 17 00:00:00 2001
From: Nick Sarnie <sarnex@gentoo.org>
-Date: Sun, 13 May 2018 09:50:07 -0400
+Date: Mon, 11 Jun 2018 21:08:25 -0400
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 86858cb055..bf902e129e 100644
+index 2929bd6323..e374796191 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,6 +69,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]),
-@@ -422,6 +430,8 @@ AC_CHECK_LIB(ossaudio,_oss_ioctl)
+@@ -423,6 +431,8 @@ AC_CHECK_LIB(ossaudio,_oss_ioctl)
AC_SUBST(OPENGL_LIBS,"")
@@ -68,7 +68,7 @@
dnl **** Check for header files ****
AC_SYS_LARGEFILE()
-@@ -1268,6 +1278,183 @@ OpenGL and Direct3D won't be supported.])
+@@ -1269,6 +1279,183 @@ OpenGL and Direct3D won't be supported.])
WINE_NOTICE_WITH(va,[test "x$ac_cv_lib_soname_va" = "x" -o "x$ac_cv_lib_soname_va_x11" = "x" -o "x$ac_cv_lib_soname_va_drm" = "x"],
[libva ${notice_platform}development files not found, GPU video acceleration won't be supported.])
@@ -252,7 +252,7 @@
CPPFLAGS="$ac_save_CPPFLAGS"
else
X_CFLAGS=""
-@@ -3208,6 +3395,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3d8)
+@@ -3219,6 +3406,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.17.0
+2.17.1
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,8 +1,8 @@
name : wine
-version : 3.9
-release : 42
+version : '3.10'
+release : 43
source :
- - https://dl.winehq.org/wine/source/3.x/wine-3.9.tar.xz : ccadc281966d5a94f1161dec22d29bf7bd6506b371b26f18f652d374e986b735
+ - https://dl.winehq.org/wine/source/3.x/wine-3.10.tar.xz : d7505cc79c7cd8950f1a46ecfcc0ae2ecc71717ce85414846264395b1e7ac6b5
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
@@ -359,6 +359,7 @@
<Path fileType="library">/usr/lib64/wine/difxapi.dll.so</Path>
<Path fileType="library">/usr/lib64/wine/dinput.dll.so</Path>
<Path fileType="library">/usr/lib64/wine/dinput8.dll.so</Path>
+ <Path fileType="library">/usr/lib64/wine/dism.exe.so</Path>
<Path fileType="library">/usr/lib64/wine/dispex.dll.so</Path>
<Path fileType="library">/usr/lib64/wine/dmband.dll.so</Path>
<Path fileType="library">/usr/lib64/wine/dmcompos.dll.so</Path>
@@ -773,6 +774,7 @@
<Path fileType="library">/usr/lib64/wine/fakedlls/difxapi.dll</Path>
<Path fileType="library">/usr/lib64/wine/fakedlls/dinput.dll</Path>
<Path fileType="library">/usr/lib64/wine/fakedlls/dinput8.dll</Path>
+ <Path fileType="library">/usr/lib64/wine/fakedlls/dism.exe</Path>
<Path fileType="library">/usr/lib64/wine/fakedlls/dispex.dll</Path>
<Path fileType="library">/usr/lib64/wine/fakedlls/dmband.dll</Path>
<Path fileType="library">/usr/lib64/wine/fakedlls/dmcompos.dll</Path>
@@ -851,7 +853,9 @@
<Path fileType="library">/usr/lib64/wine/fakedlls/ext-ms-win-uxtheme-themes-l1-1-0.dll</Path>
<Path fileType="library">/usr/lib64/wine/fakedlls/extrac32.exe</Path>
<Path fileType="library">/usr/lib64/wine/fakedlls/faultrep.dll</Path>
+ <Path fileType="library">/usr/lib64/wine/fakedlls/fc.exe</Path>
<Path fileType="library">/usr/lib64/wine/fakedlls/feclient.dll</Path>
+ <Path fileType="library">/usr/lib64/wine/fakedlls/find.exe</Path>
<Path fileType="library">/usr/lib64/wine/fakedlls/findstr.exe</Path>
<Path fileType="library">/usr/lib64/wine/fakedlls/fltlib.dll</Path>
<Path fileType="library">/usr/lib64/wine/fakedlls/fltmgr.sys</Path>
@@ -1273,7 +1277,9 @@
<Path fileType="library">/usr/lib64/wine/fakedlls/xpsprint.dll</Path>
<Path fileType="library">/usr/lib64/wine/fakedlls/xpssvcs.dll</Path>
<Path fileType="library">/usr/lib64/wine/faultrep.dll.so</Path>
+ <Path fileType="library">/usr/lib64/wine/fc.exe.so</Path>
<Path fileType="library">/usr/lib64/wine/feclient.dll.so</Path>
+ <Path fileType="library">/usr/lib64/wine/find.exe.so</Path>
<Path fileType="library">/usr/lib64/wine/findstr.exe.so</Path>
<Path fileType="library">/usr/lib64/wine/fltlib.dll.so</Path>
<Path fileType="library">/usr/lib64/wine/fltmgr.sys.so</Path>
@@ -1894,7 +1900,7 @@
</Description>
<PartOf>emul32</PartOf>
<RuntimeDependencies>
- <Dependency release="42">wine</Dependency>
+ <Dependency release="43">wine</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin/wine</Path>
@@ -1910,8 +1916,8 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="42">wine-32bit</Dependency>
- <Dependency release="42">wine-devel</Dependency>
+ <Dependency release="43">wine-32bit</Dependency>
+ <Dependency release="43">wine-devel</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib32/lib*.so</Path>
@@ -1924,7 +1930,7 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="42">wine</Dependency>
+ <Dependency release="43">wine</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/</Path>
@@ -1932,12 +1938,12 @@
</Files>
</Package>
<History>
- <Update release="42">
- <Date>2018-05-26</Date>
- <Version>3.9</Version>
+ <Update release="43">
+ <Date>2018-06-12</Date>
+ <Version>3.10</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
Details
Attached
Mime Type
text/plain
Expires
Fri, Aug 11, 5:40 PM (2 h, 46 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5814596
Default Alt Text
D3075.id.diff (14 KB)
Attached To
Mode
D3075: Update wine to 3.10
Attached
Detach File
Event Timeline
Log In to Comment