[gnome-flashback] gvc: update submodule to commit that removed autotools support

[Alberts Muktupāvels <muktupavels src gnome org>]

commit 74b779d267d526cac664a7f9fae902a85a572b7a
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Wed Dec 25 17:57:13 2019 +0200

    gvc: update submodule to commit that removed autotools support

 .gitmodules                                 |  1 +
 configure.ac                                | 10 +---
 gnome-flashback/libsound-applet/Makefile.am |  2 +-
 gvc/Makefile.am                             | 81 ++++++++++++++++++++++++++++-
 gvc/gvc                                     |  2 +-
 5 files changed, 84 insertions(+), 12 deletions(-)
---
diff --git a/.gitmodules b/.gitmodules
index 11dd619..d31f626 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,4 @@
 [submodule "gnome-flashback/libsound-applet/gvc"]
        path = gvc/gvc
        url = https://gitlab.gnome.org/GNOME/libgnome-volume-control.git
+       ignore = untracked
diff --git a/configure.ac b/configure.ac
index b2bcfb3..0e64b65 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,7 +45,7 @@ dnl **************************************************************************
 dnl Initialize automake
 dnl **************************************************************************
 
-AM_INIT_AUTOMAKE([1.13 no-dist-gzip dist-xz tar-ustar -Wno-portability])
+AM_INIT_AUTOMAKE([1.13 no-dist-gzip dist-xz subdir-objects tar-ustar -Wno-portability])
 AM_MAINTAINER_MODE([enable])
 AM_SILENT_RULES([yes])
 
@@ -243,6 +243,7 @@ PKG_CHECK_MODULES([SHELL], [
 ])
 
 PKG_CHECK_MODULES([GVC], [
+  gio-2.0
   gobject-2.0
   libpulse
   libpulse-mainloop-glib
@@ -267,12 +268,6 @@ AC_DEFINE_UNQUOTED([XKB_BASE],
                    ["`$PKG_CONFIG --variable xkb_base xkeyboard-config`"],
                    [Define XKB base directory])
 
-dnl **************************************************************************
-dnl Tell gvc submodule to not build introspection
-dnl **************************************************************************
-
-AM_CONDITIONAL([HAVE_INTROSPECTION], [false])
-
 dnl **************************************************************************
 dnl Check if we have Pango 1.44.0 or newer
 dnl **************************************************************************
@@ -416,7 +411,6 @@ AC_CONFIG_FILES([
   gnome-flashback/libstatus-notifier-watcher/Makefile
 
   gvc/Makefile
-  gvc/gvc/Makefile
 
   system-indicators/Makefile
 
diff --git a/gnome-flashback/libsound-applet/Makefile.am b/gnome-flashback/libsound-applet/Makefile.am
index 7bff965..b8d7222 100644
--- a/gnome-flashback/libsound-applet/Makefile.am
+++ b/gnome-flashback/libsound-applet/Makefile.am
@@ -31,7 +31,7 @@ libsound_applet_la_LDFLAGS = \
        $(NULL)
 
 libsound_applet_la_LIBADD = \
-       $(top_builddir)/gvc/gvc/libgvc.la \
+       $(top_builddir)/gvc/libgvc.la \
        $(SOUND_APPLET_LIBS) \
        $(LIBM) \
        $(NULL)
diff --git a/gvc/Makefile.am b/gvc/Makefile.am
index 374c714..3f111dc 100644
--- a/gvc/Makefile.am
+++ b/gvc/Makefile.am
@@ -1,7 +1,84 @@
 NULL =
 
-SUBDIRS = \
-       gvc \
+noinst_LTLIBRARIES = \
+       libgvc.la \
+       $(NULL)
+
+noinst_PROGRAMS = \
+       test-audio-device-selection \
+       $(NULL)
+
+libgvc_la_CPPFLAGS = \
+       -DG_LOG_DOMAIN=\"gvc\" \
+       -DG_LOG_USE_STRUCTURED=1 \
+       -I$(top_srcdir)/gvc/gvc \
+       $(NULL)
+
+libgvc_la_CFLAGS = \
+       $(GVC_CFLAGS) \
+       $(AM_CFLAGS) \
+       $(NULL)
+
+libgvc_la_SOURCES = \
+       gvc/gvc-channel-map-private.h \
+       gvc/gvc-channel-map.c \
+       gvc/gvc-channel-map.h \
+       gvc/gvc-mixer-card-private.h \
+       gvc/gvc-mixer-card.c \
+       gvc/gvc-mixer-card.h \
+       gvc/gvc-mixer-control-private.h \
+       gvc/gvc-mixer-control.c \
+       gvc/gvc-mixer-control.h \
+       gvc/gvc-mixer-event-role.c \
+       gvc/gvc-mixer-event-role.h \
+       gvc/gvc-mixer-sink-input.c \
+       gvc/gvc-mixer-sink-input.h \
+       gvc/gvc-mixer-sink.c \
+       gvc/gvc-mixer-sink.h \
+       gvc/gvc-mixer-source-output.c \
+       gvc/gvc-mixer-source-output.h \
+       gvc/gvc-mixer-source.c \
+       gvc/gvc-mixer-source.h \
+       gvc/gvc-mixer-stream-private.h \
+       gvc/gvc-mixer-stream.c \
+       gvc/gvc-mixer-stream.h \
+       gvc/gvc-mixer-ui-device.c \
+       gvc/gvc-mixer-ui-device.h \
+       gvc/gvc-pulseaudio-fake.h \
+       $(NULL)
+
+libgvc_la_LDFLAGS = \
+       $(WARN_LDFLAGS) \
+       $(AM_LDFLAGS) \
+       $(NULL)
+
+libgvc_la_LIBADD = \
+       $(GVC_LIBS) \
+       $(NULL)
+
+test_audio_device_selection_CPPFLAGS = \
+       -DG_LOG_DOMAIN=\"gvc\" \
+       -DG_LOG_USE_STRUCTURED=1 \
+       -I$(top_srcdir)/gvc/gvc \
+       $(NULL)
+
+test_audio_device_selection_CFLAGS = \
+       $(GVC_CFLAGS) \
+       $(AM_CFLAGS) \
+       $(NULL)
+
+test_audio_device_selection_SOURCES = \
+       gvc/test-audio-device-selection.c \
+       $(NULL)
+
+test_audio_device_selection_LDFLAGS = \
+       $(WARN_LDFLAGS) \
+       $(AM_LDFLAGS) \
+       $(NULL)
+
+test_audio_device_selection_LDADD = \
+       libgvc.la \
+       $(GVC_LIBS) \
        $(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/gvc/gvc b/gvc/gvc
index 468022b..43be5d2 160000
--- a/gvc/gvc
+++ b/gvc/gvc
@@ -1 +1 @@
-Subproject commit 468022b708fc1a56154f3b0cc5af3b938fb3e9fb
+Subproject commit 43be5d272ca2d5d9e9bed4b5ad3ac28719f07a2a