From bbc678a451454c192db75c197886f34e931a8c8a Mon Sep 17 00:00:00 2001
From: GHakansson <175003894+GHakansson@users.noreply.github.com>
Date: Tue, 2 Sep 2025 13:20:53 +0200
Subject: [PATCH] Use jq for reading app name from manifest

In addition, gnu gdb mirrors updated
---
 audio-capture/app/Makefile                          | 2 +-
 audio-playback/app/Makefile                         | 2 +-
 axevent/send_event/app/Makefile                     | 2 +-
 axevent/subscribe_to_event/app/Makefile             | 2 +-
 axevent/subscribe_to_events/app/Makefile            | 2 +-
 axoverlay/app/Makefile                              | 2 +-
 axparameter/app/Makefile                            | 2 +-
 axserialport/app/Makefile                           | 2 +-
 axstorage/app/Makefile                              | 2 +-
 bounding-box/app/Makefile                           | 2 +-
 curl-openssl/app/Makefile                           | 2 +-
 hello-world/app/Makefile                            | 2 +-
 licensekey/app/Makefile                             | 2 +-
 message-broker/consume-scene-metadata/app/Makefile  | 2 +-
 object-detection-cv25/app/Makefile                  | 2 +-
 object-detection-yolov5/app/Makefile                | 2 +-
 object-detection/app/Makefile                       | 2 +-
 remote-debug-example/Dockerfile                     | 6 ++++--
 remote-debug-example/app/Makefile                   | 2 +-
 reproducible-package/app/Makefile                   | 2 +-
 using-opencv/app/Makefile                           | 2 +-
 utility-libraries/custom_lib_example/app/Makefile   | 2 +-
 utility-libraries/openssl_curl_example/app/Makefile | 2 +-
 vapix/app/Makefile                                  | 2 +-
 vdo-larod/app/Makefile                              | 2 +-
 vdo-opencl-filtering/app/Makefile                   | 2 +-
 vdostream/app/Makefile                              | 2 +-
 web-server-using-fastcgi/app/Makefile               | 2 +-
 web-server/app/Makefile                             | 2 +-
 29 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/audio-capture/app/Makefile b/audio-capture/app/Makefile
index 3e735d9b..77f973d1 100644
--- a/audio-capture/app/Makefile
+++ b/audio-capture/app/Makefile
@@ -1,4 +1,4 @@
-PROG1	= audiocapture
+PROG1	= $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1	= $(PROG1).c
 PROGS	= $(PROG1)
 DEBUG_DIR = debug
diff --git a/audio-playback/app/Makefile b/audio-playback/app/Makefile
index 8687eb02..77f973d1 100644
--- a/audio-playback/app/Makefile
+++ b/audio-playback/app/Makefile
@@ -1,4 +1,4 @@
-PROG1	= audioplayback
+PROG1	= $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1	= $(PROG1).c
 PROGS	= $(PROG1)
 DEBUG_DIR = debug
diff --git a/axevent/send_event/app/Makefile b/axevent/send_event/app/Makefile
index ad63513e..f1e00cd7 100644
--- a/axevent/send_event/app/Makefile
+++ b/axevent/send_event/app/Makefile
@@ -1,4 +1,4 @@
-PROG1	= send_event
+PROG1	= $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1	= $(PROG1).c
 
 PROGS	= $(PROG1)
diff --git a/axevent/subscribe_to_event/app/Makefile b/axevent/subscribe_to_event/app/Makefile
index d7bce7a6..e59fa298 100644
--- a/axevent/subscribe_to_event/app/Makefile
+++ b/axevent/subscribe_to_event/app/Makefile
@@ -1,4 +1,4 @@
-PROG1	= subscribe_to_event
+PROG1	= $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1	= $(PROG1).c
 
 PROGS	= $(PROG1)
diff --git a/axevent/subscribe_to_events/app/Makefile b/axevent/subscribe_to_events/app/Makefile
index d4ebf2f3..85ede729 100644
--- a/axevent/subscribe_to_events/app/Makefile
+++ b/axevent/subscribe_to_events/app/Makefile
@@ -1,4 +1,4 @@
-PROG	= subscribe_to_events
+PROG	= $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 
 PKGS = glib-2.0 axevent
 CFLAGS += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --cflags $(PKGS))
diff --git a/axoverlay/app/Makefile b/axoverlay/app/Makefile
index f4b9e3e0..f7385e05 100644
--- a/axoverlay/app/Makefile
+++ b/axoverlay/app/Makefile
@@ -1,4 +1,4 @@
-PROG1	= axoverlay
+PROG1	= $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1	= $(PROG1).c
 
 PROGS	= $(PROG1)
diff --git a/axparameter/app/Makefile b/axparameter/app/Makefile
index 1b8878db..b59cd5a7 100644
--- a/axparameter/app/Makefile
+++ b/axparameter/app/Makefile
@@ -1,4 +1,4 @@
-PROG1	= axparameter
+PROG1	= $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1	= $(PROG1).c
 
 PROGS	= $(PROG1)
diff --git a/axserialport/app/Makefile b/axserialport/app/Makefile
index 2f76b860..e2d98b13 100644
--- a/axserialport/app/Makefile
+++ b/axserialport/app/Makefile
@@ -1,4 +1,4 @@
-PROG1	= axserialport
+PROG1	= $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1	= $(PROG1).c
 
 PROGS	= $(PROG1)
diff --git a/axstorage/app/Makefile b/axstorage/app/Makefile
index 7840b5af..9db3a218 100644
--- a/axstorage/app/Makefile
+++ b/axstorage/app/Makefile
@@ -1,4 +1,4 @@
-PROG1	= axstorage
+PROG1	= $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1	= $(PROG1).c
 
 PROGS	= $(PROG1)
diff --git a/bounding-box/app/Makefile b/bounding-box/app/Makefile
index 13278907..882a388d 100644
--- a/bounding-box/app/Makefile
+++ b/bounding-box/app/Makefile
@@ -1,4 +1,4 @@
-PROG1 = bounding_box_example
+PROG1 = $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1 = $(PROG1).c
 PROGS = $(PROG1)
 DEBUG_DIR = debug
diff --git a/curl-openssl/app/Makefile b/curl-openssl/app/Makefile
index 99a6a63d..d117f4f2 100644
--- a/curl-openssl/app/Makefile
+++ b/curl-openssl/app/Makefile
@@ -1,4 +1,4 @@
-PROG1	= curl_openssl
+PROG1	= $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1	= $(PROG1).c
 PROGS	= $(PROG1)
 DEBUG_DIR = debug
diff --git a/hello-world/app/Makefile b/hello-world/app/Makefile
index f7b6cc7f..3a52cbd3 100644
--- a/hello-world/app/Makefile
+++ b/hello-world/app/Makefile
@@ -1,4 +1,4 @@
-PROG1	= hello_world
+PROG1	= $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1	= $(PROG1).c
 
 PROGS	= $(PROG1)
diff --git a/licensekey/app/Makefile b/licensekey/app/Makefile
index 6c613be7..ddd0d873 100644
--- a/licensekey/app/Makefile
+++ b/licensekey/app/Makefile
@@ -1,4 +1,4 @@
-PROG1	= licensekey_handler
+PROG1	= $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1	= $(PROG1).c
 
 PROGS	= $(PROG1)
diff --git a/message-broker/consume-scene-metadata/app/Makefile b/message-broker/consume-scene-metadata/app/Makefile
index 88ac35c0..fc134e57 100644
--- a/message-broker/consume-scene-metadata/app/Makefile
+++ b/message-broker/consume-scene-metadata/app/Makefile
@@ -1,4 +1,4 @@
-PROG1	= consume_scene_metadata
+PROG1	= $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1	= $(PROG1).c
 PROGS	= $(PROG1)
 DEBUG_DIR = debug
diff --git a/object-detection-cv25/app/Makefile b/object-detection-cv25/app/Makefile
index c21dc664..6a43a598 100644
--- a/object-detection-cv25/app/Makefile
+++ b/object-detection-cv25/app/Makefile
@@ -1,4 +1,4 @@
-PROG1	= object_detection
+PROG1	= $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1	= $(PROG1).c argparse.c imgprovider.c imgutils.c postprocessing.c
 PROGS	= $(PROG1)
 LIBDIR = lib
diff --git a/object-detection-yolov5/app/Makefile b/object-detection-yolov5/app/Makefile
index 3a03e724..c43ead63 100644
--- a/object-detection-yolov5/app/Makefile
+++ b/object-detection-yolov5/app/Makefile
@@ -1,4 +1,4 @@
-PROG1	= object_detection_yolov5
+PROG1	= $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1	= $(PROG1).c argparse.c imgprovider.c model.c panic.c labelparse.c
 PROGS	= $(PROG1)
 DEBUG_DIR = debug
diff --git a/object-detection/app/Makefile b/object-detection/app/Makefile
index d5ebfed6..918a8d53 100644
--- a/object-detection/app/Makefile
+++ b/object-detection/app/Makefile
@@ -1,4 +1,4 @@
-PROG1	= object_detection
+PROG1	= $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1	= $(PROG1).c argparse.c imgprovider.c imgutils.c
 PROGS	= $(PROG1)
 LIBDIR = lib
diff --git a/remote-debug-example/Dockerfile b/remote-debug-example/Dockerfile
index 1383e064..c72c1030 100644
--- a/remote-debug-example/Dockerfile
+++ b/remote-debug-example/Dockerfile
@@ -18,7 +18,6 @@ RUN DEBIAN_FRONTEND=noninteractive \
 
 # Build GDB server
 ARG GDB_VERSION=9.2
-ARG GDB_REPOSITORY=https://ftp.gnu.org/gnu/gdb
 ARG GDB_ARCHIVE=gdb-${GDB_VERSION}.tar.gz
 ARG GDB_BASE_DIR=/opt/build/gdb
 ARG GDB_SOURCE_DIR=$GDB_BASE_DIR/src
@@ -29,7 +28,10 @@ ARG GDB_INSTALL_DIR=${GDB_BASE_DIR}
 ARG GDB_SERVER_BIN_DIR=${GDB_BASE_DIR}/bin
 
 WORKDIR $GDB_BASE_DIR
-RUN curl -sSL -O $GDB_REPOSITORY/$GDB_ARCHIVE
+
+# Download GDB with mirror fallback
+RUN curl -sSL -O https://sourceware.org/pub/gdb/releases/$GDB_ARCHIVE || \
+    curl -sSL -O https://ftp.gnu.org/gnu/gdb/$GDB_ARCHIVE
 
 WORKDIR $GDB_SOURCE_DIR
 RUN tar -xf $GDB_BASE_DIR/$GDB_ARCHIVE -C $GDB_SOURCE_DIR --strip-components=1
diff --git a/remote-debug-example/app/Makefile b/remote-debug-example/app/Makefile
index ebeafbe4..aecaf420 100644
--- a/remote-debug-example/app/Makefile
+++ b/remote-debug-example/app/Makefile
@@ -1,4 +1,4 @@
-PROG1 = remote_debug
+PROG1 = $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1 = $(PROG1).c
 DEBUG_DIR = debug
 
diff --git a/reproducible-package/app/Makefile b/reproducible-package/app/Makefile
index 414e8c76..a237e768 100644
--- a/reproducible-package/app/Makefile
+++ b/reproducible-package/app/Makefile
@@ -1,4 +1,4 @@
-PROG1	= reproducible_package
+PROG1	= $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1	= $(PROG1).c
 DEBUG_DIR = debug
 
diff --git a/using-opencv/app/Makefile b/using-opencv/app/Makefile
index ee04dd99..a7efc8cd 100644
--- a/using-opencv/app/Makefile
+++ b/using-opencv/app/Makefile
@@ -1,4 +1,4 @@
-PROGS = opencv_app
+PROGS = $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJECTS = $(wildcard *.cpp)
 DEBUG_DIR = debug
 
diff --git a/utility-libraries/custom_lib_example/app/Makefile b/utility-libraries/custom_lib_example/app/Makefile
index e32ae544..f44e4354 100644
--- a/utility-libraries/custom_lib_example/app/Makefile
+++ b/utility-libraries/custom_lib_example/app/Makefile
@@ -1,4 +1,4 @@
-PROG1	= customlib_example
+PROG1	= $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1	= $(PROG1).c
 PROGS	= $(PROG1)
 DEBUG_DIR = debug
diff --git a/utility-libraries/openssl_curl_example/app/Makefile b/utility-libraries/openssl_curl_example/app/Makefile
index 8af71fc1..c77d0844 100644
--- a/utility-libraries/openssl_curl_example/app/Makefile
+++ b/utility-libraries/openssl_curl_example/app/Makefile
@@ -1,4 +1,4 @@
-PROG1	= openssl_curl_example
+PROG1	= $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1	= $(PROG1).c
 PROGS	= $(PROG1)
 DEBUG_DIR = debug
diff --git a/vapix/app/Makefile b/vapix/app/Makefile
index 4f34a15a..c77a1434 100644
--- a/vapix/app/Makefile
+++ b/vapix/app/Makefile
@@ -1,4 +1,4 @@
-PROG1	= vapix_example
+PROG1	= $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1	= $(PROG1).c
 PROGS	= $(PROG1)
 DEBUG_DIR = debug
diff --git a/vdo-larod/app/Makefile b/vdo-larod/app/Makefile
index 762203c7..4e654adf 100644
--- a/vdo-larod/app/Makefile
+++ b/vdo-larod/app/Makefile
@@ -1,4 +1,4 @@
-PROG1	= vdo_larod
+PROG1	= $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1	= $(PROG1).c imgprovider.c panic.c model.c
 PROGS	= $(PROG1)
 DEBUG_DIR = debug
diff --git a/vdo-opencl-filtering/app/Makefile b/vdo-opencl-filtering/app/Makefile
index 74182d13..7a08bccc 100644
--- a/vdo-opencl-filtering/app/Makefile
+++ b/vdo-opencl-filtering/app/Makefile
@@ -1,4 +1,4 @@
-PROG1 = vdo_cl_filter_demo
+PROG1 = $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1 = $(PROG1).c
 PROGS = $(PROG1)
 DEBUG_DIR = debug
diff --git a/vdostream/app/Makefile b/vdostream/app/Makefile
index 762efe0f..25bb7fe3 100644
--- a/vdostream/app/Makefile
+++ b/vdostream/app/Makefile
@@ -1,4 +1,4 @@
-PROG1	= vdoencodeclient
+PROG1	= $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1	= $(PROG1).c
 PROGS	= $(PROG1)
 DEBUG_DIR = debug
diff --git a/web-server-using-fastcgi/app/Makefile b/web-server-using-fastcgi/app/Makefile
index 1326d7e3..3e0ba933 100644
--- a/web-server-using-fastcgi/app/Makefile
+++ b/web-server-using-fastcgi/app/Makefile
@@ -1,4 +1,4 @@
-PROG1	= fastcgi_example
+PROG1	= $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1	= $(PROG1).c
 
 PROGS	= $(PROG1)
diff --git a/web-server/app/Makefile b/web-server/app/Makefile
index 0281ee64..4af9dc52 100644
--- a/web-server/app/Makefile
+++ b/web-server/app/Makefile
@@ -1,4 +1,4 @@
-PROG1 = web_server_rev_proxy
+PROG1 = $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1 = $(PROG1).c
 PROGS = $(PROG1)
 LIBDIR = lib