Fixes | make[3]: *** No rule to make target 'viewporter-protocol.c', needed by 'all'. Stop. | make[3]: Leaving directory '/home/jenkins/oe/world/oe-build/build/tmpfs/work/armv5e-bec-linux-gnueabi/gstreamer1.0-plugins-bad/1.14.1-r0/build/ext/wayland' | Makefile:1288: recipe for target 'wayland' failed | make[2]: *** [wayland] Error 2
Signed-off-by: Khem Raj <raj.k...@gmail.com> --- ...R-for-defining-WAYLAND_PROTOCOLS_DAT.patch | 31 +++++++++++++++++++ .../gstreamer1.0-plugins-bad_1.14.1.bb | 20 ++++++------ 2 files changed, 42 insertions(+), 9 deletions(-) create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch new file mode 100644 index 0000000000..5c14a70cec --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch @@ -0,0 +1,31 @@ +From bfa34a3fa9b426f28163e9ba0539180b021d81f3 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.k...@gmail.com> +Date: Fri, 20 Jul 2018 23:24:05 -0700 +Subject: [PATCH] use PKG_CHECK_VAR for defining WAYLAND_PROTOCOLS_DATADIR + +This allows to override the wayland-protocols pkgdatadir with the +WAYLAND_PROTOCOLS_DATADIR from environment. + +pkgconfig would return an absolute path in /usr/share/wayland-protocols +for the pkgdatadir value, which is not suitable for cross-compiling. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.k...@gmail.com> +--- + configure.ac | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 79cfda4..b75c082 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1333,7 +1333,8 @@ AG_GST_CHECK_FEATURE(WAYLAND, [wayland sink], wayland , [ + PKG_CHECK_MODULES(WAYLAND, wayland-client >= 1.4.0 libdrm >= 2.4.55 wayland-protocols >= 1.4, [ + if test "x$wayland_scanner" != "x"; then + HAVE_WAYLAND="yes" +- AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, `$PKG_CONFIG --variable=pkgdatadir wayland-protocols`) ++ PKG_CHECK_VAR([WAYLAND_PROTOCOLS_DATADIR], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED], pkgdatadir) ++ AC_SUBST(WAYLAND_PROTOCOLS_DATADIR) + else + AC_MSG_RESULT([wayland-scanner is required to build the wayland plugin]) + HAVE_WAYLAND="no" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.1.bb index 0e477e5a9c..b4fb672b46 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.1.bb @@ -1,14 +1,14 @@ require gstreamer1.0-plugins.inc -SRC_URI = " \ - http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.xz \ - file://configure-allow-to-disable-libssh2.patch \ - file://fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch \ - file://avoid-including-sys-poll.h-directly.patch \ - file://ensure-valid-sentinels-for-gst_structure_get-etc.patch \ - file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ - file://0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch \ -" +SRC_URI = "http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.xz \ + file://configure-allow-to-disable-libssh2.patch \ + file://fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch \ + file://avoid-including-sys-poll.h-directly.patch \ + file://ensure-valid-sentinels-for-gst_structure_get-etc.patch \ + file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ + file://0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch \ + file://0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch \ + " SRC_URI[md5sum] = "c2f963501fc6afc084c418894425dcfd" SRC_URI[sha256sum] = "2a77c6908032aafdf2cd2e5823fec948f16a25c2d1497a953828d762dc20d61a" @@ -127,6 +127,8 @@ EXTRA_OECONF += " \ export OPENCV_PREFIX = "${STAGING_DIR_TARGET}${prefix}" +EXTRA_OEMAKE += "WAYLAND_PROTOCOLS_DATADIR=${STAGING_DATADIR}/wayland-protocols" + ARM_INSTRUCTION_SET_armv4 = "arm" ARM_INSTRUCTION_SET_armv5 = "arm" -- 2.18.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
