Bug#951464: opencv: FTBFS on riscv64 due to disabled packages

[Aurelien Jarno]

Source: opencv
Version: 4.2.0+dfsg-4
Severity: important
Tags: patch
User: debian-riscv at lists.debian.org
Usertags: riscv64

Hi,

opencv fails to build on riscv64 as some features have been disabled for
this architecture in the recent uploads, which causes some files to be
missing during the dh_install phase.

All the packages needed for opencv are available in riscv64. They might
not have been able transiently due to transitions, but that's not a
reason to disable features. The attached patch removes all this changes,
would it be possible to include it in the next upload?

Thanks,
Aurelien

-- System Information:
Debian Release: bullseye/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
-------------- next part --------------
diff -Nru opencv-4.2.0+dfsg/debian/changelog opencv-4.2.0+dfsg/debian/changelog
--- opencv-4.2.0+dfsg/debian/changelog	2020-02-03 01:14:53.000000000 +0000
+++ opencv-4.2.0+dfsg/debian/changelog	2020-02-12 22:15:25.000000000 +0000
@@ -1,3 +1,9 @@
+opencv (4.2.0+dfsg-4+riscv64) unreleased; urgency=medium
+
+  * Re-enable features disabled on riscv64.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Wed, 12 Feb 2020 23:15:25 +0100
+
 opencv (4.2.0+dfsg-4) unstable; urgency=medium
 
   * Skip dh_dwz on mipsel architecture.
diff -Nru opencv-4.2.0+dfsg/debian/control opencv-4.2.0+dfsg/debian/control
--- opencv-4.2.0+dfsg/debian/control	2020-01-08 06:59:07.000000000 +0000
+++ opencv-4.2.0+dfsg/debian/control	2020-02-12 22:15:25.000000000 +0000
@@ -15,18 +15,18 @@
  doxygen,
  javahelper,
  ninja-build,
- libavcodec-dev [!riscv64],
- libavformat-dev [!riscv64],
+ libavcodec-dev,
+ libavformat-dev,
  libavresample-dev,
  libdc1394-22-dev [linux-any],
  libeigen3-dev,
- libgdal-dev [!riscv64],
- libgdcm-dev [!hppa !m68k !powerpcspe !riscv64 !sh4 !sparc64 !x32],
+ libgdal-dev,
+ libgdcm-dev [!hppa !m68k !powerpcspe !sh4 !sparc64 !x32],
  libgl1-mesa-dev,
  libglu1-mesa-dev,
  libgoogle-glog-dev,
  libgphoto2-dev,
- libgtk-3-dev [!riscv64],
+ libgtk-3-dev,
  libjpeg-dev,
  liblapack-dev (>= 3.2.1),
  libleptonica-dev,
@@ -40,9 +40,9 @@
  libtesseract-dev,
  libtiff-dev,
  libv4l-dev [linux-any],
- libvtk6-dev [!riscv64],
- libvtkgdcm-dev [!alpha !ppc64 !riscv64 !x32],
- libgdcm-tools [!riscv64],
+ libvtk6-dev,
+ libvtkgdcm-dev [!alpha !ppc64 !x32],
+ libgdcm-tools,
  maven-repo-helper [!hppa !hurd-any !kfreebsd-any],
  ocl-icd-opencl-dev,
  protobuf-compiler,
diff -Nru opencv-4.2.0+dfsg/debian/rules opencv-4.2.0+dfsg/debian/rules
--- opencv-4.2.0+dfsg/debian/rules	2020-02-02 09:40:38.000000000 +0000
+++ opencv-4.2.0+dfsg/debian/rules	2020-02-12 22:15:25.000000000 +0000
@@ -40,11 +40,6 @@
 CMAKE_ARCH_FLAGS += -DWITH_1394=OFF -DWITH_V4L=OFF
 endif
 
-# misc arch-specific configs
-ifeq (riscv64,$(DEB_HOST_ARCH))
-	CMAKE_ARCH_FLAGS += -DWITH_GDCM=OFF -DWITH_WEBP=OFF -DWITH_GDAL=OFF -DWITH_VTK=OFF -DWITH_GTK=OFF -DWITH_FFMPEG=OFF
-endif
-
 # Java support
 ifeq (,$(findstring $(DEB_HOST_ARCH), hppa hurd-i386 kfreebsd-i386 kfreebsd-amd64))
 CMAKE_ARCH_FLAGS += -DBUILD_JAVA=ON