changeset 6478:8c1e72cd80a5

opencv: update to v4.6.0 * src/opencv.mk: update to v4.6.0, use github * src/opencv-1-fixes.patch: remove file * dist-files.mk: remove ref to deleted file
author John Donoghue <john.donoghue@ieee.org>
date Fri, 28 Oct 2022 15:10:31 -0400
parents d8cda0e30e45
children 8b83ce1e66df
files src/opencv-1-fixes.patch src/opencv.mk
diffstat 2 files changed, 7 insertions(+), 87 deletions(-) [+]
line wrap: on
line diff
--- a/src/opencv-1-fixes.patch	Fri Oct 28 15:10:30 2022 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-Common subdirectories: opencv-3.4.3.orig/3rdparty and opencv-3.4.3/3rdparty
-Common subdirectories: opencv-3.4.3.orig/apps and opencv-3.4.3/apps
-Common subdirectories: opencv-3.4.3.orig/cmake and opencv-3.4.3/cmake
-diff -ut opencv-3.4.3.orig/CMakeLists.txt opencv-3.4.3/CMakeLists.txt
---- opencv-3.4.3.orig/CMakeLists.txt	2019-10-02 15:01:47.179900886 -0400
-+++ opencv-3.4.3/CMakeLists.txt	2019-10-02 15:19:18.363163935 -0400
-@@ -39,7 +39,7 @@
-   if(NOT CMAKE_TOOLCHAIN_FILE)
-     # it _must_ go before project(OpenCV) in order to work
-     if(WIN32)
--      set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" CACHE PATH "Installation Directory")
-+      #set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" CACHE PATH "Installation Directory")
-     else()
-       set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "Installation Directory")
-     endif()
-@@ -47,7 +47,7 @@
-     #Android: set output folder to ${CMAKE_BINARY_DIR}
-     set(LIBRARY_OUTPUT_PATH_ROOT ${CMAKE_BINARY_DIR} CACHE PATH "root for library output, set this to change where android libs are compiled to" )
-     # any cross-compiling
--    set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" CACHE PATH "Installation Directory")
-+    #set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" CACHE PATH "Installation Directory")
-   endif()
- endif()
- 
-@@ -377,14 +377,7 @@
-   ocv_update(OPENCV_DOC_INSTALL_PATH share/OpenCV/doc)
- endif()
- 
--if(WIN32 AND CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
--  if(DEFINED OpenCV_RUNTIME AND DEFINED OpenCV_ARCH)
--    ocv_update(OpenCV_INSTALL_BINARIES_PREFIX "${OpenCV_ARCH}/${OpenCV_RUNTIME}/")
--  else()
--    message(STATUS "Can't detect runtime and/or arch")
--    ocv_update(OpenCV_INSTALL_BINARIES_PREFIX "")
--  endif()
--elseif(ANDROID)
-+if(ANDROID)
-   ocv_update(OpenCV_INSTALL_BINARIES_PREFIX "sdk/native/")
- else()
-   ocv_update(OpenCV_INSTALL_BINARIES_PREFIX "")
-@@ -433,11 +426,8 @@
-   ocv_update(3P_LIBRARY_OUTPUT_PATH      "${OpenCV_BINARY_DIR}/3rdparty/lib${LIB_SUFFIX}")
- 
-   if(WIN32 AND CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
--    if(OpenCV_STATIC)
--      ocv_update(OPENCV_LIB_INSTALL_PATH   "${OpenCV_INSTALL_BINARIES_PREFIX}staticlib${LIB_SUFFIX}")
--    else()
--      ocv_update(OPENCV_LIB_INSTALL_PATH   "${OpenCV_INSTALL_BINARIES_PREFIX}lib${LIB_SUFFIX}")
--    endif()
-+    ocv_update(OPENCV_LIB_INSTALL_PATH   "${OpenCV_INSTALL_BINARIES_PREFIX}lib${LIB_SUFFIX}")
-+    ocv_update(OPENCV_3P_LIB_INSTALL_PATH  "${OpenCV_INSTALL_BINARIES_PREFIX}lib${LIB_SUFFIX}")
-     ocv_update(OPENCV_3P_LIB_INSTALL_PATH  "${OpenCV_INSTALL_BINARIES_PREFIX}staticlib${LIB_SUFFIX}")
-     ocv_update(OPENCV_SAMPLES_SRC_INSTALL_PATH    samples)
-     ocv_update(OPENCV_JAR_INSTALL_PATH java)
-@@ -495,15 +485,9 @@
-   set(OPENCV_LIB_ARCHIVE_INSTALL_PATH ${OPENCV_LIB_INSTALL_PATH})
- endif()
- 
--if(WIN32)
--  # Postfix of DLLs:
--  set(OPENCV_DLLVERSION "${OPENCV_VERSION_MAJOR}${OPENCV_VERSION_MINOR}${OPENCV_VERSION_PATCH}")
--  set(OPENCV_DEBUG_POSTFIX d)
--else()
--  # Postfix of so's:
--  set(OPENCV_DLLVERSION "")
--  set(OPENCV_DEBUG_POSTFIX "")
--endif()
-+# Postfix of so's:
-+set(OPENCV_DLLVERSION "")
-+set(OPENCV_DEBUG_POSTFIX "")
- 
- if(DEFINED CMAKE_DEBUG_POSTFIX)
-   set(OPENCV_DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}")
-Common subdirectories: opencv-3.4.3.orig/data and opencv-3.4.3/data
-Common subdirectories: opencv-3.4.3.orig/doc and opencv-3.4.3/doc
-Common subdirectories: opencv-3.4.3.orig/include and opencv-3.4.3/include
-Common subdirectories: opencv-3.4.3.orig/modules and opencv-3.4.3/modules
-Common subdirectories: opencv-3.4.3.orig/platforms and opencv-3.4.3/platforms
-Common subdirectories: opencv-3.4.3.orig/samples and opencv-3.4.3/samples
--- a/src/opencv.mk	Fri Oct 28 15:10:30 2022 -0400
+++ b/src/opencv.mk	Fri Oct 28 15:10:31 2022 -0400
@@ -2,19 +2,18 @@
 
 PKG             := opencv
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.4.3
-$(PKG)_CHECKSUM := d700348b3251552ccf034e4d7dd16080e4086840
+$(PKG)_VERSION  := 4.6.0
+$(PKG)_CHECKSUM := 34394c7e2fc152eee1ce73e326bc19a99879c77c
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := opencv-$($(PKG)_VERSION).zip
-$(PKG)_URL      := https://$(SOURCEFORGE_MIRROR)/project/$(PKG)library/$(PKG)-unix/$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_URL_2    := https://distfiles.macports.org/opencv/$($(PKG)_FILE)
+$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
+$(PKG)_URL      := https://github.com/opencv/$(PKG)/archive/$($(PKG)_VERSION).tar.gz
 $(PKG)_DEPS     := eigen ffmpeg jasper jpeg libpng \
                    openblas openexr tiff xz zlib
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://sourceforge.net/projects/opencvlibrary/files/opencv-unix/' | \
-    $(SED) -n 's,.*/projects/.*/\([0-9][^"]*\)/".*,\1,p' | \
-    head -1
+    $(WGET) -q -O- 'https://github.com/opencv/opencv/tags' | \
+    $(SED) -n 's|.*releases/tag/\([^"]*\).*|\1|p' | $(SORT) -V | \
+    tail -1
 endef
 
 # -DCMAKE_CXX_STANDARD=98 required for non-posix gcc7 build