[onnx] Update to 1.17.0 and fix openvino dependency error (#42942)

Co-authored-by: Jon <[email protected]>
microsoft · Jan 16, 2025 · 7894bc9 · 7894bc9
1 parent 953d212
commit 7894bc9
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 5 deletions.
diff --git a/ports/onnx/fix-cxx_standard.patch b/ports/onnx/fix-cxx_standard.patch
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 55869f4..e8b20cb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -524,6 +524,7 @@ else()
+   set_target_properties(onnx_proto PROPERTIES VISIBILITY_INLINES_HIDDEN 1)
+ endif()
+ target_compile_definitions(onnx_proto PRIVATE ${ONNX_API_DEFINE})
++target_compile_features(onnx_proto PUBLIC cxx_std_${CMAKE_CXX_STANDARD})
+
+ if(ONNX_USE_LITE_PROTO)
+   if(TARGET protobuf::libprotobuf-lite)
diff --git a/ports/onnx/portfile.cmake b/ports/onnx/portfile.cmake
@@ -4,10 +4,11 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO onnx/onnx
     REF "v${VERSION}"
-    SHA512 7a9a8493b9c007429629484156487395044506f34e72253640e626351cb623b390750b36af78a290786131e3dcac35f4eb269e8693b594b7ce7cb105bcf9318d
+    SHA512 5a18e2b19ec9c18c8b115fb7e12ed98eddaa581c95f15c4dd420cd6c86e7caa04f9a393da589e76b89cf9b3544abd3749a8c77c2446782f37502eb74e9b1f661
     PATCHES
         fix-cmakelists.patch
         fix-dependency-protobuf.patch
+        fix-cxx_standard.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" USE_STATIC_RUNTIME)

diff --git a/ports/onnx/vcpkg.json b/ports/onnx/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "onnx",
-  "version-semver": "1.16.2",
-  "port-version": 1,
+  "version-semver": "1.17.0",
   "description": "Open standard for machine learning interoperability",
   "homepage": "https://onnx.ai",
   "license": "Apache-2.0",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -6605,8 +6605,8 @@
       "port-version": 0
     },
     "onnx": {
-      "baseline": "1.16.2",
-      "port-version": 1
+      "baseline": "1.17.0",
+      "port-version": 0
     },
     "onnx-optimizer": {
       "baseline": "0.3.19",

diff --git a/versions/o-/onnx.json b/versions/o-/onnx.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9849fadc0639a430cf9c49434b60cbeb08989112",
+      "version-semver": "1.17.0",
+      "port-version": 0
+    },
     {
       "git-tree": "262df4daa9534c3c514b1a4f7c048369b575568f",
       "version-semver": "1.16.2",