|
|
@@ -4,7 +4,7 @@
|
|
|
#global indice a
|
|
|
|
|
|
Name: opencv
|
|
|
-Version: 4.5.0
|
|
|
+Version: 4.5.3
|
|
|
Release: 1%{?_dist_release}
|
|
|
Summary: Collection of algorithms for computer vision
|
|
|
Summary(ja): コンピュータビジョン用のアルゴリズム集
|
|
|
@@ -123,7 +123,7 @@ This package contains Python bindings for the OpenCV library.
|
|
|
|
|
|
%package contrib
|
|
|
Summary: OpenCV contributed functionality
|
|
|
-Summary(ja): 寄付された OpenCV の追加機能
|
|
|
+Summary(ja): 寄贈された OpenCV の追加機能
|
|
|
Group: graphics
|
|
|
|
|
|
%description contrib
|
|
|
@@ -149,28 +149,23 @@ popd &>/dev/null
|
|
|
|
|
|
%patch0 -p1 -b .install_3rdparty_licenses
|
|
|
|
|
|
+pushd %{name}_contrib-%{version}
|
|
|
+popd
|
|
|
+
|
|
|
+# Install face_landmark_model
|
|
|
+mkdir -p .cache/data
|
|
|
+install -pm 0644 %{SOURCE3} .cache/data
|
|
|
+pushd .cache/data
|
|
|
+ xz -d face_landmark_model.dat.xz
|
|
|
+popd
|
|
|
+
|
|
|
# Install ADE, needed for opencv_gapi
|
|
|
mkdir -p .cache/ade
|
|
|
install -pm 0644 %{SOURCE4} .cache/ade/
|
|
|
|
|
|
|
|
|
%build
|
|
|
-# enabled by default if libraries are presents at build time:
|
|
|
-# GTK, GSTREAMER, 1394, V4L
|
|
|
-# non available on Fedora: FFMPEG, XINE
|
|
|
-mkdir -p build
|
|
|
-pushd build
|
|
|
-
|
|
|
-rm -rf share/opencv4/testdata/cv/face
|
|
|
-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
|
|
|
-
|
|
|
-%cmake CMAKE_VERBOSE=1 \
|
|
|
+%cmake \
|
|
|
-DWITH_IPP=OFF \
|
|
|
-DWITH_ITT=OFF \
|
|
|
-DWITH_QT=ON \
|
|
|
@@ -207,7 +202,7 @@ popd
|
|
|
-DPROTOBUF_UPDATE_FILES=ON \
|
|
|
-DWITH_OPENCL=OFF \
|
|
|
-DOPENCV_SKIP_PYTHON_LOADER=ON \
|
|
|
- -DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib-%{version}/modules \
|
|
|
+ -DOPENCV_EXTRA_MODULES_PATH=opencv_contrib-%{version}/modules \
|
|
|
-DWITH_LIBV4L=ON \
|
|
|
-DWITH_OPENMP=ON \
|
|
|
-DOPENCV_CONFIG_INSTALL_PATH=%{_lib}/cmake/OpenCV \
|
|
|
@@ -219,17 +214,14 @@ popd
|
|
|
%{?with_va: -DWITH_VA=ON } \
|
|
|
-DWITH_VTK=OFF \
|
|
|
-DWITH_TBB=1 -DTBB_LIB_DIR=%{_libdir} \
|
|
|
- -DWITH_VULKAN=ON -DVULKAN_INCLUDE_DIRS=%{_includedir}/vulkan \
|
|
|
- ..
|
|
|
-
|
|
|
-make VERBOSE=1 %{?_smp_mflags}
|
|
|
+ -DWITH_VULKAN=ON -DVULKAN_INCLUDE_DIRS=%{_includedir}/vulkan
|
|
|
|
|
|
-popd
|
|
|
+%cmake_build
|
|
|
|
|
|
|
|
|
%install
|
|
|
rm -rf %{buildroot}
|
|
|
-%make_install -C build
|
|
|
+%cmake_install
|
|
|
find %{buildroot} -name '*.la' -delete
|
|
|
rm -rf %{buildroot}%{_datadir}/OpenCV/licenses/
|
|
|
|
|
|
@@ -257,16 +249,6 @@ popd
|
|
|
rm -rf %{buildroot}
|
|
|
|
|
|
|
|
|
-%post core -p /sbin/ldconfig
|
|
|
-%postun core -p /sbin/ldconfig
|
|
|
-
|
|
|
-%post -p /sbin/ldconfig
|
|
|
-%postun -p /sbin/ldconfig
|
|
|
-
|
|
|
-%post contrib -p /sbin/ldconfig
|
|
|
-%postun contrib -p /sbin/ldconfig
|
|
|
-
|
|
|
-
|
|
|
%files
|
|
|
%doc README.md
|
|
|
%{_bindir}/opencv_*
|
|
|
@@ -351,6 +333,10 @@ rm -rf %{buildroot}
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Thu Sep 02 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.5.3-1
|
|
|
+- new upstream release.
|
|
|
+- dropped ldconfig scriptlets.
|
|
|
+
|
|
|
* Sat Dec 12 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.5.0-1
|
|
|
- new upstream release.
|
|
|
|
