diff mbox series

[DRAFT,v1,1/7] package/gstreamer1: convert to meson build

Message ID 20190429194534.25743-2-ps.report@gmx.net
State RFC
Headers show
Series gstreamer1: convert to meson build | expand

Commit Message

Peter Seiderer April 29, 2019, 7:45 p.m. UTC 
The meson build provides no 'disable-valgrind' option but checks
for the availability of valgrind/valgrind.h, so add an optional
valgrind dependency instead.

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
 package/gstreamer1/gstreamer1/gstreamer1.mk | 28 ++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

--
2.21.0

Comments

Arnout Vandecappelle April 29, 2019, 8:52 p.m. UTC | #1 
On 29/04/2019 21:45, Peter Seiderer wrote:
> +	-Dcheck=$(if $(BR2_PACKAGE_GSTREAMER1_TRACE),enabled,disabled) \

 Is this intended? Or should it be _CHECK?

 Regards,
 Arnout
Peter Seiderer April 29, 2019, 9:01 p.m. UTC | #2 
Hello Arnout,

On Mon, 29 Apr 2019 22:52:59 +0200, Arnout Vandecappelle <arnout@mind.be> wrote:

> On 29/04/2019 21:45, Peter Seiderer wrote:
> > +	-Dcheck=$(if $(BR2_PACKAGE_GSTREAMER1_TRACE),enabled,disabled) \
>
>  Is this intended? Or should it be _CHECK?

Ups, you are right, will fix it in the next patch iteration, thanks for review...

Regards,
Peter

>
>  Regards,
>  Arnout
diff mbox series

Patch

diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk
index 3378232c10..802b91de9c 100644
--- a/package/gstreamer1/gstreamer1/gstreamer1.mk
+++ b/package/gstreamer1/gstreamer1/gstreamer1.mk
@@ -12,24 +12,24 @@  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 \
+	-Dcheck=$(if $(BR2_PACKAGE_GSTREAMER1_TRACE),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))