Skip to content

Commit 0b40ac6

Browse files
nihuinihui
committed
no zlib
1 parent d23846d commit 0b40ac6

File tree

4 files changed

+48
-0
lines changed

4 files changed

+48
-0
lines changed

‎.github/workflows/release.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ jobs:
3535
truncate -s 0 cmake/OpenCVFindLibsGrfmt.cmake
3636
rm -rf modules/gapi
3737
patch -p1 -i ../opencv-4.5.1-no-rtti.patch
38+
patch -p1 -i ../opencv-4.5.1-no-zlib.patch
3839
rm -rf modules/highgui
3940
cp -r ../highgui modules/
4041
- name: build-armeabi-v7a
@@ -106,6 +107,7 @@ jobs:
106107
cd opencv-${{ env.OPENCV_VERSION }}
107108
truncate -s 0 cmake/OpenCVFindLibsGrfmt.cmake
108109
patch -p1 -i ../opencv-3.4.13-no-rtti.patch
110+
patch -p1 -i ../opencv-3.4.13-no-zlib.patch
109111
rm -rf modules/highgui
110112
cp -r ../highgui modules/
111113
- name: build-armeabi-v7a
@@ -178,6 +180,7 @@ jobs:
178180
cd opencv-${{ env.OPENCV_VERSION }}
179181
truncate -s 0 cmake/OpenCVFindLibsGrfmt.cmake
180182
patch -p1 -i ../opencv-2.4.13.7-no-rtti.patch
183+
patch -p1 -i ../opencv-2.4.13.7-no-zlib.patch
181184
rm -rf modules/highgui
182185
cp -r ../highgui modules/
183186
- name: build-armeabi-v7a
@@ -252,6 +255,7 @@ jobs:
252255
echo -n > cmake/OpenCVFindLibsGrfmt.cmake
253256
rm -rf modules/gapi
254257
patch -p1 -i ../opencv-4.5.1-no-rtti.patch
258+
patch -p1 -i ../opencv-4.5.1-no-zlib.patch
255259
rm -rf modules/highgui
256260
cp -r ../highgui modules/
257261
- name: build-ios
@@ -308,6 +312,7 @@ jobs:
308312
cd opencv-${{ env.OPENCV_VERSION }}
309313
echo -n > cmake/OpenCVFindLibsGrfmt.cmake
310314
patch -p1 -i ../opencv-3.4.13-no-rtti.patch
315+
patch -p1 -i ../opencv-3.4.13-no-zlib.patch
311316
rm -rf modules/highgui
312317
cp -r ../highgui modules/
313318
- name: build-ios
@@ -364,6 +369,7 @@ jobs:
364369
cd opencv-${{ env.OPENCV_VERSION }}
365370
echo -n > cmake/OpenCVFindLibsGrfmt.cmake
366371
patch -p1 -i ../opencv-2.4.13.7-no-rtti.patch
372+
patch -p1 -i ../opencv-2.4.13.7-no-zlib.patch
367373
rm -rf modules/highgui
368374
cp -r ../highgui modules/
369375
- name: build-ios
@@ -421,6 +427,7 @@ jobs:
421427
echo -n > cmake/OpenCVFindLibsGrfmt.cmake
422428
rm -rf modules/gapi
423429
patch -p1 -i ../opencv-4.5.1-no-rtti.patch
430+
patch -p1 -i ../opencv-4.5.1-no-zlib.patch
424431
rm -rf modules/highgui
425432
cp -r ../highgui modules/
426433
- name: build-ios
@@ -477,6 +484,7 @@ jobs:
477484
cd opencv-${{ env.OPENCV_VERSION }}
478485
echo -n > cmake/OpenCVFindLibsGrfmt.cmake
479486
patch -p1 -i ../opencv-3.4.13-no-rtti.patch
487+
patch -p1 -i ../opencv-3.4.13-no-zlib.patch
480488
rm -rf modules/highgui
481489
cp -r ../highgui modules/
482490
- name: build-ios
@@ -533,6 +541,7 @@ jobs:
533541
cd opencv-${{ env.OPENCV_VERSION }}
534542
echo -n > cmake/OpenCVFindLibsGrfmt.cmake
535543
patch -p1 -i ../opencv-2.4.13.7-no-rtti.patch
544+
patch -p1 -i ../opencv-2.4.13.7-no-zlib.patch
536545
rm -rf modules/highgui
537546
cp -r ../highgui modules/
538547
- name: build-ios
@@ -595,6 +604,7 @@ jobs:
595604
truncate -s 0 cmake/OpenCVFindLibsGrfmt.cmake
596605
rm -rf modules/gapi
597606
patch -p1 -i ../opencv-4.5.1-no-rtti.patch
607+
patch -p1 -i ../opencv-4.5.1-no-zlib.patch
598608
rm -rf modules/highgui
599609
cp -r ../highgui modules/
600610
- name: build-arm-linux-gnueabi
@@ -662,6 +672,7 @@ jobs:
662672
cd opencv-${{ env.OPENCV_VERSION }}
663673
truncate -s 0 cmake/OpenCVFindLibsGrfmt.cmake
664674
patch -p1 -i ../opencv-3.4.13-no-rtti.patch
675+
patch -p1 -i ../opencv-3.4.13-no-zlib.patch
665676
rm -rf modules/highgui
666677
cp -r ../highgui modules/
667678
- name: build-arm-linux-gnueabi
@@ -738,6 +749,7 @@ jobs:
738749
cd opencv-${{ env.OPENCV_VERSION }}
739750
truncate -s 0 cmake/OpenCVFindLibsGrfmt.cmake
740751
patch -p1 -i ../opencv-2.4.13.7-no-rtti.patch
752+
patch -p1 -i ../opencv-2.4.13.7-no-zlib.patch
741753
rm -rf modules/highgui
742754
cp -r ../highgui modules/
743755
- name: build-arm-linux-gnueabi

‎opencv-2.4.13.7-no-zlib.patch‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff -Nuarp opencv-2.4.13.7.orig/modules/core/src/persistence.cpp opencv-2.4.13.7/modules/core/src/persistence.cpp
2+
--- opencv-2.4.13.7.orig/modules/core/src/persistence.cpp 2018-07-02 05:41:56.000000000 +0800
3+
+++ opencv-2.4.13.7/modules/core/src/persistence.cpp 2021-02-24 23:58:32.154994276 +0800
4+
@@ -47,7 +47,7 @@
5+
#include <iterator>
6+
#include <wchar.h>
7+
8+
-#define USE_ZLIB 1
9+
+#define USE_ZLIB 0
10+
11+
#ifdef __APPLE__
12+
# include "TargetConditionals.h"

‎opencv-3.4.13-no-zlib.patch‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff -Nuarp opencv-3.4.13.orig/modules/core/src/persistence.hpp opencv-3.4.13/modules/core/src/persistence.hpp
2+
--- opencv-3.4.13.orig/modules/core/src/persistence.hpp 2020-12-20 14:15:48.000000000 +0800
3+
+++ opencv-3.4.13/modules/core/src/persistence.hpp 2021-02-24 23:55:08.440237914 +0800
4+
@@ -12,7 +12,7 @@
5+
#include <string>
6+
#include <iterator>
7+
8+
-#define USE_ZLIB 1
9+
+#define USE_ZLIB 0
10+
#if USE_ZLIB
11+
# ifndef _LFS64_LARGEFILE
12+
# define _LFS64_LARGEFILE 0

‎opencv-4.5.1-no-zlib.patch‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff -Nuarp opencv-4.5.1.orig/modules/core/src/persistence.hpp opencv-4.5.1/modules/core/src/persistence.hpp
2+
--- opencv-4.5.1.orig/modules/core/src/persistence.hpp 2020-12-21 12:01:38.000000000 +0800
3+
+++ opencv-4.5.1/modules/core/src/persistence.hpp 2021-02-24 23:52:47.088155277 +0800
4+
@@ -12,7 +12,7 @@
5+
#include <string>
6+
#include <iterator>
7+
8+
-#define USE_ZLIB 1
9+
+#define USE_ZLIB 0
10+
#if USE_ZLIB
11+
# ifndef _LFS64_LARGEFILE
12+
# define _LFS64_LARGEFILE 0

0 commit comments

Comments
 (0)