zishuo/opencv-mobile
1
0
Fork 0
mirror of https://github.com/nihui/opencv-mobile.git synced 2025-09-26 20:41:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 4.8.1

Browse Source
This commit is contained in:
nihui
2023-10-11 11:11:09 +08:00
parent e69c090f2b
commit 9d58ba902d
9 changed files with 103 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

202
.github/workflows/release.yml vendored
View File

@@ -34,8 +34,8 @@ jobs:
android-opencv4: android-opencv4:
runs-on: ubuntu-latest runs-on: ubuntu-latest
env: env:
OPENCV_VERSION: 4.8.0 OPENCV_VERSION: 4.8.1
PACKAGENAME: opencv-mobile-4.8.0-android PACKAGENAME: opencv-mobile-4.8.1-android
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: ndk-fix-debug - name: ndk-fix-debug
@@ -47,9 +47,9 @@ jobs:
cd opencv-${{ env.OPENCV_VERSION }} cd opencv-${{ env.OPENCV_VERSION }}
truncate -s 0 cmake/OpenCVFindLibsGrfmt.cmake truncate -s 0 cmake/OpenCVFindLibsGrfmt.cmake
rm -rf modules/gapi rm -rf modules/gapi
patch -p1 -i ../opencv-4.8.0-no-rtti.patch patch -p1 -i ../opencv-4.8.1-no-rtti.patch
patch -p1 -i ../opencv-4.8.0-no-zlib.patch patch -p1 -i ../opencv-4.8.1-no-zlib.patch
patch -p1 -i ../opencv-4.8.0-link-openmp.patch patch -p1 -i ../opencv-4.8.1-link-openmp.patch
rm -rf modules/highgui rm -rf modules/highgui
cp -r ../highgui modules/ cp -r ../highgui modules/
- name: build-armeabi-v7a - name: build-armeabi-v7a
@@ -359,8 +359,8 @@ jobs:
ios-opencv4: ios-opencv4:
runs-on: macos-12 runs-on: macos-12
env: env:
OPENCV_VERSION: 4.8.0 OPENCV_VERSION: 4.8.1
PACKAGENAME: opencv-mobile-4.8.0-ios PACKAGENAME: opencv-mobile-4.8.1-ios
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: opencv-source - name: opencv-source
@@ -370,9 +370,9 @@ jobs:
cd opencv-${{ env.OPENCV_VERSION }} cd opencv-${{ env.OPENCV_VERSION }}
echo -n > cmake/OpenCVFindLibsGrfmt.cmake echo -n > cmake/OpenCVFindLibsGrfmt.cmake
rm -rf modules/gapi rm -rf modules/gapi
patch -p1 -i ../opencv-4.8.0-no-rtti.patch patch -p1 -i ../opencv-4.8.1-no-rtti.patch
patch -p1 -i ../opencv-4.8.0-no-zlib.patch patch -p1 -i ../opencv-4.8.1-no-zlib.patch
patch -p1 -i ../opencv-4.8.0-link-openmp.patch patch -p1 -i ../opencv-4.8.1-link-openmp.patch
rm -rf modules/highgui rm -rf modules/highgui
cp -r ../highgui modules/ cp -r ../highgui modules/
- name: build-armv7 - name: build-armv7
@@ -629,8 +629,8 @@ jobs:
ios-opencv4-bitcode: ios-opencv4-bitcode:
runs-on: macos-12 runs-on: macos-12
env: env:
OPENCV_VERSION: 4.8.0 OPENCV_VERSION: 4.8.1
PACKAGENAME: opencv-mobile-4.8.0-ios-bitcode PACKAGENAME: opencv-mobile-4.8.1-ios-bitcode
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: opencv-source - name: opencv-source
@@ -640,9 +640,9 @@ jobs:
cd opencv-${{ env.OPENCV_VERSION }} cd opencv-${{ env.OPENCV_VERSION }}
echo -n > cmake/OpenCVFindLibsGrfmt.cmake echo -n > cmake/OpenCVFindLibsGrfmt.cmake
rm -rf modules/gapi rm -rf modules/gapi
patch -p1 -i ../opencv-4.8.0-no-rtti.patch patch -p1 -i ../opencv-4.8.1-no-rtti.patch
patch -p1 -i ../opencv-4.8.0-no-zlib.patch patch -p1 -i ../opencv-4.8.1-no-zlib.patch
patch -p1 -i ../opencv-4.8.0-link-openmp.patch patch -p1 -i ../opencv-4.8.1-link-openmp.patch
rm -rf modules/highgui rm -rf modules/highgui
cp -r ../highgui modules/ cp -r ../highgui modules/
- name: build-armv7 - name: build-armv7
@@ -899,8 +899,8 @@ jobs:
ios-simulator-opencv4: ios-simulator-opencv4:
runs-on: macos-12 runs-on: macos-12
env: env:
OPENCV_VERSION: 4.8.0 OPENCV_VERSION: 4.8.1
PACKAGENAME: opencv-mobile-4.8.0-ios-simulator PACKAGENAME: opencv-mobile-4.8.1-ios-simulator
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: opencv-source - name: opencv-source
@@ -910,9 +910,9 @@ jobs:
cd opencv-${{ env.OPENCV_VERSION }} cd opencv-${{ env.OPENCV_VERSION }}
echo -n > cmake/OpenCVFindLibsGrfmt.cmake echo -n > cmake/OpenCVFindLibsGrfmt.cmake
rm -rf modules/gapi rm -rf modules/gapi
patch -p1 -i ../opencv-4.8.0-no-rtti.patch patch -p1 -i ../opencv-4.8.1-no-rtti.patch
patch -p1 -i ../opencv-4.8.0-no-zlib.patch patch -p1 -i ../opencv-4.8.1-no-zlib.patch
patch -p1 -i ../opencv-4.8.0-link-openmp.patch patch -p1 -i ../opencv-4.8.1-link-openmp.patch
rm -rf modules/highgui rm -rf modules/highgui
cp -r ../highgui modules/ cp -r ../highgui modules/
- name: build-i386 - name: build-i386
@@ -1169,8 +1169,8 @@ jobs:
ios-simulator-opencv4-bitcode: ios-simulator-opencv4-bitcode:
runs-on: macos-12 runs-on: macos-12
env: env:
OPENCV_VERSION: 4.8.0 OPENCV_VERSION: 4.8.1
PACKAGENAME: opencv-mobile-4.8.0-ios-simulator-bitcode PACKAGENAME: opencv-mobile-4.8.1-ios-simulator-bitcode
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: opencv-source - name: opencv-source
@@ -1180,9 +1180,9 @@ jobs:
cd opencv-${{ env.OPENCV_VERSION }} cd opencv-${{ env.OPENCV_VERSION }}
echo -n > cmake/OpenCVFindLibsGrfmt.cmake echo -n > cmake/OpenCVFindLibsGrfmt.cmake
rm -rf modules/gapi rm -rf modules/gapi
patch -p1 -i ../opencv-4.8.0-no-rtti.patch patch -p1 -i ../opencv-4.8.1-no-rtti.patch
patch -p1 -i ../opencv-4.8.0-no-zlib.patch patch -p1 -i ../opencv-4.8.1-no-zlib.patch
patch -p1 -i ../opencv-4.8.0-link-openmp.patch patch -p1 -i ../opencv-4.8.1-link-openmp.patch
rm -rf modules/highgui rm -rf modules/highgui
cp -r ../highgui modules/ cp -r ../highgui modules/
- name: build-i386 - name: build-i386
@@ -1439,8 +1439,8 @@ jobs:
armlinux-opencv4: armlinux-opencv4:
runs-on: ubuntu-latest runs-on: ubuntu-latest
env: env:
OPENCV_VERSION: 4.8.0 OPENCV_VERSION: 4.8.1
PACKAGENAME: opencv-mobile-4.8.0-armlinux PACKAGENAME: opencv-mobile-4.8.1-armlinux
steps: steps:
- name: arm-gnu-toolchain - name: arm-gnu-toolchain
run: | run: |
@@ -1455,9 +1455,9 @@ jobs:
cd opencv-${{ env.OPENCV_VERSION }} cd opencv-${{ env.OPENCV_VERSION }}
truncate -s 0 cmake/OpenCVFindLibsGrfmt.cmake truncate -s 0 cmake/OpenCVFindLibsGrfmt.cmake
rm -rf modules/gapi rm -rf modules/gapi
patch -p1 -i ../opencv-4.8.0-no-rtti.patch patch -p1 -i ../opencv-4.8.1-no-rtti.patch
patch -p1 -i ../opencv-4.8.0-no-zlib.patch patch -p1 -i ../opencv-4.8.1-no-zlib.patch
patch -p1 -i ../opencv-4.8.0-link-openmp.patch patch -p1 -i ../opencv-4.8.1-link-openmp.patch
rm -rf modules/highgui rm -rf modules/highgui
cp -r ../highgui modules/ cp -r ../highgui modules/
- name: build-arm-linux-gnueabi - name: build-arm-linux-gnueabi
@@ -1735,8 +1735,8 @@ jobs:
macos-opencv4: macos-opencv4:
runs-on: macos-12 runs-on: macos-12
env: env:
OPENCV_VERSION: 4.8.0 OPENCV_VERSION: 4.8.1
PACKAGENAME: opencv-mobile-4.8.0-macos PACKAGENAME: opencv-mobile-4.8.1-macos
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: opencv-source - name: opencv-source
@@ -1746,8 +1746,8 @@ jobs:
cd opencv-${{ env.OPENCV_VERSION }} cd opencv-${{ env.OPENCV_VERSION }}
echo -n > cmake/OpenCVFindLibsGrfmt.cmake echo -n > cmake/OpenCVFindLibsGrfmt.cmake
rm -rf modules/gapi rm -rf modules/gapi
patch -p1 -i ../opencv-4.8.0-no-zlib.patch patch -p1 -i ../opencv-4.8.1-no-zlib.patch
patch -p1 -i ../opencv-4.8.0-link-openmp.patch patch -p1 -i ../opencv-4.8.1-link-openmp.patch
rm -rf modules/highgui rm -rf modules/highgui
cp -r ../highgui modules/ cp -r ../highgui modules/
- name: build-x86_64 - name: build-x86_64
@@ -1969,8 +1969,8 @@ jobs:
mac-catalyst-opencv4: mac-catalyst-opencv4:
runs-on: macos-12 runs-on: macos-12
env: env:
OPENCV_VERSION: 4.8.0 OPENCV_VERSION: 4.8.1
PACKAGENAME: opencv-mobile-4.8.0-mac-catalyst PACKAGENAME: opencv-mobile-4.8.1-mac-catalyst
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: opencv-source - name: opencv-source
@@ -1980,8 +1980,8 @@ jobs:
cd opencv-${{ env.OPENCV_VERSION }} cd opencv-${{ env.OPENCV_VERSION }}
echo -n > cmake/OpenCVFindLibsGrfmt.cmake echo -n > cmake/OpenCVFindLibsGrfmt.cmake
rm -rf modules/gapi rm -rf modules/gapi
patch -p1 -i ../opencv-4.8.0-no-zlib.patch patch -p1 -i ../opencv-4.8.1-no-zlib.patch
patch -p1 -i ../opencv-4.8.0-link-openmp.patch patch -p1 -i ../opencv-4.8.1-link-openmp.patch
rm -rf modules/highgui rm -rf modules/highgui
cp -r ../highgui modules/ cp -r ../highgui modules/
- name: build-x86_64 - name: build-x86_64
@@ -2179,8 +2179,8 @@ jobs:
mac-catalyst-opencv4-bitcode: mac-catalyst-opencv4-bitcode:
runs-on: macos-12 runs-on: macos-12
env: env:
OPENCV_VERSION: 4.8.0 OPENCV_VERSION: 4.8.1
PACKAGENAME: opencv-mobile-4.8.0-mac-catalyst-bitcode PACKAGENAME: opencv-mobile-4.8.1-mac-catalyst-bitcode
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: opencv-source - name: opencv-source
@@ -2190,8 +2190,8 @@ jobs:
cd opencv-${{ env.OPENCV_VERSION }} cd opencv-${{ env.OPENCV_VERSION }}
echo -n > cmake/OpenCVFindLibsGrfmt.cmake echo -n > cmake/OpenCVFindLibsGrfmt.cmake
rm -rf modules/gapi rm -rf modules/gapi
patch -p1 -i ../opencv-4.8.0-no-zlib.patch patch -p1 -i ../opencv-4.8.1-no-zlib.patch
patch -p1 -i ../opencv-4.8.0-link-openmp.patch patch -p1 -i ../opencv-4.8.1-link-openmp.patch
rm -rf modules/highgui rm -rf modules/highgui
cp -r ../highgui modules/ cp -r ../highgui modules/
- name: build-x86_64 - name: build-x86_64
@@ -2389,8 +2389,8 @@ jobs:
windows-vs2015-opencv4: windows-vs2015-opencv4:
runs-on: windows-2019 runs-on: windows-2019
env: env:
OPENCV_VERSION: 4.8.0 OPENCV_VERSION: 4.8.1
PACKAGENAME: opencv-mobile-4.8.0-windows-vs2015 PACKAGENAME: opencv-mobile-4.8.1-windows-vs2015
UseMultiToolTask: true UseMultiToolTask: true
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
@@ -2401,8 +2401,8 @@ jobs:
cd opencv-${{ env.OPENCV_VERSION }} cd opencv-${{ env.OPENCV_VERSION }}
Clear-Content "cmake\OpenCVFindLibsGrfmt.cmake" Clear-Content "cmake\OpenCVFindLibsGrfmt.cmake"
Remove-Item "modules\gapi" -Recurse Remove-Item "modules\gapi" -Recurse
C:\msys64\usr\bin\patch.exe -p1 -i ..\opencv-4.8.0-no-zlib.patch C:\msys64\usr\bin\patch.exe -p1 -i ..\opencv-4.8.1-no-zlib.patch
C:\msys64\usr\bin\patch.exe -p1 -i ..\opencv-4.8.0-link-openmp.patch C:\msys64\usr\bin\patch.exe -p1 -i ..\opencv-4.8.1-link-openmp.patch
Remove-Item "modules\highgui" -Recurse Remove-Item "modules\highgui" -Recurse
Copy-Item -Recurse -Path "..\highgui" -Destination "modules\" Copy-Item -Recurse -Path "..\highgui" -Destination "modules\"
- name: build-x86 - name: build-x86
@@ -2573,8 +2573,8 @@ jobs:
windows-vs2017-opencv4: windows-vs2017-opencv4:
runs-on: windows-2019 runs-on: windows-2019
env: env:
OPENCV_VERSION: 4.8.0 OPENCV_VERSION: 4.8.1
PACKAGENAME: opencv-mobile-4.8.0-windows-vs2017 PACKAGENAME: opencv-mobile-4.8.1-windows-vs2017
UseMultiToolTask: true UseMultiToolTask: true
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
@@ -2585,8 +2585,8 @@ jobs:
cd opencv-${{ env.OPENCV_VERSION }} cd opencv-${{ env.OPENCV_VERSION }}
Clear-Content "cmake\OpenCVFindLibsGrfmt.cmake" Clear-Content "cmake\OpenCVFindLibsGrfmt.cmake"
Remove-Item "modules\gapi" -Recurse Remove-Item "modules\gapi" -Recurse
C:\msys64\usr\bin\patch.exe -p1 -i ..\opencv-4.8.0-no-zlib.patch C:\msys64\usr\bin\patch.exe -p1 -i ..\opencv-4.8.1-no-zlib.patch
C:\msys64\usr\bin\patch.exe -p1 -i ..\opencv-4.8.0-link-openmp.patch C:\msys64\usr\bin\patch.exe -p1 -i ..\opencv-4.8.1-link-openmp.patch
Remove-Item "modules\highgui" -Recurse Remove-Item "modules\highgui" -Recurse
Copy-Item -Recurse -Path "..\highgui" -Destination "modules\" Copy-Item -Recurse -Path "..\highgui" -Destination "modules\"
- name: build-x86 - name: build-x86
@@ -2757,8 +2757,8 @@ jobs:
windows-vs2019-opencv4: windows-vs2019-opencv4:
runs-on: windows-2019 runs-on: windows-2019
env: env:
OPENCV_VERSION: 4.8.0 OPENCV_VERSION: 4.8.1
PACKAGENAME: opencv-mobile-4.8.0-windows-vs2019 PACKAGENAME: opencv-mobile-4.8.1-windows-vs2019
UseMultiToolTask: true UseMultiToolTask: true
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
@@ -2769,8 +2769,8 @@ jobs:
cd opencv-${{ env.OPENCV_VERSION }} cd opencv-${{ env.OPENCV_VERSION }}
Clear-Content "cmake\OpenCVFindLibsGrfmt.cmake" Clear-Content "cmake\OpenCVFindLibsGrfmt.cmake"
Remove-Item "modules\gapi" -Recurse Remove-Item "modules\gapi" -Recurse
C:\msys64\usr\bin\patch.exe -p1 -i ..\opencv-4.8.0-no-zlib.patch C:\msys64\usr\bin\patch.exe -p1 -i ..\opencv-4.8.1-no-zlib.patch
C:\msys64\usr\bin\patch.exe -p1 -i ..\opencv-4.8.0-link-openmp.patch C:\msys64\usr\bin\patch.exe -p1 -i ..\opencv-4.8.1-link-openmp.patch
Remove-Item "modules\highgui" -Recurse Remove-Item "modules\highgui" -Recurse
Copy-Item -Recurse -Path "..\highgui" -Destination "modules\" Copy-Item -Recurse -Path "..\highgui" -Destination "modules\"
- name: build-x86 - name: build-x86
@@ -2941,8 +2941,8 @@ jobs:
windows-vs2022-opencv4: windows-vs2022-opencv4:
runs-on: windows-2022 runs-on: windows-2022
env: env:
OPENCV_VERSION: 4.8.0 OPENCV_VERSION: 4.8.1
PACKAGENAME: opencv-mobile-4.8.0-windows-vs2022 PACKAGENAME: opencv-mobile-4.8.1-windows-vs2022
UseMultiToolTask: true UseMultiToolTask: true
steps: steps:
- uses: msys2/setup-msys2@v2 - uses: msys2/setup-msys2@v2
@@ -2958,8 +2958,8 @@ jobs:
cd opencv-${{ env.OPENCV_VERSION }} cd opencv-${{ env.OPENCV_VERSION }}
Clear-Content "cmake\OpenCVFindLibsGrfmt.cmake" Clear-Content "cmake\OpenCVFindLibsGrfmt.cmake"
Remove-Item "modules\gapi" -Recurse Remove-Item "modules\gapi" -Recurse
C:\msys64\usr\bin\patch.exe -p1 -i ..\opencv-4.8.0-no-zlib.patch C:\msys64\usr\bin\patch.exe -p1 -i ..\opencv-4.8.1-no-zlib.patch
C:\msys64\usr\bin\patch.exe -p1 -i ..\opencv-4.8.0-link-openmp.patch C:\msys64\usr\bin\patch.exe -p1 -i ..\opencv-4.8.1-link-openmp.patch
Remove-Item "modules\highgui" -Recurse Remove-Item "modules\highgui" -Recurse
Copy-Item -Recurse -Path "..\highgui" -Destination "modules\" Copy-Item -Recurse -Path "..\highgui" -Destination "modules\"
- name: build-x86 - name: build-x86
@@ -3140,8 +3140,8 @@ jobs:
ubuntu-2004-opencv4: ubuntu-2004-opencv4:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
env: env:
OPENCV_VERSION: 4.8.0 OPENCV_VERSION: 4.8.1
PACKAGENAME: opencv-mobile-4.8.0-ubuntu-2004 PACKAGENAME: opencv-mobile-4.8.1-ubuntu-2004
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: opencv-source - name: opencv-source
@@ -3151,8 +3151,8 @@ jobs:
cd opencv-${{ env.OPENCV_VERSION }} cd opencv-${{ env.OPENCV_VERSION }}
truncate -s 0 cmake/OpenCVFindLibsGrfmt.cmake truncate -s 0 cmake/OpenCVFindLibsGrfmt.cmake
rm -rf modules/gapi rm -rf modules/gapi
patch -p1 -i ../opencv-4.8.0-no-zlib.patch patch -p1 -i ../opencv-4.8.1-no-zlib.patch
patch -p1 -i ../opencv-4.8.0-link-openmp.patch patch -p1 -i ../opencv-4.8.1-link-openmp.patch
rm -rf modules/highgui rm -rf modules/highgui
cp -r ../highgui modules/ cp -r ../highgui modules/
- name: build - name: build
@@ -3281,8 +3281,8 @@ jobs:
ubuntu-2204-opencv4: ubuntu-2204-opencv4:
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
env: env:
OPENCV_VERSION: 4.8.0 OPENCV_VERSION: 4.8.1
PACKAGENAME: opencv-mobile-4.8.0-ubuntu-2204 PACKAGENAME: opencv-mobile-4.8.1-ubuntu-2204
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: opencv-source - name: opencv-source
@@ -3292,8 +3292,8 @@ jobs:
cd opencv-${{ env.OPENCV_VERSION }} cd opencv-${{ env.OPENCV_VERSION }}
truncate -s 0 cmake/OpenCVFindLibsGrfmt.cmake truncate -s 0 cmake/OpenCVFindLibsGrfmt.cmake
rm -rf modules/gapi rm -rf modules/gapi
patch -p1 -i ../opencv-4.8.0-no-zlib.patch patch -p1 -i ../opencv-4.8.1-no-zlib.patch
patch -p1 -i ../opencv-4.8.0-link-openmp.patch patch -p1 -i ../opencv-4.8.1-link-openmp.patch
rm -rf modules/highgui rm -rf modules/highgui
cp -r ../highgui modules/ cp -r ../highgui modules/
- name: build - name: build
@@ -3422,8 +3422,8 @@ jobs:
webassembly-opencv4: webassembly-opencv4:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
env: env:
OPENCV_VERSION: 4.8.0 OPENCV_VERSION: 4.8.1
PACKAGENAME: opencv-mobile-4.8.0-webassembly PACKAGENAME: opencv-mobile-4.8.1-webassembly
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: emsdk - name: emsdk
@@ -3439,17 +3439,17 @@ jobs:
cd opencv-${{ env.OPENCV_VERSION }} cd opencv-${{ env.OPENCV_VERSION }}
truncate -s 0 cmake/OpenCVFindLibsGrfmt.cmake truncate -s 0 cmake/OpenCVFindLibsGrfmt.cmake
rm -rf modules/gapi rm -rf modules/gapi
patch -p1 -i ../opencv-4.8.0-no-rtti.patch patch -p1 -i ../opencv-4.8.1-no-rtti.patch
patch -p1 -i ../opencv-4.8.0-no-zlib.patch patch -p1 -i ../opencv-4.8.1-no-zlib.patch
patch -p1 -i ../opencv-4.8.0-link-openmp.patch patch -p1 -i ../opencv-4.8.1-link-openmp.patch
patch -p1 -i ../opencv-4.8.0-fix-emscripten-include.patch patch -p1 -i ../opencv-4.8.1-fix-emscripten-include.patch
rm -rf modules/highgui rm -rf modules/highgui
cp -r ../highgui modules/ cp -r ../highgui modules/
- name: build - name: build
run: | run: |
source emsdk/emsdk_env.sh source emsdk/emsdk_env.sh
cd opencv-${{ env.OPENCV_VERSION }} cd opencv-${{ env.OPENCV_VERSION }}
patch -p1 -i ../opencv-4.8.0-unsafe-xadd.patch patch -p1 -i ../opencv-4.8.1-unsafe-xadd.patch
mkdir build && cd build mkdir build && cd build
cmake -DCMAKE_TOOLCHAIN_FILE=../emsdk/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake \ cmake -DCMAKE_TOOLCHAIN_FILE=../emsdk/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake \
-DCPU_BASELINE="" -DCPU_DISPATCH="" -DWITH_PTHREADS_PF=OFF -DCV_ENABLE_INTRINSICS=OFF -DBUILD_WASM_INTRIN_TESTS=OFF \ -DCPU_BASELINE="" -DCPU_DISPATCH="" -DWITH_PTHREADS_PF=OFF -DCV_ENABLE_INTRINSICS=OFF -DBUILD_WASM_INTRIN_TESTS=OFF \
@@ -3472,7 +3472,7 @@ jobs:
run: | run: |
source emsdk/emsdk_env.sh source emsdk/emsdk_env.sh
cd opencv-${{ env.OPENCV_VERSION }} cd opencv-${{ env.OPENCV_VERSION }}
patch -p1 -R -i ../opencv-4.8.0-unsafe-xadd.patch patch -p1 -R -i ../opencv-4.8.1-unsafe-xadd.patch
mkdir build-threads && cd build-threads mkdir build-threads && cd build-threads
cmake -DCMAKE_TOOLCHAIN_FILE=../emsdk/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake \ cmake -DCMAKE_TOOLCHAIN_FILE=../emsdk/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake \
-DCPU_BASELINE="" -DCPU_DISPATCH="" -DWITH_PTHREADS_PF=ON -DCV_ENABLE_INTRINSICS=OFF -DBUILD_WASM_INTRIN_TESTS=OFF \ -DCPU_BASELINE="" -DCPU_DISPATCH="" -DWITH_PTHREADS_PF=ON -DCV_ENABLE_INTRINSICS=OFF -DBUILD_WASM_INTRIN_TESTS=OFF \
@@ -3816,8 +3816,8 @@ jobs:
needs: [macos-opencv4, ios-opencv4, ios-simulator-opencv4, mac-catalyst-opencv4] needs: [macos-opencv4, ios-opencv4, ios-simulator-opencv4, mac-catalyst-opencv4]
runs-on: macos-12 runs-on: macos-12
env: env:
OPENCV_VERSION: 4.8.0 OPENCV_VERSION: 4.8.1
PACKAGENAME: opencv-mobile-4.8.0-apple PACKAGENAME: opencv-mobile-4.8.1-apple
steps: steps:
- run: sudo xcode-select --switch /Applications/Xcode_13.4.1.app - run: sudo xcode-select --switch /Applications/Xcode_13.4.1.app
- name: download - name: download
@@ -3936,8 +3936,8 @@ jobs:
needs: [macos-opencv4, ios-opencv4-bitcode, ios-simulator-opencv4-bitcode, mac-catalyst-opencv4-bitcode] needs: [macos-opencv4, ios-opencv4-bitcode, ios-simulator-opencv4-bitcode, mac-catalyst-opencv4-bitcode]
runs-on: macos-12 runs-on: macos-12
env: env:
OPENCV_VERSION: 4.8.0 OPENCV_VERSION: 4.8.1
PACKAGENAME: opencv-mobile-4.8.0-apple-bitcode PACKAGENAME: opencv-mobile-4.8.1-apple-bitcode
steps: steps:
- run: sudo xcode-select --switch /Applications/Xcode_13.4.1.app - run: sudo xcode-select --switch /Applications/Xcode_13.4.1.app
- name: download - name: download
@@ -4055,8 +4055,8 @@ jobs:
milkv-duo-opencv4: milkv-duo-opencv4:
runs-on: ubuntu-latest runs-on: ubuntu-latest
env: env:
OPENCV_VERSION: 4.8.0 OPENCV_VERSION: 4.8.1
PACKAGENAME: opencv-mobile-4.8.0-milkv-duo PACKAGENAME: opencv-mobile-4.8.1-milkv-duo
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: toolchain - name: toolchain
@@ -4070,10 +4070,10 @@ jobs:
cd opencv-${{ env.OPENCV_VERSION }} cd opencv-${{ env.OPENCV_VERSION }}
truncate -s 0 cmake/OpenCVFindLibsGrfmt.cmake truncate -s 0 cmake/OpenCVFindLibsGrfmt.cmake
rm -rf modules/gapi rm -rf modules/gapi
patch -p1 -i ../opencv-4.8.0-no-rtti.patch patch -p1 -i ../opencv-4.8.1-no-rtti.patch
patch -p1 -i ../opencv-4.8.0-no-zlib.patch patch -p1 -i ../opencv-4.8.1-no-zlib.patch
patch -p1 -i ../opencv-4.8.0-no-atomic.patch patch -p1 -i ../opencv-4.8.1-no-atomic.patch
patch -p1 -i ../opencv-4.8.0-link-openmp.patch patch -p1 -i ../opencv-4.8.1-link-openmp.patch
rm -rf modules/highgui rm -rf modules/highgui
cp -r ../highgui modules/ cp -r ../highgui modules/
- name: build - name: build
@@ -4111,8 +4111,8 @@ jobs:
luckfox-pico-opencv4: luckfox-pico-opencv4:
runs-on: ubuntu-latest runs-on: ubuntu-latest
env: env:
OPENCV_VERSION: 4.8.0 OPENCV_VERSION: 4.8.1
PACKAGENAME: opencv-mobile-4.8.0-luckfox-pico PACKAGENAME: opencv-mobile-4.8.1-luckfox-pico
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: toolchain - name: toolchain
@@ -4125,10 +4125,10 @@ jobs:
cd opencv-${{ env.OPENCV_VERSION }} cd opencv-${{ env.OPENCV_VERSION }}
truncate -s 0 cmake/OpenCVFindLibsGrfmt.cmake truncate -s 0 cmake/OpenCVFindLibsGrfmt.cmake
rm -rf modules/gapi rm -rf modules/gapi
patch -p1 -i ../opencv-4.8.0-no-rtti.patch patch -p1 -i ../opencv-4.8.1-no-rtti.patch
patch -p1 -i ../opencv-4.8.0-no-zlib.patch patch -p1 -i ../opencv-4.8.1-no-zlib.patch
patch -p1 -i ../opencv-4.8.0-no-atomic.patch patch -p1 -i ../opencv-4.8.1-no-atomic.patch
patch -p1 -i ../opencv-4.8.0-link-openmp.patch patch -p1 -i ../opencv-4.8.1-link-openmp.patch
rm -rf modules/highgui rm -rf modules/highgui
cp -r ../highgui modules/ cp -r ../highgui modules/
- name: build - name: build
@@ -4166,8 +4166,8 @@ jobs:
yuzuki-lizard-opencv4: yuzuki-lizard-opencv4:
runs-on: ubuntu-latest runs-on: ubuntu-latest
env: env:
OPENCV_VERSION: 4.8.0 OPENCV_VERSION: 4.8.1
PACKAGENAME: opencv-mobile-4.8.0-yuzuki-lizard PACKAGENAME: opencv-mobile-4.8.1-yuzuki-lizard
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: toolchain - name: toolchain
@@ -4181,10 +4181,10 @@ jobs:
cd opencv-${{ env.OPENCV_VERSION }} cd opencv-${{ env.OPENCV_VERSION }}
truncate -s 0 cmake/OpenCVFindLibsGrfmt.cmake truncate -s 0 cmake/OpenCVFindLibsGrfmt.cmake
rm -rf modules/gapi rm -rf modules/gapi
patch -p1 -i ../opencv-4.8.0-no-rtti.patch patch -p1 -i ../opencv-4.8.1-no-rtti.patch
patch -p1 -i ../opencv-4.8.0-no-zlib.patch patch -p1 -i ../opencv-4.8.1-no-zlib.patch
patch -p1 -i ../opencv-4.8.0-no-atomic.patch patch -p1 -i ../opencv-4.8.1-no-atomic.patch
patch -p1 -i ../opencv-4.8.0-link-openmp.patch patch -p1 -i ../opencv-4.8.1-link-openmp.patch
rm -rf modules/highgui rm -rf modules/highgui
cp -r ../highgui modules/ cp -r ../highgui modules/
- name: build - name: build
@@ -4224,8 +4224,8 @@ jobs:
purple-pi-opencv4: purple-pi-opencv4:
runs-on: ubuntu-latest runs-on: ubuntu-latest
env: env:
OPENCV_VERSION: 4.8.0 OPENCV_VERSION: 4.8.1
PACKAGENAME: opencv-mobile-4.8.0-purple-pi PACKAGENAME: opencv-mobile-4.8.1-purple-pi
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: toolchain - name: toolchain
@@ -4240,9 +4240,9 @@ jobs:
cd opencv-${{ env.OPENCV_VERSION }} cd opencv-${{ env.OPENCV_VERSION }}
truncate -s 0 cmake/OpenCVFindLibsGrfmt.cmake truncate -s 0 cmake/OpenCVFindLibsGrfmt.cmake
rm -rf modules/gapi rm -rf modules/gapi
patch -p1 -i ../opencv-4.8.0-no-rtti.patch patch -p1 -i ../opencv-4.8.1-no-rtti.patch
patch -p1 -i ../opencv-4.8.0-no-zlib.patch patch -p1 -i ../opencv-4.8.1-no-zlib.patch
patch -p1 -i ../opencv-4.8.0-link-openmp.patch patch -p1 -i ../opencv-4.8.1-link-openmp.patch
rm -rf modules/highgui rm -rf modules/highgui
cp -r ../highgui modules/ cp -r ../highgui modules/
- name: build - name: build

0
opencv-4.8.0-fix-emscripten-include.patch → opencv-4.8.1-fix-emscripten-include.patch
View File

0
opencv-4.8.0-link-openmp.patch → opencv-4.8.1-link-openmp.patch
View File

0
opencv-4.8.0-no-atomic.patch → opencv-4.8.1-no-atomic.patch
View File

0
opencv-4.8.0-no-rtti.patch → opencv-4.8.1-no-rtti.patch
View File

0
opencv-4.8.0-no-zlib.patch → opencv-4.8.1-no-zlib.patch
View File

0
opencv-4.8.0-unsafe-xadd.patch → opencv-4.8.1-unsafe-xadd.patch
View File

2
opencv3_cmake_options.txt
View File

@@ -58,7 +58,7 @@
-DBUILD_ANDROID_SERVICE=OFF -DBUILD_ANDROID_SERVICE=OFF
-DBUILD_JAVA=OFF -DBUILD_JAVA=OFF
-DENABLE_PRECOMPILED_HEADERS=OFF -DENABLE_PRECOMPILED_HEADERS=OFF
-DENABLE_FAST_MATH=OFF -DENABLE_FAST_MATH=ON
-DCV_TRACE=OFF -DCV_TRACE=OFF
-DBUILD_opencv_java=OFF -DBUILD_opencv_java=OFF
-DBUILD_opencv_js=OFF -DBUILD_opencv_js=OFF

2
opencv4_cmake_options.txt
View File

@@ -68,7 +68,7 @@
-DBUILD_JAVA=OFF -DBUILD_JAVA=OFF
-DBUILD_OBJC=OFF -DBUILD_OBJC=OFF
-DENABLE_PRECOMPILED_HEADERS=OFF -DENABLE_PRECOMPILED_HEADERS=OFF
-DENABLE_FAST_MATH=OFF -DENABLE_FAST_MATH=ON
-DCV_TRACE=OFF -DCV_TRACE=OFF
-DBUILD_opencv_java=OFF -DBUILD_opencv_java=OFF
-DBUILD_opencv_gapi=OFF -DBUILD_opencv_gapi=OFF