Added patch to implement NVIDIA video encoder library (nvencodeapi).

This commit is contained in:
Sebastian Lackner
2015-02-08 08:40:31 +01:00
parent 6a5466cff1
commit f2831c4a36
5 changed files with 777 additions and 1 deletions

View File

@@ -38,7 +38,7 @@ Wine. All those differences are also documented on the
Included bug fixes and improvements
===================================
**Bugfixes and features included in the next upcoming release [12]:**
**Bugfixes and features included in the next upcoming release [13]:**
* Add implementation for CreateThreadpool ([Wine Bug #35192](https://bugs.winehq.org/show_bug.cgi?id=35192))
* Add library override instead of closing winecfg when pressing ENTER over the combobox ([Wine Bug #12804](https://bugs.winehq.org/show_bug.cgi?id=12804))
@@ -52,6 +52,7 @@ Included bug fixes and improvements
* Implement threadpool wait objects
* Implement threadpool work items ([Wine Bug #32531](https://bugs.winehq.org/show_bug.cgi?id=32531))
* Jedi Knight: Dark Forces II crashes with winmm set to native ([Wine Bug #37983](https://bugs.winehq.org/show_bug.cgi?id=37983))
* Support for NVIDIA video encoder library (nvencodeapi)
**Bugs fixed in Wine Staging 1.7.35 [146]:**

1
debian/changelog vendored
View File

@@ -12,6 +12,7 @@ wine-staging (1.7.36) UNRELEASED; urgency=low
* Added patch to add library override instead of closing winecfg when pressing ENTER over the combobox.
* Added patchset for various improvements and cleanup of reg.exe.
* Added patch to add performance library registry keys needed by MS SQL Server Management Studio Express 2008 R2.
* Added patch to implement NVIDIA video encoder library (nvencodeapi).
* Removed patch to add additional tests for SLGetWindowsInformationDWORD (accepted upstream).
* Removed patch to avoid filling KdHelp structure for usermode applications (accepted upstream).
-- Sebastian Lackner <sebastian@fds-team.de> Sun, 25 Jan 2015 05:58:36 +0100

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,2 @@
Fixes: Support for NVIDIA video encoder library (nvencodeapi)
Depends: nvcuvid-CUDA_Video_Support

View File

@@ -141,6 +141,7 @@ patch_enable_all ()
enable_nvapi_Stub_DLL="$1"
enable_nvcuda_CUDA_Support="$1"
enable_nvcuvid_CUDA_Video_Support="$1"
enable_nvencodeapi_Video_Encoder="$1"
enable_ole32_CoWaitForMultipleHandles="$1"
enable_quartz_MediaSeeking_Positions="$1"
enable_reg_Cleanup="$1"
@@ -449,6 +450,9 @@ patch_enable ()
nvcuvid-CUDA_Video_Support)
enable_nvcuvid_CUDA_Video_Support="$2"
;;
nvencodeapi-Video_Encoder)
enable_nvencodeapi_Video_Encoder="$2"
;;
ole32-CoWaitForMultipleHandles)
enable_ole32_CoWaitForMultipleHandles="$2"
;;
@@ -910,6 +914,13 @@ if test "$enable_server_Stored_ACLs" -eq 1; then
enable_ntdll_DOS_Attributes=1
fi
if test "$enable_nvencodeapi_Video_Encoder" -eq 1; then
if test "$enable_nvcuvid_CUDA_Video_Support" -gt 1; then
abort "Patchset nvcuvid-CUDA_Video_Support disabled, but nvencodeapi-Video_Encoder depends on that."
fi
enable_nvcuvid_CUDA_Video_Support=1
fi
if test "$enable_nvcuvid_CUDA_Video_Support" -eq 1; then
if test "$enable_nvapi_Stub_DLL" -gt 1; then
abort "Patchset nvapi-Stub_DLL disabled, but nvcuvid-CUDA_Video_Support depends on that."
@@ -2413,6 +2424,19 @@ if test "$enable_nvcuvid_CUDA_Video_Support" -eq 1; then
) >> "$patchlist"
fi
# Patchset nvencodeapi-Video_Encoder
# |
# | Modified files:
# | * configure.ac, dlls/nvencodeapi/Makefile.in, dlls/nvencodeapi/nvencodeapi.c, dlls/nvencodeapi/nvencodeapi.spec,
# | dlls/nvencodeapi64/Makefile.in, dlls/nvencodeapi64/nvencodeapi64.spec, include/Makefile.in, include/nvencodeapi.h
# |
if test "$enable_nvencodeapi_Video_Encoder" -eq 1; then
patch_apply nvencodeapi-Video_Encoder/0001-nvencodeapi-First-implementation.patch
(
echo '+ { "Michael Müller", "nvencodeapi: First implementation.", 1 },';
) >> "$patchlist"
fi
# Patchset ole32-CoWaitForMultipleHandles
# |
# | Modified files: