diff -pruN 4.10.0+dfsg-5/debian/changelog 4.10.0+dfsg-6/debian/changelog --- 4.10.0+dfsg-5/debian/changelog 2025-03-18 19:39:02.000000000 +0000 +++ 4.10.0+dfsg-6/debian/changelog 2025-09-27 14:40:00.000000000 +0000 @@ -1,3 +1,17 @@ +opencv (4.10.0+dfsg-6) unstable; urgency=medium + + * Team upload. + + [ Sebastian Ramacher ] + * Fix FTBFS on ppc64el with GCC 15. Closes: #1116253. + + [ Santiago Vila ] + * Fix build with CMake 4. Closes: #1113355. + * Drop "Rules-Requires-Root: no", no longer needed. + * Update standards-version. + + -- Santiago Vila Sat, 27 Sep 2025 16:40:00 +0200 + opencv (4.10.0+dfsg-5) unstable; urgency=medium * Team upload. diff -pruN 4.10.0+dfsg-5/debian/control 4.10.0+dfsg-6/debian/control --- 4.10.0+dfsg-5/debian/control 2025-03-18 19:36:13.000000000 +0000 +++ 4.10.0+dfsg-6/debian/control 2025-09-27 12:00:00.000000000 +0000 @@ -58,11 +58,10 @@ Build-Depends: dpkg-dev (>= 1.22.5), ant python3-setuptools, qtbase5-dev, zlib1g-dev -Standards-Version: 4.6.1 +Standards-Version: 4.7.2 Vcs-Browser: https://salsa.debian.org/science-team/opencv Vcs-Git: https://salsa.debian.org/science-team/opencv.git Homepage: https://opencv.org -Rules-Requires-Root: no Package: opencv-doc Architecture: all diff -pruN 4.10.0+dfsg-5/debian/patches/cmake-4.patch 4.10.0+dfsg-6/debian/patches/cmake-4.patch --- 4.10.0+dfsg-5/debian/patches/cmake-4.patch 1970-01-01 00:00:00.000000000 +0000 +++ 4.10.0+dfsg-6/debian/patches/cmake-4.patch 2025-09-27 12:09:00.000000000 +0000 @@ -0,0 +1,124 @@ +From: Dan Dennedy +Subject: Fix configuring with CMake version 4 +Origin: upstream, https://github.com/opencv/opencv/commit/cb8030809e0278d02fa335cc1f5ec7c3c17548e0 +Bug-Debian: https://bugs.debian.org/1113355 +Last-Update: 2025-04-02 + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -16,7 +16,7 @@ + include(cmake/OpenCVMinDepVersions.cmake) + + if(CMAKE_SYSTEM_NAME MATCHES WindowsPhone OR CMAKE_SYSTEM_NAME MATCHES WindowsStore) +- cmake_minimum_required(VERSION 3.1 FATAL_ERROR) ++ cmake_minimum_required(VERSION 3.5 FATAL_ERROR) + #Required to resolve linker error issues due to incompatibility with CMake v3.0+ policies. + #CMake fails to find _fseeko() which leads to subsequent linker error. + #See details here: http://www.cmake.org/Wiki/CMake/Policies +--- a/cmake/OpenCVGenPkgconfig.cmake ++++ b/cmake/OpenCVGenPkgconfig.cmake +@@ -110,7 +110,7 @@ + # ============================================================================= + else() # DEFINED CMAKE_HELPER_SCRIPT + +-cmake_minimum_required(VERSION 2.8.12.2) ++cmake_minimum_required(VERSION 3.5) + cmake_policy(SET CMP0012 NEW) + include("${CMAKE_HELPER_SCRIPT}") + include("${OpenCV_SOURCE_DIR}/cmake/OpenCVUtils.cmake") +--- a/doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.markdown ++++ b/doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.markdown +@@ -61,7 +61,7 @@ + + Now you have to create your CMakeLists.txt file. It should look like this: + @code{.cmake} +-cmake_minimum_required(VERSION 2.8) ++cmake_minimum_required(VERSION 3.5) + project( DisplayImage ) + find_package( OpenCV REQUIRED ) + include_directories( ${OpenCV_INCLUDE_DIRS} ) +--- a/modules/python/CMakeLists.txt ++++ b/modules/python/CMakeLists.txt +@@ -35,7 +35,7 @@ + + else() # standalone build + +-cmake_minimum_required(VERSION 2.8.12.2) ++cmake_minimum_required(VERSION 3.5) + project(OpenCVPython CXX C) + include("./standalone.cmake") + +--- a/platforms/android/build-tests/test_cmake_build.py ++++ b/platforms/android/build-tests/test_cmake_build.py +@@ -7,7 +7,7 @@ + log.basicConfig(format='%(message)s', level=log.DEBUG) + + CMAKE_TEMPLATE='''\ +-CMAKE_MINIMUM_REQUIRED(VERSION 2.8) ++CMAKE_MINIMUM_REQUIRED(VERSION 3.5) + + # Enable C++11 + set(CMAKE_CXX_STANDARD 11) +--- a/samples/CMakeLists.example.in ++++ b/samples/CMakeLists.example.in +@@ -1,5 +1,5 @@ + # cmake needs this line +-cmake_minimum_required(VERSION 3.1) ++cmake_minimum_required(VERSION 3.5) + + if(NOT DEFINED EXAMPLE_NAME) + message(FATAL_ERROR "Invalid build script: missing EXAMPLE_NAME") +--- a/samples/CMakeLists.txt ++++ b/samples/CMakeLists.txt +@@ -62,7 +62,7 @@ + # Standalone mode + # + #=================================================================================================== +-cmake_minimum_required(VERSION 3.1) ++cmake_minimum_required(VERSION 3.5) + + project(samples C CXX) + option(BUILD_EXAMPLES "Build samples" ON) +--- a/samples/cpp/example_cmake/CMakeLists.txt ++++ b/samples/cpp/example_cmake/CMakeLists.txt +@@ -1,5 +1,5 @@ + # cmake needs this line +-cmake_minimum_required(VERSION 3.1) ++cmake_minimum_required(VERSION 3.5) + + # Define project name + project(opencv_example_project) +--- a/samples/cpp/tutorial_code/gpu/gpu-thrust-interop/CMakeLists.txt ++++ b/samples/cpp/tutorial_code/gpu/gpu-thrust-interop/CMakeLists.txt +@@ -1,4 +1,4 @@ +-CMAKE_MINIMUM_REQUIRED(VERSION 2.8) ++CMAKE_MINIMUM_REQUIRED(VERSION 3.5) + + FIND_PACKAGE(CUDA REQUIRED) + INCLUDE_DIRECTORIES(${CUDA_INCLUDE_DIRS}) +--- a/samples/hal/c_hal/CMakeLists.txt ++++ b/samples/hal/c_hal/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.8.12.2 FATAL_ERROR) ++cmake_minimum_required(VERSION 3.5 FATAL_ERROR) + + set(PROJECT_NAME "c_hal") + set(HAL_LIB_NAME "c_hal") +--- a/samples/hal/slow_hal/CMakeLists.txt ++++ b/samples/hal/slow_hal/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.8.12.2 FATAL_ERROR) ++cmake_minimum_required(VERSION 3.5 FATAL_ERROR) + + set(PROJECT_NAME "slow_hal") + set(HAL_LIB_NAME "slow_hal") +--- a/samples/openvx/CMakeLists.txt ++++ b/samples/openvx/CMakeLists.txt +@@ -1,6 +1,6 @@ + ocv_install_example_src(cpp *.cpp *.hpp CMakeLists.txt) + +-cmake_minimum_required(VERSION 2.8.12.2) ++cmake_minimum_required(VERSION 3.5) + + set(OPENCV_OPENVX_SAMPLE_REQUIRED_DEPS + opencv_core diff -pruN 4.10.0+dfsg-5/debian/patches/fix-vsx-build-with-gcc-15.patch 4.10.0+dfsg-6/debian/patches/fix-vsx-build-with-gcc-15.patch --- 4.10.0+dfsg-5/debian/patches/fix-vsx-build-with-gcc-15.patch 1970-01-01 00:00:00.000000000 +0000 +++ 4.10.0+dfsg-6/debian/patches/fix-vsx-build-with-gcc-15.patch 2025-09-27 12:08:00.000000000 +0000 @@ -0,0 +1,34 @@ +From: Maksim Shabunin +Subject: Fix VSX build with GCC 15 +Origin: upstream, https://github.com/opencv/opencv/commit/3effe195cb2cf4b7f98fe5e9b4df55aa4951d706 +Bug-Debian: https://bugs.debian.org/1116253 +Last-Update: 2025-01-16 + +--- + modules/core/include/opencv2/core/vsx_utils.hpp | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +--- a/modules/core/include/opencv2/core/vsx_utils.hpp ++++ b/modules/core/include/opencv2/core/vsx_utils.hpp +@@ -257,8 +257,8 @@ + VSX_IMPL_1VRG(vec_udword2, vec_dword2, vpopcntd, vec_popcntu) + + // converts between single and double-precision +-VSX_REDIRECT_1RG(vec_float4, vec_double2, vec_cvfo, __builtin_vsx_xvcvdpsp) +-VSX_REDIRECT_1RG(vec_double2, vec_float4, vec_cvfo, __builtin_vsx_xvcvspdp) ++VSX_REDIRECT_1RG(vec_float4, vec_double2, vec_cvfo, vec_floate) ++VSX_REDIRECT_1RG(vec_double2, vec_float4, vec_cvfo, vec_doubleo) + + // converts word and doubleword to double-precision + #undef vec_ctd +@@ -399,10 +399,6 @@ + VSX_REDIRECT_1RG(vec_uint4, vec_uint4, vec_popcntu, vec_popcnt) + VSX_REDIRECT_1RG(vec_udword2, vec_udword2, vec_popcntu, vec_popcnt) + +-// converts between single and double precision +-VSX_REDIRECT_1RG(vec_float4, vec_double2, vec_cvfo, __builtin_vsx_xvcvdpsp) +-VSX_REDIRECT_1RG(vec_double2, vec_float4, vec_cvfo, __builtin_vsx_xvcvspdp) +- + // converts word and doubleword to double-precision + #ifdef vec_ctd + # undef vec_ctd diff -pruN 4.10.0+dfsg-5/debian/patches/series 4.10.0+dfsg-6/debian/patches/series --- 4.10.0+dfsg-5/debian/patches/series 2025-03-18 19:36:13.000000000 +0000 +++ 4.10.0+dfsg-6/debian/patches/series 2025-09-27 12:00:00.000000000 +0000 @@ -5,3 +5,5 @@ cmake-dont-install-inexistent-files.patc 0009-Do-not-embed-build-directory-in-documentation.patch cmake-no-download.patch setup-py-for-egg.patch +fix-vsx-build-with-gcc-15.patch +cmake-4.patch