diff options
3 files changed, 39 insertions, 1 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc index d26a6a9433..d3c5326d45 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc | |||
@@ -64,7 +64,7 @@ PACKAGECONFIG[srtp] = "--enable-srtp,--disable-srtp,libsrtp" | |||
64 | PACKAGECONFIG[uvch264] = "--enable-uvch264,--disable-uvch264,libusb1 libgudev" | 64 | PACKAGECONFIG[uvch264] = "--enable-uvch264,--disable-uvch264,libusb1 libgudev" |
65 | PACKAGECONFIG[voaacenc] = "--enable-voaacenc,--disable-voaacenc,vo-aacenc" | 65 | PACKAGECONFIG[voaacenc] = "--enable-voaacenc,--disable-voaacenc,vo-aacenc" |
66 | PACKAGECONFIG[voamrwbenc] = "--enable-voamrwbenc,--disable-voamrwbenc,vo-amrwbenc" | 66 | PACKAGECONFIG[voamrwbenc] = "--enable-voamrwbenc,--disable-voamrwbenc,vo-amrwbenc" |
67 | PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland-native wayland" | 67 | PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland-native wayland wayland-protocols" |
68 | PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp" | 68 | PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp" |
69 | 69 | ||
70 | # these plugins have not been ported to 1.0 (yet): | 70 | # these plugins have not been ported to 1.0 (yet): |
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-Prepend-PKG_CONFIG_SYSROOT_DIR-to-pkg-config-output.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-Prepend-PKG_CONFIG_SYSROOT_DIR-to-pkg-config-output.patch new file mode 100644 index 0000000000..86a4495a85 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-Prepend-PKG_CONFIG_SYSROOT_DIR-to-pkg-config-output.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From c271503d7e233428ac0323c51d6517113e26bef7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 1 Dec 2016 00:27:13 -0800 | ||
4 | Subject: [PATCH] Prepend PKG_CONFIG_SYSROOT_DIR to pkg-config output | ||
5 | |||
6 | In cross environment we have to prepend the sysroot to the path found by | ||
7 | pkgconfig since the path returned from pkgconfig does not have sysroot prefixed | ||
8 | it ends up using the files from host system. If build host has wayland installed | ||
9 | the build will succeed but if you dont have wayland-protocols installed on build host then | ||
10 | it wont find the files on build host | ||
11 | |||
12 | This should work ok with non sysrooted builds too since in those cases PKG_CONFIG_SYSROOT_DIR | ||
13 | will be empty | ||
14 | |||
15 | Upstream-Status: Pending | ||
16 | |||
17 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
18 | --- | ||
19 | configure.ac | 2 +- | ||
20 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
21 | |||
22 | Index: gst-plugins-bad-1.10.1/configure.ac | ||
23 | =================================================================== | ||
24 | --- gst-plugins-bad-1.10.1.orig/configure.ac | ||
25 | +++ gst-plugins-bad-1.10.1/configure.ac | ||
26 | @@ -2233,7 +2233,7 @@ AG_GST_CHECK_FEATURE(WAYLAND, [wayland s | ||
27 | PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, wayland-protocols >= 1.4, [ | ||
28 | if test "x$wayland_scanner" != "x"; then | ||
29 | HAVE_WAYLAND="yes" | ||
30 | - AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, `$PKG_CONFIG --variable=pkgdatadir wayland-protocols`) | ||
31 | + AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, ${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`) | ||
32 | else | ||
33 | AC_MSG_RESULT([wayland-scanner is required to build the wayland plugin]) | ||
34 | HAVE_WAYLAND="no" | ||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.10.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.10.1.bb index 9cd892edf5..46df0265f9 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.10.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.10.1.bb | |||
@@ -14,8 +14,12 @@ SRC_URI = " \ | |||
14 | file://0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch \ | 14 | file://0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch \ |
15 | file://0009-glimagesink-Downrank-to-marginal.patch \ | 15 | file://0009-glimagesink-Downrank-to-marginal.patch \ |
16 | file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ | 16 | file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ |
17 | file://0001-Prepend-PKG_CONFIG_SYSROOT_DIR-to-pkg-config-output.patch \ | ||
17 | " | 18 | " |
18 | SRC_URI[md5sum] = "491d2d5aab55ffc60c66e714d3d664ea" | 19 | SRC_URI[md5sum] = "491d2d5aab55ffc60c66e714d3d664ea" |
19 | SRC_URI[sha256sum] = "133e0ed9fe21011b15d3898e3d3a9d17ab74eed31996da2e353353e688ca921d" | 20 | SRC_URI[sha256sum] = "133e0ed9fe21011b15d3898e3d3a9d17ab74eed31996da2e353353e688ca921d" |
20 | 21 | ||
21 | S = "${WORKDIR}/gst-plugins-bad-${PV}" | 22 | S = "${WORKDIR}/gst-plugins-bad-${PV}" |
23 | |||
24 | EXTRA_OECONF += "WAYLAND_PROTOCOLS_SYSROOT_DIR=${STAGING_DIR}/${MACHINE}" | ||
25 | EXTRA_OECONF[vardepsexclude] = "MACHINE" | ||