Browse Source

opencv-4.6.0-1

Tomohiro "Tomo-p" KATO 1 year ago
parent
commit
1636c6d869
1 changed files with 10 additions and 4 deletions
  1. 10 4
      o/opencv/opencv-vl.spec

+ 10 - 4
o/opencv/opencv-vl.spec

@@ -4,7 +4,7 @@
 #global indice   a
 
 Name:           opencv
-Version:        4.5.3
+Version:        4.6.0
 Release:        1%{?_dist_release}
 Summary:        Collection of algorithms for computer vision
 Summary(ja):    コンピュータビジョン用のアルゴリズム集
@@ -32,6 +32,7 @@ Source5:        xorg.conf
 Source100:      opencv-clean.sh
 
 Patch0:         opencv-4.1.0-install_3rdparty_licenses.patch
+Patch3:         opencv.python.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  libtool
@@ -143,11 +144,12 @@ to provide decent performance and stability.
 # we don't use pre-built contribs except quirc
 pushd 3rdparty
 shopt -s extglob
-rm -r !(openexr|openvx|quirc)
+rm -r !(openvx|quirc)
 shopt -u extglob
 popd &>/dev/null
 
 %patch0 -p1 -b .install_3rdparty_licenses
+%patch3 -p1 -b .python_install_binary
 
 pushd %{name}_contrib-%{version}
 popd
@@ -166,6 +168,7 @@ install -pm 0644 %{SOURCE4} .cache/ade/
 
 %build
 %cmake \
+        -DCV_TRACE=OFF \
         -DWITH_IPP=OFF \
         -DWITH_ITT=OFF \
         -DWITH_QT=ON \
@@ -197,6 +200,7 @@ install -pm 0644 %{SOURCE4} .cache/ade/
         -DINSTALL_PYTHON_EXAMPLES=OFF \
         -DPYTHON3_EXECUTABLE=%{__python3} \
         -DPYTHON3_PACKAGES_PATH=%{python3_sitearch} \
+        -DOPENCV_GENERATE_SETUPVARS=OFF \
         -DENABLE_PYLINT=ON \
         -DBUILD_PROTOBUF=OFF \
         -DPROTOBUF_UPDATE_FILES=ON \
@@ -291,8 +295,7 @@ rm -rf %{buildroot}
 %{_libdir}/cmake/OpenCV/*.cmake
 
 %files -n python3-opencv
-%exclude %{_bindir}/setup_vars_opencv4.sh
-%{python3_sitearch}/cv2.cpython-3*.so
+%{python3_sitearch}/*
 
 
 %files contrib
@@ -333,6 +336,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Nov 05 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.6.0-1
+- new upstream release.
+
 * Thu Sep 02 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.5.3-1
 - new upstream release.
 - dropped ldconfig scriptlets.