[libuv/librsync/libqrencode] Update to latest release version (#19972)

* [libuv/librsync/libqrencode] Update to latest release version * Update the baseline version * [libuv] Add new source file epoll.c * Update the source * Small changes
2024-12-27 02:11:58 +08:00 · 2021-09-08 12:40:10 +08:00 · 2021-09-08 12:40:10 +08:00 · 8ef3e28099
commit 8ef3e28099
parent 4814a51290
13 changed files with 121 additions and 81 deletions
--- a/ports/libqrencode/CONTROL
+++ b/ports/libqrencode/CONTROL
@ -1,9 +0,0 @@
-Source: libqrencode
-Version: 4.1.0
-Build-Depends: libpng, libiconv
-Homepage: https://github.com/fukuchi/libqrencode
-Description: libqrencode - a fast and compact QR Code encoding library
-
-Feature: tool
-Description: Build qrencode tool
-Build-Depends: getopt (windows)  
--- a/ports/libqrencode/portfile.cmake
+++ b/ports/libqrencode/portfile.cmake
@ -1,22 +1,20 @@
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO fukuchi/libqrencode
-    REF 0f6149e41533a34029e72ff9234a18e0f22ab992 #v4.1.0
-    SHA512 7aa215d1a9b06df19bcc0178d241af285d5215f6df994f9e2cf64cde716c7451252380a17e60ef27899bf9039e91306c8eb1948b40ede188d49a25555a94c22a
+    REF 715e29fd4cd71b6e452ae0f4e36d917b43122ce8 # v4.1.1
+    SHA512 78a5464c6fd37d2b4ed6d81c5faf8d95f6f1c95bfdb55dfe89fc227cd487c1685e8080694b1c93128364337959562ea133b3bb332ae1c5a4094614b493611e9f
    HEAD_REF master
 )

-if("tool" IN_LIST FEATURES)
-    set(WITH_TOOLS YES)
-else()
-    set(WITH_TOOLS NO)
-endif()
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        tool WITH_TOOLS
+)

-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
    OPTIONS
-        -DWITH_TOOLS=${WITH_TOOLS}
+        ${FEATURE_OPTIONS}
        -DWITH_TEST=NO
        -DSKIP_INSTALL_PROGRAMS=ON
        -DSKIP_INSTALL_EXECUTABLES=ON
@ -26,32 +24,31 @@ vcpkg_configure_cmake(
        -DWITH_TOOLS=NO
 )

-vcpkg_install_cmake()
+vcpkg_cmake_install()

 if(VCPKG_TARGET_IS_WINDOWS) # Windows
-	set(EXECUTABLE_SUFFIX ".exe")
+    set(EXECUTABLE_SUFFIX ".exe")
 else()
-	set(EXECUTABLE_SUFFIX "")
+    set(EXECUTABLE_SUFFIX "")
 endif()

-if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/qrencode.dll)
-    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/lib/qrencode.dll ${CURRENT_PACKAGES_DIR}/bin/qrencode.dll)
+if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/qrencode.dll")
+    file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin")
+    file(RENAME "${CURRENT_PACKAGES_DIR}/lib/qrencode.dll" "${CURRENT_PACKAGES_DIR}/bin/qrencode.dll")
 endif()
-if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/qrencoded.dll)
-    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/qrencoded.dll ${CURRENT_PACKAGES_DIR}/debug/bin/qrencoded.dll)
+if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/qrencoded.dll")
+    file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin")
+    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/qrencoded.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/qrencoded.dll")
 endif()
-if(EXISTS ${CURRENT_PACKAGES_DIR}/bin/qrencode${EXECUTABLE_SUFFIX})
+if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/qrencode${EXECUTABLE_SUFFIX}")
    file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/qrencode")
    file(RENAME "${CURRENT_PACKAGES_DIR}/bin/qrencode${EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/qrencode/qrencode${EXECUTABLE_SUFFIX}")
-    vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/qrencode)
+    vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/qrencode")
 endif()

-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")

 vcpkg_copy_pdbs()

-file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
--- a/ports/libqrencode/vcpkg.json
+++ b/ports/libqrencode/vcpkg.json
@ -0,0 +1,25 @@
+{
+  "name": "libqrencode",
+  "version-semver": "4.1.1",
+  "description": "libqrencode - a fast and compact QR Code encoding library",
+  "homepage": "https://github.com/fukuchi/libqrencode",
+  "dependencies": [
+    "libiconv",
+    "libpng",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ],
+  "features": {
+    "tool": {
+      "description": "Build qrencode tool",
+      "dependencies": [
+        {
+          "name": "getopt",
+          "platform": "windows"
+        }
+      ]
+    }
+  }
+}
--- a/ports/librsync/CONTROL
+++ b/ports/librsync/CONTROL
@ -1,6 +0,0 @@
-Source: librsync
-Version: 2020-09-16
-Port-Version: 1
-Description: librsync is a library for calculating and applying network deltas, with an interface designed to ease integration into diverse network applications.
-Homepage: http://librsync.sourcefrog.net/
-Supports: !uwp
--- a/ports/librsync/portfile.cmake
+++ b/ports/librsync/portfile.cmake
@ -5,44 +5,38 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO librsync/librsync
-    REF d1938c387e86ab5bbf7cb2e84244229c5bbd5ebf # commit 2020-06-04
-    SHA512 2afb844f20e6d74d8874b2022db5c4c4befa09f2cfcf5360ffcdd4fd3ef56270d3ab8de6be76fc68f8648d871c28f3bbe15e4f6f417c0776b542f86ac6a910cb
+    REF 42b636d2a65ab6914ea7cac50886da28192aaf9b # V2.3.2
+    SHA512 4903a64e327a7d49ae5f741b7b9fe3a76018010147249e2bc53917b06d31ee0f9b917f6c3e36a2d241ae66c19fa881113b59911d777742a859922486d9fe9c4c
    HEAD_REF master
 )

-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
    OPTIONS 
        -DBUILD_RDIFF:BOOL=OFF 
        -DENABLE_COMPRESSION:BOOL=OFF
        -DENABLE_TRACE:BOOL=OFF
 )

-vcpkg_install_cmake()
+vcpkg_cmake_install()

-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")

-if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/rsync.dll)
-    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/lib/rsync.dll ${CURRENT_PACKAGES_DIR}/bin/rsync.dll)
+if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/rsync.dll")
+    file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin")
+    file(RENAME "${CURRENT_PACKAGES_DIR}/lib/rsync.dll" "${CURRENT_PACKAGES_DIR}/bin/rsync.dll")
 endif()
-if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/rsync.dll)
-    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/rsync.dll ${CURRENT_PACKAGES_DIR}/debug/bin/rsync.dll)
+if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/rsync.dll")
+    file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin")
+    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/rsync.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/rsync.dll")
 endif()

 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/librsync_export.h
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/librsync_export.h"
        "#  ifdef LIBRSYNC_STATIC_DEFINE"
        "#  if 1 /* LIBRSYNC_STATIC_DEFINE */"
    )
 endif()

-file(INSTALL
-    ${SOURCE_PATH}/COPYING
-    DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright
-)
-
 vcpkg_copy_pdbs()
+file(INSTALL  "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
--- a/ports/librsync/vcpkg.json
+++ b/ports/librsync/vcpkg.json
@ -0,0 +1,13 @@
+{
+  "name": "librsync",
+  "version-semver": "2.3.2",
+  "description": "librsync is a library for calculating and applying network deltas, with an interface designed to ease integration into diverse network applications.",
+  "homepage": "http://librsync.sourcefrog.net/",
+  "supports": "!uwp",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
+}
--- a/ports/libuv/CMakeLists.txt
+++ b/ports/libuv/CMakeLists.txt
@ -32,6 +32,7 @@ file(GLOB UV_SOURCES_LINUX
    src/unix/procfs-exepath.c
    src/unix/sysinfo-loadavg.c
    src/unix/sysinfo-memory.c
+    src/unix/epoll.c
 )
 file(GLOB UV_SOURCES_DARWIN
    src/unix/proctitle.c
--- a/ports/libuv/portfile.cmake
+++ b/ports/libuv/portfile.cmake
@ -1,38 +1,39 @@
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO libuv/libuv
-    REF 1dff88e5161cba5c59276d2070d2e304e4dcb242 # v1.41.0
-    SHA512 c98b1c0b79ab87fcb49b9b7e69274d2f88318f58ec6403a75126ebda048a1f5c8bb28ed382996a0fd79f38a2f4b726e1bf6bc76a59339b5e80f2d32d9e42dc53
+    REF 6ce14710da7079eb248868171f6343bc409ea3a4 # v1.42.0
+    SHA512 305b0e8beb9372d22b767f1f792c6351d4b2d747b31cda95a4657cfca101806a17dd0bfab2039d22e29387c9d5ee376fe1b22d63aba1baf0d88817cbcacd97b8
    HEAD_REF v1.x
 )

-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")

-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
    OPTIONS_DEBUG
        -DUV_SKIP_HEADERS=ON
 )

-vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-libuv TARGET_PATH share/unofficial-libuv)
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-libuv CONFIG_PATH share/unofficial-libuv)
 vcpkg_copy_pdbs()

+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
 configure_file(
-    ${CMAKE_CURRENT_LIST_DIR}/unofficial-libuv-config.in.cmake
-    ${CURRENT_PACKAGES_DIR}/share/unofficial-libuv/unofficial-libuv-config.cmake
+    "${CMAKE_CURRENT_LIST_DIR}/unofficial-libuv-config.in.cmake"
+    "${CURRENT_PACKAGES_DIR}/share/unofficial-libuv/unofficial-libuv-config.cmake"
    @ONLY
 )

-file(READ ${CURRENT_PACKAGES_DIR}/include/uv.h UV_H)
+file(READ "${CURRENT_PACKAGES_DIR}/include/uv.h" UV_H)
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
    string(REPLACE "defined(USING_UV_SHARED)" "1" UV_H "${UV_H}")
 else()
    string(REPLACE "defined(USING_UV_SHARED)" "0" UV_H "${UV_H}")
    configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY)
 endif()
-file(WRITE ${CURRENT_PACKAGES_DIR}/include/uv.h "${UV_H}")
+file(WRITE "${CURRENT_PACKAGES_DIR}/include/uv.h" "${UV_H}")

-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

--- a/ports/libuv/vcpkg.json
+++ b/ports/libuv/vcpkg.json
@ -1,7 +1,16 @@
 {
  "name": "libuv",
-  "version": "1.41.0",
-  "port-version": 1,
+  "version-semver": "1.42.0",
  "description": "libuv is a multi-platform support library with a focus on asynchronous I/O.",
-  "homepage": "https://github.com/libuv/libuv"
+  "homepage": "https://github.com/libuv/libuv",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
--- a/versions/baseline.json
+++ b/versions/baseline.json
@ -3585,7 +3585,7 @@
      "port-version": 0
    },
    "libqrencode": {
-      "baseline": "4.1.0",
+      "baseline": "4.1.1",
      "port-version": 0
    },
    "librabbitmq": {
@ -3613,8 +3613,8 @@
      "port-version": 5
    },
    "librsync": {
-      "baseline": "2020-09-16",
-      "port-version": 1
+      "baseline": "2.3.2",
+      "port-version": 0
    },
    "librtmp": {
      "baseline": "2019-11-11",
@ -3789,8 +3789,8 @@
      "port-version": 8
    },
    "libuv": {
-      "baseline": "1.41.0",
-      "port-version": 1
+      "baseline": "1.42.0",
+      "port-version": 0
    },
    "libuvc": {
      "baseline": "2020-11-24",
--- a/versions/l-/libqrencode.json
+++ b/versions/l-/libqrencode.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "89b4597328eb8e7399b0cdaf1342c0abc74771c7",
+      "version-semver": "4.1.1",
+      "port-version": 0
+    },
    {
      "git-tree": "21e120487f7ddca306d7ddb04c75a86f360b7a4c",
      "version-string": "4.1.0",
--- a/versions/l-/librsync.json
+++ b/versions/l-/librsync.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "e6fbc4e5fec56fbef5ac08d642e8b550a1c47490",
+      "version-semver": "2.3.2",
+      "port-version": 0
+    },
    {
      "git-tree": "ce3c47220d819e3348b72aad90254cabdf238000",
      "version-string": "2020-09-16",
--- a/versions/l-/libuv.json
+++ b/versions/l-/libuv.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "cf96a59d9d41035fe89515464b3f93bcb9b84f27",
+      "version-semver": "1.42.0",
+      "port-version": 0
+    },
    {
      "git-tree": "42fa2a97059c54e5c2374a9762a7060d85a1091b",
      "version": "1.41.0",