From 18fbff3f98d9c1603bfa64226b40fb10ae17ef99 Mon Sep 17 00:00:00 2001 From: ElliotScher Date: Thu, 14 Nov 2024 15:12:23 -0500 Subject: [PATCH 1/2] add aruco libs to libopencv480.a --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 2f81e15..be9f307 100644 --- a/build.gradle +++ b/build.gradle @@ -322,7 +322,7 @@ if (project.platform == "linux-athena") { dependsOn 'make' + buildType workingDir buildDirectory.resolve("lib").resolve(buildTypeFolder).toString() executable 'lib' - def inputFiles = ["opencv_calib3d${project.libVersion}", "opencv_features2d${project.libVersion}", "opencv_flann${project.libVersion}", "opencv_gapi${project.libVersion}", "opencv_highgui${project.libVersion}", "opencv_imgcodecs${project.libVersion}", "opencv_imgproc${project.libVersion}", "opencv_ml${project.libVersion}", "opencv_photo${project.libVersion}", "opencv_stitching${project.libVersion}", "opencv_videoio${project.libVersion}", "opencv_video${project.libVersion}", "opencv_core${project.libVersion}", "../../3rdparty/lib/${buildTypeFolder}/ade", "../../3rdparty/lib/${buildTypeFolder}/libjpeg-turbo", "../../3rdparty/lib/${buildTypeFolder}/libopenjp2", "../../3rdparty/lib/${buildTypeFolder}/libpng", "../../3rdparty/lib/${buildTypeFolder}/zlib"] + def inputFiles = ["opencv_calib3d${project.libVersion}", "opencv_features2d${project.libVersion}", "opencv_flann${project.libVersion}", "opencv_gapi${project.libVersion}", "opencv_highgui${project.libVersion}", "opencv_imgcodecs${project.libVersion}", "opencv_imgproc${project.libVersion}", "opencv_ml${project.libVersion}", "opencv_photo${project.libVersion}", "opencv_stitching${project.libVersion}", "opencv_videoio${project.libVersion}", "opencv_video${project.libVersion}", "opencv_core${project.libVersion}", "opencv_aruco${project.libVersion}", "../../3rdparty/lib/${buildTypeFolder}/ade", "../../3rdparty/lib/${buildTypeFolder}/libjpeg-turbo", "../../3rdparty/lib/${buildTypeFolder}/libopenjp2", "../../3rdparty/lib/${buildTypeFolder}/libpng", "../../3rdparty/lib/${buildTypeFolder}/zlib"] def setArgs = ["/OUT:opencv${project.libVersion}.lib"] inputFiles.each { def inFile = it @@ -372,7 +372,7 @@ if (project.platform == "linux-athena") { workingDir buildDirectory.resolve("lib").toString() executable 'ar' args = ['-M'] - def inputFiles = ["libopencv_calib3d", "libopencv_features2d", "libopencv_flann", "libopencv_gapi", "libopencv_highgui", "libopencv_imgcodecs", "libopencv_imgproc", "libopencv_ml", "libopencv_photo", "libopencv_stitching", "libopencv_videoio", "libopencv_video", "libopencv_core", "../3rdparty/lib/libade", "../3rdparty/lib/liblibjpeg-turbo", "../3rdparty/lib/liblibopenjp2", "../3rdparty/lib/liblibpng", "../3rdparty/lib/libzlib"] + def inputFiles = ["libopencv_calib3d", "libopencv_features2d", "libopencv_flann", "libopencv_gapi", "libopencv_highgui", "libopencv_imgcodecs", "libopencv_imgproc", "libopencv_ml", "libopencv_photo", "libopencv_stitching", "libopencv_videoio", "libopencv_video", "libopencv_core", "libopencv_aruco", "../3rdparty/lib/libade", "../3rdparty/lib/liblibjpeg-turbo", "../3rdparty/lib/liblibopenjp2", "../3rdparty/lib/liblibpng", "../3rdparty/lib/libzlib"] def inputString = "create libopencv${project.libVersion}.a\n" inputFiles.each { From 88d44baed39ca17035d8dae428d25a1fc892c403 Mon Sep 17 00:00:00 2001 From: ElliotScher Date: Fri, 15 Nov 2024 20:50:06 -0500 Subject: [PATCH 2/2] Bump publish version. --- publish.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/publish.gradle b/publish.gradle index e0f1ccc..2dcadab 100644 --- a/publish.gradle +++ b/publish.gradle @@ -13,7 +13,7 @@ publishing { } } -def pubVersion = "${project.ext.version}-6" +def pubVersion = "${project.ext.version}-7" def outputsFolder = file("$project.buildDir/outputs")