Dear maintainer, I've prepared an NMU for php-facedetect (versioned as 1.1.0-19-g135c72a-1.1). The diff is attached to this message.
cu Adrian
diff -Nru php-facedetect-1.1.0-19-g135c72a/debian/changelog php-facedetect-1.1.0-19-g135c72a/debian/changelog --- php-facedetect-1.1.0-19-g135c72a/debian/changelog 2020-03-02 10:37:04.000000000 +0200 +++ php-facedetect-1.1.0-19-g135c72a/debian/changelog 2021-02-07 09:00:56.000000000 +0200 @@ -1,3 +1,10 @@ +php-facedetect (1.1.0-19-g135c72a-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Add upstream fix for FTBFS with OpenCV 4.5. (Closes: #977248) + + -- Adrian Bunk <b...@debian.org> Sun, 07 Feb 2021 09:00:56 +0200 + php-facedetect (1.1.0-19-g135c72a-1) unstable; urgency=medium * New upstream version 1.1.0-19-g135c72a (used git describe to gen vernum) diff -Nru php-facedetect-1.1.0-19-g135c72a/debian/patches/0001-Fix-includedir-for-opencv_cxxflags.patch php-facedetect-1.1.0-19-g135c72a/debian/patches/0001-Fix-includedir-for-opencv_cxxflags.patch --- php-facedetect-1.1.0-19-g135c72a/debian/patches/0001-Fix-includedir-for-opencv_cxxflags.patch 1970-01-01 02:00:00.000000000 +0200 +++ php-facedetect-1.1.0-19-g135c72a/debian/patches/0001-Fix-includedir-for-opencv_cxxflags.patch 2021-02-07 09:00:37.000000000 +0200 @@ -0,0 +1,30 @@ +From e2d7613993e69c660f417194843773a33dfd31ae Mon Sep 17 00:00:00 2001 +From: Nicolas Chauvet <kwiz...@gmail.com> +Date: Tue, 20 Oct 2020 16:32:51 +0200 +Subject: Fix includedir for opencv_cxxflags + +I'm not sure why includedir_new comes from but if needed it's possible +to use: + --variable=includedir_new --variable=includedir + +Signed-off-by: Nicolas Chauvet <kwiz...@gmail.com> +--- + config.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/config.m4 b/config.m4 +index 21703cd..133d27e 100644 +--- a/config.m4 ++++ b/config.m4 +@@ -17,7 +17,7 @@ if test "$PHP_FACEDETECT" != "no"; then + PHP_ADD_INCLUDE($CV_INCLUDE) + else + if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists opencv4; then +- CV_INCLUDE=`$PKG_CONFIG opencv4 --variable=includedir_new` ++ CV_INCLUDE=`$PKG_CONFIG opencv4 --variable=includedir` + CV_LIBRARY=`$PKG_CONFIG opencv4 --libs` + CV_VERSION=`$PKG_CONFIG opencv4 --modversion` + if $PKG_CONFIG opencv4 --atleast-version=3.0.0 ; then +-- +2.20.1 + diff -Nru php-facedetect-1.1.0-19-g135c72a/debian/patches/series php-facedetect-1.1.0-19-g135c72a/debian/patches/series --- php-facedetect-1.1.0-19-g135c72a/debian/patches/series 1970-01-01 02:00:00.000000000 +0200 +++ php-facedetect-1.1.0-19-g135c72a/debian/patches/series 2021-02-07 09:00:56.000000000 +0200 @@ -0,0 +1 @@ +0001-Fix-includedir-for-opencv_cxxflags.patch
