diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2021-07-28 12:25:37 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2021-07-28 12:26:08 +0200 |
| commit | eb86c9992297b9f6b87e21e8ecf004ae66782b80 (patch) | |
| tree | b87555ce67f662a1cab7ed730198df79b5894d3a | |
| parent | 0ae3fe76dfde4d6d093e3ab6d8f3b5b0b641c8d9 (diff) | |
| download | ptxdist-eb86c9992297b9f6b87e21e8ecf004ae66782b80.tar.gz ptxdist-eb86c9992297b9f6b87e21e8ecf004ae66782b80.tar.xz | |
opencv: fix gstreamer support
It actually used GStreamer 1.x now, but cmake does not complain if it is
not found. So select the correct version and make sure pkg-config is used
to find it.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/opencv.in | 4 | ||||
| -rw-r--r-- | rules/opencv.make | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/rules/opencv.in b/rules/opencv.in index bbf907b64..c700b2216 100644 --- a/rules/opencv.in +++ b/rules/opencv.in @@ -12,7 +12,8 @@ menuconfig OPENCV select QT5 if OPENCV_QT select QT5_TEST if OPENCV_QT select QT5_GUI if OPENCV_QT - select GSTREAMER if OPENCV_GSTREAMER + select GSTREAMER1 if OPENCV_GSTREAMER + select GST_PLUGINS_BASE1 if OPENCV_GSTREAMER select V4L_UTILS if OPENCV_V4L_LIBV4L2 select V4L_UTILS_LIBV4L1 if OPENCV_V4L_LIBV4L2 select V4L_UTILS_LIBV4L2 if OPENCV_V4L_LIBV4L2 @@ -114,7 +115,6 @@ config OPENCV_DNN config OPENCV_GSTREAMER bool - depends on STAGING prompt "gstreamer" help Gstreamer Support diff --git a/rules/opencv.make b/rules/opencv.make index baa8cd7b2..e0ab3143d 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -38,6 +38,13 @@ endif # Prepare # ---------------------------------------------------------------------------- +# set PKG_CONFIG_LIBDIR to something, otherwise opencv will not use +# pkg-config when cross-compiling. The value does not matter, the wrapper +# overwrites it anyways. +OPENCV_CONF_ENV := \ + $(CROSS_ENV) \ + PKG_CONFIG_LIBDIR=not-empty + OPENCV_CONF_TOOL := cmake # Note: configure_helper.py does not show some options that are only |