wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 38e95ed2227dd3f0fc3d1394c884265d43e3b283

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2020-04-08 09:15:39 +10:00
parent 160a5024b4
commit bf3fbb7bdf
18 changed files with 109 additions and 486 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/nvencodeapi-Video_Encoder/0001-nvencodeapi-First-implementation.patch
View File

@ -375,14 +375,14 @@ index 000000000..91a33fd58
+
+static BOOL load_nvencode(void)
+{
+ libnvidia_encode_handle = wine_dlopen("libnvidia-encode.so", RTLD_NOW, NULL, 0);
+ libnvidia_encode_handle = dlopen("libnvidia-encode.so", RTLD_NOW);
+ if (!libnvidia_encode_handle)
+ {
+ FIXME("Wine cannot find the libnvidia-encode.so library, NVIDIA video encoding support disabled.\n");
+ return FALSE;
+ }
+
+ pNvEncodeAPICreateInstance = wine_dlsym(libnvidia_encode_handle, "NvEncodeAPICreateInstance", NULL, 0);
+ pNvEncodeAPICreateInstance = dlsym(libnvidia_encode_handle, "NvEncodeAPICreateInstance");
+ if (!pNvEncodeAPICreateInstance)
+ {
+ FIXME("Can't find symbol NvEncodeAPICreateInstance.\n");
@ -413,7 +413,7 @@ index 000000000..91a33fd58
+ case DLL_PROCESS_DETACH:
+ if (reserved) break;
+ if (libnvidia_encode_handle)
+ wine_dlclose(libnvidia_encode_handle, NULL, 0);
+ dlclose(libnvidia_encode_handle);
+ break;
+ }
+

4
patches/nvencodeapi-Video_Encoder/0002-nvencodeapi-Add-debian-specific-paths-to-native-libr.patch
View File

@ -15,7 +15,7 @@ index 7a0f531..557c6ae 100644
static BOOL load_nvencode(void)
{
- libnvidia_encode_handle = wine_dlopen("libnvidia-encode.so", RTLD_NOW, NULL, 0);
- libnvidia_encode_handle = dlopen("libnvidia-encode.so", RTLD_NOW);
+ static const char *libname[] =
+ {
+ "libnvidia-encode.so",
@ -29,7 +29,7 @@ index 7a0f531..557c6ae 100644
+
+ for (i = 0; i < sizeof(libname)/sizeof(libname[0]); i++)
+ {
+ libnvidia_encode_handle = wine_dlopen(libname[i], RTLD_NOW, NULL, 0);
+ libnvidia_encode_handle = dlopen(libname[i], RTLD_NOW);
+ if (libnvidia_encode_handle) break;
+ }
+