Skip to content

Commit d8027b4

Browse files
nihuinihui
authored
update opencv 4.10.0 (nihui#121)
1 parent f6e4652 commit d8027b4

12 files changed

+470
-401
lines changed

‎.github/workflows/release.yml‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ jobs:
153153
zip -9 -r opencv-mobile-${{ env.opencv-version }}.zip opencv-mobile-${{ env.opencv-version }}
154154
- name: opencv4-source
155155
env:
156-
opencv-version: 4.9.0
156+
opencv-version: 4.10.0
157157
run: |
158158
wget -q https://github.com/opencv/opencv/archive/${{ env.opencv-version }}.zip -O opencv-${{ env.opencv-version }}.zip
159159
unzip -q opencv-${{ env.opencv-version }}.zip
@@ -234,15 +234,15 @@ jobs:
234234
- name: upload-opencv4-source
235235
uses: actions/upload-artifact@v4
236236
with:
237-
name: opencv-mobile-4.9.0-source
238-
path: opencv-mobile-4.9.0.zip
237+
name: opencv-mobile-4.10.0-source
238+
path: opencv-mobile-4.10.0.zip
239239

240240
android:
241241
needs: [setup]
242242
runs-on: ubuntu-latest
243243
strategy:
244244
matrix:
245-
opencv-version: [2.4.13.7, 3.4.20, 4.9.0]
245+
opencv-version: [2.4.13.7, 3.4.20, 4.10.0]
246246
env:
247247
COMMON_CMAKE_OPTIONS: |
248248
-DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_LATEST_HOME/build/cmake/android.toolchain.cmake \
@@ -342,7 +342,7 @@ jobs:
342342
runs-on: macos-13
343343
strategy:
344344
matrix:
345-
opencv-version: [2.4.13.7, 3.4.20, 4.9.0]
345+
opencv-version: [2.4.13.7, 3.4.20, 4.10.0]
346346
env:
347347
COMMON_CMAKE_OPTIONS: |
348348
-DCMAKE_TOOLCHAIN_FILE=../../toolchains/ios.toolchain.cmake \
@@ -414,7 +414,7 @@ jobs:
414414
runs-on: macos-13
415415
strategy:
416416
matrix:
417-
opencv-version: [2.4.13.7, 3.4.20, 4.9.0]
417+
opencv-version: [2.4.13.7, 3.4.20, 4.10.0]
418418
env:
419419
COMMON_CMAKE_OPTIONS: |
420420
-DCMAKE_TOOLCHAIN_FILE=../../toolchains/ios.toolchain.cmake \
@@ -496,7 +496,7 @@ jobs:
496496
runs-on: ubuntu-latest
497497
strategy:
498498
matrix:
499-
opencv-version: [2.4.13.7, 3.4.20, 4.9.0]
499+
opencv-version: [2.4.13.7, 3.4.20, 4.10.0]
500500
env:
501501
COMMON_CMAKE_OPTIONS: |
502502
-DCMAKE_C_FLAGS="-fno-rtti -fno-exceptions" \
@@ -556,7 +556,7 @@ jobs:
556556
if: matrix.opencv-version == '2.4.13.7' || matrix.opencv-version == '3.4.20'
557557
run: echo "OPENCV_SUBDIR=share/OpenCV" >> $GITHUB_ENV
558558
- name: set-opencv-dir
559-
if: matrix.opencv-version == '4.9.0'
559+
if: matrix.opencv-version == '4.10.0'
560560
run: echo "OPENCV_SUBDIR=lib/cmake/opencv4" >> $GITHUB_ENV
561561
- name: test-arm-linux-gnueabi
562562
run: |
@@ -590,7 +590,7 @@ jobs:
590590
runs-on: macos-13
591591
strategy:
592592
matrix:
593-
opencv-version: [2.4.13.7, 3.4.20, 4.9.0]
593+
opencv-version: [2.4.13.7, 3.4.20, 4.10.0]
594594
env:
595595
COMMON_CMAKE_OPTIONS: |
596596
-DCMAKE_TOOLCHAIN_FILE=../../toolchains/ios.toolchain.cmake \
@@ -676,7 +676,7 @@ jobs:
676676
runs-on: macos-13
677677
strategy:
678678
matrix:
679-
opencv-version: [2.4.13.7, 3.4.20, 4.9.0]
679+
opencv-version: [2.4.13.7, 3.4.20, 4.10.0]
680680
env:
681681
COMMON_CMAKE_OPTIONS: |
682682
-DCMAKE_TOOLCHAIN_FILE=../../toolchains/ios.toolchain.cmake \
@@ -758,7 +758,7 @@ jobs:
758758
runs-on: macos-13
759759
strategy:
760760
matrix:
761-
opencv-version: [2.4.13.7, 3.4.20, 4.9.0]
761+
opencv-version: [2.4.13.7, 3.4.20, 4.10.0]
762762
env:
763763
COMMON_CMAKE_OPTIONS: |
764764
-DCMAKE_TOOLCHAIN_FILE=../../toolchains/ios.toolchain.cmake \
@@ -840,7 +840,7 @@ jobs:
840840
runs-on: macos-13
841841
strategy:
842842
matrix:
843-
opencv-version: [2.4.13.7, 3.4.20, 4.9.0]
843+
opencv-version: [2.4.13.7, 3.4.20, 4.10.0]
844844
env:
845845
COMMON_CMAKE_OPTIONS: |
846846
-DCMAKE_TOOLCHAIN_FILE=../../toolchains/ios.toolchain.cmake \
@@ -922,7 +922,7 @@ jobs:
922922
runs-on: macos-13
923923
strategy:
924924
matrix:
925-
opencv-version: [2.4.13.7, 3.4.20, 4.9.0]
925+
opencv-version: [2.4.13.7, 3.4.20, 4.10.0]
926926
env:
927927
COMMON_CMAKE_OPTIONS: |
928928
-DCMAKE_TOOLCHAIN_FILE=../../toolchains/ios.toolchain.cmake \
@@ -1004,7 +1004,7 @@ jobs:
10041004
runs-on: macos-13
10051005
strategy:
10061006
matrix:
1007-
opencv-version: [2.4.13.7, 3.4.20, 4.9.0]
1007+
opencv-version: [2.4.13.7, 3.4.20, 4.10.0]
10081008
env:
10091009
COMMON_CMAKE_OPTIONS: |
10101010
-DCMAKE_TOOLCHAIN_FILE=../../toolchains/ios.toolchain.cmake \
@@ -1086,7 +1086,7 @@ jobs:
10861086
runs-on: macos-13
10871087
strategy:
10881088
matrix:
1089-
opencv-version: [2.4.13.7, 3.4.20, 4.9.0]
1089+
opencv-version: [2.4.13.7, 3.4.20, 4.10.0]
10901090
env:
10911091
COMMON_CMAKE_OPTIONS: |
10921092
-DCMAKE_TOOLCHAIN_FILE=../../toolchains/ios.toolchain.cmake \
@@ -1158,7 +1158,7 @@ jobs:
11581158
runs-on: macos-13
11591159
strategy:
11601160
matrix:
1161-
opencv-version: [2.4.13.7, 3.4.20, 4.9.0]
1161+
opencv-version: [2.4.13.7, 3.4.20, 4.10.0]
11621162
env:
11631163
COMMON_CMAKE_OPTIONS: |
11641164
-DCMAKE_TOOLCHAIN_FILE=../../toolchains/ios.toolchain.cmake \
@@ -1239,7 +1239,7 @@ jobs:
12391239
needs: [setup]
12401240
strategy:
12411241
matrix:
1242-
opencv-version: [2.4.13.7, 3.4.20, 4.9.0]
1242+
opencv-version: [2.4.13.7, 3.4.20, 4.10.0]
12431243
os-compiler:
12441244
- { msvc-version: vs2015, windows-version: 2019, toolset-version: v140 }
12451245
- { msvc-version: vs2017, windows-version: 2019, toolset-version: v141 }
@@ -1303,7 +1303,7 @@ jobs:
13031303
needs: [setup]
13041304
strategy:
13051305
matrix:
1306-
opencv-version: [2.4.13.7, 3.4.20, 4.9.0]
1306+
opencv-version: [2.4.13.7, 3.4.20, 4.10.0]
13071307
os-ubuntu:
13081308
- { ubuntu-id: 2004, ubuntu-version: 20.04 }
13091309
- { ubuntu-id: 2204, ubuntu-version: 22.04 }
@@ -1338,7 +1338,7 @@ jobs:
13381338
if: matrix.opencv-version == '2.4.13.7' || matrix.opencv-version == '3.4.20'
13391339
run: echo "OPENCV_SUBDIR=share/OpenCV" >> $GITHUB_ENV
13401340
- name: set-opencv-dir
1341-
if: matrix.opencv-version == '4.9.0'
1341+
if: matrix.opencv-version == '4.10.0'
13421342
run: echo "OPENCV_SUBDIR=lib/cmake/opencv4" >> $GITHUB_ENV
13431343
- name: test
13441344
run: |
@@ -1357,7 +1357,7 @@ jobs:
13571357
runs-on: ubuntu-20.04
13581358
strategy:
13591359
matrix:
1360-
opencv-version: [2.4.13.7, 3.4.20, 4.9.0]
1360+
opencv-version: [2.4.13.7, 3.4.20, 4.10.0]
13611361
env:
13621362
COMMON_CMAKE_OPTIONS: |
13631363
-DCMAKE_TOOLCHAIN_FILE=../emsdk/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake \
@@ -1443,7 +1443,7 @@ jobs:
14431443
if: matrix.opencv-version == '2.4.13.7' || matrix.opencv-version == '3.4.20'
14441444
run: echo "OPENCV_SUBDIR=share/OpenCV" >> $GITHUB_ENV
14451445
- name: set-opencv-dir
1446-
if: matrix.opencv-version == '4.9.0'
1446+
if: matrix.opencv-version == '4.10.0'
14471447
run: echo "OPENCV_SUBDIR=lib/cmake/opencv4" >> $GITHUB_ENV
14481448
- name: test
14491449
run: |
@@ -1492,7 +1492,7 @@ jobs:
14921492
runs-on: macos-13
14931493
strategy:
14941494
matrix:
1495-
opencv-version: [2.4.13.7, 3.4.20, 4.9.0]
1495+
opencv-version: [2.4.13.7, 3.4.20, 4.10.0]
14961496
steps:
14971497
- run: sudo xcode-select --switch /Applications/Xcode_15.2.app
14981498
- uses: actions/checkout@v4
@@ -1691,20 +1691,20 @@ jobs:
16911691
- uses: actions/checkout@v4
16921692
- uses: actions/download-artifact@v4
16931693
with:
1694-
name: opencv-mobile-4.9.0-source
1694+
name: opencv-mobile-4.10.0-source
16951695
- name: setup-opencv-source
16961696
run: |
1697-
unzip -q opencv-mobile-4.9.0.zip
1698-
echo "SOURCE_DIR=opencv-mobile-4.9.0" >> $GITHUB_ENV
1699-
echo "PACKAGE_NAME=opencv-mobile-4.9.0-${{ matrix.name }}" >> $GITHUB_ENV
1697+
unzip -q opencv-mobile-4.10.0.zip
1698+
echo "SOURCE_DIR=opencv-mobile-4.10.0" >> $GITHUB_ENV
1699+
echo "PACKAGE_NAME=opencv-mobile-4.10.0-${{ matrix.name }}" >> $GITHUB_ENV
17001700
- name: setup-toolchain
17011701
run: ${{ matrix.setup-toolchain-cmd }}
17021702

17031703
- name: build-disable-thread
17041704
if: ${{ matrix.single-core }}
17051705
run: |
17061706
cd ${{ env.SOURCE_DIR }}
1707-
patch -p1 -i ../patches/opencv-4.9.0-no-atomic.patch
1707+
patch -p1 -i ../patches/opencv-4.10.0-no-atomic.patch
17081708
mkdir build && cd build
17091709
${{ matrix.setup-env-cmd }}
17101710
cmake ${{ env.COMMON_CMAKE_OPTIONS }} ${{ matrix.cmake-options }} \

0 commit comments

Comments
 (0)