From a79e3fcbc2cb512a82797a0b4380432a8b08cf39 Mon Sep 17 00:00:00 2001
From: Deepika Shanmugam <deepikas@axis.com>
Date: Tue, 19 Mar 2024 16:07:23 +0100
Subject: [PATCH] Use axparameter from native-sdk

---
 Dockerfile                      | 15 +--------------
 app/dockerdwrapperwithcompose.c |  2 +-
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2857696..dabde85 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,18 +6,12 @@ ARG DOCKER_COMPOSE_VERSION=v2.18.1
 ARG REPO=axisecp
 ARG ACAPARCH=armv7hf
 
-ARG VERSION=1.10
+ARG VERSION=1.13
 ARG UBUNTU_VERSION=22.04
 ARG NATIVE_SDK=acap-native-sdk
 
-ARG ACAP3_SDK_VERSION=3.5
-ARG ACAP3_UBUNTU_VERSION=20.04
-ARG ACAP3_SDK=acap-sdk
-
 FROM ${REPO}/${NATIVE_SDK}:${VERSION}-${ACAPARCH}-ubuntu${UBUNTU_VERSION} as build_image
 
-FROM ${REPO}/${ACAP3_SDK}:${ACAP3_SDK_VERSION}-${ACAPARCH}-ubuntu${ACAP3_UBUNTU_VERSION} as acap-sdk
-
 FROM build_image AS ps
 ARG PROCPS_VERSION=v3.3.17
 ARG BUILD_DIR=/build
@@ -61,13 +55,6 @@ ARG DOCKER_VERSION
 ARG DOCKER_COMPOSE_VERSION
 ARG ACAPARCH
 
-# Copy over axparameter from the acap-sdk
-COPY --from=acap-sdk /opt/axis/acapsdk/sysroots/${ACAPARCH}/usr/include/axsdk/ax_parameter /opt/axis/acapsdk/sysroots/${ACAPARCH}/usr/include/axsdk
-COPY --from=acap-sdk /opt/axis/acapsdk/sysroots/${ACAPARCH}/usr/lib/libaxparameter.so /opt/axis/acapsdk/sysroots/${ACAPARCH}/usr/lib/libaxparameter.so
-COPY --from=acap-sdk /opt/axis/acapsdk/sysroots/${ACAPARCH}/usr/lib/libaxparameter.so.1 /opt/axis/acapsdk/sysroots/${ACAPARCH}/usr/lib/libaxparameter.so.1
-COPY --from=acap-sdk /opt/axis/acapsdk/sysroots/${ACAPARCH}/usr/lib/libaxparameter.so.1.0 /opt/axis/acapsdk/sysroots/${ACAPARCH}/usr/lib/libaxparameter.so.1.0
-COPY --from=acap-sdk /opt/axis/acapsdk/sysroots/${ACAPARCH}/usr/lib/pkgconfig/axparameter.pc /opt/axis/acapsdk/sysroots/${ACAPARCH}/usr/lib/pkgconfig/axparameter.pc
-
 COPY app /opt/app
 COPY --from=ps /export/ps /opt/app
 
diff --git a/app/dockerdwrapperwithcompose.c b/app/dockerdwrapperwithcompose.c
index 6a8412f..dfd5753 100644
--- a/app/dockerdwrapperwithcompose.c
+++ b/app/dockerdwrapperwithcompose.c
@@ -14,7 +14,7 @@
  * under the License.
  */
 
-#include <axsdk/ax_parameter.h>
+#include <axsdk/axparameter.h>
 #include <errno.h>
 #include <glib.h>
 #include <mntent.h>