wip

nihui · Dec 9, 2023 · fc6a205 · fc6a205
1 parent 4023f8c
commit fc6a205
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 6 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -44,10 +44,11 @@ jobs:
         patch -p1 -i ../opencv-2.4.13.7-link-openmp.patch
         patch -p1 -i ../opencv-2.4.13.7-newer-msvc.patch
         patch -p1 -i ../opencv-2.4.13.7-minimal-install.patch
-        rm -rf modules/highgui
-        cp -r ../highgui modules/
         cp ../misc/draw_text.h ../misc/mono_font_data.h modules/core/src/
         patch -p1 -i ../opencv-2.4.13.7-drawing-mono-font.patch
+        rm -rf modules/highgui
+        cp -r ../highgui modules/
+        rm -rf 3rdparty apps data doc samples
         cd ..
         zip -9 -r opencv-2.4.13.7.zip opencv-2.4.13.7
     - name: opencv3-source
@@ -61,10 +62,11 @@ jobs:
         patch -p1 -i ../opencv-3.4.20-no-zlib.patch
         patch -p1 -i ../opencv-3.4.20-link-openmp.patch
         patch -p1 -i ../opencv-3.4.20-minimal-install.patch
-        rm -rf modules/highgui
-        cp -r ../highgui modules/
         cp ../misc/draw_text.h ../misc/mono_font_data.h modules/imgproc/src/
         patch -p1 -i ../opencv-3.4.20-drawing-mono-font.patch
+        rm -rf modules/highgui
+        cp -r ../highgui modules/
+        rm -rf 3rdparty apps data doc samples
         cd ..
         zip -9 -r opencv-3.4.20.zip opencv-3.4.20
     - name: opencv4-source
@@ -79,10 +81,11 @@ jobs:
         patch -p1 -i ../opencv-4.8.1-no-zlib.patch
         patch -p1 -i ../opencv-4.8.1-link-openmp.patch
         patch -p1 -i ../opencv-4.8.1-minimal-install.patch
-        rm -rf modules/highgui
-        cp -r ../highgui modules/
         cp ../misc/draw_text.h ../misc/mono_font_data.h modules/imgproc/src/
         patch -p1 -i ../opencv-4.8.1-drawing-mono-font.patch
+        rm -rf modules/highgui
+        cp -r ../highgui modules/
+        rm -rf 3rdparty apps data doc samples
         cd ..
         zip -9 -r opencv-4.8.1.zip opencv-4.8.1
     - name: upload-opencv2-source

diff --git a/opencv-2.4.13.7-minimal-install.patch b/opencv-2.4.13.7-minimal-install.patch
@@ -21,6 +21,30 @@ diff -Nuarp opencv-2.4.13.7.orig/cmake/OpenCVGenConfig.cmake opencv-2.4.13.7/cma
  # --------------------------------------------------------------------------------------------
  #  Part 3/3: ${BIN_DIR}/win-install/OpenCVConfig.cmake  -> For use within binary installers/packages
  # --------------------------------------------------------------------------------------------
+diff -Nuarp opencv-2.4.13.7.orig/CMakeLists.txt opencv-2.4.13.7/CMakeLists.txt
+--- opencv-2.4.13.7.orig/CMakeLists.txt	2018-07-02 20:41:56.000000000 +0800
++++ opencv-2.4.13.7/CMakeLists.txt	2023-12-09 21:40:04.109733626 +0800
+@@ -569,20 +569,12 @@ add_subdirectory(include)
+ add_subdirectory(modules)
+
+ # Generate targets for documentation
+-add_subdirectory(doc)
+
+ # various data that is used by cv libraries and/or demo applications.
+-add_subdirectory(data)
+
+ # extra applications
+-if(BUILD_opencv_apps)
+-  add_subdirectory(apps)
+-endif()
+
+ # examples
+-if(BUILD_EXAMPLES OR BUILD_ANDROID_EXAMPLES OR INSTALL_PYTHON_EXAMPLES)
+-  add_subdirectory(samples)
+-endif()
+
+ if(ANDROID)
+   add_subdirectory(platforms/android/service)
 diff -Nuarp opencv-2.4.13.7.orig/data/CMakeLists.txt opencv-2.4.13.7/data/CMakeLists.txt
 --- opencv-2.4.13.7.orig/data/CMakeLists.txt	2018-07-02 20:41:56.000000000 +0800
 +++ opencv-2.4.13.7/data/CMakeLists.txt	2023-12-09 21:07:33.901501638 +0800