Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package opencv3 for openSUSE:Factory checked 
in at 2025-03-11 20:47:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/opencv3 (Old)
 and      /work/SRC/openSUSE:Factory/.opencv3.new.19136 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "opencv3"

Tue Mar 11 20:47:13 2025 rev:17 rq:1252110 version:3.4.20

Changes:
--------
--- /work/SRC/openSUSE:Factory/opencv3/opencv3.changes  2025-02-10 
18:17:10.151124386 +0100
+++ /work/SRC/openSUSE:Factory/.opencv3.new.19136/opencv3.changes       
2025-03-11 20:48:03.717077419 +0100
@@ -1,0 +2,7 @@
+Tue Mar 11 12:29:00 UTC 2025 - Atri Bhattacharya <badshah...@gmail.com>
+
+- Add opencv3-drop-numpy-distutils.patch: drop use of
+  numpy-distutils to determine numpy include dirs in cmake;
+  upstream commit to 4.x branch.
+
+-------------------------------------------------------------------

New:
----
  opencv3-drop-numpy-distutils.patch

BETA DEBUG BEGIN:
  New:
- Add opencv3-drop-numpy-distutils.patch: drop use of
  numpy-distutils to determine numpy include dirs in cmake;
BETA DEBUG END:

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ opencv3.spec ++++++
--- /var/tmp/diff_new_pack.ddy5OH/_old  2025-03-11 20:48:04.733119960 +0100
+++ /var/tmp/diff_new_pack.ddy5OH/_new  2025-03-11 20:48:04.737120129 +0100
@@ -47,6 +47,8 @@
 Source1:        
https://github.com/opencv/opencv_contrib/archive/%{version}.tar.gz#/opencv_contrib-%{version}.tar.gz
 # PATCH-FIX-OPENSUSE opencv-build-compare.patch -- avoid republish if some 
random external version number changes
 Patch1:         opencv-build-compare.patch
+# PATCH-FIX-UPSTREAM
+Patch2:         
https://github.com/opencv/opencv/commit/00ca8f455e6a5588d905e3a0b268f18ee3fda5dd.patch#/opencv3-drop-numpy-distutils.patch
 BuildRequires:  cmake
 BuildRequires:  fdupes
 BuildRequires:  libeigen3-devel

++++++ opencv3-drop-numpy-distutils.patch ++++++
>From 00ca8f455e6a5588d905e3a0b268f18ee3fda5dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <ser...@serjux.com>
Date: Sun, 1 Oct 2023 16:12:25 +0100
Subject: [PATCH] `numpy.distutils` is removed in numpy 1.26 on Python 3.12.

so we don't use numpy.distutils to get includes dirs of python-numpy
---
 cmake/OpenCVDetectPython.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/OpenCVDetectPython.cmake b/cmake/OpenCVDetectPython.cmake
index 88a434185622..d4098ce8e60d 100644
--- a/cmake/OpenCVDetectPython.cmake
+++ b/cmake/OpenCVDetectPython.cmake
@@ -216,7 +216,7 @@ if(NOT ${found})
           message(STATUS "  PYTHON3_NUMPY_INCLUDE_DIRS")
         else()
           # Attempt to discover the NumPy include directory. If this succeeds, 
then build python API with NumPy
-          execute_process(COMMAND "${_executable}" -c "import os; 
os.environ['DISTUTILS_USE_SDK']='1'; import numpy.distutils; 
print(os.pathsep.join(numpy.distutils.misc_util.get_numpy_include_dirs()))"
+          execute_process(COMMAND "${_executable}" -c "import numpy; 
print(numpy.get_include())"
                           RESULT_VARIABLE _numpy_process
                           OUTPUT_VARIABLE _numpy_include_dirs
                           OUTPUT_STRIP_TRAILING_WHITESPACE)

Reply via email to