From ae3d39ddfd173e5198a02469c06415516a8163a6 Mon Sep 17 00:00:00 2001 From: Carlos Rafael Giani Date: Sun, 12 Jan 2020 14:59:51 +0100 Subject: gstreamer1.0-omx: Transition to meson based build * Removed autotools/M4 specific bits from recipe. * gettext, gtk-doc, and valgrind support is no longer present in gst-omx, and arguably never really was (because they were present in the "common" git submodule that is no longer being used in meson base builds). (From OE-Core rev: cc56078e2bb793829610225a3f9d66a4454b6880) Signed-off-by: Carlos Rafael Giani Signed-off-by: Richard Purdie --- .../gstreamer/gstreamer1.0-omx_1.16.1.bb | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'meta/recipes-multimedia') diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.16.1.bb index cb2f7045a8..89e13937ea 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.16.1.bb @@ -16,14 +16,12 @@ S = "${WORKDIR}/gst-omx-${PV}" DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" -inherit autotools pkgconfig gettext gtk-doc upstream-version-is-even - -acpaths = "-I ${S}/common/m4 -I ${S}/m4" +inherit meson pkgconfig upstream-version-is-even GSTREAMER_1_0_OMX_TARGET ?= "bellagio" GSTREAMER_1_0_OMX_CORE_NAME ?= "${libdir}/libomxil-bellagio.so.0" -EXTRA_OECONF += "--disable-valgrind --with-omx-target=${GSTREAMER_1_0_OMX_TARGET}" +EXTRA_OEMESON += "-Dtarget=${GSTREAMER_1_0_OMX_TARGET}" python __anonymous () { omx_target = d.getVar("GSTREAMER_1_0_OMX_TARGET") @@ -37,21 +35,12 @@ python __anonymous () { d.setVar("PACKAGE_ARCH", d.getVar("MACHINE_ARCH")) } -delete_pkg_m4_file() { - # Delete m4 files which we provide patched versions of but will be ignored - # if these exist - rm -f "${S}/common/m4/pkg.m4" - rm -f "${S}/common/m4/gtk-doc.m4" -} -do_configure[prefuncs] += "delete_pkg_m4_file" - set_omx_core_name() { sed -i -e "s;^core-name=.*;core-name=${GSTREAMER_1_0_OMX_CORE_NAME};" "${D}${sysconfdir}/xdg/gstomx.conf" } do_install[postfuncs] += " set_omx_core_name " FILES_${PN} += "${libdir}/gstreamer-1.0/*.so" -FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la" FILES_${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a" RDEPENDS_${PN} = "libomxil" -- cgit v1.2.3-54-g00ecf