From dbe32a8e2a2e612042ed709b08ecd5db5d4e75e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Thu, 15 Oct 2020 21:53:05 +0200 Subject: [PATCH] RHEL 9.0.0 Alpha bootstrap The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/opencv#f4647943a42fa68f89940f2b3232b663878c360a --- .gitignore | 4 + 17431.patch | 24 + 2549.patch | 507 +++++++ opencv-4.1.0-install_3rdparty_licenses.patch | 11 + opencv-4.1.2-includes.patch | 24 + opencv-clean.sh | 27 + opencv.spec | 1232 ++++++++++++++++++ opencv_vulkan.patch | 28 + sources | 5 + xorg.conf | 98 ++ 10 files changed, 1960 insertions(+) create mode 100644 17431.patch create mode 100644 2549.patch create mode 100644 opencv-4.1.0-install_3rdparty_licenses.patch create mode 100644 opencv-4.1.2-includes.patch create mode 100755 opencv-clean.sh create mode 100644 opencv.spec create mode 100644 opencv_vulkan.patch create mode 100644 sources create mode 100644 xorg.conf diff --git a/.gitignore b/.gitignore index e69de29..093975d 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,4 @@ +OpenCV*.tar.* +opencv*.tar.* +face_landmark_model.dat.xz +/b624b995ec9c439cbc2e9e6ee940d3a2-v0.1.1f.zip diff --git a/17431.patch b/17431.patch new file mode 100644 index 0000000..860a9b4 --- /dev/null +++ b/17431.patch @@ -0,0 +1,24 @@ +From 7856f14558f37021c1d5b76ade40ac78e59a422d Mon Sep 17 00:00:00 2001 +From: Maksim Shabunin +Date: Sat, 30 May 2020 06:07:39 +0300 +Subject: [PATCH] Added VTK 9 support + +--- + cmake/OpenCVDetectVTK.cmake | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/cmake/OpenCVDetectVTK.cmake b/cmake/OpenCVDetectVTK.cmake +index 0f2b9584e12..23d17c35241 100644 +--- a/cmake/OpenCVDetectVTK.cmake ++++ b/cmake/OpenCVDetectVTK.cmake +@@ -1,3 +1,10 @@ ++# VTK 9.0 ++find_package(VTK QUIET NAMES vtk COMPONENTS InteractionStyle RenderingLOD IOPLY FiltersTexture RenderingFreeType IOExport IOGeometry FiltersExtraction RenderingCore NO_MODULE) ++if(VTK_FOUND) ++ set(HAVE_VTK ON) ++ return() ++endif() ++ + # VTK 6.x components + find_package(VTK QUIET COMPONENTS vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport NO_MODULE) + IF(VTK_FOUND) diff --git a/2549.patch b/2549.patch new file mode 100644 index 0000000..8d66918 --- /dev/null +++ b/2549.patch @@ -0,0 +1,507 @@ +From c4b3b920461f9c7207d4c184a5bedf7608a51ed1 Mon Sep 17 00:00:00 2001 +From: Maksim Shabunin +Date: Sat, 30 May 2020 06:09:02 +0300 +Subject: [PATCH 1/3] Added VTK 9 support + +--- + modules/viz/CMakeLists.txt | 4 +++- + modules/viz/src/precomp.hpp | 8 +++++++- + modules/viz/src/types.cpp | 3 ++- + modules/viz/src/vizimpl.cpp | 13 +++++++++++-- + modules/viz/src/vtk/vtkOBJWriter.cpp | 14 +++++++++----- + modules/viz/src/vtk/vtkXYZReader.cpp | 2 +- + modules/viz/src/vtk/vtkXYZWriter.cpp | 2 +- + 7 files changed, 34 insertions(+), 12 deletions(-) + +diff --git a/modules/viz/CMakeLists.txt b/modules/viz/CMakeLists.txt +index 89a9c3e098..3426e1dd26 100644 +--- a/modules/viz/CMakeLists.txt ++++ b/modules/viz/CMakeLists.txt +@@ -3,7 +3,9 @@ if(NOT HAVE_VTK) + endif() + + set(the_description "Viz") +-include(${VTK_USE_FILE}) ++if(VTK_VERSION VERSION_LESS 8.90) ++ include(${VTK_USE_FILE}) ++endif() + + if(NOT BUILD_SHARED_LIBS) + # We observed conflict between builtin 3rdparty libraries and +diff --git a/modules/viz/src/precomp.hpp b/modules/viz/src/precomp.hpp +index f92fdb6ac2..4c4bf7c599 100644 +--- a/modules/viz/src/precomp.hpp ++++ b/modules/viz/src/precomp.hpp +@@ -133,7 +133,8 @@ + #include + #include + #include +-#include "vtkCallbackCommand.h" ++#include ++#include + + #if !defined(_WIN32) || defined(__CYGWIN__) + # include /* unlink */ +@@ -149,6 +150,11 @@ + #include "vtk/vtkTrajectorySource.h" + #include "vtk/vtkImageMatSource.h" + ++#if VTK_MAJOR_VERSION >= 9 ++typedef vtkIdType const * CellIterT; ++#else ++typedef vtkIdType * CellIterT; ++#endif + + #include + #include +diff --git a/modules/viz/src/types.cpp b/modules/viz/src/types.cpp +index 65571a192e..0e14477891 100644 +--- a/modules/viz/src/types.cpp ++++ b/modules/viz/src/types.cpp +@@ -100,7 +100,8 @@ cv::viz::Mesh cv::viz::Mesh::load(const String& file, int type) + int* poly_ptr = mesh.polygons.ptr(); + + polygons->InitTraversal(); +- vtkIdType nr_cell_points, *cell_points; ++ vtkIdType nr_cell_points; ++ CellIterT cell_points; + while (polygons->GetNextCell(nr_cell_points, cell_points)) + { + *poly_ptr++ = nr_cell_points; +diff --git a/modules/viz/src/vizimpl.cpp b/modules/viz/src/vizimpl.cpp +index 2c291c0569..2c7ce997a4 100644 +--- a/modules/viz/src/vizimpl.cpp ++++ b/modules/viz/src/vizimpl.cpp +@@ -55,8 +55,17 @@ cv::viz::Viz3d::VizImpl::VizImpl(const String &name) : spin_once_state_(false), + + // Create render window + window_ = vtkSmartPointer::New(); +- cv::Vec2i window_size = cv::Vec2i(window_->GetScreenSize()) / 2; +- window_->SetSize(window_size.val); ++ int * sz = window_->GetScreenSize(); ++ if (sz) ++ { ++ cv::Vec2i window_size = cv::Vec2i(sz) / 2; ++ window_->SetSize(window_size.val); ++ } ++ else ++ { ++ int new_sz[2] = { 640, 480 }; ++ window_->SetSize(new_sz); ++ } + window_->AddRenderer(renderer_); + + // Create the interactor style +diff --git a/modules/viz/src/vtk/vtkOBJWriter.cpp b/modules/viz/src/vtk/vtkOBJWriter.cpp +index 296b6eb065..2e5764fc27 100644 +--- a/modules/viz/src/vtk/vtkOBJWriter.cpp ++++ b/modules/viz/src/vtk/vtkOBJWriter.cpp +@@ -72,7 +72,7 @@ void cv::viz::vtkOBJWriter::WriteData() + } + + vtkDebugMacro(<<"Opening vtk file for writing..."); +- ostream *outfilep = new ofstream(this->FileName, ios::out); ++ std::ostream *outfilep = new std::ofstream(this->FileName, ios::out); + if (outfilep->fail()) + { + vtkErrorMacro(<< "Unable to open file: "<< this->FileName); +@@ -127,7 +127,8 @@ void cv::viz::vtkOBJWriter::WriteData() + // write out verts if any + if (input->GetNumberOfVerts() > 0) + { +- vtkIdType npts = 0, *index = 0; ++ vtkIdType npts = 0; ++ CellIterT index = 0; + vtkCellArray *cells = input->GetVerts(); + for (cells->InitTraversal(); cells->GetNextCell(npts, index); ) + { +@@ -141,7 +142,8 @@ void cv::viz::vtkOBJWriter::WriteData() + // write out lines if any + if (input->GetNumberOfLines() > 0) + { +- vtkIdType npts = 0, *index = 0; ++ vtkIdType npts = 0; ++ CellIterT index = 0; + vtkCellArray *cells = input->GetLines(); + for (cells->InitTraversal(); cells->GetNextCell(npts, index); ) + { +@@ -162,7 +164,8 @@ void cv::viz::vtkOBJWriter::WriteData() + // write out polys if any + if (input->GetNumberOfPolys() > 0) + { +- vtkIdType npts = 0, *index = 0; ++ vtkIdType npts = 0; ++ CellIterT index = 0; + vtkCellArray *cells = input->GetPolys(); + for (cells->InitTraversal(); cells->GetNextCell(npts, index); ) + { +@@ -191,7 +194,8 @@ void cv::viz::vtkOBJWriter::WriteData() + // write out tstrips if any + if (input->GetNumberOfStrips() > 0) + { +- vtkIdType npts = 0, *index = 0; ++ vtkIdType npts = 0; ++ CellIterT index = 0; + vtkCellArray *cells = input->GetStrips(); + for (cells->InitTraversal(); cells->GetNextCell(npts, index); ) + { +diff --git a/modules/viz/src/vtk/vtkXYZReader.cpp b/modules/viz/src/vtk/vtkXYZReader.cpp +index 57726eae9b..3b9265fed6 100644 +--- a/modules/viz/src/vtk/vtkXYZReader.cpp ++++ b/modules/viz/src/vtk/vtkXYZReader.cpp +@@ -77,7 +77,7 @@ int cv::viz::vtkXYZReader::RequestData(vtkInformation*, vtkInformationVector**, + } + + // Open the input file. +- ifstream fin(this->FileName); ++ std::ifstream fin(this->FileName); + if(!fin) + { + vtkErrorMacro("Error opening file " << this->FileName); +diff --git a/modules/viz/src/vtk/vtkXYZWriter.cpp b/modules/viz/src/vtk/vtkXYZWriter.cpp +index cf95e3c6a0..56a26b38a0 100644 +--- a/modules/viz/src/vtk/vtkXYZWriter.cpp ++++ b/modules/viz/src/vtk/vtkXYZWriter.cpp +@@ -69,7 +69,7 @@ void cv::viz::vtkXYZWriter::WriteData() + } + + vtkDebugMacro(<<"Opening vtk file for writing..."); +- ostream *outfilep = new ofstream(this->FileName, ios::out); ++ std::ostream *outfilep = new std::ofstream(this->FileName, ios::out); + if (outfilep->fail()) + { + vtkErrorMacro(<< "Unable to open file: "<< this->FileName); + +From 4281df7fe0090c03b6a40db44292ba6268239cbb Mon Sep 17 00:00:00 2001 +From: Maksim Shabunin +Date: Tue, 2 Jun 2020 19:21:19 +0300 +Subject: [PATCH 2/3] viz: tests are non-interactive now + +--- + modules/viz/test/test_tutorial2.cpp | 4 +-- + modules/viz/test/test_tutorial3.cpp | 2 +- + modules/viz/test/test_viz3d.cpp | 2 +- + modules/viz/test/tests_simple.cpp | 56 ++++++++++++++--------------- + 4 files changed, 32 insertions(+), 32 deletions(-) + +diff --git a/modules/viz/test/test_tutorial2.cpp b/modules/viz/test/test_tutorial2.cpp +index 6b2972f0af..a4b5b99582 100644 +--- a/modules/viz/test/test_tutorial2.cpp ++++ b/modules/viz/test/test_tutorial2.cpp +@@ -28,7 +28,7 @@ static void tutorial2() + /// Rodrigues vector + Vec3d rot_vec = Vec3d::all(0); + double translation_phase = 0.0, translation = 0.0; +- while(!myWindow.wasStopped()) ++ for(unsigned num = 0; num < 50; ++num) + { + /* Rotation using rodrigues */ + /// Rotate around (1,1,1) +@@ -45,7 +45,7 @@ static void tutorial2() + + myWindow.setWidgetPose("Cube Widget", pose); + +- myWindow.spinOnce(1, true); ++ myWindow.spinOnce(100, true); + } + } + +diff --git a/modules/viz/test/test_tutorial3.cpp b/modules/viz/test/test_tutorial3.cpp +index 232130f0a6..32e33b1902 100644 +--- a/modules/viz/test/test_tutorial3.cpp ++++ b/modules/viz/test/test_tutorial3.cpp +@@ -48,7 +48,7 @@ static void tutorial3(bool camera_pov) + myWindow.setViewerPose(camera_pose); + + /// Start event loop. +- myWindow.spin(); ++ myWindow.spinOnce(500, true); + } + + TEST(Viz, tutorial3_global_view) +diff --git a/modules/viz/test/test_viz3d.cpp b/modules/viz/test/test_viz3d.cpp +index cdf8a00ad7..4ab05c3e0a 100644 +--- a/modules/viz/test/test_viz3d.cpp ++++ b/modules/viz/test/test_viz3d.cpp +@@ -59,7 +59,7 @@ TEST(Viz_viz3d, DISABLED_develop) + //cv::Mat cloud = cv::viz::readCloud(get_dragon_ply_file_path()); + //---->>>>> + +- viz.spin(); ++ viz.spinOnce(500, true); + } + + }} // namespace +diff --git a/modules/viz/test/tests_simple.cpp b/modules/viz/test/tests_simple.cpp +index 12d696dfba..5584483f4f 100644 +--- a/modules/viz/test/tests_simple.cpp ++++ b/modules/viz/test/tests_simple.cpp +@@ -56,7 +56,7 @@ TEST(Viz, show_cloud_bluberry) + viz.showWidget("dragon", WCloud(dragon_cloud, Color::bluberry()), pose); + + viz.showWidget("text2d", WText("Bluberry cloud", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_cloud_random_color) +@@ -73,7 +73,7 @@ TEST(Viz, show_cloud_random_color) + viz.showWidget("coosys", WCoordinateSystem()); + viz.showWidget("dragon", WCloud(dragon_cloud, colors), pose); + viz.showWidget("text2d", WText("Random color cloud", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_cloud_masked) +@@ -91,7 +91,7 @@ TEST(Viz, show_cloud_masked) + viz.showWidget("coosys", WCoordinateSystem()); + viz.showWidget("dragon", WCloud(dragon_cloud), pose); + viz.showWidget("text2d", WText("Nan masked cloud", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_cloud_collection) +@@ -109,7 +109,7 @@ TEST(Viz, show_cloud_collection) + viz.showWidget("coosys", WCoordinateSystem()); + viz.showWidget("ccol", ccol); + viz.showWidget("text2d", WText("Cloud collection", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_painted_clouds) +@@ -124,7 +124,7 @@ TEST(Viz, show_painted_clouds) + viz.showWidget("cloud3", WPaintedCloud(cloud, Vec3d(0.0, 0.0, -1.0), Vec3d(0.0, 0.0, 1.0), Color::blue(), Color::red())); + viz.showWidget("arrow", WArrow(Vec3d(0.0, 1.0, -1.0), Vec3d(0.0, 1.0, 1.0), 0.009, Color::raspberry())); + viz.showWidget("text2d", WText("Painted clouds", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_mesh) +@@ -137,7 +137,7 @@ TEST(Viz, show_mesh) + viz.showWidget("coosys", WCoordinateSystem()); + viz.showWidget("mesh", WMesh(mesh), pose); + viz.showWidget("text2d", WText("Just mesh", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_mesh_random_colors) +@@ -152,7 +152,7 @@ TEST(Viz, show_mesh_random_colors) + viz.showWidget("mesh", WMesh(mesh), pose); + viz.setRenderingProperty("mesh", SHADING, SHADING_PHONG); + viz.showWidget("text2d", WText("Random color mesh", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_widget_merger) +@@ -173,7 +173,7 @@ TEST(Viz, show_widget_merger) + viz.showWidget("coo", WCoordinateSystem()); + viz.showWidget("merger", merger); + viz.showWidget("text2d", WText("Widget merger", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_textured_mesh) +@@ -210,7 +210,7 @@ TEST(Viz, show_textured_mesh) + viz.showWidget("mesh", WMesh(mesh)); + viz.setRenderingProperty("mesh", SHADING, SHADING_PHONG); + viz.showWidget("text2d", WText("Textured mesh", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_polyline) +@@ -229,7 +229,7 @@ TEST(Viz, show_polyline) + viz.showWidget("polyline", WPolyLine(polyline, colors)); + viz.showWidget("coosys", WCoordinateSystem()); + viz.showWidget("text2d", WText("Polyline", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_sampled_normals) +@@ -244,7 +244,7 @@ TEST(Viz, show_sampled_normals) + viz.showWidget("normals", WCloudNormals(mesh.cloud, mesh.normals, 30, 0.1f, Color::green()), pose); + viz.setRenderingProperty("normals", LINE_WIDTH, 2.0); + viz.showWidget("text2d", WText("Cloud or mesh normals", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_cloud_shaded_by_normals) +@@ -260,7 +260,7 @@ TEST(Viz, show_cloud_shaded_by_normals) + Viz3d viz("show_cloud_shaded_by_normals"); + viz.showWidget("cloud", cloud, pose); + viz.showWidget("text2d", WText("Cloud shaded by normals", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_trajectories) +@@ -287,15 +287,15 @@ TEST(Viz, show_trajectories) + viz.showWidget("text2d", WText("Different kinds of supported trajectories", Point(20, 20), 20, Color::green())); + + int i = 0; +- while(!viz.wasStopped()) ++ for(unsigned num = 0; num < 50; ++num) + { + double a = --i % 360; + Vec3d pose(sin(a * CV_PI/180), 0.7, cos(a * CV_PI/180)); + viz.setViewerPose(makeCameraPose(pose * 7.5, Vec3d(0.0, 0.5, 0.0), Vec3d(0.0, 0.1, 0.0))); +- viz.spinOnce(20, true); ++ viz.spinOnce(100, true); + } + viz.resetCamera(); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_trajectory_reposition) +@@ -306,7 +306,7 @@ TEST(Viz, show_trajectory_reposition) + viz.showWidget("coos", WCoordinateSystem()); + viz.showWidget("sub3", WTrajectory(Mat(path).rowRange(0, (int)path.size()/3), WTrajectory::BOTH, 0.2, Color::brown()), path.front().inv()); + viz.showWidget("text2d", WText("Trajectory resposition to origin", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_camera_positions) +@@ -330,7 +330,7 @@ TEST(Viz, show_camera_positions) + viz.showWidget("pos3", WCameraPosition(0.75), poses[1]); + viz.showWidget("pos4", WCameraPosition(K, gray, 3, Color::indigo()), poses[1]); + viz.showWidget("text2d", WText("Camera positions with images", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_overlay_image) +@@ -353,16 +353,16 @@ TEST(Viz, show_overlay_image) + viz.showWidget("text2d", WText("Overlay images", Point(20, 20), 20, Color::green())); + + int i = 0; +- while(!viz.wasStopped()) ++ for(unsigned num = 0; num < 50; ++num) + { + double a = ++i % 360; + Vec3d pose(sin(a * CV_PI/180), 0.7, cos(a * CV_PI/180)); + viz.setViewerPose(makeCameraPose(pose * 3, Vec3d(0.0, 0.5, 0.0), Vec3d(0.0, 0.1, 0.0))); + viz.getWidget("img1").cast().setImage(lena * pow(sin(i*10*CV_PI/180) * 0.5 + 0.5, 1.0)); +- viz.spinOnce(1, true); ++ viz.spinOnce(100, true); + } + viz.showWidget("text2d", WText("Overlay images (stopped)", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + +@@ -376,7 +376,7 @@ TEST(Viz, show_image_method) + viz.showImage(lena, lena.size()); + viz.spinOnce(1500, true); + +- cv::viz::imshow("show_image_method", make_gray(lena)).spin(); ++ cv::viz::imshow("show_image_method", make_gray(lena)).spinOnce(500, true); + } + + TEST(Viz, show_image_3d) +@@ -398,13 +398,13 @@ TEST(Viz, show_image_3d) + viz.showWidget("text2d", WText("Images in 3D", Point(20, 20), 20, Color::green())); + + int i = 0; +- while(!viz.wasStopped()) ++ for(unsigned num = 0; num < 50; ++num) + { + viz.getWidget("img0").cast().setImage(lena * pow(sin(i++*7.5*CV_PI/180) * 0.5 + 0.5, 1.0)); +- viz.spinOnce(1, true); ++ viz.spinOnce(100, true); + } + viz.showWidget("text2d", WText("Images in 3D (stopped)", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_simple_widgets) +@@ -431,10 +431,10 @@ TEST(Viz, show_simple_widgets) + + viz.showWidget("grid1", WGrid(Vec2i(7,7), Vec2d::all(0.75), Color::gray()), Affine3d().translate(Vec3d(0.0, 0.0, -1.0))); + +- viz.spin(); ++ viz.spinOnce(500, true); + viz.getWidget("text2d").cast().setText("Different simple widgets (updated)"); + viz.getWidget("text3d").cast().setText("Updated text 3D"); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_follower) +@@ -446,9 +446,9 @@ TEST(Viz, show_follower) + viz.showWidget("t3d_2", WText3D("Simple 3D follower", Point3d(-0.5, -0.5, 0.5), 0.125, true, Color::green())); + viz.showWidget("text2d", WText("Follower: text always facing camera", Point(20, 20), 20, Color::green())); + viz.setBackgroundMeshLab(); +- viz.spin(); ++ viz.spinOnce(500, true); + viz.getWidget("t3d_2").cast().setText("Updated follower 3D"); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + }} // namespace + +From f46c6cadbe751b2dbf60b34e85aaf575511e9794 Mon Sep 17 00:00:00 2001 +From: Maksim Shabunin +Date: Tue, 2 Jun 2020 22:46:53 +0300 +Subject: [PATCH 3/3] fixup! Added VTK 9 support + +--- + modules/viz/CMakeLists.txt | 12 ++++++++---- + modules/viz/src/types.cpp | 1 + + 2 files changed, 9 insertions(+), 4 deletions(-) + +diff --git a/modules/viz/CMakeLists.txt b/modules/viz/CMakeLists.txt +index 3426e1dd26..cd225960ce 100644 +--- a/modules/viz/CMakeLists.txt ++++ b/modules/viz/CMakeLists.txt +@@ -3,9 +3,6 @@ if(NOT HAVE_VTK) + endif() + + set(the_description "Viz") +-if(VTK_VERSION VERSION_LESS 8.90) +- include(${VTK_USE_FILE}) +-endif() + + if(NOT BUILD_SHARED_LIBS) + # We observed conflict between builtin 3rdparty libraries and +@@ -37,7 +34,14 @@ ocv_add_accuracy_tests() + ocv_add_perf_tests() + ocv_add_samples(opencv_imgproc opencv_calib3d opencv_features2d opencv_flann) + +-ocv_target_link_libraries(${the_module} PRIVATE ${VTK_LIBRARIES}) ++ ++if (VTK_VERSION VERSION_LESS "8.90.0") ++ include(${VTK_USE_FILE}) ++ ocv_target_link_libraries(${the_module} PRIVATE ${VTK_LIBRARIES}) ++else () ++ ocv_target_link_libraries(${the_module} PRIVATE ${VTK_LIBRARIES}) ++ vtk_module_autoinit(TARGETS ${the_module} MODULES ${VTK_LIBRARIES}) ++endif() + + if(APPLE AND BUILD_opencv_viz) + ocv_target_link_libraries(${the_module} PRIVATE "-framework Cocoa") +diff --git a/modules/viz/src/types.cpp b/modules/viz/src/types.cpp +index 0e14477891..e9a470cf83 100644 +--- a/modules/viz/src/types.cpp ++++ b/modules/viz/src/types.cpp +@@ -97,6 +97,7 @@ cv::viz::Mesh cv::viz::Mesh::load(const String& file, int type) + // Now handle the polygons + vtkSmartPointer polygons = polydata->GetPolys(); + mesh.polygons.create(1, polygons->GetSize(), CV_32SC1); ++ mesh.polygons = 0; + int* poly_ptr = mesh.polygons.ptr(); + + polygons->InitTraversal(); diff --git a/opencv-4.1.0-install_3rdparty_licenses.patch b/opencv-4.1.0-install_3rdparty_licenses.patch new file mode 100644 index 0000000..7bbc85f --- /dev/null +++ b/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) + diff --git a/opencv-4.1.2-includes.patch b/opencv-4.1.2-includes.patch new file mode 100644 index 0000000..e69588c --- /dev/null +++ b/opencv-4.1.2-includes.patch @@ -0,0 +1,24 @@ +diff -up opencv-4.1.2/cmake/templates/OpenCVConfig.cmake.in.orig opencv-4.1.2/cmake/templates/OpenCVConfig.cmake.in +--- opencv-4.1.2/cmake/templates/OpenCVConfig.cmake.in.orig 2019-10-10 00:53:14.000000000 +0200 ++++ opencv-4.1.2/cmake/templates/OpenCVConfig.cmake.in 2019-10-17 11:08:46.626400320 +0200 +@@ -106,7 +106,7 @@ set(OpenCV_SHARED @BUILD_SHARED_LIBS@) + set(OpenCV_USE_MANGLED_PATHS @OpenCV_USE_MANGLED_PATHS_CONFIGCMAKE@) + + set(OpenCV_LIB_COMPONENTS @OPENCV_MODULES_CONFIGCMAKE@) +-set(__OpenCV_INCLUDE_DIRS @OpenCV_INCLUDE_DIRS_CONFIGCMAKE@) ++set(__OpenCV_INCLUDE_DIRS @OpenCV_INCLUDE_DIRS_CONFIGCMAKE@ @OpenCV_INCLUDE_DIRS_CONFIGCMAKE@/opencv2) + + set(OpenCV_INCLUDE_DIRS "") + foreach(d ${__OpenCV_INCLUDE_DIRS}) +diff -up opencv-4.1.2/cmake/templates/opencv-XXX.pc.in.orig opencv-4.1.2/cmake/templates/opencv-XXX.pc.in +--- opencv-4.1.2/cmake/templates/opencv-XXX.pc.in.orig 2019-10-10 00:53:14.000000000 +0200 ++++ opencv-4.1.2/cmake/templates/opencv-XXX.pc.in 2019-10-17 11:04:11.486014573 +0200 +@@ -3,7 +3,7 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ + libdir=@libdir@ +-includedir_old=@includedir@/opencv ++includedir_old=@includedir@/opencv2 + includedir_new=@includedir@ + + Name: OpenCV diff --git a/opencv-clean.sh b/opencv-clean.sh new file mode 100755 index 0000000..2a29de3 --- /dev/null +++ b/opencv-clean.sh @@ -0,0 +1,27 @@ +#!/bin/bash + +VERSION=4.3.0 + +rm -rf opencv-${VERSION}/ +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}/ + +rm -rf opencv_contrib-${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}/ +rm -rf opencv_contrib-${VERSION}/ + +rm -rf opencv_extra-${VERSION}/ +wget -c https://github.com/opencv/opencv_extra/archive/${VERSION}/opencv_extra-${VERSION}.tar.gz +tar xf opencv_extra-${VERSION}.tar.gz +find opencv_extra-${VERSION} \( -iname "len*.*" -o -iname "*lena*.png" -o -iname "*lena*.jpg" \) -exec rm {} + +tar zcf opencv_extra-clean-${VERSION}.tar.gz opencv_extra-${VERSION}/ +rm -rf opencv_extra-${VERSION}/ diff --git a/opencv.spec b/opencv.spec new file mode 100644 index 0000000..3aaca28 --- /dev/null +++ b/opencv.spec @@ -0,0 +1,1232 @@ +#global indice a +%undefine _strict_symbol_defs_build +%undefine __cmake_in_source_build +%bcond_without tests +%bcond_with ffmpeg +%bcond_without gstreamer +%bcond_with eigen2 +%bcond_without eigen3 +%ifnarch ppc64le +%bcond_without opencl +%else +# https://bugzilla.redhat.com/show_bug.cgi?id=1487174 +# fixed on f30 +%if 0%{?fedora} > 29 +%bcond_without opencl +%else +%bcond_with opencl +%endif +%endif +%ifarch %{ix86} x86_64 %{arm} +%bcond_without openni +%else +# we dont have openni in other archs +%bcond_with openni +%endif +%bcond_without tbb +%bcond_with cuda +%bcond_with xine +# Atlas need (missing: Atlas_CLAPACK_INCLUDE_DIR Atlas_CBLAS_LIBRARY Atlas_BLAS_LIBRARY Atlas_LAPACK_LIBRARY) +# LAPACK may use atlas or openblas since now it detect openblas, atlas is not used anyway, more info please +# check OpenCVFindLAPACK.cmake +%bcond_with atlas +%bcond_without openblas +%bcond_without gdcm +%bcond_without vtk + +%ifarch x86_64 +%bcond_without libmfx +%else +%bcond_with libmfx +%endif +%bcond_without clp +%bcond_without va +%bcond_without java +%bcond_without vulkan + +%ifarch ppc64le +%define _lto_cflags %{nil} +%endif + +%global srcname opencv +%global abiver 4.3 + +# Required because opencv-core has lot of spurious dependencies +# (despite supposed to be "-core") +# TODO: to be fixed properly upstream +# https://github.com/opencv/opencv/issues/7001 +%global optflags %(echo %{optflags} -Wl,--as-needed ) + +Name: opencv +Version: 4.3.0 +%global javaver %(foo=%{version}; echo ${foo//./}) +Release: 9%{?dist} +Summary: Collection of algorithms for computer vision +# This is normal three clause BSD. +License: BSD +URL: https://opencv.org +# RUN opencv-clean.sh TO PREPARE TARBALLS FOR FEDORA +# +# Need to remove copyrighted lena.jpg images from tarball (rhbz#1295173) +# and SIFT/SURF from tarball, due to legal concerns. +# +Source0: %{name}-clean-%{version}.tar.gz +Source1: %{name}_contrib-clean-%{version}.tar.gz +Source2: %{name}_extra-clean-%{version}.tar.gz +Source3: face_landmark_model.dat.xz +# from https://github.com/opencv/ade/archive/v0.1.1f.zip +Source4: b624b995ec9c439cbc2e9e6ee940d3a2-v0.1.1f.zip +Source5: xorg.conf + +Patch0: opencv-4.1.0-install_3rdparty_licenses.patch +Patch1: https://patch-diff.githubusercontent.com/raw/opencv/opencv/pull/17431.patch +Patch2: https://patch-diff.githubusercontent.com/raw/opencv/opencv_contrib/pull/2549.patch +# Comment out removed vulkan symbols +Patch3: opencv_vulkan.patch + +BuildRequires: gcc-c++ +BuildRequires: libtool +BuildRequires: cmake >= 2.6.3 +BuildRequires: chrpath +%{?with_cuda: +BuildRequires: pkgconfig(cublas-%{?_cuda_rpm_version}) +BuildRequires: pkgconfig(cufft-%{?_cuda_rpm_version}) +BuildRequires: pkgconfig(nppc-%{?_cuda_rpm_version}) +} +%{?with_eigen2:BuildRequires: eigen2-devel} +%{?with_eigen3:BuildRequires: eigen3-devel} +BuildRequires: libtheora-devel +BuildRequires: libvorbis-devel +%if 0%{?fedora} || 0%{?rhel} > 7 +%ifnarch s390 s390x +BuildRequires: libraw1394-devel +BuildRequires: libdc1394-devel +%endif +%endif +BuildRequires: jasper-devel +BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: libtiff-devel +BuildRequires: libGL-devel +BuildRequires: libv4l-devel +BuildRequires: OpenEXR-devel +%{?with_openni: +BuildRequires: openni-devel +BuildRequires: openni-primesense +} +%{?with_tbb: +BuildRequires: tbb-devel +} +BuildRequires: zlib-devel +BuildRequires: pkgconfig +BuildRequires: python3-devel +BuildRequires: python3-numpy +BuildRequires: pylint +BuildRequires: python3-flake8 +BuildRequires: swig >= 1.3.24 +%{?with_ffmpeg:BuildRequires: ffmpeg-devel >= 0.4.9} +%if 0%{?fedora} || 0%{?rhel} > 7 +%{?with_gstreamer:BuildRequires: gstreamer1-devel gstreamer1-plugins-base-devel} +%else +%{?with_gstreamer:BuildRequires: gstreamer-devel gstreamer-plugins-base-devel} +%endif +%{?with_xine:BuildRequires: xine-lib-devel} +%{?with_opencl:BuildRequires: opencl-headers} +BuildRequires: libgphoto2-devel +BuildRequires: libwebp-devel +BuildRequires: tesseract-devel +BuildRequires: protobuf-devel +BuildRequires: gdal-devel +BuildRequires: glog-devel +#BuildRequires: doxygen +BuildRequires: python3-beautifulsoup4 +#for doc/doxygen/bib2xhtml.pl +#BuildRequires: perl-open +BuildRequires: gflags-devel +BuildRequires: SFML-devel +BuildRequires: libucil-devel +BuildRequires: qt5-qtbase-devel +BuildRequires: libGL-devel +BuildRequires: libGLU-devel +BuildRequires: hdf5-devel +# Module opencv_ovis disabled because of incompatible OGRE3D version < 1.10 +# BuildRequires: ogre-devel +%{?with_vtk:BuildRequires: vtk-devel} +%{?with_atlas:BuildRequires: atlas-devel} +#ceres-solver-devel push eigen3-devel and tbb-devel +%{?with_tbb: + %{?with_eigen3: +BuildRequires: ceres-solver-devel + } +} +%{?with_openblas: +BuildRequires: openblas-devel +BuildRequires: blas-devel +BuildRequires: lapack-devel +} +%{?with_gdcm:BuildRequires: gdcm-devel} +%{?with_libmfx:BuildRequires: libmfx-devel} +%{?with_clp:BuildRequires: coin-or-Clp-devel} +%{?with_va:BuildRequires: libva-devel} +%{?with_java: +BuildRequires: ant +BuildRequires: java-devel +} +%{?with_vulkan:BuildRequires: vulkan-headers} +%if %{with tests} +BuildRequires: xorg-x11-drv-dummy +BuildRequires: mesa-dri-drivers +%endif + +Requires: opencv-core%{_isa} = %{version}-%{release} + +%description +OpenCV means Intel® Open Source Computer Vision Library. It is a collection of +C functions and a few C++ classes that implement some popular Image Processing +and Computer Vision algorithms. + + +%package core +Summary: OpenCV core libraries +Provides: bundled(quirc) = 1.0 +Obsoletes: python2-%{name} < %{version}-%{release} + +%description core +This package contains the OpenCV C/C++ core libraries. + + +%package devel +Summary: Development files for using the OpenCV library +Requires: %{name}%{_isa} = %{version}-%{release} +Requires: %{name}-contrib%{_isa} = %{version}-%{release} + +%description devel +This package contains the OpenCV C/C++ library and header files, as well as +documentation. It should be installed if you want to develop programs that +will use the OpenCV library. You should consider installing opencv-doc +package. + + +%package doc +Summary: Documentation files +Requires: opencv-devel = %{version}-%{release} +BuildArch: noarch +Provides: %{name}-devel-docs = %{version}-%{release} +Obsoletes: %{name}-devel-docs < %{version}-%{release} + +%description doc +This package contains the OpenCV documentation, samples and examples programs. + + +%package -n python3-opencv +Summary: Python3 bindings for apps which use OpenCV +Requires: opencv%{_isa} = %{version}-%{release} +Requires: python3-numpy +%{?python_provide:%python_provide python3-%{srcname}} + +%description -n python3-opencv +This package contains Python3 bindings for the OpenCV library. + + +%package java +Summary: Java bindings for apps which use OpenCV +Requires: java-headless +Requires: javapackages-filesystem +Requires: %{name}-core%{_isa} = %{version}-%{release} + +%description java +This package contains Java bindings for the OpenCV library. + + +%package contrib +Summary: OpenCV contributed functionality + +%description contrib +This package is intended for development of so-called "extra" modules, contributed +functionality. New modules quite often do not have stable API, and they are not +well-tested. Thus, they shouldn't be released as a part of official OpenCV +distribution, since the library maintains binary compatibility, and tries +to provide decent performance and stability. + +%prep +%setup -q -a1 -a2 +%if 1 +# we don't use pre-built contribs except quirc +pushd 3rdparty +shopt -s extglob +rm -r !(openexr|openvx|quirc) +shopt -u extglob +popd &>/dev/null +%endif + +%patch0 -p1 -b .install_3rdparty_licenses +%patch1 -p1 +%patch3 -p1 + +pushd %{name}_contrib-%{version} +%patch2 -p1 +popd + +# Install face_landmark_model +mkdir -p .cache/data +install -pm 0644 %{SOURCE3} .cache/data +pushd .cache/data + xz -d face_landmark_model.dat.xz +popd + +# Install ADE, needed for opencv_gapi +mkdir -p .cache/ade +install -pm 0644 %{SOURCE4} .cache/ade/ + + +%build +# enabled by default if libraries are presents at build time: +# GTK, GSTREAMER, 1394, V4L, eigen3 +# non available on Fedora: FFMPEG, XINE +# disabling IPP because it is closed source library from intel + +%cmake \ + -DCV_TRACE=OFF \ + -DWITH_IPP=OFF \ + -DWITH_ITT=OFF \ + -DWITH_QT=ON \ + -DWITH_OPENGL=ON \ + -DOpenGL_GL_PREFERENCE=GLVND \ + -DWITH_GDAL=ON \ + -DWITH_OPENEXR=ON \ + -DWITH_UNICAP=ON \ + -DCMAKE_SKIP_RPATH=ON \ + -DWITH_CAROTENE=OFF \ +%ifarch x86_64 %{ix86} + -DCPU_BASELINE=SSE2 \ +%endif + -DENABLE_PRECOMPILED_HEADERS=OFF \ + -DCMAKE_BUILD_TYPE=ReleaseWithDebInfo \ + %{?with_java: -DBUILD_opencv_java=ON \ + -DOPENCV_JAR_INSTALL_PATH=%{_jnidir} } \ + %{!?with_java: -DBUILD_opencv_java=OFF } \ + %{?with_tbb: -DWITH_TBB=ON } \ + %{!?with_gstreamer: -DWITH_GSTREAMER=OFF } \ + %{!?with_ffmpeg: -DWITH_FFMPEG=OFF } \ + %{?with_cuda: \ + -DWITH_CUDA=ON \ + -DCUDA_TOOLKIT_ROOT_DIR=%{?_cuda_prefix} \ + -DCUDA_VERBOSE_BUILD=ON \ + -DCUDA_PROPAGATE_HOST_FLAGS=OFF \ + } \ + %{?with_openni: -DWITH_OPENNI=ON } \ + %{!?with_xine: -DWITH_XINE=OFF } \ + -DBUILD_DOCS=ON \ + -DBUILD_EXAMPLES=ON \ + -DBUILD_opencv_python2=OFF \ + -DINSTALL_C_EXAMPLES=ON \ + -DINSTALL_PYTHON_EXAMPLES=ON \ + -DPYTHON3_EXECUTABLE=%{__python3} \ + -DPYTHON3_PACKAGES_PATH=%{python3_sitearch} \ + -DENABLE_PYLINT=ON \ + -DBUILD_PROTOBUF=OFF \ + -DPROTOBUF_UPDATE_FILES=ON \ +%{?with_opencl: -DOPENCL_INCLUDE_DIR=%{_includedir}/CL } \ +%{!?with_opencl: -DWITH_OPENCL=OFF } \ + -DOPENCV_SKIP_PYTHON_LOADER=ON \ + -DOPENCV_EXTRA_MODULES_PATH=opencv_contrib-%{version}/modules \ + -DWITH_LIBV4L=ON \ + -DWITH_OPENMP=ON \ + -DOPENCV_CONFIG_INSTALL_PATH=%{_lib}/cmake/OpenCV \ + -DOPENCV_GENERATE_PKGCONFIG=ON \ + -DOPENCV_TEST_DATA_PATH=opencv_extra-%{version}/testdata \ + %{?with_gdcm: -DWITH_GDCM=ON } \ + %{?with_libmfx: -DWITH_MFX=ON } \ + %{?with_clp: -DWITH_CLP=ON } \ + %{?with_va: -DWITH_VA=ON } \ + %{!?with_vtk: -DWITH_VTK=OFF} \ + %{?with_vulkan: -DWITH_VULKAN=ON -DVULKAN_INCLUDE_DIRS=%{_includedir}/vulkan } + +%cmake_build + + +%install +%cmake_install + +rm -rf %{buildroot}%{_datadir}/OpenCV/licenses/ +%if %{with java} +ln -s -r %{buildroot}%{_jnidir}/libopencv_java%{javaver}.so %{buildroot}%{_jnidir}/libopencv_java.so +ln -s -r %{buildroot}%{_jnidir}/opencv-%{javaver}.jar %{buildroot}%{_jnidir}/opencv.jar +%endif + +# For compatibility with existing opencv.pc application +%{!?without_compat_openvc_pc: + ln -s opencv4.pc %{buildroot}%{_libdir}/pkgconfig/opencv.pc +} + + +%check +# Check fails since we don't support most video +# read/write capability and we don't provide a display +# ARGS=-V increases output verbosity +#ifnarch ppc64 +%if %{with tests} + cp %SOURCE5 . + if [ -x /usr/libexec/Xorg ]; then + Xorg=/usr/libexec/Xorg + else + Xorg=/usr/libexec/Xorg.bin + fi + $Xorg -noreset +extension GLX +extension RANDR +extension RENDER -logfile ./xorg.log -config ./xorg.conf -configdir . :99 & + export DISPLAY=:99 + LD_LIBRARY_PATH=%{_builddir}/%{name}-%{version}/build/lib:$LD_LIBARY_PATH %ctest || : +%endif +#endif + + +%ldconfig_scriptlets core + +%ldconfig_scriptlets contrib + +%ldconfig_scriptlets java + +%files +%doc README.md +%{_bindir}/opencv_* +%dir %{_datadir}/opencv4 +%{_datadir}/opencv4/haarcascades +%{_datadir}/opencv4/lbpcascades +%{_datadir}/opencv4/valgrind* +%{_datadir}/opencv4/quality + +%files core +%license LICENSE +%{_datadir}/licenses/opencv4/ +%{_libdir}/libopencv_alphamat.so.%{abiver}* +%{_libdir}/libopencv_core.so.%{abiver}* +%{_libdir}/libopencv_cvv.so.%{abiver}* +%{_libdir}/libopencv_features2d.so.%{abiver}* +%{_libdir}/libopencv_flann.so.%{abiver}* +%{_libdir}/libopencv_gapi.so.%{abiver}* +%{_libdir}/libopencv_hfs.so.%{abiver}* +%{_libdir}/libopencv_highgui.so.%{abiver}* +%{_libdir}/libopencv_imgcodecs.so.%{abiver}* +%{_libdir}/libopencv_imgproc.so.%{abiver}* +%{_libdir}/libopencv_intensity_transform.so.%{abiver}* +%{_libdir}/libopencv_ml.so.%{abiver}* +%{_libdir}/libopencv_objdetect.so.%{abiver}* +%{_libdir}/libopencv_photo.so.%{abiver}* +%{_libdir}/libopencv_rapid.so.%{abiver}* +%{_libdir}/libopencv_shape.so.%{abiver}* +%{_libdir}/libopencv_stitching.so.%{abiver}* +%{_libdir}/libopencv_superres.so.%{abiver}* +%{_libdir}/libopencv_video.so.%{abiver}* +%{_libdir}/libopencv_videoio.so.%{abiver}* +%{_libdir}/libopencv_videostab.so.%{abiver}* +%if %{with vtk} +%{_libdir}/libopencv_viz.so.%{abiver}* +%endif + +%files devel +%dir %{_includedir}/opencv4 +%{_includedir}/opencv4/opencv2 +%{_libdir}/lib*.so +%{!?without_compat_openvc_pc: +%{_libdir}/pkgconfig/opencv.pc +} +%{_libdir}/pkgconfig/opencv4.pc +%{_libdir}/cmake/OpenCV/*.cmake + +%files doc +%{_datadir}/opencv4/samples + +%files -n python3-opencv +%exclude %{_bindir}/setup_vars_opencv4.sh +%{python3_sitearch}/cv2.cpython-3*.so + +%if %{with java} +%files java +%{_jnidir}/libopencv_java%{javaver}.so +%{_jnidir}/opencv-%{javaver}.jar +%{_jnidir}/libopencv_java.so +%{_jnidir}/opencv.jar +%endif + +%files contrib +%{_libdir}/libopencv_aruco.so.%{abiver}* +%{_libdir}/libopencv_bgsegm.so.%{abiver}* +%{_libdir}/libopencv_bioinspired.so.%{abiver}* +%{_libdir}/libopencv_calib3d.so.%{abiver}* +%{_libdir}/libopencv_ccalib.so.%{abiver}* +%{_libdir}/libopencv_datasets.so.%{abiver}* +%{_libdir}/libopencv_dnn.so.%{abiver}* +%{_libdir}/libopencv_dnn_objdetect.so.%{abiver}* +%{_libdir}/libopencv_dnn_superres.so.%{abiver}* +%{_libdir}/libopencv_dpm.so.%{abiver}* +%{_libdir}/libopencv_face.so.%{abiver}* +%{_libdir}/libopencv_freetype.so.%{abiver}* +%{_libdir}/libopencv_fuzzy.so.%{abiver}* +%{_libdir}/libopencv_hdf.so.%{abiver}* +%{_libdir}/libopencv_img_hash.so.%{abiver}* +%{_libdir}/libopencv_line_descriptor.so.%{abiver}* +%{_libdir}/libopencv_optflow.so.%{abiver}* +%{_libdir}/libopencv_phase_unwrapping.so.%{abiver}* +%{_libdir}/libopencv_plot.so.%{abiver}* +%{_libdir}/libopencv_reg.so.%{abiver}* +%{_libdir}/libopencv_rgbd.so.%{abiver}* +%{_libdir}/libopencv_quality.so.%{abiver}* +%{_libdir}/libopencv_saliency.so.%{abiver}* +%{_libdir}/libopencv_stereo.so.%{abiver}* +%{_libdir}/libopencv_structured_light.so.%{abiver}* +%{_libdir}/libopencv_surface_matching.so.%{abiver}* +%{_libdir}/libopencv_text.so.%{abiver}* +%{_libdir}/libopencv_tracking.so.%{abiver}* +%{_libdir}/libopencv_ximgproc.so.%{abiver}* +%{_libdir}/libopencv_xobjdetect.so.%{abiver}* +%{_libdir}/libopencv_xphoto.so.%{abiver}* + +%changelog +* Thu Sep 24 2020 Adrian Reber - 4.3.0-9 +- Rebuilt for protobuf 3.13 + +* Fri Jul 24 2020 Nicolas Chauvet - 4.3.0-8 +- Rebuilt +- Fix cmake build +- Disable LTO on ppc64le +- Add undefine __cmake_in_source_build to allow build on Fedora < 33 + +* Sat Jul 11 2020 Jiri Vanek - 4.3.0-7 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Fri Jun 26 2020 Orion Poplawski - 4.3.0-6 +- Rebuild for hdf5 1.10.6 + +* Tue Jun 23 2020 Adrian Reber - 4.3.0-5 +- Rebuilt for protobuf 3.12 + +* Sun Jun 21 2020 Sérgio Basto - 4.3.0-4 +- Readd flake8 build requirement +- Fix build because pangox has been retired for F33 so we need remove the BR + gtkglext +- Also remove all gtk stuff (we have to choose between gtk or qt when build opencv) + https://answers.opencv.org/question/215066/gtk-or-qt-when-build-opencv/ +- Doxygen requires gtk2, disabling for now + +* Sun Jun 14 2020 Adrian Reber +- Rebuilt for protobuf 3.12 + +* Tue Jun 02 2020 Orion Poplawski - 4.3.0-3 +- Run tests + +* Tue Jun 02 2020 Orion Poplawski - 4.3.0-2 +- Add upstream patches for VTK 9.0 support (bz#1840977) + +* Thu May 28 2020 Nicolas Chauvet - 4.3.0-1 +- Update to 4.3.0 + +* Thu May 28 2020 Charalampos Stratakis - 4.2.0-9 +- Remove flake8 build requirement + +* Tue May 26 2020 Miro Hrončok - 4.2.0-8 +- Rebuilt for Python 3.9 + +* Thu May 21 2020 Sandro Mani - 4.2.0-7 +- Rebuild (gdal) + +* Fri May 08 2020 Nicolas Chauvet - 4.2.0-6 +- Drop compat symlink for includes - rhbz#1830266 + +* Thu Mar 26 2020 Nicolas Chauvet - 4.2.0-5 +- Add without_compat_opencv_pc with conditional - rhbz#1816439 + +* Tue Mar 03 2020 Sandro Mani - 4.2.0-4 +- Rebuild (gdal) + +* Wed Jan 29 2020 Fedora Release Engineering - 4.2.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Jan 29 2020 Nicolas Chauvet - 4.2.0-2 +- Backport patch for ppc64le + +* Tue Dec 31 2019 Nicolas Chauvet - 4.2.0-1 +- Update to 4.2.0 + +* Sat Dec 28 2019 Sandro Mani - 4.1.2-3 +- Rebuild (tesseract) + +* Thu Dec 19 2019 Orion Poplawski - 4.1.2-2 +- Rebuild for protobuf 3.11 + +* Thu Oct 17 2019 Nicolas Chauvet - 4.1.2-1.1 +- Fix include path +- Drop CPU baseline to SSE2 for x86 +- Add missing directory ownership +- Add symlinks for compatibility with older versions +- Restore deprecated headers for compat + +* Sat Oct 12 2019 Nicolas Chauvet - 4.1.2-1 +- Update to 4.1.2 + +* Fri Sep 13 2019 Nicolas Chauvet - 4.1.1-1 +- Update to 4.1.1 + +* Fri Sep 13 2019 Sérgio Basto - 4.1.0-1 +- Update opencv to 4.1.0 + +* Fri Sep 13 2019 Christopher N. Hesse - 4.1.0-0 +- Enable vulkan compute backend + +* Fri Sep 13 2019 Sérgio Basto - 3.4.6-9 +- Reenable pylint and vtk, they are working now. +* Wed Sep 11 2019 Mamoru TASAKA - 3.4.6-8 +- F-32: remove vtk gcdm dependency for now because they have broken dependency + (bug 1751406) + +* Mon Aug 19 2019 Miro Hrončok - 3.4.6-7 +- Rebuilt for Python 3.8 + +* Thu Jul 25 2019 Fedora Release Engineering - 3.4.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jun 27 2019 Jerry James - 3.4.6-5 +- Rebuild for coin-or package updates + +* Tue Jun 25 2019 Sérgio Basto - 3.4.6-4 +- cmake: use relative PATH on OPENCV_CONFIG_INSTALL_PATH, fixes rhbz #1721876 +- cmake: don't set ENABLE_PKG_CONFIG + +* Wed Jun 12 2019 Sérgio Basto - 3.4.6-3 +- Remove Obsoletes/Provides libopencv_java.so and use OPENCV_JAR_INSTALL_PATH + +* Sun Jun 09 2019 Sérgio Basto - 3.4.6-2 +- Fix cmakes location +- add BR: python3-beautifulsoup4 + +* Thu May 23 2019 Sérgio Basto - 3.4.6-1 +- Update to 3.4.6 + +* Mon May 20 2019 Sérgio Basto - 3.4.4-10 +- Try improve Java Bindings + +* Sun May 12 2019 Sérgio Basto - 3.4.4-9 +- Enable Java Bindings (contribution of Ian Wallace) +- Obsoletes python2-opencv to fix upgrade path + +* Wed Apr 10 2019 Richard Shaw - 3.4.4-8 +- Rebuild for OpenEXR 2.3.0. + +* Mon Mar 18 2019 Orion Poplawski +- Rebuild for vtk 8.2 + +* Sun Mar 03 2019 Sérgio Basto - 3.4.4-6 +- Reenable build with gdcm +- Opencl is fixed for ppc64le on F30 + +* Thu Feb 21 2019 Josef Ridky - 3.4.4-5 +- build without gdcm to fix FTBFS in F30+ (#1676289) + +* Fri Feb 01 2019 Fedora Release Engineering - 3.4.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Jan 15 2019 Miro Hrončok - 3.4.4-3 +- Subpackage python2-opencv has been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + +* Mon Dec 03 2018 Sérgio Basto - 3.4.4-2 +- Add the correct and upstreamed fix for support_YV12_too, pull request 13351 + which is merged + +* Sat Dec 01 2018 Sérgio Basto - 3.4.4-1 +- Update to 3.4.4 + +* Wed Nov 21 2018 Igor Gnatenko - 3.4.3-7 +- Rebuild for protobuf 3.6 + +* Tue Nov 13 2018 Sandro Mani - 3.4.3-6 +- Rebuild (tesseract) + +* Tue Oct 30 2018 Sérgio Basto - 3.4.3-5 +- Enable vtk should work with vtk-8.1.1 +- Add BR python Flake8 + +* Tue Oct 23 2018 Felix Kaechele - 3.4.3-4 +- enable building of dnn + +* Sat Oct 13 2018 Jerry James - 3.4.3-3 +- Rebuild for tbb 2019_U1 + +* Sun Sep 30 2018 Sérgio Basto - 3.4.3-2 +- Use GLVND libraries for OpenGL and GLX, setting OpenGL_GL_PREFERENCE=GLVND + +* Wed Sep 26 2018 Sérgio Basto - 3.4.3-1 +- Update to 3.4.3 +- Fix build on arm and s390x + +* Wed Sep 26 2018 Sérgio Basto - 3.4.2-1 +- Update to 3.4.2 + +* Fri Jul 13 2018 Fedora Release Engineering - 3.4.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Jul 11 2018 Sérgio Basto - 3.4.1-5 +- Small fix to build with Pyhton-3.7 + +* Tue Jun 19 2018 Miro Hrončok - 3.4.1-4 +- Rebuilt for Python 3.7 + +* Mon Mar 26 2018 Iryna Shcherbina - 3.4.1-3 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + +* Thu Mar 08 2018 Sérgio Basto - 3.4.1-2 +- Enable VA +- Do not use -f on rm because it silences errors +- Opencv sub-package don't need ldconfig because don't have any so + +* Thu Mar 01 2018 Josef Ridky - 3.4.1-1 +- Spec clean up (remove Group tag, add ldconfig scriptlets, escape macros in comments) +- Remove unused patch +- Add gcc and gcc-c++ requirements +- Rebase to version 3.4.1 + +* Sun Feb 18 2018 Sérgio Basto - 3.3.1-7 +- Rebuild for gdcm-2.8 + +* Fri Feb 09 2018 Igor Gnatenko - 3.3.1-6 +- Escape macros in %%changelog + +* Thu Feb 08 2018 Fedora Release Engineering - 3.3.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Fri Jan 26 2018 Sérgio Basto - 3.3.1-4 +- Enable Pylint +- Enable Clp (COIN-OR Linear Program Solver) +- Enable VA (Video Acceleration API for Linux) +- Enable OpenMP +- Provides and obsoletes for opencv-devel-docs +- BuildRequires perl-local do generate documentation without errors + +* Thu Jan 25 2018 Sérgio Basto - 3.3.1-3 +- Rename sub-package opencv-python3 to python3-opencv and other minor fixes in + python packaging +- Generate documentation +- Rename sub-package devel-docs to doc +- Cleanup some comments from opencv 2.4 packaging + +* Wed Jan 24 2018 Troy Dawson - 3.3.1-2 +- Update conditionals + +* Tue Nov 14 2017 Sérgio Basto - 3.3.1-1 +- Update to 3.3.1 +- Fix WARNING: Option ENABLE_SSE='OFF' is deprecated and should not be used anymore +- Behaviour of this option is not backward compatible +- Refer to 'CPU_BASELINE'/'CPU_DISPATCH' CMake options documentation +- Fix WARNING: Option ENABLE_SSE2='OFF' is deprecated and should not be used anymore +- Behaviour of this option is not backward compatible +- Refer to 'CPU_BASELINE'/'CPU_DISPATCH' CMake options documentation +- Update opencv to 3.3.0 +- Patch3 is already in source code +- Fix WARNING: Option ENABLE_SSE3='OFF' is deprecated and should not be used anymore +- Enable openblas +- Add conditonal to build with_gdcm +- Disable "Intel ITT support" because source is in 3rdparty/ directory + +* Sat Oct 28 2017 Sérgio Basto - 3.2.0-13 +- Require python3-numpy instead numpy for opencv-python3 (#1504555) + +* Sat Sep 02 2017 Sérgio Basto - 3.2.0-12 +- Fix 2 rpmlint errors + +* Sat Sep 02 2017 Sérgio Basto - 3.2.0-11 +- Enable libv4l1 to fix open a video (#1487816) + +* Mon Aug 28 2017 Sérgio Basto - 3.2.0-10 +- Better conditionals to enable openni only available in ix86, x86_64 and arm + +* Sun Aug 20 2017 Sérgio Basto - 3.2.0-9 +- Enable openni. +- Enable eigen3 except in ppc64le because fails to build in OpenCL headers. +- Documented why is not enabled atlas, openblas and vtk. + +* Sun Aug 20 2017 Sérgio Basto - 3.2.0-8 +- Reenable gstreamer +- Remove architecture checks for tbb and enable it, inspired on (#1262788) + +* Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek - 3.2.0-7 +- Add Provides for the old name without %%_isa + +* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 3.2.0-6 +- Python 2 binary package renamed to python2-opencv + See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 + +* Thu Aug 03 2017 Fedora Release Engineering - 3.2.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 3.2.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Tue Jun 13 2017 Orion Poplawski - 3.2.0-3 +- Rebuild for protobuf 3.3.1 + +* Mon May 15 2017 Fedora Release Engineering - 3.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild + +* Mon Feb 27 2017 Josef Ridky - 3.2.0-1 +- Rebase to the latest version (3.2.0) - #1408880 +- Remove unused BuildRequires and patches +- Remove copyrighted lena.jpg images and SIFT/SURF from tarball, due to legal concerns. +- Disable dnn module from opencv_contrib, due missing BuildRequired package in Fedora (protobuf-cpp) +- Disable tracking module from opencv_contrib, due disabling dnn module (is required by this module) +- Disable CAROTENE in compilation (caused error on arm and ppc64le) +- Fix syntax error in opencv_contrib test file (opencv-3.2.0-test-file-fix.patch) + +* Tue Feb 21 2017 Sandro Mani - 3.1.0-15 +- Rebuild (tesseract) + +* Sat Feb 11 2017 Fedora Release Engineering - 3.1.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Feb 01 2017 Sandro Mani - 3.1.0-13 +- Rebuild (libwebp) + +* Thu Jan 26 2017 Orion Poplawski - 3.1.0-12 +- Rebuild for protobuf 3.2.0 + +* Mon Dec 19 2016 Miro Hrončok - 3.1.0-11 +- Rebuild for Python 3.6 + +* Sat Dec 03 2016 Rex Dieter - 3.1.0-10 +- rebuild (jasper) + +* Sat Nov 19 2016 Orion Poplawski - 3.1.0-9 +- Rebuild for protobuf 3.1.0 + +* Tue Jul 26 2016 Nicolas Chauvet - 3.1.0-8 +- Clean uneeded symbols until fixed upstream + +* Tue Jul 19 2016 Fedora Release Engineering - 3.1.0-7 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Fri May 27 2016 Till Maas - 3.1.0-6 +- Define %%srcname for python subpackages +- Fix whitespace + +* Mon May 09 2016 Sérgio Basto - 3.1.0-5 +- Don't clean unneeded symbols (as recommended by fedora-review), fix undefined + symbol: cvLoadImage in Unknown on line 0 on php-facedetect package. + +* Sat May 07 2016 Sérgio Basto - 3.1.0-4 +- Put all idefs and ifarchs outside the scope of rpm conditional builds, rather + than vice versa, as had organized some time ago, it seems to me more correct. +- Remove SIFT/SURF from source tarball in opencv_contrib, due to legal concerns +- Redo and readd OpenCV-2.4.4-pillow.patch . +- Add OpenCV-3.1-pillow.patch to apply only opencv_contrib . +- Add the %%python_provide macro (Packaging:Python guidelines). + +* Fri Apr 22 2016 Sérgio Basto - 3.1.0-3 +- Use always ON and OFF instead 0 and 1 in cmake command. +- Remove BUILD_TEST and TBB_LIB_DIR variables not used by cmake. +- Add BRs: tesseract-devel, protobuf-devel, glog-devel, doxygen, + gflags-devel, SFML-devel, libucil-devel, qt5-qtbase-devel, mesa-libGL-devel, + mesa-libGLU-devel and hdf5-devel. +- Remove BR: vtk-devel because VTK support is disabled. Incompatible + combination: OpenCV + Qt5 and VTK ver.6.2.0 + Qt4 +- Enable build with Qt5. +- Enable build with OpenGL. +- Enable build with UniCap. +- Also requires opencv-contrib when install opencv-devel (#1329790). + +* Wed Apr 20 2016 Sérgio Basto - 3.1.0-2 +- Add BR:libwebp-devel . +- Merge from 2.4.12.3 package: + Add aarch64 and ppc64le to list of architectures where TBB is supported (#1262788). + Use bcond tags to easily enable or disable modules. + Fix unused-direct-shlib-dependency in cmake with global optflags. + Added README.md with references to online documentation. + Investigation on the documentation, added a few notes. +- Update to 3.1.0 (Fri Mar 25 2016 Pavel Kajaba - 3.1.0-1) +- Added opencv_contrib (Thu Jul 09 2015 Sérgio Basto - + 3.0.0-2) +- Update to 3.0.0 (Fri Jun 05 2015 Jozef Mlich - 3.0.0-1) + +* Tue Mar 01 2016 Yaakov Selkowitz - 2.4.12.3-3 +- Fix FTBFS with GCC 6 (#1307821) + +* Thu Feb 04 2016 Fedora Release Engineering - 2.4.12.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Dec 02 2015 Sérgio Basto - 2.4.12.3-1 +- Update opencv to 2.4.12.3 (#1271460). +- Add aarch64 and ppc64le to list of architectures where TBB is supported (#1262788). + +* Tue Jul 14 2015 Sérgio Basto - 2.4.11-5 +- Use bcond tags to easily enable or disable modules. +- Package review, more cleaning in the spec file. +- Fixed unused-direct-shlib-dependency in cmake with global optflags. +- Added README.md index.rst with references to online documentation. +- Investigation on the documentation, added a few notes. + +* Mon Jul 06 2015 Sérgio Basto - 2.4.11-4 +- Enable-gpu-module, rhbz #1236417, thanks to Rich Mattes. +- Deleted the global gst1 because it is no longer needed. + +* Thu Jun 25 2015 Sérgio Basto - 2.4.11-3 +- Fix license tag + +* Wed Jun 17 2015 Fedora Release Engineering - 2.4.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon May 11 2015 Sérgio Basto - 2.4.11-1 +- Update to 2.4.11 . +- Dropped patches 0, 10, 11, 12, 13 and 14 . + +* Sat Apr 11 2015 Rex Dieter 2.4.9-6 +- rebuild (gcc5) + +* Mon Feb 23 2015 Rex Dieter 2.4.9-5 +- rebuild (gcc5) + +* Tue Nov 25 2014 Rex Dieter 2.4.9-4 +- rebuild (openexr) + +* Sun Aug 17 2014 Fedora Release Engineering - 2.4.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Fri Jul 25 2014 Rex Dieter 2.4.9-2 +- backport support for GStreamer 1 (#1123078) + +* Thu Jul 03 2014 Nicolas Chauvet - 2.4.9-1 +- Update to 2.4.9 + +* Sat Jun 07 2014 Fedora Release Engineering - 2.4.7-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat Apr 26 2014 Rex Dieter 2.4.7-6 +- revert pkgcmake2 patch (#1070428) + +* Fri Jan 17 2014 Nicolas Chauvet - 2.4.7-5 +- Fix opencv_ocl isn't part of -core + +* Thu Jan 16 2014 Christopher Meng - 2.4.7-4 +- Enable OpenCL support. +- SPEC small cleanup. + +* Wed Nov 27 2013 Rex Dieter 2.4.7-3 +- rebuild (openexr) + +* Mon Nov 18 2013 Rex Dieter 2.4.7-2 +- OpenCV cmake configuration broken (#1031312) + +* Wed Nov 13 2013 Nicolas Chauvet - 2.4.7-1 +- Update to 2.4.7 + +* Sun Sep 08 2013 Rex Dieter 2.4.6.1-2 +- rebuild (openexr) + +* Wed Jul 24 2013 Nicolas Chauvet - 2.4.6.1-1 +- Update to 2.4.6.1 + +* Thu May 23 2013 Nicolas Chauvet - 2.4.5-1 +- Update to 2.4.5-clean +- Spec file clean-up +- Split core libraries into a sub-package + +* Sat May 11 2013 François Cami - 2.4.4-3 +- change project URL. + +* Tue Apr 02 2013 Tom Callaway - 2.4.4-2 +- make clean source without SIFT/SURF + +* Sat Mar 23 2013 Nicolas Chauvet - 2.4.4-1 +- Update to 2.4.4a +- Fix tbb-devel architecture conditionals + +* Sun Mar 10 2013 Rex Dieter 2.4.4-0.2.beta +- rebuild (OpenEXR) + +* Mon Feb 18 2013 Nicolas Chauvet - 2.4.4-0.1.beta +- Update to 2.4.4 beta +- Drop python-imaging also from requires +- Drop merged patch for additionals codecs +- Disable the java binding for now (untested) + +* Fri Jan 25 2013 Honza Horak - 2.4.3-7 +- Do not build with 1394 libs in rhel + +* Mon Jan 21 2013 Adam Tkac - 2.4.3-6 +- rebuild due to "jpeg8-ABI" feature drop + +* Sun Jan 20 2013 Nicolas Chauvet - 2.4.3-5 +- Add more FourCC for gstreamer - rhbz#812628 +- Allow to use python-pillow - rhbz#895767 + +* Mon Nov 12 2012 Nicolas Chauvet - 2.4.3-3 +- Switch Build Type to ReleaseWithDebInfo to avoid -03 + +* Sun Nov 04 2012 Nicolas Chauvet - 2.4.3-2 +- Disable SSE3 and allow --with sse3 build conditional. +- Disable gpu module as we don't build cuda +- Update to 2.4.3 + +* Fri Jul 20 2012 Fedora Release Engineering - 2.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Mon Jul 09 2012 Honza Horak - 2.4.2-1 +- Update to 2.4.2 + +* Fri Jun 29 2012 Honza Horak - 2.4.1-2 +- Fixed cmake script for generating opencv.pc file +- Fixed OpenCVConfig script file + +* Mon Jun 04 2012 Nicolas Chauvet - 2.4.1-1 +- Update to 2.4.1 +- Rework dependencies - rhbz#828087 + Re-enable using --with tbb,openni,eigen2,eigen3 + +* Tue Feb 28 2012 Fedora Release Engineering - 2.3.1-8 +- Rebuilt for c++ ABI breakage + +* Mon Jan 16 2012 Nicolas Chauvet - 2.3.1-7 +- Update gcc46 patch for ARM FTBFS + +* Fri Jan 13 2012 Fedora Release Engineering - 2.3.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Dec 05 2011 Adam Jackson 2.3.1-5 +- Rebuild for new libpng + +* Thu Oct 20 2011 Nicolas Chauvet - 2.3.1-4 +- Rebuilt for tbb silent ABI change + +* Mon Oct 10 2011 Nicolas Chauvet - 2.3.1-3 +- Update to 2.3.1a + +* Mon Sep 26 2011 Dan Horák - 2.3.1-2 +- openni is exclusive for x86/x86_64 + +* Fri Aug 19 2011 Nicolas Chauvet - 2.3.1-1 +- Update to 2.3.1 +- Add BR openni-devel python-sphinx +- Remove deprecated cmake options +- Add --with cuda conditional (wip) +- Disable make test (unavailable) + +* Thu May 26 2011 Nicolas Chauvet - 2.2.0-6 +- Backport fixes from branch 2.2 to date + +* Tue May 17 2011 Nicolas Chauvet - 2.2.0-5 +- Re-enable v4l on f15 +- Remove unused cmake options + +* Tue Feb 08 2011 Fedora Release Engineering - 2.2.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Feb 02 2011 Nicolas Chauvet - 2.2.0-2 +- Fix with gcc46 +- Disable V4L as V4L1 is disabled for Fedora 15 + +* Thu Jan 06 2011 Nicolas Chauvet - 2.2.0-1 +- Update to 2.2.0 +- Disable -msse and -msse2 on x86_32 + +* Wed Aug 25 2010 Rex Dieter - 2.1.0-5 +- -devel: include OpenCVConfig.cmake (#627359) + +* Thu Jul 22 2010 Dan Horák - 2.1.0-4 +- TBB is available only on x86/x86_64 and ia64 + +* Wed Jul 21 2010 David Malcolm - 2.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + +* Fri Jun 25 2010 Nicolas Chauvet - 2.1.0-2 +- Move samples from main to -devel +- Fix spurious permission +- Add BR tbb-devel +- Fix CFLAGS + +* Fri Apr 23 2010 Nicolas Chauvet - 2.1.0-1 +- Update to 2.1.0 +- Update libdir patch + +* Tue Apr 13 2010 Karel Klic - 2.0.0-10 +- Fix nonstandard executable permissions + +* Tue Mar 09 2010 Karel Klic - 2.0.0-9 +- apply the previously added patch + +* Mon Mar 08 2010 Karel Klic - 2.0.0-8 +- re-enable testing on CMake build system +- fix memory corruption in the gaussian random number generator + +* Sat Feb 27 2010 Haïkel Guémar - 2.0.0-7 +- replaced BR unicap-devel by libucil-devel (unicap split) + +* Thu Feb 25 2010 Haïkel Guémar - 2.0.0-6 +- use cmake build system +- applications renamed to opencv_xxx instead of opencv-xxx +- add devel-docs subpackage #546605 +- add OpenCVConfig.cmake +- enable openmp build +- enable old SWIG based python wrappers +- opencv package is a good boy and use global instead of define + +* Tue Feb 16 2010 Karel Klic - 2.0.0-5 +- Set CXXFLAXS without -match=i386 for i386 architecture #565074 + +* Sat Jan 09 2010 Rakesh Pandit - 2.0.0-4 +- Updated opencv-samples-Makefile (Thanks Scott Tsai) #553697 + +* Wed Jan 06 2010 Karel Klic - 2.0.0-3 +- Fixed spec file issues detected by rpmlint + +* Sun Dec 06 2009 Haïkel Guémar - 2.0.0-2 +- Fix autotools scripts (missing LBP features) - #544167 + +* Fri Nov 27 2009 Haïkel Guémar - 2.0.0-1 +- Updated to 2.0.0 +- Removed upstream-ed patches +- Ugly hack (added cvconfig.h) +- Disable %%check on ppc64 + +* Thu Sep 10 2009 Karsten Hopp - 1.1.0-0.7.pre1 +- fix build on s390x where we don't have libraw1394 and devel + +* Thu Jul 30 2009 Haïkel Guémar - 1.1.0.0.6.pre1 +- Fix typo I introduced that prevented build on i386/i586 + +* Thu Jul 30 2009 Haïkel Guémar - 1.1.0.0.5.pre1 +- Added 1394 libs and unicap support + +* Sat Jul 25 2009 Fedora Release Engineering - 1.1.0-0.4.pre1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Jul 16 2009 kwizart < kwizart at gmail.com > - 1.1.0-0.3.pre1 +- Build with gstreamer support - #491223 +- Backport gcc43 fix from trunk + +* Thu Jul 16 2009 kwizart < kwizart at gmail.com > - 1.1.0-0.2.pre1 +- Fix FTBFS #511705 + +* Fri Apr 24 2009 kwizart < kwizart at gmail.com > - 1.1.0-0.1.pre1 +- Update to 1.1pre1 +- Disable CXXFLAGS hardcoded optimization +- Add BR: python-imaging, numpy +- Disable make check failure for now + +* Wed Apr 22 2009 kwizart < kwizart at gmail.com > - 1.0.0-14 +- Fix for gcc44 +- Enable BR jasper-devel +- Disable ldconfig run on python modules (uneeded) +- Prevent timestamp change on install + +* Thu Feb 26 2009 Fedora Release Engineering - 1.0.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Dec 29 2008 Rakesh Pandit - 1.0.0-12 +- fix URL field + +* Fri Dec 19 2008 Ralf Corsépius - 1.0.0-11 +- Adopt latest python spec rules. +- Rebuild for Python 2.6 once again. + +* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 1.0.0-10 +- Rebuild for Python 2.6 + +* Thu May 22 2008 Tom "spot" Callaway - 1.0.0-9 +- fix license tag + +* Sun May 11 2008 Ralf Corsépius - 1.0.0-8 +- Adjust library order in opencv.pc.in (BZ 445937). + +* Mon Feb 18 2008 Fedora Release Engineering - 1.0.0-7 +- Autorebuild for GCC 4.3 + +* Sun Feb 10 2008 Ralf Corsépius - 1.0.0-6 +- Rebuild for gcc43. + +* Tue Aug 28 2007 Fedora Release Engineering - 1.0.0-5 +- Rebuild for selinux ppc32 issue. + +* Wed Aug 22 2007 Ralf Corsépius - 1.0.0-4 +- Mass rebuild. + +* Thu Mar 22 2007 Ralf Corsépius - 1.0.0-3 +- Fix %%{_datadir}/opencv/samples ownership. +- Adjust timestamp of cvconfig.h.in to avoid re-running autoheader. + +* Thu Mar 22 2007 Ralf Corsépius - 1.0.0-2 +- Move all of the python module to pyexecdir (BZ 233128). +- Activate the testsuite. + +* Mon Dec 11 2006 Ralf Corsépius - 1.0.0-1 +- Upstream update. + +* Mon Dec 11 2006 Ralf Corsépius - 0.9.9-4 +- Remove python-abi. + +* Thu Oct 05 2006 Christian Iseli 0.9.9-3 +- rebuilt for unwind info generation, broken in gcc-4.1.1-21 + +* Thu Sep 21 2006 Ralf Corsépius - 0.9.9-2 +- Stop configure.in from hacking CXXFLAGS. +- Activate testsuite. +- Let *-devel require pkgconfig. + +* Thu Sep 21 2006 Ralf Corsépius - 0.9.9-1 +- Upstream update. +- Don't BR: autotools. +- Install samples' Makefile as GNUmakefile. + +* Thu Sep 21 2006 Ralf Corsépius - 0.9.7-18 +- Un'%%ghost *.pyo. +- Separate %%{pythondir} from %%{pyexecdir}. + +* Thu Sep 21 2006 Ralf Corsépius - 0.9.7-17 +- Rebuild for FC6. +- BR: libtool. + +* Fri Mar 17 2006 Simon Perreault - 0.9.7-16 +- Rebuild. + +* Wed Mar 8 2006 Simon Perreault - 0.9.7-15 +- Force a re-run of Autotools by calling autoreconf. + +* Wed Mar 8 2006 Simon Perreault - 0.9.7-14 +- Added build dependency on Autotools. + +* Tue Mar 7 2006 Simon Perreault - 0.9.7-13 +- Changed intrinsics patch so that it matches upstream. + +* Tue Mar 7 2006 Simon Perreault - 0.9.7-12 +- More intrinsics patch fixing. + +* Tue Mar 7 2006 Simon Perreault - 0.9.7-11 +- Don't do "make check" because it doesn't run any tests anyway. +- Back to main intrinsics patch. + +* Tue Mar 7 2006 Simon Perreault - 0.9.7-10 +- Using simple intrinsincs patch. + +* Tue Mar 7 2006 Simon Perreault - 0.9.7-9 +- Still more fixing of intrinsics patch for Python bindings on x86_64. + +* Tue Mar 7 2006 Simon Perreault - 0.9.7-8 +- Again fixed intrinsics patch so that Python modules build on x86_64. + +* Tue Mar 7 2006 Simon Perreault - 0.9.7-7 +- Fixed intrinsics patch so that it works. + +* Tue Mar 7 2006 Simon Perreault - 0.9.7-6 +- Fixed Python bindings location on x86_64. + +* Mon Mar 6 2006 Simon Perreault - 0.9.7-5 +- SSE2 support on x86_64. + +* Mon Mar 6 2006 Simon Perreault - 0.9.7-4 +- Rebuild + +* Sun Oct 16 2005 Simon Perreault - 0.9.7-3 +- Removed useless sample compilation makefiles/project files and replaced them + with one that works on Fedora Core. +- Removed shellbang from Python modules. + +* Mon Oct 10 2005 Simon Perreault - 0.9.7-2 +- Made FFMPEG dependency optional (needs to be disabled for inclusion in FE). + +* Mon Oct 10 2005 Simon Perreault - 0.9.7-1 +- Initial package. diff --git a/opencv_vulkan.patch b/opencv_vulkan.patch new file mode 100644 index 0000000..3a322a7 --- /dev/null +++ b/opencv_vulkan.patch @@ -0,0 +1,28 @@ +diff -rupN opencv-4.2.0/modules/dnn/src/vkcom/vulkan/function_list.inl.hpp opencv-4.2.0-new/modules/dnn/src/vkcom/vulkan/function_list.inl.hpp +--- opencv-4.2.0/modules/dnn/src/vkcom/vulkan/function_list.inl.hpp 2019-12-20 14:44:16.000000000 +0100 ++++ opencv-4.2.0-new/modules/dnn/src/vkcom/vulkan/function_list.inl.hpp 2020-05-21 12:39:08.652679166 +0200 +@@ -254,15 +254,15 @@ VK_FUNC(vkCmdDrawIndirectCountAMD) + VK_FUNC(vkCmdDrawIndexedIndirectCountAMD) + VK_FUNC(vkGetShaderInfoAMD) + VK_FUNC(vkGetPhysicalDeviceExternalImageFormatPropertiesNV) +-VK_FUNC(vkCmdProcessCommandsNVX) +-VK_FUNC(vkCmdReserveSpaceForCommandsNVX) +-VK_FUNC(vkCreateIndirectCommandsLayoutNVX) +-VK_FUNC(vkDestroyIndirectCommandsLayoutNVX) +-VK_FUNC(vkCreateObjectTableNVX) +-VK_FUNC(vkDestroyObjectTableNVX) +-VK_FUNC(vkRegisterObjectsNVX) +-VK_FUNC(vkUnregisterObjectsNVX) +-VK_FUNC(vkGetPhysicalDeviceGeneratedCommandsPropertiesNVX) ++// VK_FUNC(vkCmdProcessCommandsNVX) ++// VK_FUNC(vkCmdReserveSpaceForCommandsNVX) ++// VK_FUNC(vkCreateIndirectCommandsLayoutNVX) ++// VK_FUNC(vkDestroyIndirectCommandsLayoutNVX) ++// VK_FUNC(vkCreateObjectTableNVX) ++// VK_FUNC(vkDestroyObjectTableNVX) ++// VK_FUNC(vkRegisterObjectsNVX) ++// VK_FUNC(vkUnregisterObjectsNVX) ++// VK_FUNC(vkGetPhysicalDeviceGeneratedCommandsPropertiesNVX) + VK_FUNC(vkCmdSetViewportWScalingNV) + VK_FUNC(vkReleaseDisplayEXT) + VK_FUNC(vkGetPhysicalDeviceSurfaceCapabilities2EXT) diff --git a/sources b/sources new file mode 100644 index 0000000..09e268e --- /dev/null +++ b/sources @@ -0,0 +1,5 @@ +SHA512 (opencv-clean-4.3.0.tar.gz) = f582ffc45d1143abf62eac7d6ed416986e6aa0e26d9a4a2cb4d88458e1eecb24ad33570dccd99004998a4899b0a9c05de7dfa405564c0e59bc91a48b7e9d2343 +SHA512 (b624b995ec9c439cbc2e9e6ee940d3a2-v0.1.1f.zip) = f2994d5e92a2ae05cee6e153943afe151ce734ced6e06dcdb02dee9fed9336a7f1ea69661d9e033f1412fbb5e2a44a6e641662c85be5ba0604d0446abeabe836 +SHA512 (opencv_contrib-clean-4.3.0.tar.gz) = bc4f88f3624cf4aed237f8cf36ef62b20f31205e891948797e416faa5e1dd215d1bad85506aa4afacb5c11988a6fc3f81f282fd82fe491f5ffa070f97cc793d5 +SHA512 (face_landmark_model.dat.xz) = 7558f29431bb9cad1f22ee067ad3ed41be8f68b865992eb7d3a5ce6b6b9e1d031cb03e33c3c149220ef8faebd0471703a8a3bbb06402bcc8ce76bd28317aa307 +SHA512 (opencv_extra-clean-4.3.0.tar.gz) = 0f9f8b027ed7a105a6ed09d8953bb5d8c44a03ea99495aaf1dd4380a1488ca1acc614ad160a59080be4723469116d1213f3af6dfda0062d56f3575f6d2179bc4 diff --git a/xorg.conf b/xorg.conf new file mode 100644 index 0000000..8edc240 --- /dev/null +++ b/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 + SubSection "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