gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

app-emulation/wine-staging: backport opengl32.dll fix to 7.21

Browse Source 
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
This commit is contained in:
Ionen Wolkens
2022-11-23 18:49:07 -05:00
parent a62ccb7245
commit bd5474ca01
2 changed files with 75 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
app-emulation/wine-staging/files/wine-staging-7.21-opengl32.patch Normal file
View File

@@ -0,0 +1,73 @@
Fixes PE opengl32.dll failing to initialize.
https://gitlab.winehq.org/wine/wine/-/commit/34099bba6cb
From: Rémi Bernon <rbernon@codeweavers.com>
Date: Mon, 14 Nov 2022 11:55:51 +0100
Subject: [PATCH] ntdll: Delay loading unixlibs until the functions are
requested.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53909
--- a/dlls/ntdll/unix/virtual.c
+++ b/dlls/ntdll/unix/virtual.c
@@ -98,6 +98,7 @@ struct builtin_module
unsigned int refcount;
void *handle;
void *module;
+ char *unix_path;
void *unix_handle;
};
@@ -583,6 +584,7 @@ static void add_builtin_module( void *module, void *handle )
builtin->handle = handle;
builtin->module = module;
builtin->refcount = 1;
+ builtin->unix_path = NULL;
builtin->unix_handle = NULL;
list_add_tail( &builtin_modules, &builtin->entry );
}
@@ -603,6 +605,7 @@ void release_builtin_module( void *module )
list_remove( &builtin->entry );
if (builtin->handle) dlclose( builtin->handle );
if (builtin->unix_handle) dlclose( builtin->unix_handle );
+ free( builtin->unix_path );
free( builtin );
}
break;
@@ -652,6 +655,8 @@ static NTSTATUS get_builtin_unix_funcs( void *module, BOOL wow, const void **fun
LIST_FOR_EACH_ENTRY( builtin, &builtin_modules, struct builtin_module, entry )
{
if (builtin->module != module) continue;
+ if (builtin->unix_path && !builtin->unix_handle)
+ builtin->unix_handle = dlopen( builtin->unix_path, RTLD_NOW );
if (builtin->unix_handle)
{
*funcs = dlsym( builtin->unix_handle, ptr_name );
@@ -669,26 +674,19 @@ static NTSTATUS get_builtin_unix_funcs( void *module, BOOL wow, const void **fun
*/
NTSTATUS load_builtin_unixlib( void *module, const char *name )
{
- void *handle;
sigset_t sigset;
- NTSTATUS status = STATUS_DLL_NOT_FOUND;
+ NTSTATUS status = STATUS_SUCCESS;
struct builtin_module *builtin;
- if (!(handle = dlopen( name, RTLD_NOW ))) return status;
server_enter_uninterrupted_section( &virtual_mutex, &sigset );
LIST_FOR_EACH_ENTRY( builtin, &builtin_modules, struct builtin_module, entry )
{
if (builtin->module != module) continue;
- if (!builtin->unix_handle)
- {
- builtin->unix_handle = handle;
- status = STATUS_SUCCESS;
- }
+ if (!builtin->unix_path) builtin->unix_path = strdup( name );
else status = STATUS_IMAGE_ALREADY_LOADED;
break;
}
server_leave_uninterrupted_section( &virtual_mutex, &sigset );
- if (status) dlclose( handle );
return status;
}

3
app-emulation/wine-staging/wine-staging-7.21.ebuild → app-emulation/wine-staging/wine-staging-7.21-r1.ebuild
View File

@@ -129,7 +129,8 @@ QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
PATCHES=(
"${FILESDIR}"/${PN}-7.17-noexecstack.patch
"${FILESDIR}"/${PN}-7.20-unwind.patch
"${FILESDIR}"/${PN}-7.21-crossflags.patch
"${FILESDIR}"/${P}-crossflags.patch
"${FILESDIR}"/${P}-opengl32.patch
)
pkg_pretend() {