Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id 46D09E00971; Wed, 12 Sep 2018 06:20:58 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on yocto-www.yoctoproject.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 X-Spam-HAM-Report: * -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no * trust * [74.125.82.42 listed in list.dnswl.org] * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] * 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily * valid * -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Received: from mail-wm0-f42.google.com (mail-wm0-f42.google.com [74.125.82.42]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 0E6D1E0090A for ; Wed, 12 Sep 2018 06:20:56 -0700 (PDT) Received: by mail-wm0-f42.google.com with SMTP id f21-v6so2373430wmc.5 for ; Wed, 12 Sep 2018 06:20:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=boundarydevices-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=KiaAYnHsD6znvXOIqBa45ZSBl9heS1fKCAyBD/04mto=; b=feWEf02Spj7GdXTNnISZtFSAcQ9IFcWAvmVr2o6HOUIPOfAT4ikpkNc+WucyKC+/sG 6/DIXx+Y34GozsXla0pbmuBucjheZOmZQHrH9qE1ypfd8OOexbjiTDKYMQn/hmTiDEH3 6R9w8/A8GIwhlH7deVJfLxDGzOKBF2fJNLKqwuj/5TmbklRICcaqaC4c8/sRQ+s+8snV Q7bpZlFTY5HUQmqjN3khA1JiEQpJOzm4NfrjdXwU3tz042abVWwUIp3PgUTx6OGxBDuf 7z4f1pb0QWFR304ayw9SkbT0GdfgB4nvJiU/w4TqLLYJtaM8JDLzBYDaexUPrldipd+v B4vA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=KiaAYnHsD6znvXOIqBa45ZSBl9heS1fKCAyBD/04mto=; b=IE4NpHPo71he4yPpYuRrJ0huaKIklVHMd5b2mfZMxeMsPd7V9iRQgbbxlVChhKcbkb FZln9OOAXW1ofMQ79CwOKAUlubDgKhOUGHgFrt+eLMWuUrE/s/H+gKoAdPlbGmCmJHSz EyhM2j+0otN3wQv73PxmGXHy7c5d9m8AH8Gv0jXVfoPe+t9pDPxLvbiaPgu6LDD2YVwV Ss9EU6byrjPDNO8GkZTw4YuKFpNfZBmfjv+ItqOt7kyHjShjEyfuFSC164xZzrCdTIl7 nULnnoPbkU2nDy8v5O1RE99T+UWqG7W1NoODg8AZHc5OqAYrJOmjyZhEBKjJLUr0E1iH J0Vw== X-Gm-Message-State: APzg51BeISFf+Z/5bbteGmPMZXY6hu1fZgtZurX8dz+tFyboErMpSubU h0eWiztlJmIoDTVYfBE9zg0PuTaYmi4= X-Google-Smtp-Source: ANB0VdZobLpbe7wwRbeC3YNmUGwdL2L8MG3jcssUGpK8WMhQ3gVCO+Ie4+pjDUO4HViFcyeMJJ/YJQ== X-Received: by 2002:a1c:5c4:: with SMTP id 187-v6mr1741958wmf.10.1536758455376; Wed, 12 Sep 2018 06:20:55 -0700 (PDT) Received: from g751.home (2a01cb040a7dd500a90d66405dab7128.ipv6.abo.wanadoo.fr. [2a01:cb04:a7d:d500:a90d:6640:5dab:7128]) by smtp.googlemail.com with ESMTPSA id x15-v6sm737014wrt.53.2018.09.12.06.20.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Sep 2018 06:20:54 -0700 (PDT) From: Gary Bisson To: meta-freescale@yoctoproject.org Date: Wed, 12 Sep 2018 15:20:46 +0200 Message-Id: <20180912132046.14610-1-gary.bisson@boundarydevices.com> X-Mailer: git-send-email 2.18.0 MIME-Version: 1.0 Subject: [PATCH] gstreamer1.0-plugins-bad: fix build for opencv >= 3.4.2 X-BeenThere: meta-freescale@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Usage and development list for the meta-fsl-* layers List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Sep 2018 13:20:58 -0000 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since OpenCV was updated to version 3.4.3 in meta-openembedded: 7b9f86ca7 opencv: Update to 3.4.3 The gstreamer-plugins from NXP is therefore out of sync and can't build without this patch from upstream. Signed-off-by: Gary Bisson --- ...01-opencv-fix-build-for-opencv-3-4-2.patch | 63 +++++++++++++++++++ .../gstreamer1.0-plugins-bad_1.14.imx.bb | 1 + 2 files changed, 64 insertions(+) create mode 100644 recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-opencv-fix-build-for-opencv-3-4-2.patch diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-opencv-fix-build-for-opencv-3-4-2.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-opencv-fix-build-for-opencv-3-4-2.patch new file mode 100644 index 00000000..5c53e8e5 --- /dev/null +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-opencv-fix-build-for-opencv-3-4-2.patch @@ -0,0 +1,63 @@ +From c247745faaf885fd3fa094198fc0ea288e295dbf Mon Sep 17 00:00:00 2001 +From: Thibault Saunier +Date: Fri, 13 Jul 2018 14:42:28 -0400 +Subject: [PATCH] opencv: Fix build for opencv >= 3.4.2 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The `CV_RGB` macro is now in `imgproc.hpp`. + +Fixes: + + ../subprojects/gst-plugins-bad/ext/opencv/gsthanddetect.cpp:497:40: error: ‘CV_RGB’ was not declared in this scope + cvCircle (img, center, radius, CV_RGB (0, 0, 200), 1, 8, 0); + ^~~~~~ +--- + ext/opencv/MotionCells.cpp | 3 +++ + ext/opencv/gsthanddetect.cpp | 3 +++ + ext/opencv/gsttemplatematch.cpp | 3 +++ + 3 files changed, 9 insertions(+) + +diff --git a/ext/opencv/MotionCells.cpp b/ext/opencv/MotionCells.cpp +index f85989e117..175ec901b2 100644 +--- a/ext/opencv/MotionCells.cpp ++++ b/ext/opencv/MotionCells.cpp +@@ -51,6 +51,9 @@ + + #include + #include "MotionCells.h" ++#if (CV_MAJOR_VERSION >= 3) ++#include ++#endif + #include + + MotionCells::MotionCells () +diff --git a/ext/opencv/gsthanddetect.cpp b/ext/opencv/gsthanddetect.cpp +index 60fd5be72b..47203fd0ea 100644 +--- a/ext/opencv/gsthanddetect.cpp ++++ b/ext/opencv/gsthanddetect.cpp +@@ -62,6 +62,9 @@ + + /* element header */ + #include "gsthanddetect.h" ++#if (CV_MAJOR_VERSION >= 3) ++#include ++#endif + #include + + GST_DEBUG_CATEGORY_STATIC (gst_handdetect_debug); +diff --git a/ext/opencv/gsttemplatematch.cpp b/ext/opencv/gsttemplatematch.cpp +index f39208dc28..ec0b56af88 100644 +--- a/ext/opencv/gsttemplatematch.cpp ++++ b/ext/opencv/gsttemplatematch.cpp +@@ -63,6 +63,9 @@ + + #include "../../gst-libs/gst/gst-i18n-plugin.h" + #include "gsttemplatematch.h" ++#if (CV_MAJOR_VERSION >= 3) ++#include ++#endif + #include + + GST_DEBUG_CATEGORY_STATIC (gst_template_match_debug); diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.imx.bb index 313d4da1..f35c825b 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.imx.bb @@ -23,6 +23,7 @@ SRC_URI = " \ ${GST1.0-PLUGINS-BAD_SRC};branch=${SRCBRANCH} \ file://configure-allow-to-disable-libssh2.patch \ file://0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch \ + file://0001-opencv-fix-build-for-opencv-3-4-2.patch \ " SRCREV = "07ad0bb676a16c2dffb0f0e415a873f0924cfdc0" -- 2.18.0