From 8d08ab7e12b04adfa93417908cedb556191327c2 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Sat, 5 Dec 2020 16:35:23 -0700 Subject: [PATCH] Fix missing #include for gcc-11 --- opencv-gcc11.patch | 12 ++++++++++++ opencv.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 opencv-gcc11.patch diff --git a/opencv-gcc11.patch b/opencv-gcc11.patch new file mode 100644 index 0000000..a51a741 --- /dev/null +++ b/opencv-gcc11.patch @@ -0,0 +1,12 @@ +diff --git a/modules/gapi/test/gapi_async_test.cpp b/modules/gapi/test/gapi_async_test.cpp +index 66b8be4..aa0c9c7 100644 +--- a/modules/gapi/test/gapi_async_test.cpp ++++ b/modules/gapi/test/gapi_async_test.cpp +@@ -13,6 +13,7 @@ + + #include + #include ++#include + + namespace opencv_test + { diff --git a/opencv.spec b/opencv.spec index 967af71..ec01a3a 100644 --- a/opencv.spec +++ b/opencv.spec @@ -45,7 +45,7 @@ Name: opencv Version: 4.5.0 %global javaver %(foo=%{version}; echo ${foo//./}) %global abiver %(foo=%{version}; echo ${foo:0:3}) -Release: 2%{?dist} +Release: 3%{?dist} Summary: Collection of algorithms for computer vision # This is normal three clause BSD. License: BSD @@ -64,6 +64,7 @@ Source4: b624b995ec9c439cbc2e9e6ee940d3a2-v0.1.1f.zip Source5: xorg.conf Patch0: opencv-4.1.0-install_3rdparty_licenses.patch +Patch1: %{name}-gcc11.patch BuildRequires: gcc-c++ BuildRequires: libtool @@ -242,6 +243,7 @@ popd &>/dev/null %endif %patch0 -p1 -b .install_3rdparty_licenses +%patch1 -p1 -b .gcc11 pushd %{name}_contrib-%{version} popd @@ -461,6 +463,9 @@ ln -s -r %{buildroot}%{_jnidir}/opencv-%{javaver}.jar %{buildroot}%{_jnidir}/ope %{_libdir}/libopencv_xphoto.so.%{abiver}* %changelog +* Sat Dec 5 2020 Jeff Law - 4.5.0-3 +- Fix missing #include for gcc-11 + * Fri Nov 6 22:47:45 CET 2020 Sandro Mani - 4.5.0-2 - Rebuild (proj, gdal)