[vcpkg baseline][pangolin] Add features, fix dependency pybind11 (#20006)

* [vcpkg baseline][pangolin] Add features, fix dependency pybind11

* Fix dependency name realsense2

* Remove default-feature gles

* Re-generated patch, add MAYBE_UNUSED_VARIABLES, fix build with core

* version

* Fix desc, add more MAYBE_UNUSED_VARIABLES

* version

* more MAYBE_UNUSED_VARIABLES

* version

* Remove some CMAKE_DISABLE_FIND_PACKAGE_*

* version

* Remove more CMAKE_DISABLE_FIND_* since they are disabled

* Remove BUILD_FOR_GLES_2

* version

* Restore BUILD_FOR_GLES_2

* version

* Fix more dependencies

* [libuvc]Fix build type, fix usage

* version

* Re-make patch

* version

* Use libjpeg macros instead of target name to avoid use `find_dependency`

* version

* Fix usage on non-Windows

* version

* commit suggestions

* version

* Apply suggestion

* version

* Re-fix JPEG

* version

* typo

* format

* version

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>

15 files changed, 308 insertions, 75 deletions

diff --git a/ports/libusb/portfile.cmake b/ports/libusb/portfile.cmake
index 153dedf13..3aed72d2a 100644
--- a/ports/libusb/portfile.cmake
+++ b/ports/libusb/portfile.cmake
@@ -58,5 +58,5 @@ else()
 endif()
 
 configure_file(${CURRENT_PORT_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY)
-file(INSTALL ${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+configure_file(${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake @ONLY)
 file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/libusb/vcpkg-cmake-wrapper.cmake b/ports/libusb/vcpkg-cmake-wrapper.cmake
index 8f0f35811..61f9d54ba 100644
--- a/ports/libusb/vcpkg-cmake-wrapper.cmake
+++ b/ports/libusb/vcpkg-cmake-wrapper.cmake
@@ -8,3 +8,7 @@ select_library_configurations(LIBUSB)
 

 set(LIBUSB_INCLUDE_DIRS ${LIBUSB_INCLUDE_DIR})

 set(LIBUSB_LIBRARIES ${LIBUSB_LIBRARY})

+

+if (@VCPKG_TARGET_IS_LINUX@)

+    list(APPEND LIBUSB_LIBRARIES udev)

+endif()

diff --git a/ports/libusb/vcpkg.json b/ports/libusb/vcpkg.json
index 5649425e8..07bbd2d8b 100644
--- a/ports/libusb/vcpkg.json
+++ b/ports/libusb/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libusb",
   "version": "1.0.24",
-  "port-version": 4,
+  "port-version": 5,
   "description": "a cross-platform library to access USB devices",
   "homepage": "https://github.com/libusb/libusb",
   "supports": "!uwp"
diff --git a/ports/libuvc/build_fix.patch b/ports/libuvc/build_fix.patch
index 8ef3d9217..3c5bfcd44 100644
--- a/ports/libuvc/build_fix.patch
+++ b/ports/libuvc/build_fix.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f3c8116..0da84a7 100644
+index f3c8116..b9a6d38 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -39,7 +39,7 @@ set(SOURCES
+@@ -39,10 +39,10 @@ set(SOURCES
    src/misc.c
  )
  
@@ -10,7 +10,11 @@ index f3c8116..0da84a7 100644
 +find_package(libusb CONFIG REQUIRED)
  
  # JpegPkg name to differ from shipped with CMake
- find_package(JpegPkg QUIET)
+-find_package(JpegPkg QUIET)
++find_package(JPEG REQUIRED)
+ if(JPEG_FOUND)
+   message(STATUS "Building libuvc with JPEG support.")
+   set(LIBUVC_HAS_JPEG TRUE)
 @@ -107,9 +107,10 @@ foreach(target_name IN LISTS UVC_TARGETS)
        $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
        $<INSTALL_INTERFACE:include>
@@ -23,3 +27,18 @@ index f3c8116..0da84a7 100644
    )
    if(JPEG_FOUND)
      target_link_libraries(${target_name}
+diff --git a/libuvcConfig.cmake b/libuvcConfig.cmake
+index b9887ea..e8f09dc 100644
+--- a/libuvcConfig.cmake
++++ b/libuvcConfig.cmake
+@@ -10,8 +10,8 @@ if(${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED)
+   list(APPEND extraArgs REQUIRED)
+ endif()
+ 
+-find_package(JpegPkg ${extraArgs})
+-find_package(LibUSB ${extraArgs})
++include(CMakeFindDependencyMacro)
++find_dependency(JPEG ${extraArgs})
+ include("${CMAKE_CURRENT_LIST_DIR}/libuvcTargets.cmake")
+ 
+ set(libuvc_FOUND TRUE)
diff --git a/ports/libuvc/portfile.cmake b/ports/libuvc/portfile.cmake
index ab12966cd..1e76adcd9 100644
--- a/ports/libuvc/portfile.cmake
+++ b/ports/libuvc/portfile.cmake
@@ -4,23 +4,28 @@ vcpkg_from_github(
     REF c612d4509eb0ff19ce414abc3dca18d0f6263a84
     SHA512 df3f23463728e8ffd69dc52e251ea2610ea8df32b02f6d26dd2a6910cf217650245bb1a11e67be61df875c6992d592c9cb17675d914997bd72c9fe7eb5b65c32
     HEAD_REF master
-    PATCHES
-        build_fix.patch
+    PATCHES build_fix.patch
 )
 
-vcpkg_configure_cmake(
-        SOURCE_PATH ${SOURCE_PATH}
-        PREFER_NINJA
-        OPTIONS -DBUILD_EXAMPLE=OFF
-)
-vcpkg_install_cmake()
+if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+    set(BUILD_TARGET "Shared")
+else()
+    set(BUILD_TARGET "Static")
+endif()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libuvc)
+vcpkg_cmake_configure(
+    SOURCE_PATH ${SOURCE_PATH}
+    OPTIONS
+        -DCMAKE_BUILD_TARGET=${BUILD_TARGET}
+        -DBUILD_EXAMPLE=OFF
+)
+vcpkg_cmake_install()
 
 vcpkg_copy_pdbs()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+vcpkg_cmake_config_fixup(PACKAGE_NAME libuvc CONFIG_PATH lib/cmake/libuvc)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/libuvc/vcpkg.json b/ports/libuvc/vcpkg.json
index ce4a13b0a..ee9766b69 100644
--- a/ports/libuvc/vcpkg.json
+++ b/ports/libuvc/vcpkg.json
@@ -1,11 +1,21 @@
 {
   "name": "libuvc",
-  "version-string": "2020-11-24",
-  "port-version": 1,
+  "version-date": "2020-11-24",
+  "port-version": 2,
   "description": "a cross-platform library for USB video devices",
   "homepage": "https://github.com/libuvc/libuvc",
   "supports": "linux",
   "dependencies": [
-    "libusb"
+    "libjpeg-turbo",
+    "libusb",
+    "libusb",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ]
 }
diff --git a/ports/pangolin/add-definition.patch b/ports/pangolin/add-definition.patch
deleted file mode 100644
index ce27d4b33..000000000
--- a/ports/pangolin/add-definition.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 49dcf02..d448928 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -384,6 +384,7 @@ endif()
- 
- option(BUILD_PANGOLIN_FFMPEG "Build support for ffmpeg video input" ON)
- if(BUILD_PANGOLIN_FFMPEG AND BUILD_PANGOLIN_VIDEO)
-+  add_definitions(-DHAVE_FFMPEG_AVPIXELFORMAT)
-   find_package(FFMPEG QUIET)
-   if(FFMPEG_FOUND)
-     set(HAVE_FFMPEG 1)
diff --git a/ports/pangolin/fix-dependencies.patch b/ports/pangolin/fix-dependencies.patch
new file mode 100644
index 000000000..e3ced434e
--- /dev/null
+++ b/ports/pangolin/fix-dependencies.patch
@@ -0,0 +1,97 @@
+diff --git a/include/pangolin/gl/colour.h b/include/pangolin/gl/colour.h
+index 92bedf4..8c3e542 100644
+--- a/include/pangolin/gl/colour.h
++++ b/include/pangolin/gl/colour.h
+@@ -28,6 +28,7 @@
+ #pragma once
+ 
+ #include <cmath>
++#include <limits>
+ 
+ #include <stdexcept>
+ 
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index ddeb144..ee27d57 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -299,7 +299,9 @@ if(BUILD_PANGOLIN_PYTHON AND BUILD_PANGOLIN_GUI AND BUILD_PANGOLIN_VARS AND NOT
+ 
+   if(pybind11_FOUND)
+     set(HAVE_PYTHON 1)
+-
++  if (UNIX)
++    set(PYTHON_LIBRARY ${PYTHON_LIBRARY} dl util)
++  endif()
+     file(GLOB pypangolin_SRC "python/pypangolin/*.cpp" )
+     file(GLOB pypangolin_HDR "python/pypangolin/*.hpp" )
+     list(APPEND HEADERS
+@@ -382,6 +384,7 @@ endif()
+ 
+ option(BUILD_PANGOLIN_FFMPEG "Build support for ffmpeg video input" ON)
+ if(BUILD_PANGOLIN_FFMPEG AND BUILD_PANGOLIN_VIDEO)
++  add_definitions(-DHAVE_FFMPEG_AVPIXELFORMAT)
+   find_package(FFMPEG QUIET)
+   if(FFMPEG_FOUND)
+     set(HAVE_FFMPEG 1)
+@@ -464,11 +467,14 @@ endif()
+ 
+ option(BUILD_PANGOLIN_LIBUVC "Build support for libuvc video input" ON)
+ if(BUILD_PANGOLIN_LIBUVC AND BUILD_PANGOLIN_VIDEO)
+-  find_package(uvc QUIET)
+-  if(uvc_FOUND)
++  find_package(libuvc CONFIG QUIET)
++  if(libuvc_FOUND)
+     set(HAVE_UVC 1)
+-    list(APPEND INTERNAL_INC  ${uvc_INCLUDE_DIRS} )
+-    list(APPEND LINK_LIBS ${uvc_LIBRARIES} )
++    if (TARGET LibUVC::UVCShared)
++        list(APPEND LINK_LIBS LibUVC::UVCShared )
++    else()
++        list(APPEND LINK_LIBS LibUVC::UVCStatic )
++    endif()
+     list(APPEND HEADERS ${INCDIR}/video/drivers/uvc.h )
+     list(APPEND SOURCES video/drivers/uvc.cpp)
+     list(APPEND VIDEO_FACTORY_REG RegisterUvcVideoFactory )
+@@ -584,11 +590,10 @@ endif()
+ 
+ option(BUILD_PANGOLIN_LIBOPENEXR "Build support for libopenexr image input" ON)
+ if(BUILD_PANGOLIN_LIBOPENEXR)
+-  find_package(OpenEXR QUIET)
++  find_package(OpenEXR CONFIG QUIET)
+   if(OpenEXR_FOUND)
+     set(HAVE_OPENEXR 1)
+-    list(APPEND INTERNAL_INC ${OpenEXR_INCLUDE_DIR} )
+-    list(APPEND LINK_LIBS ${OpenEXR_LIBRARY} )
++    list(APPEND LINK_LIBS OpenEXR::IlmImf OpenEXR::IlmImfUtil OpenEXR::IlmImfConfig )
+     message(STATUS "libopenexr Found and Enabled")
+   endif()
+ endif()
+@@ -630,6 +635,13 @@ endif()
+ 
+ set(INSTALL_INCLUDE_DIR "include")
+ 
++# Required by geometry
++if(NOT BUILD_EXTERN_GLEW)
++    find_package(GLEW REQUIRED)
++endif()
++list(APPEND USER_INC  ${GLEW_INCLUDE_DIR})
++list(APPEND LINK_LIBS ${GLEW_LIBRARY})
++
+ add_library(${LIBRARY_NAME} ${SOURCES} ${HEADERS})
+ # 'System' includes shield us from warnings in those includes.
+ target_include_directories(${LIBRARY_NAME} SYSTEM PUBLIC ${USER_INC} PRIVATE ${INTERNAL_INC})
+@@ -692,7 +704,13 @@ CreateMethodCallFile(
+ option(BUILD_PYPANGOLIN_MODULE "Python wrapper for Pangolin" ON)
+ if(BUILD_PYPANGOLIN_MODULE AND HAVE_PYTHON )
+     file(GLOB pypangolin_SRC "python/pypangolin/*.hpp" "python/pypangolin/*.cpp" "python/pypangolin_module.cpp")
+-    pybind11_add_module(pypangolin ${pypangolin_SRC})
++    if (BUILD_SHARED_LIBS)
++        set(PYBIND11_MODULE_TYPE SHARED)
++    else()
++        set(PYBIND11_MODULE_TYPE STATIC)
++    endif()
++
++    pybind11_add_module(pypangolin ${PYBIND11_MODULE_TYPE} ${pypangolin_SRC})
+     target_link_libraries(pypangolin PRIVATE ${LIBRARY_NAME})
+     target_include_directories(pypangolin PRIVATE "${USER_INC}")
+ endif()
diff --git a/ports/pangolin/fix-dependency-python.patch b/ports/pangolin/fix-dependency-python.patch
deleted file mode 100644
index 276e0f092..000000000
--- a/ports/pangolin/fix-dependency-python.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index ddeb144..49dcf02 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -299,7 +299,9 @@ if(BUILD_PANGOLIN_PYTHON AND BUILD_PANGOLIN_GUI AND BUILD_PANGOLIN_VARS AND NOT
- 
-   if(pybind11_FOUND)
-     set(HAVE_PYTHON 1)
--
-+  if (UNIX)
-+    set(PYTHON_LIBRARY ${PYTHON_LIBRARY} dl util)
-+  endif()
-     file(GLOB pypangolin_SRC "python/pypangolin/*.cpp" )
-     file(GLOB pypangolin_HDR "python/pypangolin/*.hpp" )
-     list(APPEND HEADERS
diff --git a/ports/pangolin/portfile.cmake b/ports/pangolin/portfile.cmake
index 410fe6a14..a3c798586 100644
--- a/ports/pangolin/portfile.cmake
+++ b/ports/pangolin/portfile.cmake
@@ -12,17 +12,32 @@ vcpkg_from_github(
     HEAD_REF master
     PATCHES
         fix-includepath-error.patch # include path has one more ../
-        fix-dependency-python.patch
-        add-definition.patch
         fix-cmake-version.patch
         fix-build-error-in-vs2019.patch
+        fix-dependencies.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
-        test     BUILD_TESTS
-        tools    BUILD_TOOLS
-        examples BUILD_EXAMPLES
+        test        BUILD_TESTS
+        tools       BUILD_TOOLS
+        examples    BUILD_EXAMPLES
+        gui         BUILD_PANGOLIN_GUI
+        vars        BUILD_PANGOLIN_VARS
+        video       BUILD_PANGOLIN_VIDEO
+        pybind11    BUILD_PANGOLIN_PYTHON
+        eigen       BUILD_PANGOLIN_EIGEN
+        ffmpeg      BUILD_PANGOLIN_FFMPEG
+        realsense   BUILD_PANGOLIN_LIBREALSENSE2
+        openni2     BUILD_PANGOLIN_OPENNI2
+        uvc         BUILD_PANGOLIN_LIBUVC
+        png         BUILD_PANGOLIN_LIBPNG
+        jpeg        BUILD_PANGOLIN_LIBJPEG
+        tiff        BUILD_PANGOLIN_LIBTIFF
+        openexr     BUILD_PANGOLIN_LIBOPENEXR
+        zstd        BUILD_PANGOLIN_ZSTD
+        lz4         BUILD_PANGOLIN_LZ4
+        module      BUILD_PYPANGOLIN_MODULE
 )
 
 file(REMOVE "${SOURCE_PATH}/CMakeModules/FindGLEW.cmake")
@@ -36,20 +51,22 @@ vcpkg_cmake_configure(
         -DBUILD_EXTERN_GLEW=OFF
         -DBUILD_EXTERN_LIBPNG=OFF
         -DBUILD_EXTERN_LIBJPEG=OFF
-        -DCMAKE_DISABLE_FIND_PACKAGE_TooN=ON
-        -DCMAKE_DISABLE_FIND_PACKAGE_DC1394=ON
-        -DCMAKE_DISABLE_FIND_PACKAGE_LibRealSense=ON
-        -DCMAKE_DISABLE_FIND_PACKAGE_OpenNI=ON
-        -DCMAKE_DISABLE_FIND_PACKAGE_OpenNI2=ON
-        -DCMAKE_DISABLE_FIND_PACKAGE_uvc=ON
-        -DCMAKE_DISABLE_FIND_PACKAGE_DepthSense=ON
-        -DCMAKE_DISABLE_FIND_PACKAGE_TeliCam=ON
-        -DCMAKE_DISABLE_FIND_PACKAGE_Pleora=ON
-        -DCMAKE_DISABLE_FIND_PACKAGE_TIFF=ON
-        -DCMAKE_DISABLE_FIND_PACKAGE_OpenEXR=ON
+        -DBUILD_PANGOLIN_PLEORA=OFF
+        -DBUILD_PANGOLIN_TELICAM=OFF
+        -DBUILD_PANGOLIN_DEPTHSENSE=OFF
+        -DBUILD_PANGOLIN_OPENNI=OFF
+        -DBUILD_PANGOLIN_UVC_MEDIAFOUNDATION=OFF
+        -DBUILD_PANGOLIN_LIBREALSENSE=OFF
+        -DBUILD_PANGOLIN_V4L=OFF
+        -DBUILD_PANGOLIN_LIBDC1394=OFF
+        -DBUILD_PANGOLIN_TOON=OFF
+        -DDISPLAY_WAYLAND=OFF
+        -DDISPLAY_X11=OFF
+        -DBUILD_FOR_GLES_2=OFF
         -DMSVC_USE_STATIC_CRT=${MSVC_USE_STATIC_CRT}
     MAYBE_UNUSED_VARIABLES
         MSVC_USE_STATIC_CRT
+        BUILD_FOR_GLES_2
 )
 
 vcpkg_cmake_install()
diff --git a/ports/pangolin/vcpkg.json b/ports/pangolin/vcpkg.json
index 360eb2e0c..b28451d10 100644
--- a/ports/pangolin/vcpkg.json
+++ b/ports/pangolin/vcpkg.json
@@ -1,20 +1,12 @@
 {
   "name": "pangolin",
   "version": "0.6",
+  "port-version": 1,
   "description": "Lightweight GUI Library",
   "homepage": "https://github.com/stevenlovegrove/Pangolin",
   "supports": "!uwp",
   "dependencies": [
-    "eigen3",
-    {
-      "name": "ffmpeg",
-      "features": [
-        "avformat"
-      ]
-    },
     "glew",
-    "libjpeg-turbo",
-    "libpng",
     {
       "name": "vcpkg-cmake",
       "host": true
@@ -24,15 +16,116 @@
       "host": true
     }
   ],
+  "default-features": [
+    "eigen",
+    "ffmpeg",
+    "gui",
+    "jpeg",
+    "png",
+    "vars",
+    "video"
+  ],
   "features": {
+    "eigen": {
+      "description": "Build support for Eigen matrix types",
+      "dependencies": [
+        "eigen3"
+      ]
+    },
     "examples": {
       "description": "Build Examples"
     },
+    "ffmpeg": {
+      "description": "Build support for ffmpeg video input",
+      "dependencies": [
+        {
+          "name": "ffmpeg",
+          "features": [
+            "avformat"
+          ]
+        }
+      ]
+    },
+    "gui": {
+      "description": "Build support for Pangolin GUI"
+    },
+    "jpeg": {
+      "description": "Build support for libjpeg image input",
+      "dependencies": [
+        "libjpeg-turbo"
+      ]
+    },
+    "lz4": {
+      "description": "Build support for liblz4 compression",
+      "dependencies": [
+        "lz4"
+      ]
+    },
+    "module": {
+      "description": "Python wrapper for Pangolin",
+      "dependencies": [
+        "python3"
+      ]
+    },
+    "openexr": {
+      "description": "Build support for libopenexr image input",
+      "dependencies": [
+        "openexr"
+      ]
+    },
+    "openni2": {
+      "description": "Build support for OpenNI2 video input",
+      "dependencies": [
+        "openni2"
+      ]
+    },
+    "png": {
+      "description": "Build support for libpng image input",
+      "dependencies": [
+        "libpng"
+      ]
+    },
+    "pybind11": {
+      "description": "Build support for Pangolin Interactive Console",
+      "dependencies": [
+        "pybind11"
+      ]
+    },
+    "realsense": {
+      "description": "Build support for LibRealSense2 video input",
+      "dependencies": [
+        "realsense2"
+      ]
+    },
     "test": {
       "description": "Build Tests"
     },
+    "tiff": {
+      "description": "Build support for libtiff image input",
+      "dependencies": [
+        "tiff"
+      ]
+    },
     "tools": {
       "description": "Build Tools"
+    },
+    "uvc": {
+      "description": "Build support for MediaFoundation UVC input",
+      "dependencies": [
+        "libuvc"
+      ]
+    },
+    "vars": {
+      "description": "Build support for Pangolin Vars"
+    },
+    "video": {
+      "description": "Build support for Pangolin Video Utilities"
+    },
+    "zstd": {
+      "description": "Build support for libzstd compression",
+      "dependencies": [
+        "zstd"
+      ]
     }
   }
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index 608ec44a4..ab646a395 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3782,7 +3782,7 @@
     },
     "libusb": {
       "baseline": "1.0.24",
-      "port-version": 4
+      "port-version": 5
     },
     "libusb-win32": {
       "baseline": "1.2.6.0",
@@ -3802,7 +3802,7 @@
     },
     "libuvc": {
       "baseline": "2020-11-24",
-      "port-version": 1
+      "port-version": 2
     },
     "libvmdk": {
       "baseline": "20200926",
@@ -4878,7 +4878,7 @@
     },
     "pangolin": {
       "baseline": "0.6",
-      "port-version": 0
+      "port-version": 1
     },
     "pangomm": {
       "baseline": "2.48.0",
diff --git a/versions/l-/libusb.json b/versions/l-/libusb.json
index 502a02100..12878e1b7 100644
--- a/versions/l-/libusb.json
+++ b/versions/l-/libusb.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "76a5ebd046d669a93d2a467d87a80efbe85f8226",
+      "version": "1.0.24",
+      "port-version": 5
+    },
+    {
       "git-tree": "0d77c2046af91be18e4af15b3a9b3e7f0024fa18",
       "version": "1.0.24",
       "port-version": 4
diff --git a/versions/l-/libuvc.json b/versions/l-/libuvc.json
index d1416c245..5aa43cece 100644
--- a/versions/l-/libuvc.json
+++ b/versions/l-/libuvc.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "79ca2fc9bcce260bf39d630dcac5a2cc2cb7f486",
+      "version-date": "2020-11-24",
+      "port-version": 2
+    },
+    {
       "git-tree": "c6a9ae104918d980729af70da17fed9849500504",
       "version-string": "2020-11-24",
       "port-version": 1
diff --git a/versions/p-/pangolin.json b/versions/p-/pangolin.json
index f55cbf05e..2775d5adc 100644
--- a/versions/p-/pangolin.json
+++ b/versions/p-/pangolin.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "f6f7eff13d603463a77a637879929275ecff776e",
+      "version": "0.6",
+      "port-version": 1
+    },
+    {
       "git-tree": "e28a4e1603d5ee1843787223a55dce439b579b94",
       "version": "0.6",
       "port-version": 0