Skip to content

Commit 976cd0d

Browse files
nihuinihui
authored
update opencv 4.9.0 (#85)
1 parent a3438a1 commit 976cd0d

13 files changed

+242
-277
lines changed

‎.github/workflows/release.yml‎

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
zip -9 -r opencv-mobile-${{ env.opencv-version }}.zip opencv-mobile-${{ env.opencv-version }}
8989
- name: opencv4-source
9090
env:
91-
opencv-version: 4.8.1
91+
opencv-version: 4.9.0
9292
run: |
9393
wget -q https://github.com/opencv/opencv/archive/${{ env.opencv-version }}.zip -O opencv-${{ env.opencv-version }}.zip
9494
unzip -q opencv-${{ env.opencv-version }}.zip
@@ -99,7 +99,6 @@ jobs:
9999
patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-no-rtti.patch
100100
patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-no-zlib.patch
101101
patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-link-openmp.patch
102-
patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-fix-emscripten-include.patch
103102
patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-minimal-install.patch
104103
cp ../patches/draw_text.h ../patches/mono_font_data.h modules/imgproc/src/
105104
patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-drawing-mono-font.patch
@@ -128,15 +127,15 @@ jobs:
128127
- name: upload-opencv4-source
129128
uses: actions/upload-artifact@v3
130129
with:
131-
name: opencv-mobile-4.8.1-source
132-
path: opencv-mobile-4.8.1.zip
130+
name: opencv-mobile-4.9.0-source
131+
path: opencv-mobile-4.9.0.zip
133132

134133
android:
135134
needs: [setup]
136135
runs-on: ubuntu-latest
137136
strategy:
138137
matrix:
139-
opencv-version: [2.4.13.7, 3.4.20, 4.8.1]
138+
opencv-version: [2.4.13.7, 3.4.20, 4.9.0]
140139
env:
141140
COMMON_CMAKE_OPTIONS: |
142141
-DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_LATEST_HOME/build/cmake/android.toolchain.cmake \
@@ -236,7 +235,7 @@ jobs:
236235
runs-on: macos-12
237236
strategy:
238237
matrix:
239-
opencv-version: [2.4.13.7, 3.4.20, 4.8.1]
238+
opencv-version: [2.4.13.7, 3.4.20, 4.9.0]
240239
bitcode: [OFF, ON]
241240
env:
242241
COMMON_CMAKE_OPTIONS: |
@@ -336,7 +335,7 @@ jobs:
336335
runs-on: macos-12
337336
strategy:
338337
matrix:
339-
opencv-version: [2.4.13.7, 3.4.20, 4.8.1]
338+
opencv-version: [2.4.13.7, 3.4.20, 4.9.0]
340339
bitcode: [OFF, ON]
341340
env:
342341
COMMON_CMAKE_OPTIONS: |
@@ -436,7 +435,7 @@ jobs:
436435
runs-on: ubuntu-latest
437436
strategy:
438437
matrix:
439-
opencv-version: [2.4.13.7, 3.4.20, 4.8.1]
438+
opencv-version: [2.4.13.7, 3.4.20, 4.9.0]
440439
env:
441440
COMMON_CMAKE_OPTIONS: |
442441
-DCMAKE_C_FLAGS="-fno-rtti -fno-exceptions" \
@@ -496,7 +495,7 @@ jobs:
496495
if: matrix.opencv-version == '2.4.13.7' || matrix.opencv-version == '3.4.20'
497496
run: echo "OPENCV_SUBDIR=share/OpenCV" >> $GITHUB_ENV
498497
- name: set-opencv-dir
499-
if: matrix.opencv-version == '4.8.1'
498+
if: matrix.opencv-version == '4.9.0'
500499
run: echo "OPENCV_SUBDIR=lib/cmake/opencv4" >> $GITHUB_ENV
501500
- name: test-arm-linux-gnueabi
502501
run: |
@@ -530,7 +529,7 @@ jobs:
530529
runs-on: macos-12
531530
strategy:
532531
matrix:
533-
opencv-version: [2.4.13.7, 3.4.20, 4.8.1]
532+
opencv-version: [2.4.13.7, 3.4.20, 4.9.0]
534533
env:
535534
COMMON_CMAKE_OPTIONS: |
536535
-DCMAKE_TOOLCHAIN_FILE=../../toolchains/ios.toolchain.cmake \
@@ -616,7 +615,7 @@ jobs:
616615
runs-on: macos-12
617616
strategy:
618617
matrix:
619-
opencv-version: [2.4.13.7, 3.4.20, 4.8.1]
618+
opencv-version: [2.4.13.7, 3.4.20, 4.9.0]
620619
bitcode: [OFF, ON]
621620
env:
622621
COMMON_CMAKE_OPTIONS: |
@@ -705,7 +704,7 @@ jobs:
705704
needs: [setup]
706705
strategy:
707706
matrix:
708-
opencv-version: [2.4.13.7, 3.4.20, 4.8.1]
707+
opencv-version: [2.4.13.7, 3.4.20, 4.9.0]
709708
os-compiler:
710709
- { msvc-version: vs2015, windows-version: 2019, toolset-version: v140 }
711710
- { msvc-version: vs2017, windows-version: 2019, toolset-version: v141 }
@@ -769,7 +768,7 @@ jobs:
769768
needs: [setup]
770769
strategy:
771770
matrix:
772-
opencv-version: [2.4.13.7, 3.4.20, 4.8.1]
771+
opencv-version: [2.4.13.7, 3.4.20, 4.9.0]
773772
os-ubuntu:
774773
- { ubuntu-id: 2004, ubuntu-version: 20.04 }
775774
- { ubuntu-id: 2204, ubuntu-version: 22.04 }
@@ -804,7 +803,7 @@ jobs:
804803
if: matrix.opencv-version == '2.4.13.7' || matrix.opencv-version == '3.4.20'
805804
run: echo "OPENCV_SUBDIR=share/OpenCV" >> $GITHUB_ENV
806805
- name: set-opencv-dir
807-
if: matrix.opencv-version == '4.8.1'
806+
if: matrix.opencv-version == '4.9.0'
808807
run: echo "OPENCV_SUBDIR=lib/cmake/opencv4" >> $GITHUB_ENV
809808
- name: test
810809
run: |
@@ -823,7 +822,7 @@ jobs:
823822
runs-on: ubuntu-20.04
824823
strategy:
825824
matrix:
826-
opencv-version: [2.4.13.7, 3.4.20, 4.8.1]
825+
opencv-version: [2.4.13.7, 3.4.20, 4.9.0]
827826
env:
828827
COMMON_CMAKE_OPTIONS: |
829828
-DCMAKE_TOOLCHAIN_FILE=../emsdk/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake \
@@ -909,7 +908,7 @@ jobs:
909908
if: matrix.opencv-version == '2.4.13.7' || matrix.opencv-version == '3.4.20'
910909
run: echo "OPENCV_SUBDIR=share/OpenCV" >> $GITHUB_ENV
911910
- name: set-opencv-dir
912-
if: matrix.opencv-version == '4.8.1'
911+
if: matrix.opencv-version == '4.9.0'
913912
run: echo "OPENCV_SUBDIR=lib/cmake/opencv4" >> $GITHUB_ENV
914913
- name: test
915914
run: |
@@ -958,7 +957,7 @@ jobs:
958957
runs-on: macos-12
959958
strategy:
960959
matrix:
961-
opencv-version: [2.4.13.7, 3.4.20, 4.8.1]
960+
opencv-version: [2.4.13.7, 3.4.20, 4.9.0]
962961
bitcode: [OFF, ON]
963962
steps:
964963
- run: sudo xcode-select --switch /Applications/Xcode_13.4.1.app
@@ -1074,20 +1073,20 @@ jobs:
10741073
- uses: actions/checkout@v3
10751074
- uses: actions/download-artifact@v3
10761075
with:
1077-
name: opencv-mobile-4.8.1-source
1076+
name: opencv-mobile-4.9.0-source
10781077
- name: setup-opencv-source
10791078
run: |
1080-
unzip -q opencv-mobile-4.8.1.zip
1081-
echo "SOURCE_DIR=opencv-mobile-4.8.1" >> $GITHUB_ENV
1082-
echo "PACKAGE_NAME=opencv-mobile-4.8.1-${{ matrix.name }}" >> $GITHUB_ENV
1079+
unzip -q opencv-mobile-4.9.0.zip
1080+
echo "SOURCE_DIR=opencv-mobile-4.9.0" >> $GITHUB_ENV
1081+
echo "PACKAGE_NAME=opencv-mobile-4.9.0-${{ matrix.name }}" >> $GITHUB_ENV
10831082
- name: setup-toolchain
10841083
run: ${{ matrix.setup-toolchain-cmd }}
10851084

10861085
- name: build-disable-thread
10871086
if: ${{ matrix.single-core }}
10881087
run: |
10891088
cd ${{ env.SOURCE_DIR }}
1090-
patch -p1 -i ../patches/opencv-4.8.1-no-atomic.patch
1089+
patch -p1 -i ../patches/opencv-4.9.0-no-atomic.patch
10911090
mkdir build && cd build
10921091
${{ matrix.setup-env-cmd }}
10931092
cmake ${{ env.COMMON_CMAKE_OPTIONS }} \

0 commit comments

Comments
 (0)