Update to OpenCV 4.8.0 (#73)

Co-authored-by: Ryan Blue <[email protected]>

.github/workflows/main.yml

@@ -34,6 +34,9 @@ jobs:
           submodules: 'true'
       - run: sudo apt-get update && sudo apt-get install ant -y && sudo rm -rf /var/lib/apt/lists/* && sudo rm -f /bin/ant && sudo ln -s /usr/share/ant/bin/ant /bin/ant
         name: Install Ant
+      - run: rm -rf /usr/local/arm-linux-gnueabihf && curl -SL https://github.com/wpilibsuite/opensdk/releases/download/v2023-9/armhf-raspi-bullseye-2023-x86_64-linux-gnu-Toolchain-10.2.0.tgz | sh -c 'mkdir -p /usr/local && cd /usr/local && tar xzf - --strip-components=2'
+        name: Replace arm32 compiler
+        if: matrix.artifact-name == 'Arm32'
       - run: ./gradlew build -PjenkinsBuild ${{ matrix.build-options }}
         name: Build with Gradle
       - uses: actions/upload-artifact@v3
@@ -76,6 +79,9 @@ jobs:
           java-version: 11
           distribution: 'zulu'
           architecture: ${{ matrix.architecture }}
+      - name: Set Java Heap Size
+        run: sed -i 's/-Xmx2g/-Xmx1g/g' gradle.properties
+        if: matrix.architecture == 'x86'
       - run: |
           @call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\VC\\Auxiliary\\Build\\vcvars64.bat"
           set PATH=%PATH%;%ANT_HOME%\bin

aarch64-bullseye-gnu.toolchain.cmake

@@ -1,5 +1,5 @@
 set(CMAKE_SYSTEM_PROCESSOR aarch64)
 set(GCC_COMPILER_VERSION "" CACHE STRING "GCC Compiler version")
 set(GNU_MACHINE "aarch64-bullseye-linux-gnu" CACHE STRING "GNU compiler triple")
-set(ARM_LINUX_SYSROOT /usr/local/sys-root)
+set(ARM_LINUX_SYSROOT /usr/local/aarch64-linux-gnu/sysroot)
 include("${CMAKE_CURRENT_LIST_DIR}/opencv/platforms/linux/arm.toolchain.cmake")

arm-frc-gnueabi.toolchain.cmake

@@ -1,4 +1,5 @@
 set(GCC_COMPILER_VERSION "" CACHE STRING "GCC Compiler version")
 set(GNU_MACHINE "arm-frc2023-linux-gnueabi" CACHE STRING "GNU compiler triple")
 set(SOFTFP yes)
+set(ARM_LINUX_SYSROOT /usr/local/arm-nilrt-linux-gnueabi/sysroot)
 include("${CMAKE_CURRENT_LIST_DIR}/opencv/platforms/linux/arm.toolchain.cmake")

arm-pi-gnueabihf.toolchain.cmake

@@ -1,5 +1,6 @@
 set(GCC_COMPILER_VERSION "" CACHE STRING "GCC Compiler version")
 set(GNU_MACHINE "armv6-bullseye-linux-gnueabi" CACHE STRING "GNU compiler triple")
+set(ARM_LINUX_SYSROOT /usr/local/arm-linux-gnueabihf/sysroot)
 
 if(COMMAND toolchain_save_config)
   return() # prevent recursive call

build.gradle

@@ -7,8 +7,8 @@ apply plugin: 'java'
 
 def date = new Date()
 def formattedDate = date.format('yyMMdd')
-ext.version = "4.6.0"
-ext.soVersion = "4.6"
+ext.version = "4.8.0"
+ext.soVersion = "4.8"
 ext.libVersion = "${ext.version.replace(".", "")}"
 
 ext.licenseFile = file("$rootDir/opencv/LICENSE")
@@ -238,7 +238,8 @@ if (project.platform == "linux-athena") {
                     '-DENABLE_NEON=ON' +
                     '-DENABLE_VFPV3=ON' +
                     '-DOPENCV_EXTRA_FLAGS_DEBUG=-Og' +
-                    "-DCMAKE_MODULE_PATH=$rootDir/arm-frc-modules"
+                    "-DCMAKE_MODULE_PATH=$rootDir/arm-frc-modules" +
+                    '-DOPENCV_FORCE_LIBATOMIC_COMPILER_CHECK=ON'
             } else if (project.platform == "linux-arm64") {
                 toolchain = projectDir.canonicalPath + "/aarch64-bullseye-gnu.toolchain.cmake"
                 println "Using toolchain '${toolchain}'"

gradle.properties

@@ -1,3 +1,3 @@
 buildDir=gradleDir
 bintrayPublishType=WRAPPER
-org.gradle.jvmargs=-Xmx1g
+org.gradle.jvmargs=-Xmx2g