|
66 | 66 | patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-fix-windows-arm-arch.patch |
67 | 67 | patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-minimal-install.patch |
68 | 68 | cp ../patches/draw_text.h ../patches/mono_font_data.h modules/core/src/ |
| 69 | + cp ../patches/fontface.html ./ |
69 | 70 | patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-drawing-mono-font.patch |
70 | 71 | rm -rf modules/highgui |
71 | 72 | cp -r ../highgui modules/ |
@@ -140,6 +141,7 @@ jobs: |
140 | 141 | patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-fix-windows-arm-arch.patch |
141 | 142 | patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-minimal-install.patch |
142 | 143 | cp ../patches/draw_text.h ../patches/mono_font_data.h modules/imgproc/src/ |
| 144 | + cp ../patches/fontface.html ./ |
143 | 145 | patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-drawing-mono-font.patch |
144 | 146 | rm -rf modules/highgui |
145 | 147 | cp -r ../highgui modules/ |
@@ -211,6 +213,7 @@ jobs: |
211 | 213 | patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-fix-windows-arm-arch.patch |
212 | 214 | patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-minimal-install.patch |
213 | 215 | cp ../patches/draw_text.h ../patches/mono_font_data.h modules/imgproc/src/ |
| 216 | + cp ../patches/fontface.html ./ |
214 | 217 | patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-drawing-mono-font.patch |
215 | 218 | rm -rf modules/highgui |
216 | 219 | cp -r ../highgui modules/ |
@@ -249,6 +252,7 @@ jobs: |
249 | 252 | opencv-version: [2.4.13.7, 3.4.20, 4.10.0] |
250 | 253 | env: |
251 | 254 | COMMON_CMAKE_OPTIONS: | |
| 255 | + -DCMAKE_POLICY_DEFAULT_CMP0057=NEW \ |
252 | 256 | -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_LATEST_HOME/build/cmake/android.toolchain.cmake \ |
253 | 257 | -DANDROID_USE_LEGACY_TOOLCHAIN_FILE=False \ |
254 | 258 | -DANDROID_PLATFORM=android-21 \ |
|
0 commit comments