[apriltag] update to 3.3.0 (#36547)

* [apriltag] update to 3.3.0

* [apriltag] update to 3.3.0

* bde tmp

* fix line ending

ports/apriltag/fix-config.patch

@@ -1,11 +1,11 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 72c3ad6..607d024 100644
+index 9924a74..08e3cbe 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -1,4 +1,4 @@
 -cmake_minimum_required(VERSION 3.1)
 +cmake_minimum_required(VERSION 3.5)
- project(apriltag VERSION 3.2.0 LANGUAGES C CXX)
+ project(apriltag VERSION 3.3.0 LANGUAGES C CXX)
  
  if(POLICY CMP0077)
 @@ -39,6 +39,9 @@ endif()
@@ -16,20 +16,9 @@ index 72c3ad6..607d024 100644
 +  add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 +endif()
  # Library
- file(GLOB TAG_FILES ${PROJECT_SOURCE_DIR}/tag*.c)
+ file(GLOB TAG_FILES ${CMAKE_CURRENT_SOURCE_DIR}/tag*.c)
  add_library(${PROJECT_NAME} ${APRILTAG_SRCS} ${COMMON_SRC} ${TAG_FILES})
-@@ -46,8 +49,8 @@ add_library(${PROJECT_NAME} ${APRILTAG_SRCS} ${COMMON_SRC} ${TAG_FILES})
- if (MSVC)
-     # FindThreads will not find pthread.h with MSVC
-     # winmm is necessary for __imp_timeGetTime
--    find_library(PTHREAD_LIBRARIES NAMES pthreads)
--    target_link_libraries(${PROJECT_NAME} ${PTHREAD_LIBRARIES} winmm)
-+    find_package(PThreads4W REQUIRED)
-+    target_link_libraries(${PROJECT_NAME} PThreads4W::PThreads4W winmm)
- else()
-     find_package(Threads REQUIRED)
-     target_link_libraries(${PROJECT_NAME} PUBLIC Threads::Threads m)
-@@ -101,6 +104,7 @@ write_basic_package_version_file("${version_config}" COMPATIBILITY SameMajorVers
+@@ -98,6 +101,7 @@ write_basic_package_version_file("${version_config}" COMPATIBILITY SameMajorVers
  install(TARGETS ${PROJECT_NAME} EXPORT ${targets_export_name}
          LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
          ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -37,7 +26,7 @@ index 72c3ad6..607d024 100644
          )
  
  install(EXPORT ${targets_export_name}
-@@ -123,7 +127,7 @@ install(FILES "${PROJECT_BINARY_DIR}/apriltag.pc" DESTINATION "${CMAKE_INSTALL_L
+@@ -120,7 +124,7 @@ install(FILES "${PROJECT_BINARY_DIR}/apriltag.pc" DESTINATION "${CMAKE_INSTALL_L
  
  # Python wrapper
  include(CMakeDependentOption)
@@ -46,16 +35,15 @@ index 72c3ad6..607d024 100644
  
  if(BUILD_PYTHON_WRAPPER)
      SET(Python_ADDITIONAL_VERSIONS 3)
-@@ -160,7 +164,7 @@ string(STRIP ${PY_DEST} PY_DEST)
+@@ -158,6 +162,7 @@ string(STRIP ${PY_DEST} PY_DEST)
  install(FILES ${PROJECT_BINARY_DIR}/apriltag${PY_EXT_SUFFIX} DESTINATION ${PY_DEST})
  endif (NOT Python3_NOT_FOUND AND NOT Numpy_NOT_FOUND AND PYTHONLIBS_FOUND AND BUILD_PYTHON_WRAPPER)
  
--
 +if(0)
  # Examples
  # apriltag_demo
  add_executable(apriltag_demo example/apriltag_demo.c)
-@@ -179,3 +183,4 @@ endif(OpenCV_FOUND)
+@@ -177,3 +182,4 @@ endif(OpenCV_FOUND)
  
  # install example programs
  install(TARGETS apriltag_demo RUNTIME DESTINATION bin)

ports/apriltag/portfile.cmake

@@ -6,7 +6,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO AprilRobotics/apriltag
     REF v${VERSION}
-    SHA512 0b09b530ed03dce0bdc3c4e08b17d98f1303ab1d45870843354bf1a5bdf6c7efc6089e2bdf40a370d17a8191b7ce2c46fefa2dd2d49a959591351e00e186f33e
+    SHA512 45965f2f888475ea5aecdada0d41a5495f6f0c545d5219c96d82aea009e310a17308df858d4ba40ff191cfe15801dfe16298f20efcc5c117695dd0fa8d3a3fd7
     HEAD_REF master
     PATCHES
         fix-config.patch

ports/apriltag/usage

@@ -1,4 +1,4 @@
-The package apriltag is compatible with built-in CMake targets:
+apriltag provides CMake targets: 
 
     find_package(apriltag REQUIRED)
     target_link_libraries(main PRIVATE apriltag::apriltag)

ports/apriltag/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "apriltag",
-  "version": "3.2.0",
+  "version": "3.3.0",
   "description": "AprilTag is a visual fiducial system popular for robotics research.",
   "homepage": "https://april.eecs.umich.edu/software/apriltag",
   "license": "BSD-2-Clause",

versions/a-/apriltag.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5c64c401307d5ae0c4ee91fc2e9e1b3950776feb",
+      "version": "3.3.0",
+      "port-version": 0
+    },
     {
       "git-tree": "3523f2ad6198164afda1782327470188dc3f7221",
       "version": "3.2.0",

versions/baseline.json

@@ -173,7 +173,7 @@
       "port-version": 0
     },
     "apriltag": {
-      "baseline": "3.2.0",
+      "baseline": "3.3.0",
       "port-version": 0
     },
     "apsi": {