diff -Nru opencv-4.6.0+dfsg/debian/changelog opencv-4.6.0+dfsg/debian/changelog --- opencv-4.6.0+dfsg/debian/changelog 2022-07-01 20:22:48.000000000 +0000 +++ opencv-4.6.0+dfsg/debian/changelog 2022-08-23 13:04:14.000000000 +0000 @@ -1,3 +1,30 @@ +opencv (4.6.0+dfsg-4ubuntu4) kinetic; urgency=medium + + * Build with GCC 11 to fix runtime crash. + - debian/control: added gcc-11 and g++-11 to Build-Depends. + - debian/rules: set CC and CXX in override_dh_auto_configure. + + -- Marc Deslauriers Tue, 23 Aug 2022 09:04:14 -0400 + +opencv (4.6.0+dfsg-4ubuntu3) kinetic; urgency=medium + + * No-change rebuild against libopenexr3-1-30 + + -- Steve Langasek Tue, 23 Aug 2022 04:03:46 +0000 + +opencv (4.6.0+dfsg-4ubuntu2) kinetic; urgency=medium + + * d/patches/ffmpeg5.patch: Remove references to deprecated + ffmpeg constants. + + -- William 'jawn-smith' Wilson Fri, 05 Aug 2022 13:50:28 -0500 + +opencv (4.6.0+dfsg-4ubuntu1) kinetic; urgency=medium + + * Switch again to tbb2, needed for opencolorio + + -- Gianfranco Costamagna Thu, 04 Aug 2022 17:13:39 +0200 + opencv (4.6.0+dfsg-4) unstable; urgency=medium * Team upload. diff -Nru opencv-4.6.0+dfsg/debian/control opencv-4.6.0+dfsg/debian/control --- opencv-4.6.0+dfsg/debian/control 2022-06-27 19:53:33.000000000 +0000 +++ opencv-4.6.0+dfsg/debian/control 2022-08-23 13:04:14.000000000 +0000 @@ -1,5 +1,6 @@ Source: opencv -Maintainer: Debian Science Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Science Team Uploaders: Sam Hocevar (Debian packages) , Nobuhiro Iwamatsu , Mo Zhou @@ -12,6 +13,8 @@ dh-sequence-python3, doxygen, dh-sequence-javahelper, + g++-11, + gcc-11, ninja-build, libavcodec-dev, libavformat-dev, @@ -36,7 +39,7 @@ libprotobuf-dev, libraw1394-dev [linux-any], libswscale-dev, - libtbb-dev [amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x powerpc powerpcspe ppc64 riscv64 sh4 sparc64], + libtbb2-dev [amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x powerpc powerpcspe ppc64 riscv64 sh4 sparc64], libtesseract-dev, libtiff-dev, libv4l-dev [linux-any], @@ -142,7 +145,7 @@ Multi-Arch: same Section: libdevel Depends: libopencv-core406 (= ${binary:Version}), - libtbb-dev [amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x powerpc powerpcspe ppc64 riscv64 sh4 sparc64], + libtbb2-dev [amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x powerpc powerpcspe ppc64 riscv64 sh4 sparc64], zlib1g-dev, ${misc:Depends} Description: development files for libopencv-core406 diff -Nru opencv-4.6.0+dfsg/debian/patches/ffmpeg5.patch opencv-4.6.0+dfsg/debian/patches/ffmpeg5.patch --- opencv-4.6.0+dfsg/debian/patches/ffmpeg5.patch 1970-01-01 00:00:00.000000000 +0000 +++ opencv-4.6.0+dfsg/debian/patches/ffmpeg5.patch 2022-08-05 18:50:28.000000000 +0000 @@ -0,0 +1,84 @@ +Description: Update to ffmpeg 5 compatibility + This package had references to some constants that were at + one point declared in ffmpeg's libavcodec package, but have + been deprecated and removed. This patch removes those references. +Author: William 'jawn-smith' Wilson +Last-Update: 2022-08-05 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: opencv-4.6.0+dfsg/modules/videoio/src/ffmpeg_codecs.hpp +=================================================================== +--- opencv-4.6.0+dfsg.orig/modules/videoio/src/ffmpeg_codecs.hpp ++++ opencv-4.6.0+dfsg/modules/videoio/src/ffmpeg_codecs.hpp +@@ -77,71 +77,6 @@ + unsigned int tag; + } AVCodecTag; + +-#if (LIBAVCODEC_VERSION_INT <= AV_VERSION_INT(54, 51, 100)) +-#define AV_CODEC_ID_H264 CODEC_ID_H264 +-#define AV_CODEC_ID_H263 CODEC_ID_H263 +-#define AV_CODEC_ID_H263P CODEC_ID_H263P +-#define AV_CODEC_ID_H263I CODEC_ID_H263I +-#define AV_CODEC_ID_H261 CODEC_ID_H261 +-#define AV_CODEC_ID_MPEG4 CODEC_ID_MPEG4 +-#define AV_CODEC_ID_MSMPEG4V3 CODEC_ID_MSMPEG4V3 +-#define AV_CODEC_ID_MSMPEG4V2 CODEC_ID_MSMPEG4V2 +-#define AV_CODEC_ID_MSMPEG4V1 CODEC_ID_MSMPEG4V1 +-#define AV_CODEC_ID_WMV1 CODEC_ID_WMV1 +-#define AV_CODEC_ID_WMV2 CODEC_ID_WMV1 +-#define AV_CODEC_ID_DVVIDEO CODEC_ID_DVVIDEO +-#define AV_CODEC_ID_MPEG1VIDEO CODEC_ID_MPEG1VIDEO +-#define AV_CODEC_ID_MPEG2VIDEO CODEC_ID_MPEG2VIDEO +-#define AV_CODEC_ID_MJPEG CODEC_ID_MJPEG +-#define AV_CODEC_ID_LJPEG CODEC_ID_LJPEG +-#define AV_CODEC_ID_HUFFYUV CODEC_ID_HUFFYUV +-#define AV_CODEC_ID_FFVHUFF CODEC_ID_FFVHUFF +-#define AV_CODEC_ID_CYUV CODEC_ID_CYUV +-#define AV_CODEC_ID_RAWVIDEO CODEC_ID_RAWVIDEO +-#define AV_CODEC_ID_INDEO3 CODEC_ID_INDEO3 +-#define AV_CODEC_ID_VP3 CODEC_ID_VP3 +-#define AV_CODEC_ID_ASV1 CODEC_ID_ASV1 +-#define AV_CODEC_ID_ASV2 CODEC_ID_ASV2 +-#define AV_CODEC_ID_VCR1 CODEC_ID_VCR1 +-#define AV_CODEC_ID_FFV1 CODEC_ID_FFV1 +-#define AV_CODEC_ID_XAN_WC4 CODEC_ID_XAN_WC4 +-#define AV_CODEC_ID_MSRLE CODEC_ID_MSRLE +-#define AV_CODEC_ID_MSVIDEO1 CODEC_ID_MSVIDEO1 +-#define AV_CODEC_ID_CINEPAK CODEC_ID_CINEPAK +-#define AV_CODEC_ID_TRUEMOTION1 CODEC_ID_TRUEMOTION1 +-#define AV_CODEC_ID_MSZH CODEC_ID_MSZH +-#define AV_CODEC_ID_ZLIB CODEC_ID_ZLIB +-#define AV_CODEC_ID_SNOW CODEC_ID_SNOW +-#define AV_CODEC_ID_4XM CODEC_ID_4XM +-#define AV_CODEC_ID_FLV1 CODEC_ID_FLV1 +-#define AV_CODEC_ID_SVQ1 CODEC_ID_SVQ1 +-#define AV_CODEC_ID_TSCC CODEC_ID_TSCC +-#define AV_CODEC_ID_ULTI CODEC_ID_ULTI +-#define AV_CODEC_ID_VIXL CODEC_ID_VIXL +-#define AV_CODEC_ID_QPEG CODEC_ID_QPEG +-#define AV_CODEC_ID_WMV3 CODEC_ID_WMV3 +-#define AV_CODEC_ID_LOCO CODEC_ID_LOCO +-#define AV_CODEC_ID_THEORA CODEC_ID_THEORA +-#define AV_CODEC_ID_WNV1 CODEC_ID_WNV1 +-#define AV_CODEC_ID_AASC CODEC_ID_AASC +-#define AV_CODEC_ID_INDEO2 CODEC_ID_INDEO2 +-#define AV_CODEC_ID_FRAPS CODEC_ID_FRAPS +-#define AV_CODEC_ID_TRUEMOTION2 CODEC_ID_TRUEMOTION2 +-#define AV_CODEC_ID_FLASHSV CODEC_ID_FLASHSV +-#define AV_CODEC_ID_JPEGLS CODEC_ID_JPEGLS +-#define AV_CODEC_ID_VC1 CODEC_ID_VC1 +-#define AV_CODEC_ID_CSCD CODEC_ID_CSCD +-#define AV_CODEC_ID_ZMBV CODEC_ID_ZMBV +-#define AV_CODEC_ID_KMVC CODEC_ID_KMVC +-#define AV_CODEC_ID_VP5 CODEC_ID_VP5 +-#define AV_CODEC_ID_VP6 CODEC_ID_VP6 +-#define AV_CODEC_ID_VP6F CODEC_ID_VP6F +-#define AV_CODEC_ID_JPEG2000 CODEC_ID_JPEG2000 +-#define AV_CODEC_ID_VMNC CODEC_ID_VMNC +-#define AV_CODEC_ID_TARGA CODEC_ID_TARGA +-#define AV_CODEC_ID_NONE CODEC_ID_NONE +-#endif +- + const AVCodecTag codec_bmp_tags[] = { + { AV_CODEC_ID_H264, MKTAG('H', '2', '6', '4') }, + { AV_CODEC_ID_H264, MKTAG('h', '2', '6', '4') }, diff -Nru opencv-4.6.0+dfsg/debian/patches/series opencv-4.6.0+dfsg/debian/patches/series --- opencv-4.6.0+dfsg/debian/patches/series 2022-06-30 10:23:58.000000000 +0000 +++ opencv-4.6.0+dfsg/debian/patches/series 2022-08-05 18:49:11.000000000 +0000 @@ -1,3 +1,4 @@ change_jquery.js_path face-no-download.patch cmake-dont-install-inexistent-files.patch +ffmpeg5.patch diff -Nru opencv-4.6.0+dfsg/debian/rules opencv-4.6.0+dfsg/debian/rules --- opencv-4.6.0+dfsg/debian/rules 2022-06-30 09:49:42.000000000 +0000 +++ opencv-4.6.0+dfsg/debian/rules 2022-08-23 13:04:14.000000000 +0000 @@ -128,13 +128,13 @@ override_dh_auto_configure: # dynamicly linked - dh_auto_configure -B $(BUILDDIR) \ + CC=gcc-11 CXX=g++-11 dh_auto_configure -B $(BUILDDIR) \ -- $(CMAKE_FLAGS) \ -DCMAKE_SHARED_LINKER_FLAGS_RELEASE="$(LDFLAGS)" \ -DBUILD_SHARED_LIBS=ON -DBUILD_DOCS=ON \ -DBUILD_TESTS=OFF # statically linked - dh_auto_configure -B $(BUILDDIR)-static \ + CC=gcc-11 CXX=g++-11 dh_auto_configure -B $(BUILDDIR)-static \ -- $(CMAKE_FLAGS) \ -DBUILD_SHARED_LIBS=OFF -DBUILD_DOCS=OFF \ -DBUILD_TESTS=OFF -DBUILD_opencv_python3=OFF