brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to using Clutter 1.0

Browse Source 
Change the pkg-config and .gir requirements.
This commit is contained in:
Colin Walters 2009-07-29 13:00:11 -04:00
parent f3efbf432f
commit 119516424d
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@ -34,16 +34,16 @@ if $PKG_CONFIG --exists gstreamer-0.10 '>=' $GSTREAMER_MIN_VERSION ; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
build_recorder=true build_recorder=true
recorder_modules="gstreamer-0.10 gstreamer-base-0.10 xfixes" recorder_modules="gstreamer-0.10 gstreamer-base-0.10 xfixes"
PKG_CHECK_MODULES(TEST_SHELL_RECORDER, $recorder_modules clutter-0.9) PKG_CHECK_MODULES(TEST_SHELL_RECORDER, $recorder_modules clutter-1.0)
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
fi fi
AM_CONDITIONAL(BUILD_RECORDER, $build_recorder) AM_CONDITIONAL(BUILD_RECORDER, $build_recorder)
PKG_CHECK_MODULES(MUTTER_PLUGIN, gio-unix-2.0 gtk+-2.0 dbus-glib-1 mutter-plugins gjs-gi-1.0 xscrnsaver libgnome-menu $recorder_modules gconf-2.0 gdk-x11-2.0 clutter-x11-0.9 clutter-glx-0.9) PKG_CHECK_MODULES(MUTTER_PLUGIN, gio-unix-2.0 gtk+-2.0 dbus-glib-1 mutter-plugins gjs-gi-1.0 xscrnsaver libgnome-menu $recorder_modules gconf-2.0 gdk-x11-2.0 clutter-x11-1.0 clutter-glx-1.0)
PKG_CHECK_MODULES(TIDY, clutter-0.9) PKG_CHECK_MODULES(TIDY, clutter-1.0)
PKG_CHECK_MODULES(BIG, clutter-0.9 gtk+-2.0 librsvg-2.0) PKG_CHECK_MODULES(BIG, clutter-1.0 gtk+-2.0 librsvg-2.0)
PKG_CHECK_MODULES(GDMUSER, dbus-glib-1 gtk+-2.0) PKG_CHECK_MODULES(GDMUSER, dbus-glib-1 gtk+-2.0)
PKG_CHECK_MODULES(TRAY, gtk+-2.0) PKG_CHECK_MODULES(TRAY, gtk+-2.0)
PKG_CHECK_MODULES(TASKPANEL, libwnck-1.0 dbus-glib-1) PKG_CHECK_MODULES(TASKPANEL, libwnck-1.0 dbus-glib-1)

6
src/Makefile.am
View File

@ -153,7 +153,7 @@ Shell-0.1.gir: $(mutter) $(G_IR_SCANNER) Big-1.0.gir libgnome-shell.la Makefile
--namespace=Shell \ --namespace=Shell \
--nsversion=0.1 \ --nsversion=0.1 \
--add-include-path=$(MUTTER_LIB_DIR)/mutter/ \ --add-include-path=$(MUTTER_LIB_DIR)/mutter/ \
--include=Clutter-0.9 \ --include=Clutter-1.0 \
--include=Meta-2.27 \ --include=Meta-2.27 \
--add-include-path=$(builddir) \ --add-include-path=$(builddir) \
--include=Big-1.0 \ --include=Big-1.0 \
@ -174,7 +174,7 @@ Tidy-1.0.gir: $(mutter) $(G_IR_SCANNER) libgnome-shell.la libtidy-1.0.la Makefil
$(G_IR_SCANNER) \ $(G_IR_SCANNER) \
--namespace=Tidy \ --namespace=Tidy \
--nsversion=1.0 \ --nsversion=1.0 \
--include=Clutter-0.9 \ --include=Clutter-1.0 \
--program=mutter \ --program=mutter \
--program-arg=--mutter-plugins=$$(pwd)/libgnome-shell.la \ --program-arg=--mutter-plugins=$$(pwd)/libgnome-shell.la \
$(addprefix $(srcdir)/,$(tidy_source_h)) \ $(addprefix $(srcdir)/,$(tidy_source_h)) \
@ -192,7 +192,7 @@ Big-1.0.gir: $(mutter) $(G_IR_SCANNER) libgnome-shell.la libbig-1.0.la Makefile
$(G_IR_SCANNER) \ $(G_IR_SCANNER) \
--namespace=Big \ --namespace=Big \
--nsversion=1.0 \ --nsversion=1.0 \
--include=Clutter-0.9 \ --include=Clutter-1.0 \
--include=GdkPixbuf-2.0 \ --include=GdkPixbuf-2.0 \
--program=mutter \ --program=mutter \
--program-arg=--mutter-plugins=$$(pwd)/libgnome-shell.la \ --program-arg=--mutter-plugins=$$(pwd)/libgnome-shell.la \