isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 01:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

build: Use plain libcanberra instead of libcanberra-gtk3

Browse Source 
We no longer use the gtk-aware ca_context, the dependency can be lowered
now.
This commit is contained in:
Carlos Garnacho 2019-01-08 15:59:57 +01:00
parent ebfc6184b2
commit 3693f6f630
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -74,8 +74,8 @@ PKG_PROG_PKG_CONFIG([0.21])
# Sets GLIB_GENMARSHAL and GLIB_MKENUMS # Sets GLIB_GENMARSHAL and GLIB_MKENUMS
AM_PATH_GLIB_2_0([2.53.2]) AM_PATH_GLIB_2_0([2.53.2])
CANBERRA_GTK=libcanberra-gtk3 CANBERRA=libcanberra-gtk3
CANBERRA_GTK_VERSION=0.26 CANBERRA_VERSION=0.26
LIBWACOM_VERSION=0.13 LIBWACOM_VERSION=0.13

4
meson.build
View File

@ -26,7 +26,7 @@ xfixes_req = '>= 3'
xi_req = '>= 1.6.99.1' xi_req = '>= 1.6.99.1'
xrandr_req = '>= 1.5.0' xrandr_req = '>= 1.5.0'
libstartup_notification_req = '>= 0.7' libstartup_notification_req = '>= 0.7'
libcanberra_gtk3_req = '>= 0.26' libcanberra_req = '>= 0.26'
libwacom_req = '>= 0.13' libwacom_req = '>= 0.13'
atk_req = '>= 2.5.3' atk_req = '>= 2.5.3'
@ -117,7 +117,7 @@ xcb_res_dep = dependency('xcb-res')
xinerama_dep = dependency('xinerama') xinerama_dep = dependency('xinerama')
ice_dep = dependency('ice') ice_dep = dependency('ice')
atk_dep = dependency('atk', version: atk_req) 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 # For now always require X11 support
have_x11 = true have_x11 = true

2
src/meson.build
View File

@ -23,7 +23,7 @@ mutter_pkg_deps = [
json_glib_dep, json_glib_dep,
pango_dep, pango_dep,
xkbcommon_dep, xkbcommon_dep,
libcanberra_gtk3_dep, libcanberra_dep,
] ]
if have_gl if have_gl