commit b4901eb809ecc458e77be4552ef20309801c2b83
Author: phantomjinx <p.g.richard...@phantomjinx.co.uk>
Date: Sat Feb 11 23:15:44 2012 +0000
Remove canberra dependency
* All use has been removed from sjcd plugin so no need to include the
actual dependency.
configure.ac | 3 +--
plugins/sjcd/Makefile.am | 2 --
plugins/sjcd/sj-extracting.c | 1 -
3 files changed, 1 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 5aeade4..77c8cda 100644
--- a/configure.ac
+++ b/configure.ac
@@ -98,7 +98,6 @@ PKG_CHECK_MODULES(GSTREAMER, gstreamer-0.10 >= 0.10.25
gstreamer-base-0.10 >= 0.
PKG_CHECK_MODULES(VORBISFILE, vorbisfile >= 1.3.1, [have_vorbis="yes"],
[have_vorbis="no"])
PKG_CHECK_MODULES(FLAC, flac >= 1.2.1, [have_flac="yes"], [have_flac="no"])
PKG_CHECK_MODULES(BRASERO, libbrasero-media3 >= 3.0, [have_brasero="yes"],
[have_brasero="no"])
-PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk3, [have_canberra="yes"],
[have_canberra="no"])
dnl musicbrainz 3 is deprecated so may not be included. However required by
sound juicer
dnl will probably need replacing faily soon
@@ -361,7 +360,7 @@ if test "$user_disabled_sjcd" = 1; then
else
AC_MSG_RESULT(no)
AC_MSG_CHECKING(sjcd plugin dependencies)
- if test "x$have_gstreamer" = "xyes" -a "x$have_brasero" = "xyes" -a
"x$have_canberra" = "xyes" -a "x$have_mb3" = "xyes"; then
+ if test "x$have_gstreamer" = "xyes" -a "x$have_brasero" = "xyes" -a
"x$have_mb3" = "xyes"; then
AC_MSG_RESULT(yes)
have_sjcd="yes"
diff --git a/plugins/sjcd/Makefile.am b/plugins/sjcd/Makefile.am
index 7e9eb10..9a25f33 100644
--- a/plugins/sjcd/Makefile.am
+++ b/plugins/sjcd/Makefile.am
@@ -40,7 +40,6 @@ libsjcd_la_SOURCES = plugin.c plugin.h \
libsjcd_la_CFLAGS = -I$(top_srcdir)/plugins/$(plugin_name)/libjuicer \
$(GSTREAMER_CFLAGS) \
$(BRASERO_CFLAGS) \
- $(CANBERRA_CFLAGS) \
$(MUSICBRAINZ3_CFLAGS)
libsjcd_la_LDFLAGS = $(GTKPOD_PLUGIN_LDFLAGS)
@@ -52,7 +51,6 @@ libsjcd_la_LIBADD = \
$(LIBANJUTA_LIBS) \
$(GSTREAMER_LIBS) \
$(BRASERO_LIBS) \
- $(CANBERRA_LIBS) \
$(MUSICBRAINZ3_LIBS)
endif
diff --git a/plugins/sjcd/sj-extracting.c b/plugins/sjcd/sj-extracting.c
index 5c89dfd..792c032 100644
--- a/plugins/sjcd/sj-extracting.c
+++ b/plugins/sjcd/sj-extracting.c
@@ -42,7 +42,6 @@
#include <gdk/gdkx.h>
#include <brasero-volume.h>
-#include <canberra-gtk.h>
#include "sj-error.h"
#include "sj-extracting.h"
------------------------------------------------------------------------------
For Developers, A Lot Can Happen In A Second.
Boundary is the first to Know...and Tell You.
Monitor Your Applications in Ultra-Fine Resolution. Try it FREE!
http://p.sf.net/sfu/Boundary-d2dvs2
_______________________________________________
gtkpod-cvs2 mailing list
gtkpod-cvs2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
