From 62f292ac7360491c260b25de48ec0bc4259aef50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com>
Date: Thu, 19 Oct 2023 16:16:21 -0400
Subject: [PATCH] onnx: Update to build against 1.16.1

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4916>
---
 subprojects/gst-plugins-bad/ext/onnx/gstonnxclient.cpp | 4 ++--
 subprojects/gst-plugins-bad/ext/onnx/meson.build       | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/subprojects/gst-plugins-bad/ext/onnx/gstonnxclient.cpp b/subprojects/gst-plugins-bad/ext/onnx/gstonnxclient.cpp
index c7653e9119..201ab6e6aa 100644
--- a/subprojects/gst-plugins-bad/ext/onnx/gstonnxclient.cpp
+++ b/subprojects/gst-plugins-bad/ext/onnx/gstonnxclient.cpp
@@ -1,6 +1,6 @@
 /*
  * GStreamer gstreamer-onnxclient
- * Copyright (C) 2021 Collabora Ltd
+ * Copyright (C) 2021-2023 Collabora Ltd
  *
  * gstonnxclient.cpp
  *
@@ -22,7 +22,7 @@
 
 #include "gstonnxclient.h"
 #include <tensor/gsttensorid.h>
-#include <providers/cpu/cpu_provider_factory.h>
+#include <cpu_provider_factory.h>
 #include <sstream>
 
 namespace GstOnnxNamespace
diff --git a/subprojects/gst-plugins-bad/ext/onnx/meson.build b/subprojects/gst-plugins-bad/ext/onnx/meson.build
index f591388866..6e0f7be831 100644
--- a/subprojects/gst-plugins-bad/ext/onnx/meson.build
+++ b/subprojects/gst-plugins-bad/ext/onnx/meson.build
@@ -3,7 +3,7 @@ if get_option('onnx').disabled()
 endif
 
 
-onnxrt_dep = dependency('libonnxruntime', version : '>= 1.15.1', required : get_option('onnx'))
+onnxrt_dep = dependency('libonnxruntime', version : '>= 1.16.1', required : get_option('onnx'))
 
 extra_args = []
 extra_deps = []
@@ -13,8 +13,6 @@ if gstcuda_dep.found()
 endif
 
 if onnxrt_dep.found()
-	onnxrt_include_root = onnxrt_dep.get_variable('includedir')
-	onnxrt_includes = [onnxrt_include_root / 'core/session', onnxrt_include_root / 'core']
     gstonnx = library('gstonnx',
     'gstonnx.c',
     'decoders/gstobjectdetectorutils.cpp',
@@ -26,7 +24,7 @@ if onnxrt_dep.found()
     c_args : gst_plugins_bad_args + extra_args,
     cpp_args : gst_plugins_bad_args + extra_args,
     link_args : noseh_link_args,
-    include_directories : [configinc, libsinc, onnxrt_includes, cuda_stubinc],
+    include_directories : [configinc, libsinc, cuda_stubinc],
     dependencies : [gstbase_dep, gstvideo_dep, onnxrt_dep, libm] + extra_deps,
     install : true,
     install_dir : plugins_install_dir,