From 9085e409d31bb28e8e62c7fc55547c9dad449e96 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Wed, 10 Jul 2019 11:36:29 -0400 Subject: [PATCH] package/gstreamer1/gstreamer1: convert package type to meson Gstreamer 1.16.0 is the last version to support autotools, and will be removed in the next version. Other changes: - The meson build provides no 'disable-valgrind' option but checks for the availability of valgrind/valgrind.h, so add an optional valgrind dependency instead. - Add the following new meson-specific options: - -Dgtk_doc=disabled - -Dglib-asserts=disabled - -Dglib-checks=disabled - -Dgobject-cast-checks=disabled Signed-off-by: Adam Duskett Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/gstreamer1/gstreamer1/gstreamer1.mk | 31 +++++++++++---------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index 3378232c10..cea933be84 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -12,24 +12,27 @@ GSTREAMER1_LICENSE_FILES = COPYING GSTREAMER1_LICENSE = LGPL-2.0+, LGPL-2.1+ GSTREAMER1_CONF_OPTS = \ - --disable-examples \ - --disable-tests \ - --disable-failing-tests \ - --disable-valgrind \ - --disable-benchmarks \ - --disable-introspection \ - $(if $(BR2_PACKAGE_GSTREAMER1_CHECK),,--disable-check) \ - $(if $(BR2_PACKAGE_GSTREAMER1_TRACE),,--disable-trace) \ - $(if $(BR2_PACKAGE_GSTREAMER1_PARSE),,--disable-parse) \ - $(if $(BR2_PACKAGE_GSTREAMER1_GST_DEBUG),,--disable-gst-debug) \ - $(if $(BR2_PACKAGE_GSTREAMER1_PLUGIN_REGISTRY),,--disable-registry) \ - $(if $(BR2_PACKAGE_GSTREAMER1_INSTALL_TOOLS),,--disable-tools) + -Dexamples=disabled \ + -Dtests=disabled \ + -Dbenchmarks=disabled \ + -Dgtk_doc=disabled \ + -Dintrospection=disabled \ + -Dglib-asserts=disabled \ + -Dglib-checks=disabled \ + -Dgobject-cast-checks=disabled \ + -Dcheck=$(if $(BR2_PACKAGE_GSTREAMER1_CHECK),enabled,disabled) \ + -Dtracer_hooks=$(if $(BR2_PACKAGE_GSTREAMER1_TRACE),true,false) \ + -Doption-parsing=$(if $(BR2_PACKAGE_GSTREAMER1_PARSE),true,false) \ + -Dgst_debug=$(if $(BR2_PACKAGE_GSTREAMER1_GST_DEBUG),true,false) \ + -Dregistry=$(if $(BR2_PACKAGE_GSTREAMER1_PLUGIN_REGISTRY),true,false) \ + -Dtools=$(if $(BR2_PACKAGE_GSTREAMER1_INSTALL_TOOLS),enabled,disabled) GSTREAMER1_DEPENDENCIES = \ host-bison \ host-flex \ host-pkgconf \ libglib2 \ - $(if $(BR2_PACKAGE_LIBUNWIND),libunwind) + $(if $(BR2_PACKAGE_LIBUNWIND),libunwind) \ + $(if $(BR2_PACKAGE_VALGRIND),valgrind) -$(eval $(autotools-package)) +$(eval $(meson-package)) -- 2.30.2