? bindings
? compile
? plugins
? py-compile
? yp.xml
? metadata/rhythmbox-metadata
? metadata/test-metadata
? shell/rb-playlist-manager-glue.h
Index: configure.ac
===================================================================
RCS file: /cvs/gnome/rhythmbox/configure.ac,v
retrieving revision 1.211
diff -u -u -r1.211 configure.ac
--- configure.ac	19 Feb 2006 16:55:59 -0000	1.211
+++ configure.ac	21 Feb 2006 02:52:13 -0000
@@ -57,7 +57,8 @@
 PKG_CHECK_MODULES(TOTEM_PLPARSER, totem-plparser >= $TOTEM_PLPARSER_REQS, have_totem_plparser=yes, have_totem_plparser=no)
 if test x$have_totem_plparser != xyes; then
    AC_MSG_ERROR([totem playlist parsing library not found or too old])
-fi   
+fi
+
 
 AC_ARG_WITH(hal,
 	      AC_HELP_STRING([--without-hal],
@@ -423,19 +424,21 @@
 
 
 dnl check for MusicBrainz
-AC_ARG_ENABLE(musicbrainz, AC_HELP_STRING([--disable-musicbrainz],
-				[don't build with MusicBrainz support]))
-if test x"$enable_musicbrainz" != "xno"; then
-	PKG_CHECK_MODULES(MUSICBRAINZ, libmusicbrainz >= 2.1.0, enable_musicbrainz=yes,
-		          enable_musicbrainz=no)
-fi
-if test x"$enable_musicbrainz" = xyes; then
-	RHYTHMBOX_CFLAGS="$RHYTHMBOX_CFLAGS $MUSICBRAINZ_CFLAGS"
-	RHYTHMBOX_LIBS="$RHYTHMBOX_LIBS $MUSICBRAINZ_LIBS"
-	AC_DEFINE(HAVE_MUSICBRAINZ, 1, [define if you have Musicbrainz])
+AC_ARG_WITH(libjuicer,
+	      AC_HELP_STRING([--without-libjuicer],
+			     [Disable libjuicer support]))
+if test "x$with_libjuicer" != "xno"; then
+  PKG_CHECK_MODULES(LIBJUICER, libjuicer, enable_libjuicer=yes, enable_libjuicer=no)
+  if test x$enable_libjuicer == xyes; then
+    AC_DEFINE(HAVE_LIBJUICER, 1, [Define if you have libjuicer])
+    AC_SUBST(LIBJUICER_CFLAGS)
+    AC_SUBST(LIBJUICER_LIBS)
+  else
+    if test "x$with_libjuicer" = "xyes"; then
+	  AC_MSG_ERROR([libjuicer support explicitly requested but libjuicer couldn't be found])
+    fi
+  fi
 fi
-AM_CONDITIONAL(HAVE_MUSICBRAINZ, test "x$enable_musicbrainz" = "xyes")
-
 
 
 AC_PATH_X
@@ -738,10 +741,10 @@
 else
 	AC_MSG_NOTICE([** Multimedia keys support is enabled])
 fi
-if test x"$enable_musicbrainz" != "xyes"; then
-	AC_MSG_NOTICE([   MusicBrainz support is disabled])
+if test x"$enable_libjuicer" = xyes; then
+	AC_MSG_NOTICE([** libjuicer support enabled])
 else
-	AC_MSG_NOTICE([** MusicBrainz support is enabled])
+	AC_MSG_NOTICE([   libjuicer support disabled])
 fi
 
 if test x"$with_playback" = xgstreamer_0_8; then
Index: omf.make
===================================================================
RCS file: /cvs/gnome/rhythmbox/omf.make,v
retrieving revision 1.4
diff -u -u -r1.4 omf.make
--- omf.make	3 Sep 2004 03:13:06 -0000	1.4
+++ omf.make	21 Feb 2006 02:52:13 -0000
@@ -1,15 +1,14 @@
 # 
-# arch-tag: Makefile rules for using Scrollkeeper to install OMF files
 # No modifications of this Makefile should be necessary.
 #
 # This file contains the build instructions for installing OMF files.  It is
 # generally called from the makefiles for particular formats of documentation.
 #
-# Note that you must configure your package with --localstatedir=/var/lib
+# Note that you must configure your package with --localstatedir=/var
 # so that the scrollkeeper-update command below will update the database
 # in the standard scrollkeeper directory.
 #
-# If it is impossible to configure with --localstatedir=/var/lib, then
+# If it is impossible to configure with --localstatedir=/var, then
 # modify the definition of scrollkeeper_localstate_dir so that
 # it points to the correct location. Note that you must still use 
 # $(localstatedir) in this or when people build RPMs it will update
@@ -20,22 +19,25 @@
 #       and the makefiles for these formats should also include this file.
 #
 # About this file:
-#	This file was taken from scrollkeeper_example2, a package illustrating
-#	how to install documentation and OMF files for use with ScrollKeeper
-#	0.3.x and 0.4.x.  For more information, see:
+#	This file was derived from scrollkeeper_example2, a package
+#	illustrating how to install documentation and OMF files for use with
+#	ScrollKeeper 0.3.x and 0.4.x.  For more information, see:
 #		http://scrollkeeper.sourceforge.net/	
-# 	Version: 0.1.2 (last updated: March 20, 2002)
+# 	Version: 0.1.3 (last updated: March 20, 2002)
 #
 
 omf_dest_dir=$(datadir)/omf/@PACKAGE@
 scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
 
+# At some point, it may be wise to change to something like this:
+# scrollkeeper_localstate_dir = @SCROLLKEEPER_STATEDIR@
+
 omf: omf_timestamp
 
 omf_timestamp: $(omffile)
 	-for file in $(omffile); do \
 	  scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $$file.out; \
-	done
+	done; \
 	touch omf_timestamp
 
 install-data-hook-omf:
@@ -43,12 +45,17 @@
 	for file in $(omffile); do \
 		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
 	done
-	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
+	-scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
 
 uninstall-local-omf:
 	-for file in $(srcdir)/*.omf; do \
 		basefile=`basename $$file`; \
 		rm -f $(DESTDIR)$(omf_dest_dir)/$$basefile; \
 	done
-	-rmdir $(omf_dest_dir)
-	-scrollkeeper-update -p $(scrollkeeper_localstate_dir)
+	-rmdir $(DESTDIR)$(omf_dest_dir)
+	-scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir)
+
+clean-local-omf:
+	-for file in $(omffile); do \
+		rm -f $$file.out; \
+	done
Index: xmldocs.make
===================================================================
RCS file: /cvs/gnome/rhythmbox/xmldocs.make,v
retrieving revision 1.3
diff -u -u -r1.3 xmldocs.make
--- xmldocs.make	23 Oct 2003 02:49:38 -0000	1.3
+++ xmldocs.make	21 Feb 2006 02:52:14 -0000
@@ -1,5 +1,4 @@
 #
-# arch-tag: Makefile rules for building GNOMEish Docbook documentation
 # No modifications of this Makefile should be necessary.
 #
 # To use this template:
@@ -34,23 +33,26 @@
 #
 
 
-# ************* Begin of section some packagers may need to modify  **************
+# **********  Begin of section some packagers may need to modify  **********
 # This variable (docdir) specifies where the documents should be installed.
 # This default value should work for most packages.
-# docdir = $(datadir)/@PACKAGE@/doc/$(docname)/$(lang)
 docdir = $(datadir)/gnome/help/$(docname)/$(lang)
 
-# **************  You should not have to edit below this line  *******************
+# **********  You should not have to edit below this line  **********
 xml_files = $(entities) $(docname).xml
 
 EXTRA_DIST = $(xml_files) $(omffile)
 CLEANFILES = omf_timestamp
 
-# If the following file is in a subdir (like help/) you need to add that to the path
 include $(top_srcdir)/omf.make
 
 all: omf
 
+$(docname).xml: $(entities)
+	-ourdir=`pwd`;  \
+	cd $(srcdir);   \
+	cp $(entities) $$ourdir
+
 app-dist-hook:
 	if test "$(figdir)"; then \
 	  $(mkinstalldirs) $(distdir)/$(figdir); \
@@ -90,3 +92,10 @@
 	done
 	-rmdir $(DESTDIR)$(docdir)
 
+clean-local: clean-local-doc clean-local-omf
+
+# for non-srcdir builds, remove the copied entities.
+clean-local-doc:
+	if test $(srcdir) != .; then \
+	  rm -f $(entities); \
+	fi
Index: metadata/Makefile.am
===================================================================
RCS file: /cvs/gnome/rhythmbox/metadata/Makefile.am,v
retrieving revision 1.9
diff -u -u -r1.9 Makefile.am
--- metadata/Makefile.am	19 Feb 2006 11:30:08 -0000	1.9
+++ metadata/Makefile.am	21 Feb 2006 02:52:14 -0000
@@ -78,37 +78,3 @@
 
 endif
 
-MARSHALFILES = 
-
-if HAVE_MUSICBRAINZ
-librbmetadata_la_SOURCES += \
-	sj-metadata.h sj-metadata.c \
-	sj-metadata-musicbrainz.h sj-metadata-musicbrainz.c \
-	sj-structures.h sj-structures.c \
-	sj-error.h sj-error.c \
-	$(MARSHALFILES)
-
-INCLUDES += $(LIBNAUTILUS_BURN_CFLAGS)
-
-MARSHALFILES += sj-metadata-marshal.h sj-metadata-marshal.c
-
-sj-metadata-marshal.h: sj-metadata-marshal.list
-	( $(GLIB_GENMARSHAL) --prefix=metadata_marshal $< \
-	--header > marshal-header.tmp \
-	&& mv marshal-header.tmp $@ ) \
-	|| ( rm -f marshal-header.tmp && exit 1 )
-
-sj-metadata-marshal.c: sj-metadata-marshal.list
-	( $(GLIB_GENMARSHAL) --prefix=metadata_marshal $< \
-	--body > marshal-source.tmp \
-	&& echo "#include \"sj-metadata-marshal.h\"" > $@ \
-	&& cat marshal-source.tmp >> $@ \
-	&& rm -f marshal-source.tmp ) \
-	|| ( rm -f marshal-source.tmp && exit 1 )
-
-endif
-
-BUILT_SOURCES = $(MARSHALFILES)
-CLEANFILES = $(BUILT_SOURCES)
-EXTRA_DIST = sj-metadata-marshal.list
-
Index: sources/Makefile.am
===================================================================
RCS file: /cvs/gnome/rhythmbox/sources/Makefile.am,v
retrieving revision 1.32
diff -u -u -r1.32 Makefile.am
--- sources/Makefile.am	21 Jan 2006 23:06:10 -0000	1.32
+++ sources/Makefile.am	21 Feb 2006 02:52:15 -0000
@@ -57,10 +57,13 @@
 	$(TOTEM_PLPARSER_CFLAGS)			\
 	$(HAL_CFLAGS)					\
 	$(LIBNAUTILUS_BURN_CFLAGS)			\
+	$(LIBJUICER_CFLAGS)					\
 	$(RHYTHMBOX_CFLAGS)
 
 libsources_la_LDFLAGS = -export-dynamic
 libsourcesimpl_la_LDFLAGS = -export-dynamic
+
+libsourcesimpl_la_LIBADD = $(LIBJUICER_LIBS)
 
 if USE_IPOD
 libsourcesimpl_la_SOURCES +=         \
Index: sources/rb-audiocd-source.c
===================================================================
RCS file: /cvs/gnome/rhythmbox/sources/rb-audiocd-source.c,v
retrieving revision 1.22
diff -u -u -r1.22 rb-audiocd-source.c
--- sources/rb-audiocd-source.c	16 Feb 2006 13:04:00 -0000	1.22
+++ sources/rb-audiocd-source.c	21 Feb 2006 02:52:15 -0000
@@ -45,7 +45,7 @@
 #include "rb-dialog.h"
 #include "rb-player.h"
 #include "rhythmdb.h"
-#ifdef HAVE_MUSICBRAINZ
+#ifdef HAVE_LIBJUICER
 #include "sj-metadata-musicbrainz.h"
 #include "sj-structures.h"
 #endif
@@ -70,7 +70,7 @@
 
 	GstElement *pipeline, *cdda, *fakesink;
 	
-#ifdef HAVE_MUSICBRAINZ
+#ifdef HAVE_LIBJUICER
 	SjMetadata *metadata;
 #endif
 } RBAudioCdSourcePrivate;
@@ -355,7 +355,7 @@
 	return ok;
 }
 
-#ifdef HAVE_MUSICBRAINZ
+#ifdef HAVE_LIBJUICER
 static void
 metadata_cb (SjMetadata *metadata, GList *albums, GError *error, RBAudioCdSource *source)
 {
@@ -445,7 +445,7 @@
 static void
 rb_audiocd_load_metadata (RBAudioCdSource *source, RhythmDB *db)
 {
-#ifdef HAVE_MUSICBRAINZ
+#ifdef HAVE_LIBJUICER
 	RBAudioCdSourcePrivate *priv = AUDIOCD_SOURCE_GET_PRIVATE (source);
 
 	priv->metadata = (SjMetadata*)sj_metadata_musicbrainz_new();
@@ -460,7 +460,7 @@
 static void
 rb_audiocd_load_metadata_cancel (RBAudioCdSource *source)
 {
-#ifdef HAVE_MUSICBRAINZ
+#ifdef HAVE_LIBJUICER
 	RBAudioCdSourcePrivate *priv = AUDIOCD_SOURCE_GET_PRIVATE (source);
 
 	if (priv->metadata) {
