From: Andrey Zhizhikin Date: Sat, 9 May 2020 20:48:52 +0000 (+0000) Subject: gstreamer1.0-plugins-bad: update opencv patch to 4.3.0 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=08491c86615cdd48736b3b783ed3770a50fd06fd;p=meta-freescale.git gstreamer1.0-plugins-bad: update opencv patch to 4.3.0 OpenCV has been upgraded upstream to 4.3.0 and current build of gstreamer1.0-plugins-bad is broken as the previous patch required version to be < 4.2.0 Backport the patch from upsteam to allow compilation with OpenCV 4.3.0 and replace the patch in the layer. Signed-off-by: Andrey Zhizhikin --- diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-opencv-allow-compilation-against-4.3.x.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-opencv-allow-compilation-against-4.3.x.patch new file mode 100644 index 00000000..a9e1bd00 --- /dev/null +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-opencv-allow-compilation-against-4.3.x.patch @@ -0,0 +1,34 @@ +From cfb196925312b3c3d7a19dbb9a3ce64d20d66409 Mon Sep 17 00:00:00 2001 +From: Andrey Zhizhikin +Date: Sat, 9 May 2020 19:56:51 +0000 +Subject: [PATCH] opencv: allow compilation against 4.3.x + +Backport upstream commit 4cf362e2df0fb809ea0f21dd4a6fbb8b46ca54ef to NXP +fork of gstreamer1.0-plugins-bad. + +Original commit link: +https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/commit/4cf362e2df0fb809ea0f21dd4a6fbb8b46ca54ef + +Upstream-Status: Backport [4cf362e2df0fb809ea0f21dd4a6fbb8b46ca54ef] + +Signed-off-by: Andrey Zhizhikin +--- + ext/opencv/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build +index d0ce1d3ee..05b142edc 100644 +--- a/ext/opencv/meson.build ++++ b/ext/opencv/meson.build +@@ -65,7 +65,7 @@ if opencv_found + endif + endforeach + else +- opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.1.0'], required : false) ++ opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.4.0'], required : false) + opencv_found = opencv_dep.found() + if opencv_found + foreach h : libopencv4_headers +-- +2.17.1 + diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-opencv-allow-compilation-against-4.1.x.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-opencv-allow-compilation-against-4.1.x.patch deleted file mode 100644 index 62705dd4..00000000 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-opencv-allow-compilation-against-4.1.x.patch +++ /dev/null @@ -1,43 +0,0 @@ -From eb404fd917fa3ab7ffa9433c9975ee49cfc9c41f Mon Sep 17 00:00:00 2001 -From: Nicola Murino -Date: Tue, 23 Apr 2019 09:06:13 +0200 -Subject: [PATCH 1/2] opencv: allow compilation against 4.1.x - -Upstream-Status: Backport [https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/commit/49a2baebf58d9288f75964fc40a547fde510a840] - -(cherry picked from commit 49a2baebf58d9288f75964fc40a547fde510a840) -Signed-off-by: Andrey Zhizhikin ---- - configure.ac | 2 +- - ext/opencv/meson.build | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 26f72eb0d..9e12d39a0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1852,7 +1852,7 @@ AG_GST_CHECK_FEATURE(OPENCV, [opencv plugins], opencv, [ - HAVE_OPENCV="yes" - fi - ], [ -- PKG_CHECK_MODULES([OPENCV], [opencv4 >= 4.0.0 opencv4 < 4.1.0] , [ -+ PKG_CHECK_MODULES([OPENCV], [opencv4 >= 4.0.0 opencv4 < 4.2.0] , [ - AC_PROG_CXX - AC_LANG([C++]) - OLD_CPPFLAGS=$CPPFLAGS -diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build -index d0ce1d3ee..f38b55dfe 100644 ---- a/ext/opencv/meson.build -+++ b/ext/opencv/meson.build -@@ -65,7 +65,7 @@ if opencv_found - endif - endforeach - else -- opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.1.0'], required : false) -+ opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.2.0'], required : false) - opencv_found = opencv_dep.found() - if opencv_found - foreach h : libopencv4_headers --- -2.17.1 - diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.imx.bb index e64d29fa..59aeca11 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.imx.bb @@ -20,7 +20,7 @@ SRC_URI = " \ file://0001-ext-wayland-fix-meson-build-in-nxp-fork.patch \ file://0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch \ file://0001-meson-fix-build-with-opencv-enabled-and-opencv4.-Fix.patch \ - file://0002-opencv-allow-compilation-against-4.1.x.patch \ + file://0001-opencv-allow-compilation-against-4.3.x.patch \ file://opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \ file://fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch \ file://avoid-including-sys-poll.h-directly.patch \