Update to 4.1.1
This commit is contained in:
parent
8e36afc541
commit
428f643a93
2
.gitignore
vendored
2
.gitignore
vendored
@ -33,3 +33,5 @@ OpenCV-2.1.0.tar.bz2
|
|||||||
/opencv-clean-3.4.6.tar.gz
|
/opencv-clean-3.4.6.tar.gz
|
||||||
/opencv_contrib-3.4.6.tar.gz
|
/opencv_contrib-3.4.6.tar.gz
|
||||||
/opencv_contrib-clean-3.4.6.tar.gz
|
/opencv_contrib-clean-3.4.6.tar.gz
|
||||||
|
/opencv-clean-4.1.1.tar.gz
|
||||||
|
/opencv_contrib-clean-4.1.1.tar.gz
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
export VERSION=3.4.6
|
export VERSION=4.1.1
|
||||||
|
|
||||||
wget -c https://github.com/opencv/opencv/archive/${VERSION}/opencv-${VERSION}.tar.gz
|
wget -c https://github.com/opencv/opencv/archive/${VERSION}/opencv-${VERSION}.tar.gz
|
||||||
tar xf opencv-${VERSION}.tar.gz
|
tar xf opencv-${VERSION}.tar.gz
|
||||||
|
26
opencv.spec
26
opencv.spec
@ -53,8 +53,8 @@
|
|||||||
%bcond_without java
|
%bcond_without java
|
||||||
|
|
||||||
%global srcname opencv
|
%global srcname opencv
|
||||||
%global abiver 3.4
|
%global abiver 4.1
|
||||||
%global javaver 346
|
%global javaver 411
|
||||||
|
|
||||||
# Required because opencv-core has lot of spurious dependencies
|
# Required because opencv-core has lot of spurious dependencies
|
||||||
# (despite supposed to be "-core")
|
# (despite supposed to be "-core")
|
||||||
@ -63,8 +63,8 @@
|
|||||||
%global optflags %(echo %{optflags} -Wl,--as-needed )
|
%global optflags %(echo %{optflags} -Wl,--as-needed )
|
||||||
|
|
||||||
Name: opencv
|
Name: opencv
|
||||||
Version: 3.4.6
|
Version: 4.1.1
|
||||||
Release: 9%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Collection of algorithms for computer vision
|
Summary: Collection of algorithms for computer vision
|
||||||
# This is normal three clause BSD.
|
# This is normal three clause BSD.
|
||||||
License: BSD
|
License: BSD
|
||||||
@ -76,7 +76,9 @@ URL: https://opencv.org
|
|||||||
#
|
#
|
||||||
Source0: %{name}-clean-%{version}.tar.gz
|
Source0: %{name}-clean-%{version}.tar.gz
|
||||||
Source1: %{name}_contrib-clean-%{version}.tar.gz
|
Source1: %{name}_contrib-clean-%{version}.tar.gz
|
||||||
Patch2: opencv-4.1.0-install_3rdparty_licenses.patch
|
#Source2: https://github.com/opencv/ade/archive/37479d90e3a5d47f132f512b22cbe206#v0.1.1d.zip
|
||||||
|
Source3: face_landmark_model.dat.xz
|
||||||
|
#Source4: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0
|
||||||
|
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: libtool
|
BuildRequires: libtool
|
||||||
@ -247,11 +249,6 @@ rm -r 3rdparty/
|
|||||||
mkdir 3rdparty/
|
mkdir 3rdparty/
|
||||||
mv quirc/ 3rdparty/
|
mv quirc/ 3rdparty/
|
||||||
|
|
||||||
%patch2 -p1 -b .install_3rdparty_licenses
|
|
||||||
|
|
||||||
%ifarch %{ix86} %{arm}
|
|
||||||
%endif
|
|
||||||
|
|
||||||
pushd %{name}_contrib-%{version}
|
pushd %{name}_contrib-%{version}
|
||||||
popd
|
popd
|
||||||
|
|
||||||
@ -262,6 +259,12 @@ popd
|
|||||||
mkdir -p build
|
mkdir -p build
|
||||||
pushd build
|
pushd build
|
||||||
|
|
||||||
|
mkdir -p share/opencv4/testdata/cv/face
|
||||||
|
install -pm 0644 %{SOURCE3} share/opencv4/testdata/cv/face
|
||||||
|
pushd share/opencv4/testdata/cv/face
|
||||||
|
xz -d face_landmark_model.dat.xz
|
||||||
|
popd
|
||||||
|
|
||||||
# disabling IPP because it is closed source library from intel
|
# disabling IPP because it is closed source library from intel
|
||||||
|
|
||||||
%cmake CMAKE_VERBOSE=1 \
|
%cmake CMAKE_VERBOSE=1 \
|
||||||
@ -439,6 +442,9 @@ popd
|
|||||||
%{_libdir}/libopencv_xphoto.so.%{abiver}*
|
%{_libdir}/libopencv_xphoto.so.%{abiver}*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Sep 13 2019 Nicolas Chauvet <kwizart@gmail.com> - 4.1.1-1
|
||||||
|
- Update to 4.1.1
|
||||||
|
|
||||||
* Fri Sep 13 2019 Sérgio Basto <sergio@serjux.com> - 3.4.6-9
|
* Fri Sep 13 2019 Sérgio Basto <sergio@serjux.com> - 3.4.6-9
|
||||||
- Reenable pylint and vtk, they are working now.
|
- Reenable pylint and vtk, they are working now.
|
||||||
|
|
||||||
|
4
sources
4
sources
@ -1,2 +1,2 @@
|
|||||||
SHA512 (opencv-clean-3.4.6.tar.gz) = df7f2ee5ab83c047e5caa8cb12f6cbd8e7c13e554fe4183c43fc4d59e6b42e7a6e8caf71de587c95e36ec720105b4e5c166f3e376bb7ad446bd1b94bc0a84192
|
SHA512 (opencv-clean-4.1.1.tar.gz) = 154d5c4e9d3d68638af480ca928560d12150a4e948565de362ed415adea0aa3ea38b9a803bb472d49e7d5752ea80bb4b99953813491a20162ca531adbc5a4d87
|
||||||
SHA512 (opencv_contrib-clean-3.4.6.tar.gz) = 261628e0ce607e9ff37d49dffb0378dd50b81b216c1223cb43489441131c522567b09c022dddcc99712268b77449a00b5f03ceceb4c104c4a111e7b246613ff6
|
SHA512 (opencv_contrib-clean-4.1.1.tar.gz) = e34d514716eff2eea6d953b194c8bb5554524cbf16078485d2bdbc48180ed840b1f6be2c178160ae6d64f45b4c7dd635d54433eae84ab3efa8d8d79e07114682
|
||||||
|
Loading…
Reference in New Issue
Block a user