diff options
| author | Phoebe <20694052+PhoebeHui@users.noreply.github.com> | 2021-09-17 09:31:30 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-16 18:31:30 -0700 |
| commit | 69d5556d0d8c105f75055326cef346546e40e615 (patch) | |
| tree | a12bad6152ccaa044abdd44945b4f2aee1ad374c /ports/ffnvcodec | |
| parent | 574c125d6f1dd8150dadf1e116cd182823591626 (diff) | |
| download | vcpkg-69d5556d0d8c105f75055326cef346546e40e615.tar.gz vcpkg-69d5556d0d8c105f75055326cef346546e40e615.zip | |
[ffnvcodec/libproxy] Update to latest release version (#20169)
* [ffnvcodec/libproxy] Update to latest release version
* Small changes
* [ffnvcodec] Use version instead of version-string.
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Diffstat (limited to 'ports/ffnvcodec')
| -rw-r--r-- | ports/ffnvcodec/portfile.cmake | 19 | ||||
| -rw-r--r-- | ports/ffnvcodec/vcpkg.json | 3 |
2 files changed, 10 insertions, 12 deletions
diff --git a/ports/ffnvcodec/portfile.cmake b/ports/ffnvcodec/portfile.cmake index 31c6c9137..1b67cba6f 100644 --- a/ports/ffnvcodec/portfile.cmake +++ b/ports/ffnvcodec/portfile.cmake @@ -1,9 +1,8 @@ -# Get nvcodec vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO FFmpeg/nv-codec-headers - REF 5ee2ae591f74f53bd6028344f8690f1558a1f17a # 10.0.26.0 - SHA512 f9d40a44f85016f0f76c7f630c3defb2e94858b43ae714adae546842c2801f51358b7c2b3326952e7aeb25f5b1611af4eee3024f495eaaaecbfd31851cc7edca + REF b641a195edbe3ac9788e681e22c2e2fad8aacddb # 11.1.5.0 + SHA512 e8b4c21ddc9c39dadd9b69ebdfcf38cf1e61f19ffb88d0a4d9086ddbf69285d2c8c946bb02bde3ee943accae559a72468f096718ad69ac03a43746c1eb0ed483 HEAD_REF master ) @@ -30,7 +29,7 @@ if(VCPKG_TARGET_IS_WINDOWS) LOGNAME build-${TARGET_TRIPLET} ) - file(INSTALL ${SOURCE_PATH}/ffnvcodec.pc DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) + file(INSTALL "${SOURCE_PATH}/ffnvcodec.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") # Linux, etc. else() @@ -47,12 +46,12 @@ else() # FFmpeg uses pkgconfig to find ffnvcodec.pc, so install it where # FFMpeg's call to pkgconfig expects to find it. - file(INSTALL ${SOURCE_PATH}/ffnvcodec.pc DESTINATION ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) - file(INSTALL ${SOURCE_PATH}/ffnvcodec.pc DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) + file(INSTALL "${SOURCE_PATH}/ffnvcodec.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") + file(INSTALL "${SOURCE_PATH}/ffnvcodec.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") endif() -# Install the files to their default vcpkg locations -file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR}) -file(INSTALL ${CURRENT_PORT_DIR}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) - vcpkg_fixup_pkgconfig() + +# Install the files to their default vcpkg locations +file(INSTALL "${SOURCE_PATH}/include" DESTINATION "${CURRENT_PACKAGES_DIR}") +file(INSTALL "${CURRENT_PORT_DIR}/copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/ffnvcodec/vcpkg.json b/ports/ffnvcodec/vcpkg.json index f21ec1e94..7ef678a4b 100644 --- a/ports/ffnvcodec/vcpkg.json +++ b/ports/ffnvcodec/vcpkg.json @@ -1,7 +1,6 @@ { "name": "ffnvcodec", - "version-string": "10.0.26.0", - "port-version": 2, + "version": "11.1.5.0", "description": "FFmpeg version of Nvidia Codec SDK headers.", "homepage": "https://github.com/FFmpeg/nv-codec-headers", "supports": "(windows | linux) & !uwp" |