From d70b37eff27aa52efdaebf04f274467a29a032eb Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Thu, 28 Sep 2017 19:37:34 +0200 Subject: libgstomx: do not build with libgstphotography Depending on the availability of libgstphotography configure picks up the dependency and builds for it. Change configure to never build against it. This addresses builds where libgstomx is taken from sstate but libgstphotography is not available due to other dependencies. | Collected errors: | * calculate_dependencies_for: Cannot satisfy the following dependencies for libgstomx: | * libgstphotography-0.10-23 (>= 0.10.23) * | * opkg_solver_install: Cannot install package libgstomx. Signed-off-by: Max Krummenacher Acked-by: Dominik Sliwa --- ...on-t-use-gst-photography-even-if-it-is-in.patch | 34 ++++++++++++++++++++++ .../libgstomx-0.10/libgstomx-0.10_21.5.0.bb | 1 + 2 files changed, 35 insertions(+) create mode 100644 recipes-multimedia/libgstomx-0.10/files/0001-configure-don-t-use-gst-photography-even-if-it-is-in.patch diff --git a/recipes-multimedia/libgstomx-0.10/files/0001-configure-don-t-use-gst-photography-even-if-it-is-in.patch b/recipes-multimedia/libgstomx-0.10/files/0001-configure-don-t-use-gst-photography-even-if-it-is-in.patch new file mode 100644 index 0000000..e0c8805 --- /dev/null +++ b/recipes-multimedia/libgstomx-0.10/files/0001-configure-don-t-use-gst-photography-even-if-it-is-in.patch @@ -0,0 +1,34 @@ +From b18901617717029cbe26ecb578a6e9c5ec92d507 Mon Sep 17 00:00:00 2001 +From: Max Krummenacher +Date: Thu, 28 Sep 2017 15:05:35 +0200 +Subject: [PATCH] configure: don't use gst-photography even if it is installed + in the rootfs + +Signed-off-by: Max Krummenacher +--- + configure.ac | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 885720d..9aa608e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -275,11 +275,12 @@ AM_CONDITIONAL([GST_ENABLE_PHOTOGRAPHY], [test x$GST_ENABLE_PHOTOGRAPHY = xyes]) + dnl Check for GStreamer-Interfaces + PKG_CHECK_MODULES([GST_INTERFACES], [gstreamer-interfaces-$GST_MAJORMINOR], HAVE_GST_INTERFACES=yes, HAVE_GST_INTERFACES=no) + if test "x$HAVE_GST_INTERFACES" = xyes; then +- PKG_CHECK_MODULES([GST_PHOTOGRAPHY], [gstreamer-plugins-bad-$GST_MAJORMINOR] >= $GST_PHOTOGRAPHY_REQUIRED, HAVE_GST_PHOTOGRAPHY=yes, HAVE_GST_PHOTOGRAPHY=no) ++ PKG_CHECK_MODULES([GST_PHOTOGRAPHY], [gstreamer-plugins-bad-$GST_MAJORMINOR] >= $GST_PHOTOGRAPHY_REQUIRED, HAVE_GST_PHOTOGRAPHY=no, HAVE_GST_PHOTOGRAPHY=no) + if test "x$HAVE_GST_PHOTOGRAPHY" = xyes; then +- GST_ENABLE_PHOTOGRAPHY=yes ++ dnl don't configure it, even if there is a gst-photography ++ GST_ENABLE_PHOTOGRAPHY=no + AM_CONDITIONAL([GST_ENABLE_PHOTOGRAPHY], [test x$GST_ENABLE_PHOTOGRAPHY = xyes]) +- XOPT_CFLAGS+=" -DGST_ENABLE_PHOTOGRAPHY -DGST_USE_UNSTABLE_API" ++# XOPT_CFLAGS+=" -DGST_ENABLE_PHOTOGRAPHY -DGST_USE_UNSTABLE_API" + fi + fi + +-- +2.9.4 + diff --git a/recipes-multimedia/libgstomx-0.10/libgstomx-0.10_21.5.0.bb b/recipes-multimedia/libgstomx-0.10/libgstomx-0.10_21.5.0.bb index 07359a4..d98d0c9 100644 --- a/recipes-multimedia/libgstomx-0.10/libgstomx-0.10_21.5.0.bb +++ b/recipes-multimedia/libgstomx-0.10/libgstomx-0.10_21.5.0.bb @@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" SRC_URI = " \ http://developer.download.nvidia.com/embedded/L4T/r21_Release_v5.0/source/gstomx_src.tbz2 \ file://0001-fix-gstomx-compilation-issues.patch \ + file://0001-configure-don-t-use-gst-photography-even-if-it-is-in.patch \ " SRC_URI[md5sum] = "457764edbcbe7239f93f6e1284d66b17" -- cgit v1.2.3