aboutsummaryrefslogtreecommitdiff
path: root/ports/ffnvcodec
diff options
context:
space:
mode:
authorMatthew Oliver <protogonoi@gmail.com>2020-10-07 18:23:23 +1100
committerGitHub <noreply@github.com>2020-10-07 00:23:23 -0700
commit72d98524e38d96982618d872ae045c2edb7f2c2e (patch)
tree938f98d29453f0c19943da588bcf6ede02b0e110 /ports/ffnvcodec
parent7dc0049439681a7f9537af420573d0ac3ef6ce31 (diff)
downloadvcpkg-72d98524e38d96982618d872ae045c2edb7f2c2e.tar.gz
vcpkg-72d98524e38d96982618d872ae045c2edb7f2c2e.zip
[ffmpeg] Update to 4.3.1 (#13365)
Co-authored-by: Lily <47812810+LilyWangL@users.noreply.github.com> Co-authored-by: wangli28 <wangli28@beyondsoft.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Diffstat (limited to 'ports/ffnvcodec')
-rw-r--r--ports/ffnvcodec/CONTROL3
-rw-r--r--ports/ffnvcodec/portfile.cmake6
2 files changed, 4 insertions, 5 deletions
diff --git a/ports/ffnvcodec/CONTROL b/ports/ffnvcodec/CONTROL
index d035f81db..5b09398f0 100644
--- a/ports/ffnvcodec/CONTROL
+++ b/ports/ffnvcodec/CONTROL
@@ -1,6 +1,5 @@
Source: ffnvcodec
-Version: 9.1.23.1
-Port-Version: 4
+Version: 10.0.26.0
Homepage: https://github.com/FFmpeg/nv-codec-headers
Description: FFmpeg version of Nvidia Codec SDK headers.
Supports: windows|linux
diff --git a/ports/ffnvcodec/portfile.cmake b/ports/ffnvcodec/portfile.cmake
index 1c8b59be4..31c6c9137 100644
--- a/ports/ffnvcodec/portfile.cmake
+++ b/ports/ffnvcodec/portfile.cmake
@@ -2,8 +2,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO FFmpeg/nv-codec-headers
- REF 4a0bbfd58724d6d19851cd8a6f7a9098dde9ab77 # 9.1.23.1
- SHA512 39b643c6925558428f2e814fc3441878a906f324163396b8c6139ce48f62308c3dc2416b9c995eaed890338919ca0dfc9437fbb6b6d078f7a6f1b9675104c223
+ REF 5ee2ae591f74f53bd6028344f8690f1558a1f17a # 10.0.26.0
+ SHA512 f9d40a44f85016f0f76c7f630c3defb2e94858b43ae714adae546842c2801f51358b7c2b3326952e7aeb25f5b1611af4eee3024f495eaaaecbfd31851cc7edca
HEAD_REF master
)
@@ -12,7 +12,7 @@ vcpkg_from_github(
# ====================================================
# Windows
-if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+if(VCPKG_TARGET_IS_WINDOWS)
set(BUILD_SCRIPT ${CMAKE_CURRENT_LIST_DIR}\\build.sh)
vcpkg_acquire_msys(MSYS_ROOT PACKAGES make pkg-config)
set(BASH ${MSYS_ROOT}/usr/bin/bash.exe)