rpms
/
opencv
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove hack to keep old so version

This commit is contained in:
Sérgio M. Basto 2022-06-17 20:21:10 +01:00
parent 6b89fb12ba
commit 69ea132829
2 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
81a6d1b0d4d93a3330cc99fbb1601c90b9516a9c.patch
View File

@ -1,28 +0,0 @@
From 81a6d1b0d4d93a3330cc99fbb1601c90b9516a9c Mon Sep 17 00:00:00 2001
From: Alexander Alekhin <alexander.a.alekhin@gmail.com>
Date: Thu, 2 Dec 2021 13:32:59 +0000
Subject: [PATCH] cmake: update SOVERSION
- OpenCV 4.x doesn't guarantee or maintain ABI compatibility
- We should increase SO version on each release
---
cmake/OpenCVVersion.cmake | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/cmake/OpenCVVersion.cmake b/cmake/OpenCVVersion.cmake
index a2b4926cf0d2..6ffaab94cf02 100644
--- a/cmake/OpenCVVersion.cmake
+++ b/cmake/OpenCVVersion.cmake
@@ -10,8 +10,10 @@ set(OPENCV_VERSION_PLAIN "${OPENCV_VERSION_MAJOR}.${OPENCV_VERSION_MINOR}.${OPEN
set(OPENCV_VERSION "${OPENCV_VERSION_PLAIN}${OPENCV_VERSION_STATUS}")
-set(OPENCV_SOVERSION "${OPENCV_VERSION_MAJOR}.${OPENCV_VERSION_MINOR}")
-set(OPENCV_LIBVERSION "${OPENCV_VERSION_MAJOR}.${OPENCV_VERSION_MINOR}.${OPENCV_VERSION_PATCH}")
+string(REGEX MATCH "[0-9][0-9]$" OPENCV_VERSION_MINOR_2DIGITS "00${OPENCV_VERSION_MINOR}")
+string(REGEX MATCH "[0-9][0-9]$" OPENCV_VERSION_PATCH_2DIGITS "00${OPENCV_VERSION_PATCH}")
+ocv_update(OPENCV_SOVERSION "${OPENCV_VERSION_MAJOR}${OPENCV_VERSION_MINOR_2DIGITS}")
+ocv_update(OPENCV_LIBVERSION "${OPENCV_VERSION_MAJOR}.${OPENCV_VERSION_MINOR}.${OPENCV_VERSION_PATCH}")
# create a dependency on the version file
# we never use the output of the following command but cmake will rerun automatically if the version file changes

2
opencv.spec
View File

@ -73,7 +73,6 @@ Source4: b624b995ec9c439cbc2e9e6ee940d3a2-v0.1.1f.zip
Source5: xorg.conf
Patch0: opencv-4.1.0-install_3rdparty_licenses.patch
Patch1: https://github.com/opencv/opencv/commit/81a6d1b0d4d93a3330cc99fbb1601c90b9516a9c.patch
Patch2: https://github.com/opencv/opencv/commit/8d88bb06b230b5c4b5bca78d84102f5d1adf48cf.patch
Patch3: opencv.python.patch
@ -256,7 +255,6 @@ popd &>/dev/null
%endif
%patch0 -p1 -b .install_3rdparty_licenses
%patch1 -p1 -R -b .soversion
%patch2 -p1 -b .ppc64le_builtin_altivec_vadub
%patch3 -p1 -b .python_install_binary