Merge ~xypron/ubuntu/+source/opencv:lp2130009 into ubuntu/+source/opencv:ubuntu/devel

[Heinrich Schuchardt]

[Heinrich Schuchardt (xypron)]

A successful build is available in ppa:xypron/opencv.

[Andreas Hasenack (ahasenack)]

review: Needs Information

Unmerged commits

15d8324... by Heinrich Schuchardt on 2026-01-30

Update changelog

Signed-off-by: Heinrich Schuchardt <email address hidden>

93aa8c9... by Heinrich Schuchardt on 2026-01-29

d/rules: build for RVA20 on riscv64

Avoid FTBFS with GCC 15.2 in version 4.10 (LP: #2130009)

Signed-off-by: Heinrich Schuchardt <email address hidden>

diff --git a/debian/changelog b/debian/changelog
index 5a6c119..c8983fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+opencv (4.10.0+dfsg-7ubuntu4) resolute; urgency=medium
+
+  * Build for RVA20 on riscv64 to avoid FTBFS with GCC 15.2
+    in version 4.10 (LP: #2130009)
+
+ -- Heinrich Schuchardt <[e-mail]>  Fri, 30 Jan 2026 16:27:38 +0100
+
 opencv (4.10.0+dfsg-7ubuntu3) resolute; urgency=medium
 
   * No-change rebuild for ffmpeg 8.
diff --git a/debian/rules b/debian/rules
index ed01c7b..e19eca0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,11 +8,6 @@ BUILDDIR = obj-$(DEB_HOST_MULTIARCH)
 
 CMAKE_ARCH_FLAGS :=
 
-ifneq (,$(filter $(DEB_HOST_ARCH), riscv64))
-  export CC=gcc-14
-  export CXX=g++-14
-endif
-
 # Comply with Debian architectures baseline.
 # See cmake/OpenCVCompilerOptimizations.cmake for a list of known features.
 # Reference: https://github.com/opencv/opencv/wiki/CPU-optimizations-build-options
@@ -30,6 +25,11 @@ else ifeq ($(DEB_HOST_ARCH_CPU),ppc64el)
  # VSX for Power8, VSX3 for Power9
  CMAKE_ARCH_FLAGS += -DCPU_BASELINE="VSX"
  CMAKE_ARCH_FLAGS += -DCPU_DISPATCH="VSX3"
+else ifeq ($(DEB_HOST_ARCH_CPU),riscv64)
+ # Disable vector support in version 4.10. The FTBFS issue is resolved in 4.11+.
+ # (LP #2130009)
+ CMAKE_ARCH_FLAGS += -DCMAKE_C_FLAGS="-march=rv64gc"
+ CMAKE_ARCH_FLAGS += -DCMAKE_CXX_FLAGS="-march=rv64gc"
 endif
 
 # TBB support