diff --git a/ports/ffnvcodec/portfile.cmake b/ports/ffnvcodec/portfile.cmake index 5092e09bdf..1d10039650 100644 --- a/ports/ffnvcodec/portfile.cmake +++ b/ports/ffnvcodec/portfile.cmake @@ -28,8 +28,10 @@ if(VCPKG_TARGET_IS_WINDOWS) WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET} LOGNAME build-${TARGET_TRIPLET} ) - - file(INSTALL "${SOURCE_PATH}/ffnvcodec.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") + + if(NOT VCPKG_BUILD_TYPE) + file(INSTALL "${SOURCE_PATH}/ffnvcodec.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") + endif() # Linux, etc. else() @@ -47,11 +49,13 @@ 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") + if(NOT VCPKG_BUILD_TYPE) + file(INSTALL "${SOURCE_PATH}/ffnvcodec.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") + endif() endif() 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}") +vcpkg_install_copyright(FILE_LIST "${CURRENT_PORT_DIR}/copyright") diff --git a/ports/ffnvcodec/vcpkg.json b/ports/ffnvcodec/vcpkg.json index b02718f8f3..1536c28efb 100644 --- a/ports/ffnvcodec/vcpkg.json +++ b/ports/ffnvcodec/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ffnvcodec", "version": "12.2.72.0", + "port-version": 1, "description": "FFmpeg version of Nvidia Codec SDK headers.", "homepage": "https://github.com/FFmpeg/nv-codec-headers", "supports": "linux | (!osx & !uwp & !(arm64 & windows))" diff --git a/versions/baseline.json b/versions/baseline.json index 26dc3a4ae7..2cde2705ae 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2762,7 +2762,7 @@ }, "ffnvcodec": { "baseline": "12.2.72.0", - "port-version": 0 + "port-version": 1 }, "fftw3": { "baseline": "3.3.10", diff --git a/versions/f-/ffnvcodec.json b/versions/f-/ffnvcodec.json index 6dce364782..b459f45366 100644 --- a/versions/f-/ffnvcodec.json +++ b/versions/f-/ffnvcodec.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "90afa3238f852b5b9bc8fee3e259b3a0f0fee91d", + "version": "12.2.72.0", + "port-version": 1 + }, { "git-tree": "5cbb2a7f0ed07795c560971fddd1c6021c37fbfb", "version": "12.2.72.0",