Skip to content

Commit

Permalink
update opencv 4.10.0 (#121)
Browse files Browse the repository at this point in the history
  • Loading branch information
@nihui
nihui authored Jun 5, 2024
1 parent f6e4652 commit d8027b4
Show file tree
Hide file tree
Showing 12 changed files with 470 additions and 401 deletions.
54 changes: 27 additions & 27 deletions .github/workflows/release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ jobs:
zip -9 -r opencv-mobile-${{ env.opencv-version }}.zip opencv-mobile-${{ env.opencv-version }}
- name: opencv4-source
env:
opencv-version: 4.9.0
opencv-version: 4.10.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
Expand Down Expand Up @@ -234,15 +234,15 @@ 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.10.0-source
path: opencv-mobile-4.10.0.zip

android:
needs: [setup]
runs-on: ubuntu-latest
strategy:
matrix:
opencv-version: [2.4.13.7, 3.4.20, 4.9.0]
opencv-version: [2.4.13.7, 3.4.20, 4.10.0]
env:
COMMON_CMAKE_OPTIONS: |
-DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_LATEST_HOME/build/cmake/android.toolchain.cmake \
Expand Down Expand Up @@ -342,7 +342,7 @@ jobs:
runs-on: macos-13
strategy:
matrix:
opencv-version: [2.4.13.7, 3.4.20, 4.9.0]
opencv-version: [2.4.13.7, 3.4.20, 4.10.0]
env:
COMMON_CMAKE_OPTIONS: |
-DCMAKE_TOOLCHAIN_FILE=../../toolchains/ios.toolchain.cmake \
Expand Down Expand Up @@ -414,7 +414,7 @@ jobs:
runs-on: macos-13
strategy:
matrix:
opencv-version: [2.4.13.7, 3.4.20, 4.9.0]
opencv-version: [2.4.13.7, 3.4.20, 4.10.0]
env:
COMMON_CMAKE_OPTIONS: |
-DCMAKE_TOOLCHAIN_FILE=../../toolchains/ios.toolchain.cmake \
Expand Down Expand Up @@ -496,7 +496,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
opencv-version: [2.4.13.7, 3.4.20, 4.9.0]
opencv-version: [2.4.13.7, 3.4.20, 4.10.0]
env:
COMMON_CMAKE_OPTIONS: |
-DCMAKE_C_FLAGS="-fno-rtti -fno-exceptions" \
Expand Down Expand Up @@ -556,7 +556,7 @@ jobs:
if: matrix.opencv-version == '2.4.13.7' || matrix.opencv-version == '3.4.20'
run: echo "OPENCV_SUBDIR=share/OpenCV" >> $GITHUB_ENV
- name: set-opencv-dir
if: matrix.opencv-version == '4.9.0'
if: matrix.opencv-version == '4.10.0'
run: echo "OPENCV_SUBDIR=lib/cmake/opencv4" >> $GITHUB_ENV
- name: test-arm-linux-gnueabi
run: |
Expand Down Expand Up @@ -590,7 +590,7 @@ jobs:
runs-on: macos-13
strategy:
matrix:
opencv-version: [2.4.13.7, 3.4.20, 4.9.0]
opencv-version: [2.4.13.7, 3.4.20, 4.10.0]
env:
COMMON_CMAKE_OPTIONS: |
-DCMAKE_TOOLCHAIN_FILE=../../toolchains/ios.toolchain.cmake \
Expand Down Expand Up @@ -676,7 +676,7 @@ jobs:
runs-on: macos-13
strategy:
matrix:
opencv-version: [2.4.13.7, 3.4.20, 4.9.0]
opencv-version: [2.4.13.7, 3.4.20, 4.10.0]
env:
COMMON_CMAKE_OPTIONS: |
-DCMAKE_TOOLCHAIN_FILE=../../toolchains/ios.toolchain.cmake \
Expand Down Expand Up @@ -758,7 +758,7 @@ jobs:
runs-on: macos-13
strategy:
matrix:
opencv-version: [2.4.13.7, 3.4.20, 4.9.0]
opencv-version: [2.4.13.7, 3.4.20, 4.10.0]
env:
COMMON_CMAKE_OPTIONS: |
-DCMAKE_TOOLCHAIN_FILE=../../toolchains/ios.toolchain.cmake \
Expand Down Expand Up @@ -840,7 +840,7 @@ jobs:
runs-on: macos-13
strategy:
matrix:
opencv-version: [2.4.13.7, 3.4.20, 4.9.0]
opencv-version: [2.4.13.7, 3.4.20, 4.10.0]
env:
COMMON_CMAKE_OPTIONS: |
-DCMAKE_TOOLCHAIN_FILE=../../toolchains/ios.toolchain.cmake \
Expand Down Expand Up @@ -922,7 +922,7 @@ jobs:
runs-on: macos-13
strategy:
matrix:
opencv-version: [2.4.13.7, 3.4.20, 4.9.0]
opencv-version: [2.4.13.7, 3.4.20, 4.10.0]
env:
COMMON_CMAKE_OPTIONS: |
-DCMAKE_TOOLCHAIN_FILE=../../toolchains/ios.toolchain.cmake \
Expand Down Expand Up @@ -1004,7 +1004,7 @@ jobs:
runs-on: macos-13
strategy:
matrix:
opencv-version: [2.4.13.7, 3.4.20, 4.9.0]
opencv-version: [2.4.13.7, 3.4.20, 4.10.0]
env:
COMMON_CMAKE_OPTIONS: |
-DCMAKE_TOOLCHAIN_FILE=../../toolchains/ios.toolchain.cmake \
Expand Down Expand Up @@ -1086,7 +1086,7 @@ jobs:
runs-on: macos-13
strategy:
matrix:
opencv-version: [2.4.13.7, 3.4.20, 4.9.0]
opencv-version: [2.4.13.7, 3.4.20, 4.10.0]
env:
COMMON_CMAKE_OPTIONS: |
-DCMAKE_TOOLCHAIN_FILE=../../toolchains/ios.toolchain.cmake \
Expand Down Expand Up @@ -1158,7 +1158,7 @@ jobs:
runs-on: macos-13
strategy:
matrix:
opencv-version: [2.4.13.7, 3.4.20, 4.9.0]
opencv-version: [2.4.13.7, 3.4.20, 4.10.0]
env:
COMMON_CMAKE_OPTIONS: |
-DCMAKE_TOOLCHAIN_FILE=../../toolchains/ios.toolchain.cmake \
Expand Down Expand Up @@ -1239,7 +1239,7 @@ jobs:
needs: [setup]
strategy:
matrix:
opencv-version: [2.4.13.7, 3.4.20, 4.9.0]
opencv-version: [2.4.13.7, 3.4.20, 4.10.0]
os-compiler:
- { msvc-version: vs2015, windows-version: 2019, toolset-version: v140 }
- { msvc-version: vs2017, windows-version: 2019, toolset-version: v141 }
Expand Down Expand Up @@ -1303,7 +1303,7 @@ jobs:
needs: [setup]
strategy:
matrix:
opencv-version: [2.4.13.7, 3.4.20, 4.9.0]
opencv-version: [2.4.13.7, 3.4.20, 4.10.0]
os-ubuntu:
- { ubuntu-id: 2004, ubuntu-version: 20.04 }
- { ubuntu-id: 2204, ubuntu-version: 22.04 }
Expand Down Expand Up @@ -1338,7 +1338,7 @@ jobs:
if: matrix.opencv-version == '2.4.13.7' || matrix.opencv-version == '3.4.20'
run: echo "OPENCV_SUBDIR=share/OpenCV" >> $GITHUB_ENV
- name: set-opencv-dir
if: matrix.opencv-version == '4.9.0'
if: matrix.opencv-version == '4.10.0'
run: echo "OPENCV_SUBDIR=lib/cmake/opencv4" >> $GITHUB_ENV
- name: test
run: |
Expand All @@ -1357,7 +1357,7 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
opencv-version: [2.4.13.7, 3.4.20, 4.9.0]
opencv-version: [2.4.13.7, 3.4.20, 4.10.0]
env:
COMMON_CMAKE_OPTIONS: |
-DCMAKE_TOOLCHAIN_FILE=../emsdk/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake \
Expand Down Expand Up @@ -1443,7 +1443,7 @@ jobs:
if: matrix.opencv-version == '2.4.13.7' || matrix.opencv-version == '3.4.20'
run: echo "OPENCV_SUBDIR=share/OpenCV" >> $GITHUB_ENV
- name: set-opencv-dir
if: matrix.opencv-version == '4.9.0'
if: matrix.opencv-version == '4.10.0'
run: echo "OPENCV_SUBDIR=lib/cmake/opencv4" >> $GITHUB_ENV
- name: test
run: |
Expand Down Expand Up @@ -1492,7 +1492,7 @@ jobs:
runs-on: macos-13
strategy:
matrix:
opencv-version: [2.4.13.7, 3.4.20, 4.9.0]
opencv-version: [2.4.13.7, 3.4.20, 4.10.0]
steps:
- run: sudo xcode-select --switch /Applications/Xcode_15.2.app
- uses: actions/checkout@v4
Expand Down Expand Up @@ -1691,20 +1691,20 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/download-artifact@v4
with:
name: opencv-mobile-4.9.0-source
name: opencv-mobile-4.10.0-source
- 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.10.0.zip
echo "SOURCE_DIR=opencv-mobile-4.10.0" >> $GITHUB_ENV
echo "PACKAGE_NAME=opencv-mobile-4.10.0-${{ matrix.name }}" >> $GITHUB_ENV
- name: setup-toolchain
run: ${{ matrix.setup-toolchain-cmd }}

- 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.10.0-no-atomic.patch
mkdir build && cd build
${{ matrix.setup-env-cmd }}
cmake ${{ env.COMMON_CMAKE_OPTIONS }} ${{ matrix.cmake-options }} \
Expand Down
Loading

0 comments on commit d8027b4

Please sign in to comment.