diff options
author | Vincent Dehors <vincent.dehors@smile.fr> | 2019-03-04 09:24:03 +0100 |
---|---|---|
committer | Vincent Dehors <vincent.dehors@smile.fr> | 2019-03-19 11:17:14 +0100 |
commit | 5b35bca70f67d9e8bcb02859ba09ed16287db8d7 (patch) | |
tree | 57243c528f17f3d92f2108072e4bcf4fc421bb21 /recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.imx.bb | |
parent | 4ee590743c3c897724c5add273ab04518fece770 (diff) | |
download | meta-freescale-5b35bca70f67d9e8bcb02859ba09ed16287db8d7.tar.gz |
recipes-multimedia/gstreamer: Fix compilation with OpenCV 3.4.5
This commit fixes the compilation of gstreamer1.0-plugins-bad which failed with :
from ../../../git/ext/opencv/gstgrabcut.cpp:90: [...]
error: conflicting declaration of C function 'CvMoments cvMoments(const cv::Moments&)
The added patch is similar to 0001-opencv-fix-build-for-opencv-3-4-2.patch but for
gstgrabcut.cpp.
Diffstat (limited to 'recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.imx.bb')
-rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.imx.bb | 1 |
1 files changed, 1 insertions, 0 deletions
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 2e3f3469..9d7a1eed 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 | |||
@@ -24,6 +24,7 @@ SRC_URI = " \ | |||
24 | file://configure-allow-to-disable-libssh2.patch \ | 24 | file://configure-allow-to-disable-libssh2.patch \ |
25 | file://0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch \ | 25 | file://0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch \ |
26 | file://0001-opencv-fix-build-for-opencv-3-4-2.patch \ | 26 | file://0001-opencv-fix-build-for-opencv-3-4-2.patch \ |
27 | file://0002-opencv-Fix-build-with-opencv-3.4.5.patch \ | ||
27 | " | 28 | " |
28 | 29 | ||
29 | SRCREV = "03e6ef6a371a0578a9629abde8e9c83e66f34b11" | 30 | SRCREV = "03e6ef6a371a0578a9629abde8e9c83e66f34b11" |