Skip to content

Commit 03bc93b

Browse files
nihuinihui
authored
android 16kb page size (#175)
1 parent 1d40ca9 commit 03bc93b

File tree

3 files changed

+350
-2
lines changed

3 files changed

+350
-2
lines changed

‎.github/workflows/build.yml

+347
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,347 @@
1+
name: release
2+
on: pull_request
3+
# on:
4+
# push:
5+
# tags:
6+
# - '*'
7+
8+
env:
9+
DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
10+
IOS_DEPLOYMENT_TARGET: '13.0'
11+
MAC_DEPLOYMENT_TARGET: '11.0'
12+
MAC_CATALYST_DEPLOYMENT_TARGET: '13.1'
13+
WATCHOS_DEPLOYMENT_TARGET: '6.0'
14+
TVOS_DEPLOYMENT_TARGET: '11.0'
15+
VISIONOS_DEPLOYMENT_TARGET: '1.0'
16+
ENABLE_BITCODE: OFF
17+
ENABLE_ARC: OFF
18+
ENABLE_VISIBILITY: OFF
19+
EMSCRIPTEN_VERSION: 3.1.28
20+
21+
permissions:
22+
contents: read
23+
24+
jobs:
25+
setup:
26+
runs-on: ubuntu-latest
27+
outputs:
28+
VERSION: ${{ steps.get_version.outputs.VERSION }}
29+
steps:
30+
- uses: actions/checkout@v4
31+
- name: get-version
32+
id: get_version
33+
run: echo "VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT
34+
- name: opencv2-source
35+
env:
36+
opencv-version: 2.4.13.7
37+
run: |
38+
wget -q https://github.com/opencv/opencv/archive/${{ env.opencv-version }}.zip -O opencv-${{ env.opencv-version }}.zip
39+
unzip -q opencv-${{ env.opencv-version }}.zip
40+
rm opencv-${{ env.opencv-version }}.zip
41+
cd opencv-${{ env.opencv-version }}
42+
truncate -s 0 cmake/OpenCVFindLibsGrfmt.cmake
43+
44+
rm modules/core/src/gl_*
45+
rm modules/core/src/gpumat.cpp
46+
rm modules/core/src/opengl_*
47+
rm modules/core/include/opencv2/core/cuda_*
48+
rm modules/core/include/opencv2/core/devmem2d.hpp
49+
rm modules/core/include/opencv2/core/gpumat.hpp
50+
rm modules/core/include/opencv2/core/opengl_*
51+
rm modules/core/include/opencv2/core/wimage.hpp
52+
53+
rm -rf modules/dynamicuda
54+
rm -rf modules/gpu
55+
rm -rf modules/ocl
56+
57+
patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-no-gpu.patch
58+
59+
patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-no-rtti.patch
60+
patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-no-zlib.patch
61+
patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-fix-highgui-include.patch
62+
patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-no-link-stdc++.patch
63+
patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-enable-cxx11.patch
64+
patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-link-openmp.patch
65+
patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-newer-msvc.patch
66+
patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-fix-windows-arm-arch.patch
67+
patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-minimal-install.patch
68+
cp ../patches/draw_text.h ../patches/mono_font_data.h modules/core/src/
69+
cp ../patches/fontface.html ./
70+
patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-drawing-mono-font.patch
71+
rm -rf modules/highgui
72+
cp -r ../highgui modules/
73+
rm -rf 3rdparty apps data doc samples platforms
74+
rm -rf modules/java
75+
rm -rf modules/python
76+
rm -rf modules/ts
77+
sed -e 's/__VERSION__/${{ env.opencv-version }}/g' ../patches/Info.plist > ./Info.plist
78+
cp ../opencv2_cmake_options.txt ./options.txt
79+
cd ..
80+
mv opencv-${{ env.opencv-version }} opencv-mobile-${{ env.opencv-version }}
81+
zip -9 -r opencv-mobile-${{ env.opencv-version }}.zip opencv-mobile-${{ env.opencv-version }}
82+
- name: opencv3-source
83+
env:
84+
opencv-version: 3.4.20
85+
run: |
86+
wget -q https://github.com/opencv/opencv/archive/${{ env.opencv-version }}.zip -O opencv-${{ env.opencv-version }}.zip
87+
unzip -q opencv-${{ env.opencv-version }}.zip
88+
rm opencv-${{ env.opencv-version }}.zip
89+
cd opencv-${{ env.opencv-version }}
90+
truncate -s 0 cmake/OpenCVFindLibsGrfmt.cmake
91+
92+
rm modules/core/src/cuda_*
93+
rm modules/core/src/direct*
94+
rm modules/core/src/gl_*
95+
rm modules/core/src/intel_gpu_*
96+
rm modules/core/src/ocl*
97+
rm modules/core/src/opengl.cpp
98+
rm modules/core/src/ovx.cpp
99+
rm modules/core/src/umatrix.hpp
100+
rm modules/core/src/va_intel.cpp
101+
102+
rm modules/core/include/opencv2/core/cuda*.hpp
103+
rm modules/core/include/opencv2/core/directx.hpp
104+
rm modules/core/include/opencv2/core/ippasync.hpp
105+
rm modules/core/include/opencv2/core/ocl*.hpp
106+
rm modules/core/include/opencv2/core/opengl.hpp
107+
rm modules/core/include/opencv2/core/ovx.hpp
108+
rm modules/core/include/opencv2/core/private.cuda.hpp
109+
rm modules/core/include/opencv2/core/va_intel.hpp
110+
rm modules/core/include/opencv2/core/wimage.hpp
111+
rm -rf modules/core/include/opencv2/core/cuda
112+
rm -rf modules/core/include/opencv2/core/opencl
113+
rm -rf modules/core/include/opencv2/core/openvx
114+
115+
rm modules/photo/src/denoising.cuda.cpp
116+
rm modules/photo/include/opencv2/photo/cuda.hpp
117+
118+
rm -rf modules/cuda*
119+
rm -rf modules/cudev
120+
121+
find modules -type d | xargs -i rm -rf {}/src/cuda
122+
find modules -type d | xargs -i rm -rf {}/src/opencl
123+
find modules -type d | xargs -i rm -rf {}/perf/cuda
124+
find modules -type d | xargs -i rm -rf {}/perf/opencl
125+
find modules -type f | xargs -i sed -i '/opencl_kernels/d' {}
126+
find modules -type f | xargs -i sed -i '/cuda.hpp/d' {}
127+
find modules -type f | xargs -i sed -i '/opengl.hpp/d' {}
128+
find modules -type f | xargs -i sed -i '/ocl_defs.hpp/d' {}
129+
find modules -type f | xargs -i sed -i '/ocl.hpp/d' {}
130+
find modules -type f | xargs -i sed -i '/ovx_defs.hpp/d' {}
131+
find modules -type f | xargs -i sed -i '/ovx.hpp/d' {}
132+
find modules -type f | xargs -i sed -i '/va_intel.hpp/d' {}
133+
134+
patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-no-gpu.patch
135+
136+
patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-no-rtti.patch
137+
patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-no-zlib.patch
138+
patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-link-openmp.patch
139+
patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-fix-emscripten-include.patch
140+
patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-newer-msvc.patch
141+
patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-fix-windows-arm-arch.patch
142+
patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-minimal-install.patch
143+
cp ../patches/draw_text.h ../patches/mono_font_data.h modules/imgproc/src/
144+
cp ../patches/fontface.html ./
145+
patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-drawing-mono-font.patch
146+
rm -rf modules/highgui
147+
cp -r ../highgui modules/
148+
rm -rf 3rdparty apps data doc samples platforms
149+
rm -rf modules/java
150+
rm -rf modules/js
151+
rm -rf modules/python
152+
rm -rf modules/ts
153+
rm -rf modules/dnn
154+
sed -e 's/__VERSION__/${{ env.opencv-version }}/g' ../patches/Info.plist > ./Info.plist
155+
cp ../opencv3_cmake_options.txt ./options.txt
156+
cd ..
157+
mv opencv-${{ env.opencv-version }} opencv-mobile-${{ env.opencv-version }}
158+
zip -9 -r opencv-mobile-${{ env.opencv-version }}.zip opencv-mobile-${{ env.opencv-version }}
159+
- name: opencv4-source
160+
env:
161+
opencv-version: 4.10.0
162+
run: |
163+
wget -q https://github.com/opencv/opencv/archive/${{ env.opencv-version }}.zip -O opencv-${{ env.opencv-version }}.zip
164+
unzip -q opencv-${{ env.opencv-version }}.zip
165+
rm opencv-${{ env.opencv-version }}.zip
166+
cd opencv-${{ env.opencv-version }}
167+
truncate -s 0 cmake/OpenCVFindLibsGrfmt.cmake
168+
rm -rf modules/gapi
169+
170+
rm modules/core/src/cuda_*
171+
rm modules/core/src/direct*
172+
rm modules/core/src/gl_*
173+
rm modules/core/src/intel_gpu_*
174+
rm modules/core/src/ocl*
175+
rm modules/core/src/opengl.cpp
176+
rm modules/core/src/ovx.cpp
177+
rm modules/core/src/umatrix.hpp
178+
rm modules/core/src/va_intel.cpp
179+
rm modules/core/src/va_wrapper.impl.hpp
180+
181+
rm modules/core/include/opencv2/core/cuda*.hpp
182+
rm modules/core/include/opencv2/core/directx.hpp
183+
rm modules/core/include/opencv2/core/ocl*.hpp
184+
rm modules/core/include/opencv2/core/opengl.hpp
185+
rm modules/core/include/opencv2/core/ovx.hpp
186+
rm modules/core/include/opencv2/core/private.cuda.hpp
187+
rm modules/core/include/opencv2/core/va_*.hpp
188+
rm -rf modules/core/include/opencv2/core/cuda
189+
rm -rf modules/core/include/opencv2/core/opencl
190+
rm -rf modules/core/include/opencv2/core/openvx
191+
192+
rm modules/photo/src/denoising.cuda.cpp
193+
rm modules/photo/include/opencv2/photo/cuda.hpp
194+
195+
find modules -type d | xargs -i rm -rf {}/src/cuda
196+
find modules -type d | xargs -i rm -rf {}/src/opencl
197+
find modules -type d | xargs -i rm -rf {}/perf/cuda
198+
find modules -type d | xargs -i rm -rf {}/perf/opencl
199+
find modules -type f | xargs -i sed -i '/opencl_kernels/d' {}
200+
find modules -type f | xargs -i sed -i '/cuda.hpp/d' {}
201+
find modules -type f | xargs -i sed -i '/opengl.hpp/d' {}
202+
find modules -type f | xargs -i sed -i '/ocl_defs.hpp/d' {}
203+
find modules -type f | xargs -i sed -i '/ocl.hpp/d' {}
204+
find modules -type f | xargs -i sed -i '/ovx_defs.hpp/d' {}
205+
find modules -type f | xargs -i sed -i '/ovx.hpp/d' {}
206+
find modules -type f | xargs -i sed -i '/va_intel.hpp/d' {}
207+
208+
patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-no-gpu.patch
209+
210+
patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-no-rtti.patch
211+
patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-no-zlib.patch
212+
patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-link-openmp.patch
213+
patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-fix-windows-arm-arch.patch
214+
patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-minimal-install.patch
215+
cp ../patches/draw_text.h ../patches/mono_font_data.h modules/imgproc/src/
216+
cp ../patches/fontface.html ./
217+
patch -p1 -i ../patches/opencv-${{ env.opencv-version }}-drawing-mono-font.patch
218+
rm -rf modules/highgui
219+
cp -r ../highgui modules/
220+
rm -rf 3rdparty apps data doc samples platforms
221+
rm -rf modules/java
222+
rm -rf modules/js
223+
rm -rf modules/python
224+
rm -rf modules/ts
225+
rm -rf modules/dnn
226+
sed -e 's/__VERSION__/${{ env.opencv-version }}/g' ../patches/Info.plist > ./Info.plist
227+
cp ../opencv4_cmake_options.txt ./options.txt
228+
cd ..
229+
mv opencv-${{ env.opencv-version }} opencv-mobile-${{ env.opencv-version }}
230+
zip -9 -r opencv-mobile-${{ env.opencv-version }}.zip opencv-mobile-${{ env.opencv-version }}
231+
- name: upload-opencv2-source
232+
uses: actions/upload-artifact@v4
233+
with:
234+
name: opencv-mobile-2.4.13.7-source
235+
path: opencv-mobile-2.4.13.7.zip
236+
- name: upload-opencv3-source
237+
uses: actions/upload-artifact@v4
238+
with:
239+
name: opencv-mobile-3.4.20-source
240+
path: opencv-mobile-3.4.20.zip
241+
- name: upload-opencv4-source
242+
uses: actions/upload-artifact@v4
243+
with:
244+
name: opencv-mobile-4.10.0-source
245+
path: opencv-mobile-4.10.0.zip
246+
247+
android:
248+
needs: [setup]
249+
runs-on: ubuntu-latest
250+
strategy:
251+
matrix:
252+
opencv-version: [2.4.13.7, 3.4.20, 4.10.0]
253+
env:
254+
COMMON_CMAKE_OPTIONS: |
255+
-DCMAKE_POLICY_DEFAULT_CMP0057=NEW \
256+
-DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_LATEST_HOME/build/cmake/android.toolchain.cmake \
257+
-DANDROID_USE_LEGACY_TOOLCHAIN_FILE=False \
258+
-DANDROID_PLATFORM=android-21 \
259+
-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON \
260+
-DANDROID_CPP_FEATURES="no-rtti no-exceptions" \
261+
-DCMAKE_INSTALL_PREFIX=install \
262+
-DCMAKE_BUILD_TYPE=Release \
263+
steps:
264+
- uses: actions/checkout@v4
265+
- name: ndk-fix-debug
266+
run: sed -i -e '/^ -g$/d' $ANDROID_NDK_LATEST_HOME/build/cmake/android-legacy.toolchain.cmake
267+
- uses: actions/download-artifact@v4
268+
with:
269+
name: opencv-mobile-${{ matrix.opencv-version }}-source
270+
- name: setup-opencv-source
271+
run: |
272+
unzip -q opencv-mobile-${{ matrix.opencv-version }}.zip
273+
echo "SOURCE_DIR=opencv-mobile-${{ matrix.opencv-version }}" >> $GITHUB_ENV
274+
echo "PACKAGE_NAME=opencv-mobile-${{ matrix.opencv-version }}-android" >> $GITHUB_ENV
275+
- name: build-armeabi-v7a
276+
run: |
277+
cd ${{ env.SOURCE_DIR }}
278+
mkdir build-armeabi-v7a && cd build-armeabi-v7a
279+
cmake ${{ env.COMMON_CMAKE_OPTIONS }} -DANDROID_ABI="armeabi-v7a" -DANDROID_ARM_NEON=ON \
280+
`cat ../options.txt` -DBUILD_opencv_world=OFF -DOPENCV_DISABLE_FILESYSTEM_SUPPORT=ON ..
281+
cmake --build . -j $(nproc)
282+
cmake --build . --target install
283+
- name: build-arm64-v8a
284+
run: |
285+
cd ${{ env.SOURCE_DIR }}
286+
mkdir build-arm64-v8a && cd build-arm64-v8a
287+
cmake ${{ env.COMMON_CMAKE_OPTIONS }} -DANDROID_ABI="arm64-v8a" \
288+
`cat ../options.txt` -DBUILD_opencv_world=OFF -DOPENCV_DISABLE_FILESYSTEM_SUPPORT=ON -DOPENCV_EXTRA_FLAGS="-mno-outline-atomics" ..
289+
cmake --build . -j $(nproc)
290+
cmake --build . --target install
291+
- name: build-x86
292+
run: |
293+
cd ${{ env.SOURCE_DIR }}
294+
mkdir build-x86 && cd build-x86
295+
cmake ${{ env.COMMON_CMAKE_OPTIONS }} -DANDROID_ABI="x86" \
296+
`cat ../options.txt` -DBUILD_opencv_world=OFF -DOPENCV_DISABLE_FILESYSTEM_SUPPORT=ON ..
297+
cmake --build . -j $(nproc)
298+
cmake --build . --target install
299+
- name: build-x86_64
300+
run: |
301+
cd ${{ env.SOURCE_DIR }}
302+
mkdir build-x86_64 && cd build-x86_64
303+
cmake ${{ env.COMMON_CMAKE_OPTIONS }} -DANDROID_ABI="x86_64" \
304+
`cat ../options.txt` -DBUILD_opencv_world=OFF -DOPENCV_DISABLE_FILESYSTEM_SUPPORT=ON ..
305+
cmake --build . -j $(nproc)
306+
cmake --build . --target install
307+
- name: package
308+
run: |
309+
mkdir ${{ env.PACKAGE_NAME }}
310+
cp -rf ${{ env.SOURCE_DIR }}/build-x86/install/* ${{ env.PACKAGE_NAME }}/
311+
cp -rf ${{ env.SOURCE_DIR }}/build-x86_64/install/* ${{ env.PACKAGE_NAME }}/
312+
cp -rf ${{ env.SOURCE_DIR }}/build-armeabi-v7a/install/* ${{ env.PACKAGE_NAME }}/
313+
cp -rf ${{ env.SOURCE_DIR }}/build-arm64-v8a/install/* ${{ env.PACKAGE_NAME }}/
314+
zip -9 -r ${{ env.PACKAGE_NAME }}.zip ${{ env.PACKAGE_NAME }}
315+
- name: test-armeabi-v7a
316+
run: |
317+
cd test
318+
mkdir build-armeabi-v7a && cd build-armeabi-v7a
319+
cmake ${{ env.COMMON_CMAKE_OPTIONS }} -DANDROID_ABI="armeabi-v7a" -DANDROID_ARM_NEON=ON \
320+
-DOpenCV_DIR=$GITHUB_WORKSPACE/${{ env.PACKAGE_NAME }}/sdk/native/jni ..
321+
cmake --build . -j $(nproc)
322+
- name: test-arm64-v8a
323+
run: |
324+
cd test
325+
mkdir build-arm64-v8a && cd build-arm64-v8a
326+
cmake ${{ env.COMMON_CMAKE_OPTIONS }} -DANDROID_ABI="arm64-v8a" \
327+
-DOpenCV_DIR=$GITHUB_WORKSPACE/${{ env.PACKAGE_NAME }}/sdk/native/jni ..
328+
cmake --build . -j $(nproc)
329+
- name: test-x86
330+
run: |
331+
cd test
332+
mkdir build-x86 && cd build-x86
333+
cmake ${{ env.COMMON_CMAKE_OPTIONS }} -DANDROID_ABI="x86" \
334+
-DOpenCV_DIR=$GITHUB_WORKSPACE/${{ env.PACKAGE_NAME }}/sdk/native/jni ..
335+
cmake --build . -j $(nproc)
336+
- name: test-x86_64
337+
run: |
338+
cd test
339+
mkdir build-x86_64 && cd build-x86_64
340+
cmake ${{ env.COMMON_CMAKE_OPTIONS }} -DANDROID_ABI="x86_64" \
341+
-DOpenCV_DIR=$GITHUB_WORKSPACE/${{ env.PACKAGE_NAME }}/sdk/native/jni ..
342+
cmake --build . -j $(nproc)
343+
- name: upload
344+
uses: actions/upload-artifact@v4
345+
with:
346+
name: ${{ env.PACKAGE_NAME }}
347+
path: ${{ env.PACKAGE_NAME }}.zip

‎.github/workflows/release.yml

+1
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,7 @@ jobs:
256256
-DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_LATEST_HOME/build/cmake/android.toolchain.cmake \
257257
-DANDROID_USE_LEGACY_TOOLCHAIN_FILE=False \
258258
-DANDROID_PLATFORM=android-21 \
259+
-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON \
259260
-DANDROID_CPP_FEATURES="no-rtti no-exceptions" \
260261
-DCMAKE_INSTALL_PREFIX=install \
261262
-DCMAKE_BUILD_TYPE=Release \

‎highgui/src/highgui.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -784,11 +784,11 @@ void imshow(const String& winname, InputArray mat)
784784
std::vector<uchar> buf;
785785
bool result = cv::imencode(".bmp", mat, buf);
786786
if (result) {
787-
BitmapWindow::show(winname.c_str(), buf.data());
787+
BitmapWindow::show(winname.c_str(), buf.data());
788788
return;
789789
}
790790
return ;
791-
#elif __linux__
791+
#elif __linux__ && !__ANDROID__
792792
if (winname == "fb")
793793
{
794794
static display_fb dpy;

0 commit comments

Comments
 (0)