From 08f9218e2851c6c1a303f458d2b9e131c3a67fdc Mon Sep 17 00:00:00 2001 From: yanhailiang Date: Fri, 19 Nov 2021 14:55:54 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=9E=84=E5=BB=BA=E8=BF=87=E7=A8=8B?= =?UTF-8?q?=E8=BF=90=E8=A1=8Cpython=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- opencv.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/opencv.spec b/opencv.spec index 5569258..8c2c4ca 100644 --- a/opencv.spec +++ b/opencv.spec @@ -16,7 +16,7 @@ Patch2: Fix_compilation_of_copy_assignment_operators_with_GCC.patch Patch3: Repair_clang_abi.patch BuildRequires: gcc-c++ gcc autoconf pkgconfig protobuf-compiler protobuf BuildRequires: cmake -BuildRequires: python3-numpy python3-devel +BuildRequires: python3-numpy python3-devel python3-py python3-pytest %description OpenCV means Intel® Open Source Computer Vision Library. It is a collection of @@ -70,8 +70,8 @@ cmake ../../ -DCMAKE_BUILD_TYPE=Release\ -DPYTHON_LIBRARY=$(python3 -c "import distutils.sysconfig as sysconfig; print(sysconfig.get_config_var('LIBDIR')+ '/libpython3.so')")\ -DCMAKE_INSTALL_PREFIX=/usr make -j24 V=1 -ctest -E "opencv_test_objdetect|opencv_test_photo" - +#ctest -E "opencv_test_objdetect|opencv_test_photo" +pytest %install cd cmake/build -- Gitee From a0ddde98507bca7a7ccc511503cfce20a5eab10e Mon Sep 17 00:00:00 2001 From: yanhailiang Date: Fri, 19 Nov 2021 15:35:48 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=9E=84=E5=BB=BA=E8=BF=87=E7=A8=8B?= =?UTF-8?q?=E8=BF=90=E8=A1=8Cpython=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- opencv.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opencv.spec b/opencv.spec index 8c2c4ca..aba33ad 100644 --- a/opencv.spec +++ b/opencv.spec @@ -71,7 +71,7 @@ cmake ../../ -DCMAKE_BUILD_TYPE=Release\ -DCMAKE_INSTALL_PREFIX=/usr make -j24 V=1 #ctest -E "opencv_test_objdetect|opencv_test_photo" -pytest +pytest --rootdir=%_builddir/%{name}-%{version}/modules/python/test %install cd cmake/build -- Gitee From 1a6531f7075fe48ea359a2b80e1d4652055f43c6 Mon Sep 17 00:00:00 2001 From: yanhailiang Date: Sun, 21 Nov 2021 20:01:10 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=9E=84=E5=BB=BA=E8=BF=87=E7=A8=8B?= =?UTF-8?q?=E8=BF=90=E8=A1=8Cpython=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- opencv.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opencv.spec b/opencv.spec index aba33ad..40e0840 100644 --- a/opencv.spec +++ b/opencv.spec @@ -71,7 +71,7 @@ cmake ../../ -DCMAKE_BUILD_TYPE=Release\ -DCMAKE_INSTALL_PREFIX=/usr make -j24 V=1 #ctest -E "opencv_test_objdetect|opencv_test_photo" -pytest --rootdir=%_builddir/%{name}-%{version}/modules/python/test +pytest %_builddir/%{name}-%{version}/modules/python/test/test.py %install cd cmake/build -- Gitee From e3f8b96b029681d81d127487841377079a34dea4 Mon Sep 17 00:00:00 2001 From: yanhailiang Date: Fri, 10 Dec 2021 14:54:55 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E9=80=82=E9=85=8D=E5=8D=87=E7=BA=A7python?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=88=B03.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- opencv.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/opencv.spec b/opencv.spec index aba33ad..b29bbac 100644 --- a/opencv.spec +++ b/opencv.spec @@ -70,8 +70,7 @@ cmake ../../ -DCMAKE_BUILD_TYPE=Release\ -DPYTHON_LIBRARY=$(python3 -c "import distutils.sysconfig as sysconfig; print(sysconfig.get_config_var('LIBDIR')+ '/libpython3.so')")\ -DCMAKE_INSTALL_PREFIX=/usr make -j24 V=1 -#ctest -E "opencv_test_objdetect|opencv_test_photo" -pytest --rootdir=%_builddir/%{name}-%{version}/modules/python/test +ctest -E "opencv_test_objdetect|opencv_test_photo" %install cd cmake/build @@ -84,7 +83,7 @@ make install DESTDIR=%{buildroot} %{_libdir}/* %{_includedir}/* %exclude /usr/share/* -/usr/lib/python3.8/site-packages/cv2/* +/usr/lib/python3.10/site-packages/cv2/* %changelog * Wed Nov 17 2021 shenwei - 4.5.2-4 -- Gitee From a7399aa45fac7955add027a5351c02320be31739 Mon Sep 17 00:00:00 2001 From: yanhailiang Date: Fri, 10 Dec 2021 15:22:48 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E9=80=82=E9=85=8D=E5=8D=87=E7=BA=A7python?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=88=B03.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- opencv.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opencv.spec b/opencv.spec index b29bbac..cdf198b 100644 --- a/opencv.spec +++ b/opencv.spec @@ -16,7 +16,7 @@ Patch2: Fix_compilation_of_copy_assignment_operators_with_GCC.patch Patch3: Repair_clang_abi.patch BuildRequires: gcc-c++ gcc autoconf pkgconfig protobuf-compiler protobuf BuildRequires: cmake -BuildRequires: python3-numpy python3-devel python3-py python3-pytest +BuildRequires: python3-numpy python3-devel %description OpenCV means Intel® Open Source Computer Vision Library. It is a collection of -- Gitee