From 58c1d6636be14c014d06ab7cc3ab0dff8ce257ef Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Fri, 30 Apr 2021 07:14:01 +0800 Subject: [libyuv] update to latest commit (#17294) * [libyuv] update to latest commit * update version * change configure_file parameter * update version --- ports/libyuv/CONTROL | 6 ------ ports/libyuv/portfile.cmake | 4 ++-- ports/libyuv/vcpkg.json | 9 +++++++++ versions/baseline.json | 4 ++-- versions/l-/libyuv.json | 5 +++++ 5 files changed, 18 insertions(+), 10 deletions(-) delete mode 100644 ports/libyuv/CONTROL create mode 100644 ports/libyuv/vcpkg.json diff --git a/ports/libyuv/CONTROL b/ports/libyuv/CONTROL deleted file mode 100644 index bd998bd95..000000000 --- a/ports/libyuv/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: libyuv -Version: fec9121 -Port-Version: 3 -Homepage: https://chromium.googlesource.com/libyuv/libyuv -Build-Depends: libjpeg-turbo -Description: libyuv is an open source project that includes YUV scaling and conversion functionality. diff --git a/ports/libyuv/portfile.cmake b/ports/libyuv/portfile.cmake index 590f72b95..aa5b81de1 100644 --- a/ports/libyuv/portfile.cmake +++ b/ports/libyuv/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH URL https://chromium.googlesource.com/libyuv/libyuv - REF fec9121b676eccd9acea2460aec7d6ae219701b9 + REF 287158925b0e03ea4499a18b4e08478c5781541b #2021-4-15 PATCHES fix_cmakelists.patch fix-build-type.patch @@ -28,5 +28,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/libyuv/convert.h "#ifdef HAVE_JPEG" "#if 1") vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/libyuv/convert_argb.h "#ifdef HAVE_JPEG" "#if 1") -configure_file(${CMAKE_CURRENT_LIST_DIR}/libyuv-config.cmake ${CURRENT_PACKAGES_DIR}/share/libyuv COPYONLY) +configure_file(${CMAKE_CURRENT_LIST_DIR}/libyuv-config.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT} COPYONLY) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/libyuv/vcpkg.json b/ports/libyuv/vcpkg.json new file mode 100644 index 000000000..fcf55453d --- /dev/null +++ b/ports/libyuv/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "libyuv", + "version-date": "2021-04-15", + "description": "libyuv is an open source project that includes YUV scaling and conversion functionality", + "homepage": "https://chromium.googlesource.com/libyuv/libyuv", + "dependencies": [ + "libjpeg-turbo" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 0087dab00..49722e67b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3665,8 +3665,8 @@ "port-version": 0 }, "libyuv": { - "baseline": "fec9121", - "port-version": 3 + "baseline": "2021-04-15", + "port-version": 0 }, "libzen": { "baseline": "0.4.38", diff --git a/versions/l-/libyuv.json b/versions/l-/libyuv.json index bec719296..e7439d7af 100644 --- a/versions/l-/libyuv.json +++ b/versions/l-/libyuv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d3e4d6adb28f13cb3aa4978cd0d6e319b87416cb", + "version-date": "2021-04-15", + "port-version": 0 + }, { "git-tree": "3e79a0e3d4e6d2d92532d3ad8d368e4fc46ca62f", "version-string": "fec9121", -- cgit v1.2.3