commit 38e159efa57c4f70eddf861b7e199df621eb06f7
Author: Jakub Bogusz <[email protected]>
Date: Sat Jul 9 22:15:11 2022 +0200
- fix glog flags conflict; release 12
opencv.spec | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/opencv.spec b/opencv.spec
index 86280c9..540d513 100644
--- a/opencv.spec
+++ b/opencv.spec
@@ -60,7 +60,7 @@ Summary: A library of programming functions mainly aimed
at real time computer v
Summary(pl.UTF-8): Biblioteka funkcji do grafiki komputerowej w czasie
rzeczywistym
Name: opencv
Version: 4.5.1
-Release: 11
+Release: 12
Epoch: 1
%if %{with unicap} || %{with xine}
License: GPL (enforced by used libraries), BSD (opencv itself)
@@ -363,6 +363,10 @@ cache_file %{SOURCE40} ade
cd opencv_contrib-%{version}
%patch5 -p1
+# both files use Glog_FOUND variable, but set different variables for LIBS;
unify them so they won't disturb each other
+cp -f modules/sfm/cmake/FindGlog.cmake modules/cnn_3dobj/FindGlog.cmake
+%{__sed} -i -e 's/Glog_LIBS/GLOG_LIBRARIES/' modules/cnn_3dobj/CMakeLists.txt
+
%build
mkdir -p build
cd build
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/opencv.git/commitdiff/38e159efa57c4f70eddf861b7e199df621eb06f7
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
