wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:wine-compholio/wine-staging

Browse Source
This commit is contained in:
Sebastian Lackner 2015-01-07 10:07:50 +01:00
commit 63509658f4
6 changed files with 956 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -37,8 +37,9 @@ Wine. All those differences are also documented on the
Included bug fixes and improvements
===================================
**Bugfixes and features included in the next upcoming release [22]:**
**Bugfixes and features included in the next upcoming release [23]:**
* Add nvapi stubs required for GPU PhysX support
* Add stub for D3DXComputeNormalMap
* Add stub for D3DXComputeTangentFrameEx ([Wine Bug #31984](https://bugs.winehq.org/show_bug.cgi?id=31984))
* Add stub for D3DXIntersect

1
debian/changelog vendored
View File

@ -30,6 +30,7 @@ wine-staging (1.7.34) UNRELEASED; urgency=low
* Added patch to fix parameters for ConvertToIndexedBlendedMesh stub.
* Added patch for basic CUDA support.
* Added patches for D3DXComputeNormals and D3DXComputeNormalMap.
* Added patch for nvapi stubs (required for GPU PhysX support).
* Removed patch to emulate write to CR4 register (accepted upstream).
* Removed patch with stub for KeSetSystemAffinityThread (accepted upstream).
* Removed patch to implement combase HSTRING objects (accepted upstream).

2
patches/Makefile
View File

@ -18,4 +18,4 @@ install-git:
.PHONY: series
series:
@echo "ERROR: Using this Makefile is deprecated!" >&2
@false
@false

928
patches/nvapi-Stub_DLL/0001-nvapi-First-implementation.patch Normal file
View File

File diff suppressed because it is too large Load Diff

2
patches/nvapi-Stub_DLL/definition Normal file
View File

@ -0,0 +1,2 @@
Fixes: Add nvapi stubs required for GPU PhysX support
Depends: nvcuda-CUDA_Support

22
patches/patchinstall.sh
View File

@ -125,6 +125,7 @@ patch_enable_all ()
enable_ntoskrnl_Irp_Status="$1"
enable_ntoskrnl_Stub_FileObject="$1"
enable_nvcuda_CUDA_Support="$1"
enable_nvapi_Stub_DLL="$1"
enable_ole32_CoWaitForMultipleHandles="$1"
enable_quartz_MediaSeeking_Positions="$1"
enable_riched20_IText_Interface="$1"
@ -404,6 +405,9 @@ patch_enable ()
nvcuda-CUDA_Support)
enable_nvcuda_CUDA_Support="$2"
;;
nvapi-Stub_DLL)
enable_nvapi_Stub_DLL="$2"
;;
ole32-CoWaitForMultipleHandles)
enable_ole32_CoWaitForMultipleHandles="$2"
;;
@ -703,6 +707,11 @@ if [ "$enable_server_Stored_ACLs" -eq 1 ]; then
enable_ntdll_DOS_Attributes=1
fi
if [ "$enable_nvapi_Stub_DLL" -eq 1 ]; then
[ "$enable_nvcuda_CUDA_Support" -gt 1 ] && abort "ERROR: Patchset nvcuda-CUDA_Support disabled, but nvapi-Stub_DLL depends on that." >&2
enable_nvcuda_CUDA_Support=1
fi
if [ "$enable_ntoskrnl_Emulator" -eq 1 ]; then
[ "$enable_ntdll_User_Shared_Data" -gt 1 ] && abort "ERROR: Patchset ntdll-User_Shared_Data disabled, but ntoskrnl-Emulator depends on that." >&2
enable_ntdll_User_Shared_Data=1
@ -2001,6 +2010,19 @@ if [ "$enable_nvcuda_CUDA_Support" -eq 1 ]; then
) >> "$patchlist"
fi
# Patchset nvapi-Stub_DLL
# |
# | Modified files:
# | * configure.ac, dlls/nvapi/Makefile.in, dlls/nvapi/nvapi.c, dlls/nvapi/nvapi.spec, dlls/nvapi/tests/Makefile.in,
# | dlls/nvapi/tests/nvapi.c, dlls/nvapi64/Makefile.in, dlls/nvapi64/nvapi64.spec, include/Makefile.in, include/nvapi.h
# |
if [ "$enable_nvapi_Stub_DLL" -eq 1 ]; then
patch_apply nvapi-Stub_DLL/0001-nvapi-First-implementation.patch
(
echo '+ { "Michael Müller", "nvapi: First implementation.", 1 },';
) >> "$patchlist"
fi
# Patchset ole32-CoWaitForMultipleHandles
# |
# | Modified files: