packages/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!12 repair clang abi

Browse Source 
From: @shenwei41
Reviewed-by: @zhengzhenyu
Signed-off-by: @zhengzhenyu
This commit is contained in:
openeuler-ci-bot 2021-11-18 03:41:21 +00:00 committed by Gitee
commit 409667119d
3 changed files with 45 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Fix_compilation_of_copy_assignment_operators_with_GCC.patch
View File

@ -15,7 +15,7 @@ diff -Npur opencv-4.5.2/modules/core/include/opencv2/core/types.hpp opencv-4.5.2
Point_(const Size_<_Tp>& sz); Point_(const Size_<_Tp>& sz);
Point_(const Vec<_Tp, 2>& v); Point_(const Vec<_Tp, 2>& v);
+#if (defined(__GNUC__) && __GNUC__ < 5) // GCC 4.x bug. Details: https://github.com/opencv/opencv/pull/20837 +#if (defined(__GNUC__) && __GNUC__ < 5)
+ Point_& operator = (const Point_& pt); + Point_& operator = (const Point_& pt);
+ Point_& operator = (Point_&& pt) CV_NOEXCEPT = default; + Point_& operator = (Point_&& pt) CV_NOEXCEPT = default;
+#elif OPENCV_ABI_COMPATIBILITY < 500 +#elif OPENCV_ABI_COMPATIBILITY < 500

39
Repair_clang_abi.patch Normal file
View File

@ -0,0 +1,39 @@
diff -Npur opencv-4.5.2/modules/core/include/opencv2/core/types.hpp opencv-4.5.2-new/modules/core/include/opencv2/core/types.hpp
--- opencv-4.5.2/modules/core/include/opencv2/core/types.hpp 2021-11-17 10:30:22.631203192 +0800
+++ opencv-4.5.2-new/modules/core/include/opencv2/core/types.hpp 2021-11-17 10:34:53.117761924 +0800
@@ -162,7 +162,7 @@ public:
//! default constructor
Point_();
Point_(_Tp _x, _Tp _y);
-#if (defined(__GNUC__) && __GNUC__ < 5)
+#if (defined(__GNUC__) && __GNUC__ < 5) && !defined(__clang__)
Point_(const Point_& pt);
Point_(Point_&& pt) CV_NOEXCEPT = default;
#elif OPENCV_ABI_COMPATIBILITY < 500
@@ -172,7 +172,7 @@ public:
Point_(const Size_<_Tp>& sz);
Point_(const Vec<_Tp, 2>& v);
-#if (defined(__GNUC__) && __GNUC__ < 5)
+#if (defined(__GNUC__) && __GNUC__ < 5) && !defined(__clang__)
Point_& operator = (const Point_& pt);
Point_& operator = (Point_&& pt) CV_NOEXCEPT = default;
#elif OPENCV_ABI_COMPATIBILITY < 500
@@ -1186,7 +1186,7 @@ template<typename _Tp> inline
Point_<_Tp>::Point_(_Tp _x, _Tp _y)
: x(_x), y(_y) {}
-#if (defined(__GNUC__) && __GNUC__ < 5)
+#if (defined(__GNUC__) && __GNUC__ < 5) && !defined(__clang__)
template<typename _Tp> inline
Point_<_Tp>::Point_(const Point_& pt)
: x(pt.x), y(pt.y) {}
@@ -1208,7 +1208,7 @@ template<typename _Tp> inline
Point_<_Tp>::Point_(const Vec<_Tp,2>& v)
: x(v[0]), y(v[1]) {}
-#if (defined(__GNUC__) && __GNUC__ < 5)
+#if (defined(__GNUC__) && __GNUC__ < 5) && !defined(__clang__)
template<typename _Tp> inline
Point_<_Tp>& Point_<_Tp>::operator = (const Point_& pt)
{

6
opencv.spec
View File

@ -1,6 +1,6 @@
Name: opencv Name: opencv
Version: 4.5.2 Version: 4.5.2
Release: 3 Release: 4
Summary: OpenCV means Intel® Open Source Computer Vision Library. Summary: OpenCV means Intel® Open Source Computer Vision Library.
License: Apache-2.0 License: Apache-2.0
URL: https://github.com/opencv/opencv URL: https://github.com/opencv/opencv
@ -13,6 +13,7 @@ Source5: opencv_extra-4.5.2.tar.gz.ad
Source6: opencv_extra-4.5.2.tar.gz.ae Source6: opencv_extra-4.5.2.tar.gz.ae
Patch1: Fix-OpenCV-build-with-OpenEXR-before-2.2.0.patch Patch1: Fix-OpenCV-build-with-OpenEXR-before-2.2.0.patch
Patch2: Fix_compilation_of_copy_assignment_operators_with_GCC.patch Patch2: Fix_compilation_of_copy_assignment_operators_with_GCC.patch
Patch3: Repair_clang_abi.patch
BuildRequires: gcc-c++ gcc autoconf pkgconfig protobuf-compiler protobuf BuildRequires: gcc-c++ gcc autoconf pkgconfig protobuf-compiler protobuf
BuildRequires: cmake BuildRequires: cmake
@ -72,6 +73,9 @@ make install DESTDIR=%{buildroot}
%exclude /usr/share/* %exclude /usr/share/*
%changelog %changelog
* Wed Nov 17 2021 shenwei <shenwei41@huawei.com> - 4.5.2-4
- repair Clang ABI
* Sat Nov 13 2021 shenwei <shenwei41@huawei.com> - 4.5.2-3 * Sat Nov 13 2021 shenwei <shenwei41@huawei.com> - 4.5.2-3
- fix compilation of copy ctors/assignment operators with GCC 4.x - fix compilation of copy ctors/assignment operators with GCC 4.x