[ogdf] update (#27502)

microsoft · Oct 31, 2022 · 5a49746 · 5a49746
1 parent a17a5ca
commit 5a49746
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 40 deletions.
diff --git a/ports/ogdf/fix-c4723.patch b/ports/ogdf/fix-c4723.patch
diff --git a/ports/ogdf/portfile.cmake b/ports/ogdf/portfile.cmake
@@ -1,27 +1,25 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ogdf/ogdf
-    REF  8a103cf3a7dfff87fe8b7534575604bc53c0870c
-    SHA512 264e8586be7a18640f253eb7b289dd99f1f2fc42c4d2304ab12f7c6aa9c5754b710642e7296038aea0cd9368d732d0106501fefed800743b403adafff7e3f0b2
+    REF 214105da97863e1d0a066157e5cc573b65b433a9
+    SHA512 8ab9f266fef224ce600cec418d5de56761714fbaa2d509ba89d55700c1d27d02a5fc93fab8eb8e10325a42c7d2fa8e251e2a18ece9a9565e215bf39672bff92d
     HEAD_REF master
-    PATCHES fix-c4723.patch
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DCOIN_INSTALL_LIBRARY_DIR:STRING=lib
         -DCOIN_INSTALL_CMAKE_DIR:STRING=lib/cmake/OGDF
         -DOGDF_INSTALL_LIBRARY_DIR:STRING=lib
         -DOGDF_INSTALL_CMAKE_DIR:STRING=lib/cmake/OGDF
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/OGDF)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/OGDF)
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/minisat/doc ${CURRENT_PACKAGES_DIR}/include/ogdf/lib/minisat/doc)
+file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/minisat/doc" "${CURRENT_PACKAGES_DIR}/include/ogdf/lib/minisat/doc")
diff --git a/ports/ogdf/vcpkg.json b/ports/ogdf/vcpkg.json
@@ -1,7 +1,18 @@
 {
   "name": "ogdf",
-  "version-string": "2019-08-23",
-  "port-version": 2,
+  "version-date": "2022-06-30",
   "description": "Open Graph Drawing Framework",
-  "homepage": "https://github.com/ogdf/ogdf"
+  "homepage": "https://github.com/ogdf/ogdf",
+  "license": null,
+  "supports": "!uwp",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
@@ -713,17 +713,6 @@ ode:arm-uwp=fail
 ode:x64-uwp=fail
 offscale-libetcd-cpp:arm-uwp=fail
 offscale-libetcd-cpp:x64-uwp=fail
-ogdf:arm64-windows      = skip
-ogdf:arm-uwp            = skip
-ogdf:x64-osx=fail
-ogdf:arm64-osx=fail
-ogdf:x64-uwp            = skip
-ogdf:x64-windows        = skip
-ogdf:x64-windows-static = skip
-ogdf:x64-windows-static-md=skip
-ogdf:x86-windows        = skip
-# broken when `python` is python3, https://github.com/microsoft/vcpkg/issues/18936
-ogdf:x64-linux=fail
 ogre:arm64-osx=fail
 # Conflicts with ogre
 ogre-next:arm64-windows      = skip

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -5321,8 +5321,8 @@
       "port-version": 3
     },
     "ogdf": {
-      "baseline": "2019-08-23",
-      "port-version": 2
+      "baseline": "2022-06-30",
+      "port-version": 0
     },
     "ogre": {
       "baseline": "13.4.4",

diff --git a/versions/o-/ogdf.json b/versions/o-/ogdf.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "59450d8dd4543482cace9a1a59ca8f46883e85b2",
+      "version-date": "2022-06-30",
+      "port-version": 0
+    },
     {
       "git-tree": "1a3d7f1e718f35843520add2d7e102b12586e401",
       "version-string": "2019-08-23",