diff options
| author | Rui Matos <tiagomatos@gmail.com> | 2016-04-09 19:02:17 +0200 |
|---|---|---|
| committer | Rui Matos <tiagomatos@gmail.com> | 2016-04-11 23:12:23 +0200 |
| commit | 389539d1a02d9ff1301c896df9254daa962e5224 (patch) | |
| tree | a4aa3922138057620d30bc7570d039333650e6cb | |
| parent | 2edfd458b73157997868b81758e266e6351cc07c (diff) | |
| download | gnome-shell-wip/rtcm/merge.tar.gz | |
mutter/clutter/cogl merge build fixeswip/rtcm/merge
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/shell-global.c | 1 |
3 files changed, 5 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 3d1588870..b33f609a9 100644 --- a/configure.ac +++ b/configure.ac @@ -52,7 +52,7 @@ if $PKG_CONFIG --exists gstreamer-1.0 '>=' $GSTREAMER_MIN_VERSION ; then AC_MSG_RESULT(yes) build_recorder=true recorder_modules="gstreamer-1.0 gstreamer-base-1.0 x11 gtk+-3.0" - PKG_CHECK_MODULES(TEST_SHELL_RECORDER, $recorder_modules clutter-1.0) + PKG_CHECK_MODULES(TEST_SHELL_RECORDER, $recorder_modules mutter-clutter-1.0) else AC_MSG_RESULT(no) fi @@ -98,8 +98,7 @@ SHARED_PCS="gio-unix-2.0 >= $GIO_MIN_VERSION gjs-internals-1.0 >= $GJS_MIN_VERSION $recorder_modules gdk-x11-3.0 libsoup-2.4 - clutter-x11-1.0 >= $CLUTTER_MIN_VERSION - clutter-glx-1.0 >= $CLUTTER_MIN_VERSION + mutter-clutter-1.0 >= $CLUTTER_MIN_VERSION libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_MIN_VERSION gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION libcanberra libcanberra-gtk3 @@ -114,10 +113,10 @@ PKG_CHECK_MODULES(GNOME_SHELL, $SHARED_PCS) PKG_CHECK_MODULES(MUTTER, libmutter >= $MUTTER_MIN_VERSION) PKG_CHECK_MODULES(GNOME_SHELL_JS, gio-2.0 gjs-internals-1.0 >= $GJS_MIN_VERSION) -PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-3.0 libcroco-0.6 >= 0.6.8 x11) +PKG_CHECK_MODULES(ST, mutter-clutter-1.0 gtk+-3.0 libcroco-0.6 >= 0.6.8 x11) PKG_CHECK_MODULES(SHELL_PERF_HELPER, gtk+-3.0 gio-2.0) PKG_CHECK_MODULES(SHELL_HOTPLUG_SNIFFER, gio-2.0 gdk-pixbuf-2.0) -PKG_CHECK_MODULES(TRAY, clutter-1.0 gtk+-3.0) +PKG_CHECK_MODULES(TRAY, mutter-clutter-1.0 gtk+-3.0) PKG_CHECK_MODULES(GVC, libpulse >= $PULSE_MIN_VERS libpulse-mainloop-glib gobject-2.0) PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 3.19.2) diff --git a/src/Makefile.am b/src/Makefile.am index f3e926818..4b507ee70 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -12,7 +12,7 @@ SUBDIRS = gvc -include $(INTROSPECTION_MAKEFILE) INTROSPECTION_GIRS = -INTROSPECTION_SCANNER_ARGS = --warn-all --warn-error --add-include-path=$(srcdir) +INTROSPECTION_SCANNER_ARGS = --warn-all --warn-error --add-include-path=$(srcdir) --add-include-path=$(MUTTER_GIR_DIR) INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) --includedir=$(MUTTER_TYPELIB_DIR) typelibdir = $(pkglibdir) diff --git a/src/shell-global.c b/src/shell-global.c index 39224679a..2b6eb8f65 100644 --- a/src/shell-global.c +++ b/src/shell-global.c @@ -18,7 +18,6 @@ #include <X11/extensions/Xfixes.h> #include <canberra.h> #include <canberra-gtk.h> -#include <clutter/glx/clutter-glx.h> #include <clutter/x11/clutter-x11.h> #include <gdk/gdkx.h> #include <gio/gio.h> |