[gnome-flashback] gvc: build with alsa



commit 28622682fa0a92026fafe74073d2f2ce86260ce4
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Wed Dec 25 20:01:16 2019 +0200

    gvc: build with alsa

 .gitlab-ci.yml  |  1 +
 configure.ac    | 27 ++++++++++++++++++++-------
 gvc/Makefile.am | 20 ++++++++++++++++----
 3 files changed, 37 insertions(+), 11 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 04c37a8..6af7917 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,6 +17,7 @@ build-ubuntu:
                       gettext
                       git
                       gsettings-desktop-schemas-dev
+                      libasound2-dev
                       libcanberra-gtk3-dev
                       libdbus-glib-1-dev
                       libgdk-pixbuf2.0-dev
diff --git a/configure.ac b/configure.ac
index 0e64b65..e7a7f37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -242,13 +242,6 @@ PKG_CHECK_MODULES([SHELL], [
   gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED
 ])
 
-PKG_CHECK_MODULES([GVC], [
-  gio-2.0
-  gobject-2.0
-  libpulse
-  libpulse-mainloop-glib
-])
-
 PKG_CHECK_MODULES([SOUND_APPLET], [
   gtk+-3.0 >= $GTK_REQUIRED
   libcanberra-gtk3 >= $CANBERRA_REQUIRED
@@ -260,6 +253,26 @@ PKG_CHECK_MODULES([STATUS_NOTIFIER_WATCHER], [
   gio-unix-2.0 >= $GLIB_REQUIRED
 ])
 
+dnl **************************************************************************
+dnl libgnome-volume-control
+dnl **************************************************************************
+
+PKG_CHECK_MODULES([GVC], [
+  gio-2.0
+  gobject-2.0
+  libpulse
+  libpulse-mainloop-glib
+])
+
+PKG_CHECK_EXISTS([alsa], [found_alsa="yes"], [found_alsa="no"])
+
+AS_IF([test "x$found_alsa" = "xyes"], [
+  AC_DEFINE([HAVE_ALSA], [1], [Define to 1 if alsa is available])
+  PKG_CHECK_MODULES([ALSA], [alsa])
+])
+
+AM_CONDITIONAL(HAVE_ALSA, [test "x$found_alsa" = "xyes"])
+
 dnl **************************************************************************
 dnl Define XKB base directory
 dnl **************************************************************************
diff --git a/gvc/Makefile.am b/gvc/Makefile.am
index 56211a3..ee7e3ff 100644
--- a/gvc/Makefile.am
+++ b/gvc/Makefile.am
@@ -4,10 +4,6 @@ noinst_LTLIBRARIES = \
        libgvc.la \
        $(NULL)
 
-noinst_PROGRAMS = \
-       test-audio-device-selection \
-       $(NULL)
-
 libgvc_la_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"gvc\" \
        -DG_LOG_USE_STRUCTURED=1 \
@@ -58,6 +54,19 @@ libgvc_la_LIBADD = \
        $(GVC_LIBS) \
        $(NULL)
 
+if HAVE_ALSA
+libgvc_la_CFLAGS += \
+       $(ALSA_CFLAGS) \
+       $(NULL)
+
+libgvc_la_LIBADD += \
+       $(ALSA_LIBS) \
+       $(NULL)
+
+noinst_PROGRAMS = \
+       test-audio-device-selection \
+       $(NULL)
+
 test_audio_device_selection_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"gvc\" \
        -DG_LOG_USE_STRUCTURED=1 \
@@ -65,6 +74,7 @@ test_audio_device_selection_CPPFLAGS = \
        $(NULL)
 
 test_audio_device_selection_CFLAGS = \
+       $(ALSA_CFLAGS) \
        $(GVC_CFLAGS) \
        $(AM_CFLAGS) \
        $(NULL)
@@ -80,8 +90,10 @@ test_audio_device_selection_LDFLAGS = \
 
 test_audio_device_selection_LDADD = \
        libgvc.la \
+       $(ALSA_LIBS) \
        $(GVC_LIBS) \
        $(NULL)
+endif
 
 ENUM_TYPES = \
        gvc/gvc-mixer-stream.h \


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]