From 456c01afbc82c2bc078de8ea059df6c885d416cf Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Wed, 10 Oct 2018 17:16:01 +0200
Subject: [PATCH] meson: enable more options by default

Update submodules to latest version
---
 meson_options.txt                     | 24 ++++++++++++------------
 pipewire-alsa                         |  2 +-
 pipewire-pulseaudio                   |  2 +-
 spa/plugins/audioconvert/fmtconvert.c |  2 ++
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/meson_options.txt b/meson_options.txt
index 42a4ea6c0..e5d9ff4fb 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -5,11 +5,11 @@ option('docs',
 option('man',
        description: 'Build manpages',
        type: 'boolean',
-       value: false)
+       value: true)
 option('gstreamer',
        description: 'Build GStreamer plugins',
        type: 'boolean',
-       value: false)
+       value: true)
 option('systemd',
        description: 'Enable systemd integration',
        type: 'boolean',
@@ -17,15 +17,15 @@ option('systemd',
 option('pipewire-alsa',
        description: 'Enable pipewire-alsa integration',
        type: 'boolean',
-       value: false)
+       value: true)
 option('pipewire-jack',
        description: 'Enable pipewire-jack integration',
        type: 'boolean',
-       value: false)
+       value: true)
 option('pipewire-pulseaudio',
        description: 'Enable pipewire-pulseaudio integration',
        type: 'boolean',
-       value: false)
+       value: true)
 option('spa',
        description: 'Enable spa integration',
        type: 'boolean',
@@ -33,23 +33,23 @@ option('spa',
 option('spa-plugins',
        description: 'Enable spa plugins integration',
        type: 'boolean',
-       value: false)
+       value: true)
 option('alsa',
        description: 'Enable alsa spa plugin integration',
        type: 'boolean',
-       value: false)
+       value: true)
 option('audiomixer',
        description: 'Enable audiomixer spa plugin integration',
        type: 'boolean',
        value: false)
 option('audioconvert',
-       description: 'Enable audiconvert spa plugin integration',
+       description: 'Enable audioconvert spa plugin integration',
        type: 'boolean',
-       value: false)
+       value: true)
 option('bluez5',
        description: 'Enable bluez5 spa plugin integration',
        type: 'boolean',
-       value: false)
+       value: true)
 option('audiotestsrc',
        description: 'Enable audiotestsrc spa plugin integration',
        type: 'boolean',
@@ -61,7 +61,7 @@ option('ffmpeg',
 option('support',
        description: 'Enable support spa plugin integration',
        type: 'boolean',
-       value: false)
+       value: true)
 option('test',
        description: 'Enable test spa plugin integration',
        type: 'boolean',
@@ -69,7 +69,7 @@ option('test',
 option('v4l2',
        description: 'Enable v4l2 spa plugin integration',
        type: 'boolean',
-       value: false)
+       value: true)
 option('videotestsrc',
        description: 'Enable videotestsrc spa plugin integration',
        type: 'boolean',
diff --git a/pipewire-alsa b/pipewire-alsa
index 9955e3203..7303f2c1a 160000
--- a/pipewire-alsa
+++ b/pipewire-alsa
@@ -1 +1 @@
-Subproject commit 9955e3203025cfe2cd7913d7851e3adb33863259
+Subproject commit 7303f2c1a0a7643ab3017ffed17c82d0e35118ba
diff --git a/pipewire-pulseaudio b/pipewire-pulseaudio
index 6a4da8a6b..a00c00bae 160000
--- a/pipewire-pulseaudio
+++ b/pipewire-pulseaudio
@@ -1 +1 @@
-Subproject commit 6a4da8a6b31e5ed2e455608d853de159f470ba2e
+Subproject commit a00c00baed6984b07e396cacfeba14c09e43102e
diff --git a/spa/plugins/audioconvert/fmtconvert.c b/spa/plugins/audioconvert/fmtconvert.c
index 42c5aafae..288d4eee9 100644
--- a/spa/plugins/audioconvert/fmtconvert.c
+++ b/spa/plugins/audioconvert/fmtconvert.c
@@ -615,6 +615,8 @@ impl_node_port_set_param(struct spa_node *node,
 			 uint32_t id, uint32_t flags,
 			 const struct spa_pod *param)
 {
+	struct impl *this;
+
 	spa_return_val_if_fail(node != NULL, -EINVAL);
 
 	this = SPA_CONTAINER_OF(node, struct impl, node);