Rebuild for opencv 4.10.0

- Resolves: rhbz#2290312

Upstream tag: 4.10.0
Upstream commit: 71d3237a

Commit authored by Packit automation (https://packit.dev/)

.gitignore

@@ -1,26 +1,7 @@
-OpenCV-2.1.0.tar.bz2
-/OpenCV-2.2.0.tar.bz2
-/OpenCV-2.3.1.tar.bz2
-/OpenCV-2.3.1a.tar.bz2
-/OpenCV-2.4.1.tar.bz2
-/OpenCV-2.4.2.tar.bz2
-/OpenCV-2.4.3.tar.bz2
-/OpenCV-2.4.4-beta.tar.bz2
-/OpenCV-2.4.4a.tar.bz2
-/OpenCV-2.4.4a-clean.tar.bz2
-/opencv-2.4.5-clean.tar.xz
-/opencv-clean-2.4.6.1.tar.xz
-/opencv-clean-2.4.7.tar.xz
-/opencv-clean-2.4.9.tar.xz
-/opencv-clean-2.4.11.tar.xz
-/opencv-clean-2.4.12.3.tar.xz
-/opencv_contrib-3.1.0.tar.gz
-/opencv-3.1.0.tar.gz
-/opencv_contrib-clean-3.1.0.tar.gz
-/opencv-clean-3.2.0.tar.gz
-/opencv-3.2.0.tar.gz
-/opencv_contrib-clean-3.2.0.tar.gz
-/opencv_contrib-clean-3.3.1.tar.gz
-/opencv-clean-3.3.1.tar.gz
-/opencv_contrib-clean-3.4.1.tar.gz
-/opencv-clean-3.4.1.tar.gz
+OpenCV*.tar.*
+opencv*.tar.*
+face_landmark_model.dat.xz
+/b624b995ec9c439cbc2e9e6ee940d3a2-v0.1.1f.zip
+/fa4b3e25167319cb0fa9432ef8281945-v0.1.2a.zip
+/wechat-20230712.git3487ef7.tar.gz
+/dbb095a8bf3008e91edbbf45d8d34885-v0.1.2d.zip

.packit.yaml

@@ -0,0 +1,17 @@
+# See the documentation for more information:
+# https://packit.dev/docs/configuration/
+
+upstream_project_url: https://github.com/opencv/opencv
+
+# run opencv-clean.sh
+# the sed currently hacks the script so that the version is correctly set and the sources upload is handled by Packit
+actions:
+  pre-sync:
+    - bash -c "cd ${PACKIT_DOWNSTREAM_REPO}; sed '3d;$d' ./opencv-clean.sh | VERSION=${PACKIT_PROJECT_VERSION} bash"
+
+jobs:
+  - job: pull_from_upstream
+    trigger: release
+    dist_git_branches:
+      - fedora-rawhide
+

README.packit

@@ -0,0 +1,3 @@
+This repository is maintained by packit.
+https://packit.dev/
+The file was generated using packit 0.97.1.post1.dev6+gc8c0314a.

opencv-3.4.1-cmake_paths.patch

@@ -1,24 +0,0 @@
---- ./CMakeLists.txt.orig	2018-02-27 01:46:32.259819239 +0000
-+++ ./CMakeLists.txt	2018-02-27 19:48:19.658736383 +0000
-@@ -439,19 +439,14 @@ else()
-     ocv_update(OPENCV_CONFIG_INSTALL_PATH  ".")
-   else()
-     include(GNUInstallDirs)
--    ocv_update(OPENCV_LIB_INSTALL_PATH     ${CMAKE_INSTALL_LIBDIR}${LIB_SUFFIX})
-+    ocv_update(OPENCV_LIB_INSTALL_PATH     ${CMAKE_INSTALL_LIBDIR})
-     ocv_update(OPENCV_3P_LIB_INSTALL_PATH  share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH})
-     ocv_update(OPENCV_SAMPLES_SRC_INSTALL_PATH    share/OpenCV/samples)
-     ocv_update(OPENCV_JAR_INSTALL_PATH share/OpenCV/java)
-     ocv_update(OPENCV_OTHER_INSTALL_PATH   share/OpenCV)
- 
-     if(NOT DEFINED OPENCV_CONFIG_INSTALL_PATH)
--      math(EXPR SIZEOF_VOID_P_BITS "8 * ${CMAKE_SIZEOF_VOID_P}")
--      if(LIB_SUFFIX AND NOT SIZEOF_VOID_P_BITS EQUAL LIB_SUFFIX)
--        ocv_update(OPENCV_CONFIG_INSTALL_PATH ${CMAKE_INSTALL_LIBDIR}${LIB_SUFFIX}/cmake/opencv)
--      else()
--        ocv_update(OPENCV_CONFIG_INSTALL_PATH share/OpenCV)
--      endif()
-+      ocv_update(OPENCV_CONFIG_INSTALL_PATH lib${LIB_SUFFIX}/OpenCV)
-     endif()
-   endif()
-   ocv_update(OPENCV_INCLUDE_INSTALL_PATH "include")

opencv-3.4.1-cmake_va_intel_fix.patch

@@ -1,9 +0,0 @@
---- ./samples/va_intel/CMakeLists.txt.bak	2018-02-28 01:53:40.199554269 +0000
-+++ ./samples/va_intel/CMakeLists.txt	2018-02-28 01:54:34.036200492 +0000
-@@ -17,5 +17,5 @@ ocv_include_modules_recurse(${OPENCV_VA_
- file(GLOB all_samples RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp)
- foreach(sample_filename ${all_samples})
-   ocv_define_sample(tgt ${sample_filename} va_intel)
--  ocv_target_link_libraries(${tgt} ${OPENCV_LINKER_LIBS} ${OPENCV_VA_INTEL_SAMPLES_REQUIRED_DEPS})
-+  ocv_target_link_libraries(${tgt} ${OPENCV_LINKER_LIBS} ${OPENCV_VA_INTEL_SAMPLES_REQUIRED_DEPS} ${VA_LIBRARIES} ${VA_INTEL_LIBRARIES})
- endforeach()

opencv-4.1.0-install_3rdparty_licenses.patch

@@ -0,0 +1,11 @@
+--- ./cmake/OpenCVDetectOpenCL.cmake.orig	2019-05-14 00:35:41.373094435 +0100
++++ ./cmake/OpenCVDetectOpenCL.cmake	2019-05-14 00:35:50.833189862 +0100
+@@ -5,7 +5,7 @@ if(APPLE)
+ else()
+   set(OPENCL_LIBRARY "" CACHE STRING "OpenCL library")
+   set(OPENCL_INCLUDE_DIR "${OpenCV_SOURCE_DIR}/3rdparty/include/opencl/1.2" CACHE PATH "OpenCL include directory")
+-  ocv_install_3rdparty_licenses(opencl-headers "${OpenCV_SOURCE_DIR}/3rdparty/include/opencl/LICENSE.txt")
++  #ocv_install_3rdparty_licenses(opencl-headers "${OpenCV_SOURCE_DIR}/3rdparty/include/opencl/LICENSE.txt")
+ endif()
+ mark_as_advanced(OPENCL_INCLUDE_DIR OPENCL_LIBRARY)
+ 

opencv-clean.sh

@@ -1,16 +1,34 @@
-export VERSION=3.4.1
+#!/bin/bash
+
+VERSION=4.9.0
 
 wget -c https://github.com/opencv/opencv/archive/${VERSION}/opencv-${VERSION}.tar.gz
-tar xf opencv-${VERSION}.tar.gz
-cd opencv-${VERSION}/
-find ./ -iname "len*.*" -exec rm {} \;
-rm -rf modules/xfeatures2d/
-cd ..; tar zcf opencv-clean-${VERSION}.tar.gz opencv-${VERSION}/
-rm -rf opencv-${VERSION}/
-
 wget -c https://github.com/opencv/opencv_contrib/archive/${VERSION}/opencv_contrib-${VERSION}.tar.gz
-tar xf opencv_contrib-${VERSION}.tar.gz
-cd opencv_contrib-${VERSION}/
-rm -rf modules/xfeatures2d/
-cd ..; tar zcf opencv_contrib-clean-${VERSION}.tar.gz opencv_contrib-${VERSION}/
+wget -c https://github.com/opencv/opencv_extra/archive/${VERSION}/opencv_extra-${VERSION}.tar.gz
+
+rm -rf opencv-${VERSION}/
+tar xf opencv-${VERSION}.tar.gz
+find opencv-${VERSION}/ -iname "*lena*" -exec rm {} ';' -print
+find opencv-${VERSION}/ -iname "*lenna*" -exec rm {} ';' -print
+rm -r opencv-${VERSION}/modules/xfeatures2d/
+tar zcf opencv-clean-${VERSION}.tar.gz opencv-${VERSION}/
+rm -r opencv-${VERSION}/
+
 rm -rf opencv_contrib-${VERSION}/
+tar xf opencv_contrib-${VERSION}.tar.gz
+find opencv_contrib-${VERSION}/ -iname "*lena*" -exec rm {} ';' -print
+find opencv_contrib-${VERSION}/ -iname "*lenna*" -exec rm {} ';' -print
+rm -r opencv_contrib-${VERSION}/modules/xfeatures2d/
+tar zcf opencv_contrib-clean-${VERSION}.tar.gz opencv_contrib-${VERSION}/
+rm -r opencv_contrib-${VERSION}/
+
+rm -rf opencv_extra-${VERSION}/
+tar xf opencv_extra-${VERSION}.tar.gz
+find opencv_extra-${VERSION} -iname "*lena*" -exec rm {} ';' -print
+find opencv_extra-${VERSION} -iname "*lenna*" -exec rm {} ';' -print
+find opencv_extra-${VERSION} \( -iname "len*.*" -o -iname "*lena*.png" -o -iname "*lena*.jpg" \) -exec rm {} ';' -print
+tar zcf opencv_extra-clean-${VERSION}.tar.gz opencv_extra-${VERSION}/
+rm -r opencv_extra-${VERSION}/
+
+
+echo fedpkg new-sources $(spectool -l --sources opencv.spec | sed 's/.*: //;s/.*\///')

opencv.python.patch

@@ -0,0 +1,11 @@
+--- opencv-4.5.5/modules/python/common.cmake.orig	2022-04-11 18:40:18.925266930 +0100
++++ opencv-4.5.5/modules/python/common.cmake	2022-04-11 18:42:17.753849346 +0100
+@@ -179,7 +179,7 @@ else()
+   else()
+     set(__python_binary_subdir "python-${${PYTHON}_VERSION_MAJOR}.${${PYTHON}_VERSION_MINOR}")
+   endif()
+-  set(__python_binary_install_path "${OPENCV_PYTHON_INSTALL_PATH}/${__python_loader_subdir}${__python_binary_subdir}")
++  set(__python_binary_install_path "${OPENCV_PYTHON_INSTALL_PATH}/${__python_loader_subdir}")
+ endif()
+ 
+ install(TARGETS ${the_module}

sources

@@ -1,2 +1,6 @@
-SHA512 (opencv_contrib-clean-3.4.1.tar.gz) = 1bdd54f3f48a268a1099a91456415af86ef2d449ef547ac14447cf5fcc6af84561e76f183b6124ecc638a8b80b312909521a4c9b5d9e7f3ed544d99acfe9cc96
-SHA512 (opencv-clean-3.4.1.tar.gz) = d73038400cafe9f03eab27f3ec79f0cf42930603727d8682d45853bf1165aa62e5fde77e56e8ca73ae65096bf3c6b5dff0780994bc7d67414657f2e027eb8f8a
+SHA512 (opencv-clean-4.10.0.tar.gz) = 0fc8c4f870bcc67bd70bb1d438afe62a4e0874a9e6af364fd0cf08648c6110469fb7d433d561b12f3cae88bcc7b74d2680ffb0364a028a90918fb1d9542f544a
+SHA512 (wechat-20230712.git3487ef7.tar.gz) = bc4f220465de41df8af0cb35312c1db155976d05f13a60e43c1798b161d8f56388e34a59108fb3e27e8c97b53acfd198256d9ae420b5f70a32ddc1ea65c3c8a6
+SHA512 (opencv_contrib-clean-4.10.0.tar.gz) = 382a08b4c4be6ad2f2c0f682a169c119e6be4d04b57973fd85daf16cf0cd78dc55a64729c7efbd39b41711ef3dd354e7f323c384c5a5d39d8c1d9f42c9eedbe5
+SHA512 (opencv_extra-clean-4.10.0.tar.gz) = 8c61246ae773e50bb3080f732aaac8a1fb762e81a0f8abdf0987377a92d97ecfcbe99c3a1058ed313008c039b269e65646463f82b347e3a546f32dd4c8fed903
+SHA512 (face_landmark_model.dat.xz) = 7558f29431bb9cad1f22ee067ad3ed41be8f68b865992eb7d3a5ce6b6b9e1d031cb03e33c3c149220ef8faebd0471703a8a3bbb06402bcc8ce76bd28317aa307
+SHA512 (dbb095a8bf3008e91edbbf45d8d34885-v0.1.2d.zip) = f6f87be8932c0c0ca40bec20b750ab3df27dac44f4507211c29c60f42160e3f2f2133b52c18245eff5241f216a3f5526d299937470b69b125e8eca369c8f6939

xorg.conf

@@ -0,0 +1,98 @@
+# This xorg configuration file is meant to be used
+# to start a dummy X11 server for graphical testing.
+
+Section "ServerFlags"
+  Option "DontVTSwitch" "true"
+  Option "AllowMouseOpenFail" "true"
+  Option "PciForceNone" "true"
+  Option "AutoEnableDevices" "false"
+  Option "AutoAddDevices" "false"
+EndSection
+
+Section "InputDevice"
+  Identifier "dummy_mouse"
+  Option "CorePointer" "true"
+  Driver "void"
+EndSection
+
+Section "InputDevice"
+  Identifier "dummy_keyboard"
+  Option "CoreKeyboard" "true"
+  Driver "void"
+EndSection
+
+Section "Device"
+  Identifier "dummy_videocard"
+  Driver "dummy"
+  Option "ConstantDPI" "true"
+  #VideoRam 4096000
+  #VideoRam 256000
+  VideoRam 192000
+EndSection
+
+Section "Monitor"
+  Identifier "dummy_monitor"
+  HorizSync   5.0 - 1000.0
+  VertRefresh 5.0 - 200.0
+  #This can be used to get a specific DPI, but only for the default resolution:
+  #DisplaySize 508 317
+  #NOTE: the highest modes will not work without increasing the VideoRam
+  # for the dummy video card.
+  Modeline "32768x32768" 15226.50 32768 35800 39488 46208 32768 32771 32781 32953
+  Modeline "32768x16384" 7516.25 32768 35544 39192 45616 16384 16387 16397 16478
+  Modeline "16384x8192" 2101.93 16384 16416 24400 24432 8192 8390 8403 8602
+  Modeline "8192x4096" 424.46 8192 8224 9832 9864 4096 4195 4202 4301
+  Modeline "5496x1200" 199.13 5496 5528 6280 6312 1200 1228 1233 1261
+  Modeline "5280x1080" 169.96 5280 5312 5952 5984 1080 1105 1110 1135
+  Modeline "5280x1200" 191.40 5280 5312 6032 6064 1200 1228 1233 1261
+  Modeline "5120x3200" 199.75 5120 5152 5904 5936 3200 3277 3283 3361
+  Modeline "4800x1200" 64.42 4800 4832 5072 5104 1200 1229 1231 1261
+  Modeline "3840x2880" 133.43 3840 3872 4376 4408 2880 2950 2955 3025
+  Modeline "3840x2560" 116.93 3840 3872 4312 4344 2560 2622 2627 2689
+  Modeline "3840x2048" 91.45 3840 3872 4216 4248 2048 2097 2101 2151
+  Modeline "3840x1080" 100.38 3840 3848 4216 4592 1080 1081 1084 1093
+  Modeline "3600x1200" 106.06 3600 3632 3984 4368 1200 1201 1204 1214
+  Modeline "3288x1080" 39.76 3288 3320 3464 3496 1080 1106 1108 1135
+  Modeline "2048x2048" 49.47 2048 2080 2264 2296 2048 2097 2101 2151
+  Modeline "2048x1536" 80.06 2048 2104 2312 2576 1536 1537 1540 1554
+  Modeline "2560x1600" 47.12 2560 2592 2768 2800 1600 1639 1642 1681
+  Modeline "2560x1440" 42.12 2560 2592 2752 2784 1440 1475 1478 1513
+  Modeline "1920x1440" 69.47 1920 1960 2152 2384 1440 1441 1444 1457
+  Modeline "1920x1200" 26.28 1920 1952 2048 2080 1200 1229 1231 1261
+  Modeline "1920x1080" 23.53 1920 1952 2040 2072 1080 1106 1108 1135
+  Modeline "1680x1050" 20.08 1680 1712 1784 1816 1050 1075 1077 1103
+  Modeline "1600x1200" 22.04 1600 1632 1712 1744 1200 1229 1231 1261
+  Modeline "1600x900" 33.92 1600 1632 1760 1792 900 921 924 946
+  Modeline "1440x900" 30.66 1440 1472 1584 1616 900 921 924 946
+  ModeLine "1366x768" 72.00 1366 1414 1446 1494  768 771 777 803
+  Modeline "1280x1024" 31.50 1280 1312 1424 1456 1024 1048 1052 1076
+  Modeline "1280x800" 24.15 1280 1312 1400 1432 800 819 822 841
+  Modeline "1280x768" 23.11 1280 1312 1392 1424 768 786 789 807
+  Modeline "1360x768" 24.49 1360 1392 1480 1512 768 786 789 807
+  Modeline "1024x768" 18.71 1024 1056 1120 1152 768 786 789 807
+  Modeline "768x1024" 19.50 768 800 872 904 1024 1048 1052 1076
+EndSection
+
+Section "Screen"
+  Identifier "dummy_screen"
+  Device "dummy_videocard"
+  Monitor "dummy_monitor"
+  DefaultDepth 24
+  SubSectionSub "Display"
+    Viewport 0 0
+    Depth 24
+    #Modes "32768x32768" "32768x16384" "16384x8192" "8192x4096" "5120x3200" "3840x2880" "3840x2560" "3840x2048" "2048x2048" "2560x1600" "1920x1440" "1920x1200" "1920x1080" "1600x1200" "1680x1050" "1600x900" "1400x1050" "1440x900" "1280x1024" "1366x768" "1280x800" "1024x768"
+    Modes "5120x3200" "3840x2880" "3840x2560" "3840x2048" "2048x2048" "2560x1600" "1920x1440" "1920x1200" "1920x1080" "1600x1200" "1680x1050" "1600x900" "1400x1050" "1440x900" "1280x1024" "1366x768" "1280x800" "1024x768"
+    #Virtual 32000 32000
+    #Virtual 16384 8192
+    Virtual 8192 4096
+    #Virtual 5120 3200
+  EndSubSection
+EndSection
+
+Section "ServerLayout"
+  Identifier   "dummy_layout"
+  Screen       "dummy_screen"
+  InputDevice  "dummy_mouse"
+  InputDevice  "dummy_keyboard"
+EndSection