[mutter/wip/carlosg/sound-abstraction: 42/42] build: Use plain libcanberra instead of libcanberra-gtk3



commit 3693f6f63080cffb9893f6c9248c71f7fcc7eea3
Author: Carlos Garnacho <carlosg gnome org>
Date:   Tue Jan 8 15:59:57 2019 +0100

    build: Use plain libcanberra instead of libcanberra-gtk3
    
    We no longer use the gtk-aware ca_context, the dependency can be lowered
    now.

 configure.ac    | 4 ++--
 meson.build     | 4 ++--
 src/meson.build | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e18426166..5752d6545 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,8 +74,8 @@ PKG_PROG_PKG_CONFIG([0.21])
 # Sets GLIB_GENMARSHAL and GLIB_MKENUMS
 AM_PATH_GLIB_2_0([2.53.2])
 
-CANBERRA_GTK=libcanberra-gtk3
-CANBERRA_GTK_VERSION=0.26
+CANBERRA=libcanberra-gtk3
+CANBERRA_VERSION=0.26
 
 LIBWACOM_VERSION=0.13
 
diff --git a/meson.build b/meson.build
index 1a566d15d..2ca0b4020 100644
--- a/meson.build
+++ b/meson.build
@@ -26,7 +26,7 @@ xfixes_req = '>= 3'
 xi_req = '>= 1.6.99.1'
 xrandr_req = '>= 1.5.0'
 libstartup_notification_req = '>= 0.7'
-libcanberra_gtk3_req = '>= 0.26'
+libcanberra_req = '>= 0.26'
 libwacom_req = '>= 0.13'
 atk_req = '>= 2.5.3'
 
@@ -117,7 +117,7 @@ xcb_res_dep = dependency('xcb-res')
 xinerama_dep = dependency('xinerama')
 ice_dep = dependency('ice')
 atk_dep = dependency('atk', version: atk_req)
-libcanberra_gtk3_dep = dependency('libcanberra-gtk3', version: libcanberra_gtk3_req)
+libcanberra_dep = dependency('libcanberra', version: libcanberra_req)
 
 # For now always require X11 support
 have_x11 = true
diff --git a/src/meson.build b/src/meson.build
index c2f43b3ac..71555c62a 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -23,7 +23,7 @@ mutter_pkg_deps = [
   json_glib_dep,
   pango_dep,
   xkbcommon_dep,
-  libcanberra_gtk3_dep,
+  libcanberra_dep,
 ]
 
 if have_gl


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