import changed/i9/opencv-4.6.0-7.el9

1 year ago · 93d1ef5f52
parent 28acd2979c
commit 93d1ef5f52
7 changed files with 745 additions and 231 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,5 @@
-SOURCES/opencv-clean-3.4.6.tar.gz
-SOURCES/opencv_contrib-clean-3.4.6.tar.gz
+SOURCES/b624b995ec9c439cbc2e9e6ee940d3a2-v0.1.1f.zip
+SOURCES/face_landmark_model.dat.xz
+SOURCES/opencv_extra-clean-4.6.0.tar.gz
+SOURCES/opencv-clean-4.6.0.tar.gz
+SOURCES/opencv_contrib-clean-4.6.0.tar.gz
--- a/.opencv.metadata
+++ b/.opencv.metadata
@ -1,2 +1,5 @@
-76924263971d8314a4fb8a152cd0c3b3c337ff8f SOURCES/opencv-clean-3.4.6.tar.gz
-22c33b7cc5f1c17ccefd9f9a2618afc17289c180 SOURCES/opencv_contrib-clean-3.4.6.tar.gz
+80d8ee4757cf3dca0e485ce920d181750b410f31  SOURCES/b624b995ec9c439cbc2e9e6ee940d3a2-v0.1.1f.zip
+b3fe7e6db1f8c77a13fbc4b32ac0e90a443f1d57  SOURCES/face_landmark_model.dat.xz
+e74b465c1e0e1d40d78cd968d41135e6ff79b7e0  SOURCES/opencv_extra-clean-4.6.0.tar.gz
+93dfb2504d4a82d17d8c7037332d265ca330143d  SOURCES/opencv-clean-4.6.0.tar.gz
+5ce991a17e61c94ec40d5beff27ecaac6ca5df02  SOURCES/opencv_contrib-clean-4.6.0.tar.gz
--- a/SOURCES/opencv-3.4.6-cvSaveImage.patch
+++ b/SOURCES/opencv-3.4.6-cvSaveImage.patch
@ -1,31 +0,0 @@
-From 6e1da2ef91907678159d40f600a56094c4d196b9 Mon Sep 17 00:00:00 2001
-From: Zhuo Zhang <zchrissirhcz@gmail.com>
-Date: Fri, 25 Dec 2020 00:58:16 +0800
-Subject: [PATCH] Merge pull request #19203 from zchrissirhcz:fix-cvSaveImage
-
-Fix cvSaveImage( ) function bug
-
-* fix cvSaveImage crash
-
-* replace emplace_back with {}, no C++11 required
-
-* fix MacOSX build with vector's push_back
---
- modules/imgcodecs/src/loadsave.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/modules/imgcodecs/src/loadsave.cpp b/modules/imgcodecs/src/loadsave.cpp
-index 4e626cd2165b..44c458c7273c 100644
--- a/modules/imgcodecs/src/loadsave.cpp
-+++ b/modules/imgcodecs/src/loadsave.cpp
-@@ -1001,7 +1001,9 @@ cvSaveImage( const char* filename, const CvArr* arr, const int* _params )
-         for( ; _params[i] > 0; i += 2 )
-             CV_Assert(static_cast<size_t>(i) < cv::CV_IO_MAX_IMAGE_PARAMS*2); // Limit number of params for security reasons
-     }
-    return cv::imwrite_(filename, cv::cvarrToMat(arr),
-+    std::vector<cv::Mat> img_vec;
-+    img_vec.push_back(cv::cvarrToMat(arr));
-+    return cv::imwrite_(filename, img_vec,
-         i > 0 ? std::vector<int>(_params, _params+i) : std::vector<int>(),
-         CV_IS_IMAGE(arr) && ((const IplImage*)arr)->origin == IPL_ORIGIN_BL );
- }
--- a/SOURCES/opencv-4.1.0-install_3rdparty_licenses.patch
+++ b/SOURCES/opencv-4.1.0-install_3rdparty_licenses.patch
--- a/SOURCES/opencv.python.patch
+++ b/SOURCES/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}
--- a/SOURCES/xorg.conf
+++ b/SOURCES/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
--- a/SPECS/opencv.spec
+++ b/SPECS/opencv.spec