debian bookworm

Author: nihui

.github/workflows/test.yml

@@ -6,11 +6,14 @@ on: pull_request
 #       - '*'
 
 env:
-  DEVELOPER_DIR: /Applications/Xcode_13.4.1.app/Contents/Developer
-  IOS_DEPLOYMENT_TARGET: '9.0'
-  MAC_DEPLOYMENT_TARGET: '10.9'
-  MAC_ARM64_DEPLOYMENT_TARGET: '11.0'
+  DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
+  IOS_DEPLOYMENT_TARGET: '13.0'
+  MAC_DEPLOYMENT_TARGET: '11.0'
   MAC_CATALYST_DEPLOYMENT_TARGET: '13.1'
+  WATCHOS_DEPLOYMENT_TARGET: '6.0'
+  TVOS_DEPLOYMENT_TARGET: '11.0'
+  VISIONOS_DEPLOYMENT_TARGET: '1.0'
+  ENABLE_BITCODE: OFF
   ENABLE_ARC: OFF
   ENABLE_VISIBILITY: OFF
   EMSCRIPTEN_VERSION: 3.1.28
@@ -30,7 +33,7 @@ jobs:
       run: echo "VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT
     - name: opencv4-source
       env:
-        opencv-version: 4.9.0
+        opencv-version: 4.11.0
       run: |
         wget -q https://github.com/opencv/opencv/archive/${{ env.opencv-version }}.zip -O opencv-${{ env.opencv-version }}.zip
         unzip -q opencv-${{ env.opencv-version }}.zip
@@ -82,16 +85,22 @@ jobs:
         patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-no-rtti.patch
         patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-no-zlib.patch
         patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-link-openmp.patch
+        patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-fix-windows-arm-arch.patch
         patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-minimal-install.patch
         cp ../patches/draw_text.h ../patches/mono_font_data.h modules/imgproc/src/
+        cp ../patches/fontface.html ./
         patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-drawing-mono-font.patch
         rm -rf modules/highgui
         cp -r ../highgui modules/
-        rm -rf 3rdparty apps data doc samples platforms
+        mv 3rdparty/kleidicv .
+        rm -rf 3rdparty/*
+        mv kleidicv 3rdparty/
+        rm -rf apps data doc samples platforms
         rm -rf modules/java
         rm -rf modules/js
         rm -rf modules/python
         rm -rf modules/ts
+        rm -rf modules/dnn
         sed -e 's/__VERSION__/${{ env.opencv-version }}/g' ../patches/Info.plist > ./Info.plist
         cp ../opencv4_cmake_options.txt ./options.txt
         cd ..
@@ -100,27 +109,70 @@ jobs:
     - name: upload-opencv4-source
       uses: actions/upload-artifact@v4
       with:
-        name: opencv-mobile-4.9.0-source
-        path: opencv-mobile-4.9.0.zip
+        name: opencv-mobile-4.11.0-source
+        path: opencv-mobile-4.11.0.zip
 
   devboard:
     needs: [setup]
     runs-on: ubuntu-latest
 
-    container:
-      image: debian:bullseye
-
     strategy:
       matrix:
         include:
-          - name: maixiii-ax-pi
+          - name: debian-bullseye-arm
+            os-image: debian:bullseye
             single-core: false
             cmake-toolchain: arm-linux-gnueabihf.toolchain.cmake
             setup-toolchain-cmd: |
               apt-get update
               apt-get install -y unzip zip patch cmake g++-arm-linux-gnueabihf
             setup-env-cmd: |
               echo "fine :)"
+            setup-test-env-cmd: |
+              echo "fine :)"
+            cmake-options:
+
+          - name: debian-bullseye-aarch64
+            os-image: debian:bullseye
+            single-core: false
+            cmake-toolchain: aarch64-linux-gnu.toolchain.cmake
+            setup-toolchain-cmd: |
+              apt-get update
+              apt-get install -y unzip zip patch cmake g++-aarch64-linux-gnu
+            setup-env-cmd: |
+              echo "fine :)"
+            setup-test-env-cmd: |
+              echo "fine :)"
+            cmake-options:
+
+          - name: debian-bookworm-arm
+            os-image: debian:bookworm
+            single-core: false
+            cmake-toolchain: arm-linux-gnueabihf.toolchain.cmake
+            setup-toolchain-cmd: |
+              apt-get update
+              apt-get install -y unzip zip patch cmake g++-arm-linux-gnueabihf
+            setup-env-cmd: |
+              echo "fine :)"
+            setup-test-env-cmd: |
+              echo "fine :)"
+            cmake-options:
+
+          - name: debian-bookworm-aarch64
+            os-image: debian:bookworm
+            single-core: false
+            cmake-toolchain: aarch64-linux-gnu.toolchain.cmake
+            setup-toolchain-cmd: |
+              apt-get update
+              apt-get install -y unzip zip patch cmake g++-aarch64-linux-gnu
+            setup-env-cmd: |
+              echo "fine :)"
+            setup-test-env-cmd: |
+              echo "fine :)"
+            cmake-options: -DWITH_RPI=ON
+
+    container:
+      image: ${{ matrix.os-image }}
 
     env:
       COMMON_CMAKE_OPTIONS: |
@@ -134,23 +186,23 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/download-artifact@v4
       with:
-        name: opencv-mobile-4.9.0-source
+        name: opencv-mobile-4.11.0-source
     - name: setup-toolchain
       run: ${{ matrix.setup-toolchain-cmd }}
     - name: setup-opencv-source
       run: |
-        unzip -q opencv-mobile-4.9.0.zip
-        echo "SOURCE_DIR=opencv-mobile-4.9.0" >> $GITHUB_ENV
-        echo "PACKAGE_NAME=opencv-mobile-4.9.0-${{ matrix.name }}" >> $GITHUB_ENV
+        unzip -q opencv-mobile-4.11.0.zip
+        echo "SOURCE_DIR=opencv-mobile-4.11.0" >> $GITHUB_ENV
+        echo "PACKAGE_NAME=opencv-mobile-4.11.0-${{ matrix.name }}" >> $GITHUB_ENV
 
     - name: build-disable-thread
       if: ${{ matrix.single-core }}
       run: |
         cd ${{ env.SOURCE_DIR }}
-        patch -p1 -i ../patches/opencv-4.9.0-no-atomic.patch
+        patch -p1 -i ../patches/opencv-4.11.0-no-atomic.patch
         mkdir build && cd build
         ${{ matrix.setup-env-cmd }}
-        cmake ${{ env.COMMON_CMAKE_OPTIONS }} \
+        cmake ${{ env.COMMON_CMAKE_OPTIONS }} ${{ matrix.cmake-options }} \
             `cat ../options.txt` -DBUILD_opencv_world=OFF -DOPENCV_DISABLE_FILESYSTEM_SUPPORT=ON \
             -DWITH_OPENMP=OFF -DOPENCV_DISABLE_THREAD_SUPPORT=ON ..
         cmake --build . -j $(nproc)
@@ -162,7 +214,7 @@ jobs:
         cd ${{ env.SOURCE_DIR }}
         mkdir build && cd build
         ${{ matrix.setup-env-cmd }}
-        cmake ${{ env.COMMON_CMAKE_OPTIONS }} \
+        cmake ${{ env.COMMON_CMAKE_OPTIONS }} ${{ matrix.cmake-options }} \
             `cat ../options.txt` -DBUILD_opencv_world=OFF -DOPENCV_DISABLE_FILESYSTEM_SUPPORT=ON ..
         cmake --build . -j $(nproc)
         cmake --build . --target install
@@ -177,7 +229,7 @@ jobs:
       run: |
         cd test
         mkdir build && cd build
-        ${{ matrix.setup-env-cmd }}
+        ${{ matrix.setup-test-env-cmd }}
         cmake ${{ env.COMMON_CMAKE_OPTIONS }} -DOpenCV_DIR=$GITHUB_WORKSPACE/${{ env.PACKAGE_NAME }}/lib/cmake/opencv4 ..
         cmake --build . -j $(nproc)