[dlib] Update to 19.24.6 (#38751)

Co-authored-by: Monica <[email protected]>
microsoft · Oct 15, 2024 · 3207386 · 3207386
1 parent 4ef6650
commit 3207386
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 16 deletions.
diff --git a/ports/dlib/fix-dependencies.patch b/ports/dlib/fix-dependencies.patch
@@ -1,16 +1,16 @@
 diff --git a/dlib/CMakeLists.txt b/dlib/CMakeLists.txt
-index 9f3001d..962cfc4 100644
+index cfe6ad9..75cfd54 100644
 --- a/dlib/CMakeLists.txt
 +++ b/dlib/CMakeLists.txt
-@@ -287,6 +287,7 @@ if (NOT TARGET dlib)
-
-    set(dlib_needed_libraries)
-    set(dlib_needed_includes)
+@@ -293,6 +293,7 @@ if (NOT TARGET dlib)
+    set(dlib_needed_public_ldflags)
+    set(dlib_needed_private_libraries)
+    set(dlib_needed_private_includes)
 +   set(pkg_config_dlib_requires_private "")
 
     if (DLIB_ISO_CPP_ONLY)
        add_library(dlib ${source_files} )
-@@ -814,6 +815,10 @@ if (NOT TARGET dlib)
+@@ -833,6 +834,10 @@ if (NOT TARGET dlib)
 
 
        if (DLIB_LINK_WITH_SQLITE3)
@@ -21,7 +21,7 @@ index 9f3001d..962cfc4 100644
           find_library(sqlite sqlite3)
           # make sure sqlite3.h is in the include path
           find_path(sqlite_path sqlite3.h)
-@@ -829,6 +834,10 @@ if (NOT TARGET dlib)
+@@ -848,6 +853,10 @@ if (NOT TARGET dlib)
 
 
        if (DLIB_USE_FFTW)
@@ -32,7 +32,7 @@ index 9f3001d..962cfc4 100644
           find_library(fftw fftw3)
           # make sure fftw3.h is in the include path
           find_path(fftw_path fftw3.h)
-@@ -964,6 +973,8 @@ if (NOT TARGET dlib)
+@@ -998,6 +1007,8 @@ if (NOT TARGET dlib)
 
        ## dlib-1.pc generation and installation
 
@@ -41,7 +41,7 @@ index 9f3001d..962cfc4 100644
        configure_file("cmake_utils/dlib.pc.in" "dlib-1.pc" @ONLY)
        install(FILES "${CMAKE_CURRENT_BINARY_DIR}/dlib-1.pc"
           DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
-@@ -977,7 +988,7 @@ if (NOT TARGET dlib)
+@@ -1011,7 +1022,7 @@ if (NOT TARGET dlib)
 
  endif()
 

diff --git a/ports/dlib/portfile.cmake b/ports/dlib/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO davisking/dlib
-    REF 6097093ab329fcd19aed03a8fe67949f6971a65d #v19.24
-    SHA512 4bdcecdf0f986abc748245d21616bf2c304461e9a37572c66743f69141fc3f37eb846fdaedc6c910135d986534f7989cbcc52a884ae7a52464fbb2a07b16a327
+    REF "v${VERSION}"
+    SHA512 548f15fcd345a56b6e7a0a568fa7c694beeeda3b863492f59bdaa0b0e6d48b21d6705e2ac56a06f349aa26b0e9b79aa0a437870940170772b5b30cf35841cbb4
     HEAD_REF master
     PATCHES
         fix-dependencies.patch
@@ -43,6 +43,7 @@ vcpkg_cmake_configure(
         -DDLIB_GIF_SUPPORT=OFF
         -DDLIB_WEBP_SUPPORT=OFF
         -DDLIB_USE_MKL_FFT=OFF
+        -DDLIB_USE_FFMPEG=OFF
     OPTIONS_DEBUG
         ${dbg_opts}
         #-DDLIB_ENABLE_STACK_TRACE=ON
@@ -78,6 +79,8 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_a
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_sse4")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_libjpeg")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_libpng")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_libjxl")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_libwebp")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/dlib/external/libpng/arm")
 
-file(INSTALL "${SOURCE_PATH}/dlib/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/dlib/LICENSE.txt")
diff --git a/ports/dlib/vcpkg.json b/ports/dlib/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "dlib",
-  "version": "19.24",
-  "port-version": 4,
+  "version": "19.24.6",
   "description": "Modern C++ toolkit containing machine learning algorithms and tools for creating complex software in C++",
   "homepage": "https://github.com/davisking/dlib",
   "license": "BSL-1.0",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -2345,8 +2345,8 @@
       "port-version": 0
     },
     "dlib": {
-      "baseline": "19.24",
-      "port-version": 4
+      "baseline": "19.24.6",
+      "port-version": 0
     },
     "dlpack": {
       "baseline": "0.8",

diff --git a/versions/d-/dlib.json b/versions/d-/dlib.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5ec140618bd63da01f52b9904b02d03e8b6b1256",
+      "version": "19.24.6",
+      "port-version": 0
+    },
     {
       "git-tree": "f9c3d8205c42c8450e81864a313021ff76efec5f",
       "version": "19.24",