From 728ce4f1677012db95c6f946f43e272762d98175 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 12 Jan 2020 16:06:25 -0800 Subject: [PATCH] gstreamer: Adapt to meson changes from oe-core Signed-off-by: Khem Raj --- .../gstreamer/gstreamer1.0-plugins-bad_1.16.imx.bb | 2 +- .../gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb | 2 +- .../gstreamer/gstreamer1.0-plugins-good_1.16.imx.bb | 2 +- recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_git.bb | 2 +- .../gstreamer/gstreamer1.0-plugins-ugly_1.16.0.bb | 2 +- recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.16.0.bb | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.imx.bb index 2b037e94..f18a70d1 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.imx.bb @@ -1,4 +1,4 @@ -require recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc +require recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc LIC_FILES_CHKSUM = "file://COPYING;md5=73a5855a8119deb017f5f13cf327095d \ file://COPYING.LIB;md5=21682e4e8fea52413fd26c60acb907e5 " diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb index ee7a9baf..1310d94d 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb @@ -1,4 +1,4 @@ -require recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc +require recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc LICENSE = "GPLv2+ & LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \ diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.imx.bb index e317a55e..d09be8dd 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.imx.bb @@ -1,4 +1,4 @@ -require recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc +require recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc LICENSE = "GPLv2+ & LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_git.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_git.bb index 011fc0fd..ce836df1 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_git.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_git.bb @@ -63,7 +63,7 @@ PACKAGECONFIG[mp3encoder] = ",--disable-mp3encoder,imx-codec" # LIBV is used by gst-plugins-package.inc to specify the GStreamer version (0.10 vs 1.0) LIBV = "1.0" -require recipes-multimedia/gstreamer/gst-plugins-package.inc +require recipes-multimedia/gstreamer/gstreamer1.0-plugins-packaging.inc # the following line is required to produce one package for each plugin PACKAGES_DYNAMIC = "^${PN}-.*" diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.16.0.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.16.0.bb index 9169d617..7e6fcaae 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.16.0.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.16.0.bb @@ -1,4 +1,4 @@ -require recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc +require recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ file://tests/check/elements/xingmux.c;beginline=1;endline=21;md5=4c771b8af188724855cb99cadd390068" diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.16.0.bb b/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.16.0.bb index b19344b1..6a9995b0 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.16.0.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.16.0.bb @@ -24,7 +24,7 @@ EXTRA_OECONF = "--disable-examples --disable-tests --disable-introspection " # Starting with 1.8.0 gst-rtsp-server includes dependency-less plugins as well LIBV = "1.0" -require recipes-multimedia/gstreamer/gst-plugins-package.inc +require recipes-multimedia/gstreamer/gstreamer1.0-plugins-packaging.inc delete_pkg_m4_file() { # This m4 file is out of date and is missing PKG_CONFIG_SYSROOT_PATH tweaks which we need for introspection -- 2.40.1