From 6e74f987ec8d63bd1b85b41825aef94f8338558c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1igo=20Mart=C3=ADnez?= <inigomartinez@gmail.com>
Date: Tue, 30 Jan 2018 13:37:38 +0100
Subject: [PATCH] build: Update gvc to support renamed options

gvc has made some recent changes that rename its user options
following meson guidelines for GNOME packages[0].

The options used in gvc as a subproject have been renamed
accordingly.

[0] https://wiki.gnome.org/Initiatives/GnomeGoals/MesonPorting
---
 meson.build     | 6 +++---
 subprojects/gvc | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meson.build b/meson.build
index 88766b3e4..1eec6aa27 100644
--- a/meson.build
+++ b/meson.build
@@ -167,12 +167,12 @@ conf_inc = include_directories('.')
 
 libgvc = subproject('gvc',
   default_options: [
-    'package-name=' + meson.project_name(),
-    'package-version=' + meson.project_version(),
+    'package_name=' + meson.project_name(),
+    'package_version=' + meson.project_version(),
     'pkgdatadir=' + pkgdatadir,
     'pkglibdir=' + pkglibdir,
     'static=false',
-    'with-introspection=true',
+    'introspection=true',
     'alsa=false'
   ]
 )
diff --git a/subprojects/gvc b/subprojects/gvc
index 67533bffd..6a0ac9ba6 160000
--- a/subprojects/gvc
+++ b/subprojects/gvc
@@ -1 +1 @@
-Subproject commit 67533bffdcd22893b28baa411b2e75bd75dce323
+Subproject commit 6a0ac9ba69f84d763f286c5741b57ff8d87c1f45