From 810421db81e96082b99bc89bfd0f5f4a041b5a0b Mon Sep 17 00:00:00 2001
From: mksbabu <140674455+mksbabu@users.noreply.github.com>
Date: Mon, 30 Oct 2023 13:59:20 +1100
Subject: [PATCH 1/9] Update depthai.yml
---
.github/workflows/depthai.yml | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/depthai.yml b/.github/workflows/depthai.yml
index 1b62311c8ae..ccda2a8dd5c 100644
--- a/.github/workflows/depthai.yml
+++ b/.github/workflows/depthai.yml
@@ -41,8 +41,16 @@ jobs:
runs-on: macos-11
steps:
- uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions
+ windows-x86:
+ runs-on: windows-2019
+ steps:
+ - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions
+ windows-x86_64:
+ runs-on: windows-2019
+ steps:
+ - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions
redeploy:
- needs: [linux-armhf, linux-arm64, linux-x86, linux-x86_64, macosx-x86_64]
+ needs: [linux-armhf, linux-arm64, linux-x86, linux-x86_64, macosx-x86_64, windows-x86, windows-x86_64]
runs-on: ubuntu-20.04
steps:
- uses: bytedeco/javacpp-presets/.github/actions/redeploy@actions
From 63e2e26a88b49ed3724e40a1f1a7368eac2035f4 Mon Sep 17 00:00:00 2001
From: mksbabu <140674455+mksbabu@users.noreply.github.com>
Date: Mon, 30 Oct 2023 14:05:19 +1100
Subject: [PATCH 2/9] Update pom.xml
---
depthai/platform/pom.xml | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/depthai/platform/pom.xml b/depthai/platform/pom.xml
index b03df5813ab..03db2f31edc 100644
--- a/depthai/platform/pom.xml
+++ b/depthai/platform/pom.xml
@@ -65,6 +65,18 @@
${project.version}
${javacpp.platform.macosx-x86_64}
+
+ ${project.groupId}
+ ${javacpp.moduleId}
+ ${project.version}
+ ${javacpp.platform.windows-x86}
+
+
+ ${project.groupId}
+ ${javacpp.moduleId}
+ ${project.version}
+ ${javacpp.platform.windows-x86_64}
+
@@ -77,7 +89,7 @@
- ${javacpp.moduleId}.jar ${javacpp.moduleId}-linux-armhf.jar ${javacpp.moduleId}-linux-arm64.jar ${javacpp.moduleId}-linux-x86.jar ${javacpp.moduleId}-linux-x86_64.jar ${javacpp.moduleId}-macosx-x86_64.jar
+ ${javacpp.moduleId}.jar ${javacpp.moduleId}-linux-armhf.jar ${javacpp.moduleId}-linux-arm64.jar ${javacpp.moduleId}-linux-x86.jar ${javacpp.moduleId}-linux-x86_64.jar ${javacpp.moduleId}-macosx-x86_64.jar ${javacpp.moduleId}-windows-x86.jar ${javacpp.moduleId}-windows-x86_64.jar
@@ -127,6 +139,8 @@
requires static org.bytedeco.${javacpp.moduleId}.linux.x86;
requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64;
requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
+ requires static org.bytedeco.${javacpp.moduleId}.windows.x86;
+ requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64;
}
From 6b124cbbb0710221ddfa8ff23dbd5bd211e07083 Mon Sep 17 00:00:00 2001
From: mksbabu <140674455+mksbabu@users.noreply.github.com>
Date: Mon, 30 Oct 2023 15:18:57 +1100
Subject: [PATCH 3/9] Update cppbuild.sh
---
depthai/cppbuild.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/depthai/cppbuild.sh b/depthai/cppbuild.sh
index 3ddecb619f1..a6c6757c8d6 100755
--- a/depthai/cppbuild.sh
+++ b/depthai/cppbuild.sh
@@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then
exit
fi
-DEPTHAI_VERSION=2.21.2
+DEPTHAI_VERSION=2.21.3
LIBUSB_VERSION=1.0.22
download https://github.com/luxonis/depthai-core/releases/download/v$DEPTHAI_VERSION/depthai-core-v$DEPTHAI_VERSION.tar.gz depthai-core-v$DEPTHAI_VERSION.tar.gz
download http://sourceforge.net/projects/libusb/files/libusb-1.0/libusb-$LIBUSB_VERSION/libusb-$LIBUSB_VERSION.tar.bz2/download libusb-$LIBUSB_VERSION.tar.bz2
From 06fde40369936f2e39bfc6e21b78c6db4b56f99b Mon Sep 17 00:00:00 2001
From: mksbabu <140674455+mksbabu@users.noreply.github.com>
Date: Tue, 31 Oct 2023 10:33:48 +1100
Subject: [PATCH 4/9] Update cppbuild.sh
---
depthai/cppbuild.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/depthai/cppbuild.sh b/depthai/cppbuild.sh
index a6c6757c8d6..3ddecb619f1 100755
--- a/depthai/cppbuild.sh
+++ b/depthai/cppbuild.sh
@@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then
exit
fi
-DEPTHAI_VERSION=2.21.3
+DEPTHAI_VERSION=2.21.2
LIBUSB_VERSION=1.0.22
download https://github.com/luxonis/depthai-core/releases/download/v$DEPTHAI_VERSION/depthai-core-v$DEPTHAI_VERSION.tar.gz depthai-core-v$DEPTHAI_VERSION.tar.gz
download http://sourceforge.net/projects/libusb/files/libusb-1.0/libusb-$LIBUSB_VERSION/libusb-$LIBUSB_VERSION.tar.bz2/download libusb-$LIBUSB_VERSION.tar.bz2
From db98c88b4fb61762dbf861b4436fc06eb5386200 Mon Sep 17 00:00:00 2001
From: mksbabu <140674455+mksbabu@users.noreply.github.com>
Date: Tue, 31 Oct 2023 12:11:22 +1100
Subject: [PATCH 5/9] Update cppbuild.sh
---
depthai/cppbuild.sh | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/depthai/cppbuild.sh b/depthai/cppbuild.sh
index 3ddecb619f1..a6ede3e349d 100755
--- a/depthai/cppbuild.sh
+++ b/depthai/cppbuild.sh
@@ -107,6 +107,28 @@ case $PLATFORM in
make install/strip
install_name_tool -change /usr/local/opt/libusb/lib/libusb-1.0.0.dylib @rpath/libusb-1.0.0.dylib ../lib/libdepthai-core.dylib
;;
+ windows-x86)
+ mkdir -p build
+ cd build
+ export CC="cl.exe"
+ export CXX="cl.exe"
+ "$CMAKE" -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DBUILD_UNIT_TESTS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_GRAPHICAL_EXAMPLES=OFF ..
+ ninja -j $MAKEJ
+ cd ..
+ cp -a include/* ../include/
+ cp -a build/* ../lib/
+ ;;
+ windows-x86_64)
+ mkdir -p build
+ cd build
+ export CC="cl.exe"
+ export CXX="cl.exe"
+ "$CMAKE" -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DBUILD_UNIT_TESTS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_GRAPHICAL_EXAMPLES=OFF ..
+ ninja -j $MAKEJ
+ cd ..
+ cp -a include/* ../include/
+ cp -a build/* ../lib/
+ ;;
*)
echo "Error: Platform \"$PLATFORM\" is not supported"
;;
From 43fc68fbd5b37b0a6f60b7bc09577191a3839570 Mon Sep 17 00:00:00 2001
From: mksbabu <140674455+mksbabu@users.noreply.github.com>
Date: Tue, 31 Oct 2023 17:35:09 +1100
Subject: [PATCH 6/9] Update cppbuild.sh
---
depthai/cppbuild.sh | 27 ++++++++-------------------
1 file changed, 8 insertions(+), 19 deletions(-)
diff --git a/depthai/cppbuild.sh b/depthai/cppbuild.sh
index a6ede3e349d..8a131814c78 100755
--- a/depthai/cppbuild.sh
+++ b/depthai/cppbuild.sh
@@ -108,27 +108,16 @@ case $PLATFORM in
install_name_tool -change /usr/local/opt/libusb/lib/libusb-1.0.0.dylib @rpath/libusb-1.0.0.dylib ../lib/libdepthai-core.dylib
;;
windows-x86)
- mkdir -p build
- cd build
- export CC="cl.exe"
- export CXX="cl.exe"
- "$CMAKE" -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DBUILD_UNIT_TESTS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_GRAPHICAL_EXAMPLES=OFF ..
- ninja -j $MAKEJ
- cd ..
- cp -a include/* ../include/
- cp -a build/* ../lib/
+ nmake -f win32/Makefile.msc zlib.lib
+ mkdir -p ../include ../lib
+ cp zconf.h zlib.h ../include/
+ cp zlib.lib ../lib/
;;
windows-x86_64)
- mkdir -p build
- cd build
- export CC="cl.exe"
- export CXX="cl.exe"
- "$CMAKE" -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DBUILD_UNIT_TESTS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_GRAPHICAL_EXAMPLES=OFF ..
- ninja -j $MAKEJ
- cd ..
- cp -a include/* ../include/
- cp -a build/* ../lib/
- ;;
+ CC="gcc -m64 -DWIN32" CXX="g++ -m64 -DWIN32" $CMAKE -DCMAKE_BUILD_TYPE=Release -G "MSYS Makefiles" -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DCMAKE_INSTALL_LIBDIR="lib" -DDEPTHAI_ENABLE_BACKWARD=OFF -DBUILD_SHARED_LIBS=ON -DDEPTHAI_OPENCV_SUPPORT=ON .
+ make -j $MAKEJ
+ make install
+ ;;
*)
echo "Error: Platform \"$PLATFORM\" is not supported"
;;
From 284dd3aa1b02348d6391aff0bbc0ed8ffd183a51 Mon Sep 17 00:00:00 2001
From: mksbabu <140674455+mksbabu@users.noreply.github.com>
Date: Tue, 31 Oct 2023 20:13:29 +1100
Subject: [PATCH 7/9] Update cppbuild.sh
---
depthai/cppbuild.sh | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/depthai/cppbuild.sh b/depthai/cppbuild.sh
index 8a131814c78..8c1d135a5d9 100755
--- a/depthai/cppbuild.sh
+++ b/depthai/cppbuild.sh
@@ -108,10 +108,9 @@ case $PLATFORM in
install_name_tool -change /usr/local/opt/libusb/lib/libusb-1.0.0.dylib @rpath/libusb-1.0.0.dylib ../lib/libdepthai-core.dylib
;;
windows-x86)
- nmake -f win32/Makefile.msc zlib.lib
- mkdir -p ../include ../lib
- cp zconf.h zlib.h ../include/
- cp zlib.lib ../lib/
+ CC="gcc -m32 -DWIN32" CXX="g++ -m64 -DWIN32" $CMAKE -DCMAKE_BUILD_TYPE=Release -G "MSYS Makefiles" -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DCMAKE_INSTALL_LIBDIR="lib" -DDEPTHAI_ENABLE_BACKWARD=OFF -DBUILD_SHARED_LIBS=ON -DDEPTHAI_OPENCV_SUPPORT=ON .
+ make -j $MAKEJ
+ make install
;;
windows-x86_64)
CC="gcc -m64 -DWIN32" CXX="g++ -m64 -DWIN32" $CMAKE -DCMAKE_BUILD_TYPE=Release -G "MSYS Makefiles" -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DCMAKE_INSTALL_LIBDIR="lib" -DDEPTHAI_ENABLE_BACKWARD=OFF -DBUILD_SHARED_LIBS=ON -DDEPTHAI_OPENCV_SUPPORT=ON .
From eacbf171ce1f28f89ce740f8e50561d7174faf3f Mon Sep 17 00:00:00 2001
From: mksbabu <140674455+mksbabu@users.noreply.github.com>
Date: Wed, 1 Nov 2023 09:19:32 +1100
Subject: [PATCH 8/9] Update pom.xml
---
pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/pom.xml b/pom.xml
index d30031fece3..50f238bb77a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1645,6 +1645,7 @@
+ depthai
opencv
ffmpeg
flycapture
From e89cc386e185333200e4a2d52f3a42920b72bbec Mon Sep 17 00:00:00 2001
From: mksbabu <140674455+mksbabu@users.noreply.github.com>
Date: Wed, 1 Nov 2023 09:28:40 +1100
Subject: [PATCH 9/9] Update pom.xml
---
pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/pom.xml b/pom.xml
index 50f238bb77a..9bab1ec97cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1581,6 +1581,7 @@
opencv
+ depthai
ffmpeg
flycapture
spinnaker