Attachment #124658 for bug #168154

Lines 6-12 Link Here

(-)scrobbler/Makefile (-3 / +2 lines)
6		6
7	PORTNAME?= scrobbler	7	PORTNAME?= scrobbler
8	PORTVERSION= 0.3.8.1	8	PORTVERSION= 0.3.8.1
9	PORTREVISION= 12	9	PORTREVISION= 13
10	CATEGORIES= audio	10	CATEGORIES= audio
11	MASTER_SITES= http://static.audioscrobbler.com/plugins/ \	11	MASTER_SITES= http://static.audioscrobbler.com/plugins/ \
12	http://www.pipian.com/stuffforchat/	12	http://www.pipian.com/stuffforchat/
Lines 15-22 Link Here
15	MAINTAINER?= novel@FreeBSD.org	15	MAINTAINER?= novel@FreeBSD.org
16	COMMENT?= XMMS/BMP plugin for Audioscrobbler.com	16	COMMENT?= XMMS/BMP plugin for Audioscrobbler.com
17		17
18	LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \	18	LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl
19	curl.6:${PORTSDIR}/ftp/curl
20		19
21	CONFLICTS= bmp-scrobbler-[0-9]* \	20	CONFLICTS= bmp-scrobbler-[0-9]* \
22	xmms-scrobbler-[0-9]*	21	xmms-scrobbler-[0-9]*




--- ./Makefile.in.orig	2005-02-26 21:37:07.000000000 -0500
+++ ./Makefile.in	2012-05-19 08:49:13.000000000 -0400
@@ -78,7 +78,7 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
-LIBS = `curl-config --libs` -lmusicbrainz -lm -lstdc++
+LIBS = `curl-config --libs` -lm -lstdc++
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
@@ -173,9 +173,9 @@
 queue.c queue.h tags/tags.c tags/include/tags.h tags/unicode.c \
 tags/include/unicode.h fmt.c fmt.h gtkstuff.c gtkstuff.h md5.c md5.h \
 tags/include/endian.h tags/id3v1.c tags/id3v2.c tags/vorbis.c tags/ape.c \
-tags/itunes.c tags/cdaudio.c tags/include/id3v1.h tags/include/id3v2.h \
+tags/itunes.c tags/include/id3v1.h tags/include/id3v2.h \
 tags/include/ape.h tags/include/vorbis.h tags/include/itunes.h \
-tags/include/cdaudio.h tags/id3genres.c tags/wma.c tags/include/wma.h
+tags/id3genres.c tags/wma.c tags/include/wma.h
 
 
 libbmp_scrobbler_la_CFLAGS = $(AM_CFLAGS) @BMP_CFLAGS@ -DMAKE_BMP=1 \
@@ -188,13 +188,13 @@
 queue.c queue.h tags/tags.c tags/include/tags.h tags/unicode.c \
 tags/include/unicode.h fmt.c fmt.h gtkstuff.c gtkstuff.h md5.c md5.h \
 tags/include/endian.h tags/id3v1.c tags/id3v2.c tags/vorbis.c tags/ape.c \
-tags/itunes.c tags/cdaudio.c tags/include/id3v1.h tags/include/id3v2.h \
+tags/itunes.c tags/include/id3v1.h tags/include/id3v2.h \
 tags/include/ape.h tags/include/vorbis.h tags/include/itunes.h \
-tags/include/cdaudio.h tags/id3genres.c tags/wma.c tags/include/wma.h \
+tags/id3genres.c tags/wma.c tags/include/wma.h \
 tags/include/bmp_vfs.h
 
 
-EXTRA_DIST = README.tags KnownIssues
+EXTRA_DIST = README.tags KnownIssues tags/cdaudio.c tags/include/cdaudio.h
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -210,7 +210,7 @@
 	libbmp_scrobbler_la-md5.lo libbmp_scrobbler_la-id3v1.lo \
 	libbmp_scrobbler_la-id3v2.lo libbmp_scrobbler_la-vorbis.lo \
 	libbmp_scrobbler_la-ape.lo libbmp_scrobbler_la-itunes.lo \
-	libbmp_scrobbler_la-cdaudio.lo libbmp_scrobbler_la-id3genres.lo \
+	libbmp_scrobbler_la-id3genres.lo \
 	libbmp_scrobbler_la-wma.lo
 libbmp_scrobbler_la_OBJECTS = $(am_libbmp_scrobbler_la_OBJECTS)
 libxmms_scrobbler_la_LIBADD =
@@ -221,7 +221,6 @@
 	libxmms_scrobbler_la-md5.lo libxmms_scrobbler_la-id3v1.lo \
 	libxmms_scrobbler_la-id3v2.lo libxmms_scrobbler_la-vorbis.lo \
 	libxmms_scrobbler_la-ape.lo libxmms_scrobbler_la-itunes.lo \
-	libxmms_scrobbler_la-cdaudio.lo \
 	libxmms_scrobbler_la-id3genres.lo libxmms_scrobbler_la-wma.lo
 libxmms_scrobbler_la_OBJECTS = $(am_libxmms_scrobbler_la_OBJECTS)
 
@@ -229,7 +228,6 @@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/libbmp_scrobbler_la-ape.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/libbmp_scrobbler_la-cdaudio.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/libbmp_scrobbler_la-fmt.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/libbmp_scrobbler_la-gtkstuff.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/libbmp_scrobbler_la-id3genres.Plo \
@@ -245,7 +243,6 @@
 @AMDEP_TRUE@	./$(DEPDIR)/libbmp_scrobbler_la-wma.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/libbmp_scrobbler_la-xmms_scrobbler.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/libxmms_scrobbler_la-ape.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/libxmms_scrobbler_la-cdaudio.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/libxmms_scrobbler_la-fmt.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/libxmms_scrobbler_la-gtkstuff.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/libxmms_scrobbler_la-id3genres.Plo \
@@ -381,7 +378,6 @@
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libbmp_scrobbler_la-ape.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libbmp_scrobbler_la-cdaudio.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libbmp_scrobbler_la-fmt.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libbmp_scrobbler_la-gtkstuff.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libbmp_scrobbler_la-id3genres.Plo@am__quote@
@@ -397,7 +393,6 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libbmp_scrobbler_la-wma.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libbmp_scrobbler_la-xmms_scrobbler.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmms_scrobbler_la-ape.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmms_scrobbler_la-cdaudio.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmms_scrobbler_la-fmt.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmms_scrobbler_la-gtkstuff.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmms_scrobbler_la-id3genres.Plo@am__quote@
@@ -875,39 +870,6 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbmp_scrobbler_la_CFLAGS) $(CFLAGS) -c -o libbmp_scrobbler_la-itunes.lo `test -f 'tags/itunes.c' || echo '$(srcdir)/'`tags/itunes.c
 
-libbmp_scrobbler_la-cdaudio.o: tags/cdaudio.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbmp_scrobbler_la_CFLAGS) $(CFLAGS) -MT libbmp_scrobbler_la-cdaudio.o -MD -MP -MF "$(DEPDIR)/libbmp_scrobbler_la-cdaudio.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libbmp_scrobbler_la-cdaudio.o `test -f 'tags/cdaudio.c' || echo '$(srcdir)/'`tags/cdaudio.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libbmp_scrobbler_la-cdaudio.Tpo" "$(DEPDIR)/libbmp_scrobbler_la-cdaudio.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libbmp_scrobbler_la-cdaudio.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tags/cdaudio.c' object='libbmp_scrobbler_la-cdaudio.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libbmp_scrobbler_la-cdaudio.Po' tmpdepfile='$(DEPDIR)/libbmp_scrobbler_la-cdaudio.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbmp_scrobbler_la_CFLAGS) $(CFLAGS) -c -o libbmp_scrobbler_la-cdaudio.o `test -f 'tags/cdaudio.c' || echo '$(srcdir)/'`tags/cdaudio.c
-
-libbmp_scrobbler_la-cdaudio.obj: tags/cdaudio.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbmp_scrobbler_la_CFLAGS) $(CFLAGS) -MT libbmp_scrobbler_la-cdaudio.obj -MD -MP -MF "$(DEPDIR)/libbmp_scrobbler_la-cdaudio.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libbmp_scrobbler_la-cdaudio.obj `if test -f 'tags/cdaudio.c'; then $(CYGPATH_W) 'tags/cdaudio.c'; else $(CYGPATH_W) '$(srcdir)/tags/cdaudio.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libbmp_scrobbler_la-cdaudio.Tpo" "$(DEPDIR)/libbmp_scrobbler_la-cdaudio.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libbmp_scrobbler_la-cdaudio.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tags/cdaudio.c' object='libbmp_scrobbler_la-cdaudio.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libbmp_scrobbler_la-cdaudio.Po' tmpdepfile='$(DEPDIR)/libbmp_scrobbler_la-cdaudio.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbmp_scrobbler_la_CFLAGS) $(CFLAGS) -c -o libbmp_scrobbler_la-cdaudio.obj `if test -f 'tags/cdaudio.c'; then $(CYGPATH_W) 'tags/cdaudio.c'; else $(CYGPATH_W) '$(srcdir)/tags/cdaudio.c'; fi`
-
-libbmp_scrobbler_la-cdaudio.lo: tags/cdaudio.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbmp_scrobbler_la_CFLAGS) $(CFLAGS) -MT libbmp_scrobbler_la-cdaudio.lo -MD -MP -MF "$(DEPDIR)/libbmp_scrobbler_la-cdaudio.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libbmp_scrobbler_la-cdaudio.lo `test -f 'tags/cdaudio.c' || echo '$(srcdir)/'`tags/cdaudio.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libbmp_scrobbler_la-cdaudio.Tpo" "$(DEPDIR)/libbmp_scrobbler_la-cdaudio.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libbmp_scrobbler_la-cdaudio.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tags/cdaudio.c' object='libbmp_scrobbler_la-cdaudio.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libbmp_scrobbler_la-cdaudio.Plo' tmpdepfile='$(DEPDIR)/libbmp_scrobbler_la-cdaudio.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbmp_scrobbler_la_CFLAGS) $(CFLAGS) -c -o libbmp_scrobbler_la-cdaudio.lo `test -f 'tags/cdaudio.c' || echo '$(srcdir)/'`tags/cdaudio.c
-
 libbmp_scrobbler_la-id3genres.o: tags/id3genres.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbmp_scrobbler_la_CFLAGS) $(CFLAGS) -MT libbmp_scrobbler_la-id3genres.o -MD -MP -MF "$(DEPDIR)/libbmp_scrobbler_la-id3genres.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o libbmp_scrobbler_la-id3genres.o `test -f 'tags/id3genres.c' || echo '$(srcdir)/'`tags/id3genres.c; \




--- ./config.h.in.orig	2005-02-20 14:26:40.000000000 -0500
+++ ./config.h.in	2012-05-19 08:49:13.000000000 -0400
@@ -12,9 +12,6 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
-/* Define to 1 if you have the `musicbrainz' library (-lmusicbrainz). */
-#undef HAVE_LIBMUSICBRAINZ
-
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 




--- ./configure.orig	2005-02-26 21:37:06.000000000 -0500
+++ ./configure	2012-05-19 08:49:13.000000000 -0400
@@ -22548,145 +22548,6 @@
 
 
 
-
-echo "$as_me:$LINENO: checking for mb_GetVersion in -lmusicbrainz" >&5
-echo $ECHO_N "checking for mb_GetVersion in -lmusicbrainz... $ECHO_C" >&6
-if test "${ac_cv_lib_musicbrainz_mb_GetVersion+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lmusicbrainz -lstdc++ $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char mb_GetVersion ();
-int
-main ()
-{
-mb_GetVersion ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_musicbrainz_mb_GetVersion=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_musicbrainz_mb_GetVersion=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_musicbrainz_mb_GetVersion" >&5
-echo "${ECHO_T}$ac_cv_lib_musicbrainz_mb_GetVersion" >&6
-if test $ac_cv_lib_musicbrainz_mb_GetVersion = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBMUSICBRAINZ 1
-_ACEOF
-
-  LIBS="-lmusicbrainz $LIBS"
-
-else
-  echo "*"
-             echo "*  The MusicBrainz client library needs to be installed "
-             echo "*  to build this plugin. Please download the library from "
-             echo "*  http://www.musicbrainz.org/download "
-             echo "*"
-             { { echo "$as_me:$LINENO: error: \"Cannot build. Stop.\"" >&5
-echo "$as_me: error: \"Cannot build. Stop.\"" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-
-
-LIBS="-lmusicbrainz -lstdc++"
-if test "$cross_compiling" = yes; then
-  have_mbver=false
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <musicbrainz/mb_c.h>
-
-int main ()
-{
-  int           major, minor, rev;
-  musicbrainz_t o;
-
-  o = mb_New();
-  mb_GetVersion(o, &major, &minor, &rev);
-  mb_Delete(o);
-  if (major >= 2)
-  {
-     return 0;
-  }
-
-  return -1;
-}
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  have_mbver=true
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-have_mbver=false
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
 if test "${my_cv_curl_vers+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -22727,24 +22588,6 @@
 
 LIBS="$LIBS $GTKLIBS"
 
-echo "$as_me:$LINENO: checking for version >= 2.0.0 in -lmusicbrainz" >&5
-echo $ECHO_N "checking for version >= 2.0.0 in -lmusicbrainz... $ECHO_C" >&6
-if test "$have_mbver" = "false"; then
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-    echo "*"
-    echo "*  Version 2.0.0 or higher of the MusicBrainz "
-    echo "*  client library needs to be installed to build this application. "
-    echo "*  Please download the library from: "
-    echo "*  http://musicbrainz.org/products/client/download.html "
-    echo "*"
-    { { echo "$as_me:$LINENO: error: Cannot build. Stop." >&5
-echo "$as_me: error: Cannot build. Stop." >&2;}
-   { (exit 1); exit 1; }; }
-else
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-fi
 
           ac_config_files="$ac_config_files Makefile"
 cat >confcache <<\_ACEOF




--- ./tags/include/tags.h.orig	2012-05-19 17:35:23.000000000 -0400
+++ ./tags/include/tags.h	2012-05-19 17:36:12.000000000 -0400
@@ -31,7 +31,6 @@
 #include "vorbis.h"
 #include "itunes.h"
 #include "ape.h"
-#include "cdaudio.h"
 
 extern const char *genre_list[148];
 
@@ -59,7 +58,6 @@
 			has_oggflac,
 			has_speex,
 			has_itunes,
-			has_cdaudio,
 			prefer_ape;
 	wma_t		*wma;
 	id3v1_t		*id3v1;
@@ -70,7 +68,6 @@
 			*oggflac,
 			*speex;
 	itunes_t	*itunes;
-	cdaudio_t	*cdaudio;
 } metatag_t;
 
 void get_tag_data(metatag_t *, char *, int);




--- ./tags/tags.c.orig	2005-02-20 13:08:42.000000000 -0500
+++ ./tags/tags.c	2012-05-19 08:49:13.000000000 -0400
@@ -141,37 +141,6 @@
 	return;
 }
 
-void metaCD(metatag_t *meta, char *filename, int track)
-{
-	int tmp;
-	
-	pdebug("Getting CD Audio metadata...", META_DEBUG);
-	meta->cdaudio = readCDAudio(filename, track);
-	if(meta->cdaudio == NULL)
-	{
-		pdebug("Error getting metadata", META_DEBUG);
-		
-		return;
-	}
-	
-	meta->has_cdaudio = 1;
-	
-	pdebug("Reading metadata into structs...", META_DEBUG);
-	meta->artist = meta->cdaudio->artist;
-	meta->title = meta->cdaudio->title;
-	meta->mb = realloc(meta->mb, strlen(meta->cdaudio->mbid) + 1);
-	strcpy(meta->mb, meta->cdaudio->mbid);
-	meta->album = meta->cdaudio->album;
-	meta->year = NULL;
-	meta->genre = NULL;
-	/* Special track handling... Yay! */
-	meta->track = realloc(meta->track, 4);
-	tmp = snprintf(meta->track, 3, "%d", track);
-	*(meta->track + tmp) = '\0';
-	
-	return;
-} /* End CD Audio support */
-
 static ape_t *fetchAPE(char *filename)
 {
 	ape_t *ape;
@@ -693,8 +662,6 @@
 {
 	if(track > 0)
 	{
-		metaCD(meta, filename, track);
-		
 		return;
 	}
 	else
@@ -801,8 +768,6 @@
 		freeVorbis(meta->speex);
 	if(meta->itunes != NULL)
 		freeiTunes(meta->itunes);
-	if(meta->cdaudio != NULL)
-		freeCDAudio(meta->cdaudio);
 	free(meta);
 }
 

Return to bug 168154

Line 0 Link Here

(-)scrobbler/files/patch-Makefile.in (+129 lines)
		1	--- ./Makefile.in.orig 2005-02-26 21:37:07.000000000 -0500
		2	+++ ./Makefile.in 2012-05-19 08:49:13.000000000 -0400
		3	@@ -78,7 +78,7 @@
		4	INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
		5	LDFLAGS = @LDFLAGS@
		6	LIBOBJS = @LIBOBJS@
		7	-LIBS = `curl-config --libs` -lmusicbrainz -lm -lstdc++
		8	+LIBS = `curl-config --libs` -lm -lstdc++
		9	LIBTOOL = @LIBTOOL@
		10	LN_S = @LN_S@
		11	LTLIBOBJS = @LTLIBOBJS@
		12	@@ -173,9 +173,9 @@
		13	queue.c queue.h tags/tags.c tags/include/tags.h tags/unicode.c \
		14	tags/include/unicode.h fmt.c fmt.h gtkstuff.c gtkstuff.h md5.c md5.h \
		15	tags/include/endian.h tags/id3v1.c tags/id3v2.c tags/vorbis.c tags/ape.c \
		16	-tags/itunes.c tags/cdaudio.c tags/include/id3v1.h tags/include/id3v2.h \
		17	+tags/itunes.c tags/include/id3v1.h tags/include/id3v2.h \
		18	tags/include/ape.h tags/include/vorbis.h tags/include/itunes.h \
		19	-tags/include/cdaudio.h tags/id3genres.c tags/wma.c tags/include/wma.h
		20	+tags/id3genres.c tags/wma.c tags/include/wma.h
		21
		22
		23	libbmp_scrobbler_la_CFLAGS = $(AM_CFLAGS) @BMP_CFLAGS@ -DMAKE_BMP=1 \
		24	@@ -188,13 +188,13 @@
		25	queue.c queue.h tags/tags.c tags/include/tags.h tags/unicode.c \
		26	tags/include/unicode.h fmt.c fmt.h gtkstuff.c gtkstuff.h md5.c md5.h \
		27	tags/include/endian.h tags/id3v1.c tags/id3v2.c tags/vorbis.c tags/ape.c \
		28	-tags/itunes.c tags/cdaudio.c tags/include/id3v1.h tags/include/id3v2.h \
		29	+tags/itunes.c tags/include/id3v1.h tags/include/id3v2.h \
		30	tags/include/ape.h tags/include/vorbis.h tags/include/itunes.h \
		31	-tags/include/cdaudio.h tags/id3genres.c tags/wma.c tags/include/wma.h \
		32	+tags/id3genres.c tags/wma.c tags/include/wma.h \
		33	tags/include/bmp_vfs.h
		34
		35
		36	-EXTRA_DIST = README.tags KnownIssues
		37	+EXTRA_DIST = README.tags KnownIssues tags/cdaudio.c tags/include/cdaudio.h
		38	subdir = .
		39	ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
		40	mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
		41	@@ -210,7 +210,7 @@
		42	libbmp_scrobbler_la-md5.lo libbmp_scrobbler_la-id3v1.lo \
		43	libbmp_scrobbler_la-id3v2.lo libbmp_scrobbler_la-vorbis.lo \
		44	libbmp_scrobbler_la-ape.lo libbmp_scrobbler_la-itunes.lo \
		45	- libbmp_scrobbler_la-cdaudio.lo libbmp_scrobbler_la-id3genres.lo \
		46	+ libbmp_scrobbler_la-id3genres.lo \
		47	libbmp_scrobbler_la-wma.lo
		48	libbmp_scrobbler_la_OBJECTS = $(am_libbmp_scrobbler_la_OBJECTS)
		49	libxmms_scrobbler_la_LIBADD =
		50	@@ -221,7 +221,6 @@
		51	libxmms_scrobbler_la-md5.lo libxmms_scrobbler_la-id3v1.lo \
		52	libxmms_scrobbler_la-id3v2.lo libxmms_scrobbler_la-vorbis.lo \
		53	libxmms_scrobbler_la-ape.lo libxmms_scrobbler_la-itunes.lo \
		54	- libxmms_scrobbler_la-cdaudio.lo \
		55	libxmms_scrobbler_la-id3genres.lo libxmms_scrobbler_la-wma.lo
		56	libxmms_scrobbler_la_OBJECTS = $(am_libxmms_scrobbler_la_OBJECTS)
		57
		58	@@ -229,7 +228,6 @@
		59	depcomp = $(SHELL) $(top_srcdir)/depcomp
		60	am__depfiles_maybe = depfiles
		61	@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/libbmp_scrobbler_la-ape.Plo \
		62	-@AMDEP_TRUE@ ./$(DEPDIR)/libbmp_scrobbler_la-cdaudio.Plo \
		63	@AMDEP_TRUE@ ./$(DEPDIR)/libbmp_scrobbler_la-fmt.Plo \
		64	@AMDEP_TRUE@ ./$(DEPDIR)/libbmp_scrobbler_la-gtkstuff.Plo \
65	@AMDEP_TRUE@ ./$(DEPDIR)/libbmp_scrobbler_la-id3genres.Plo \
66	@@ -245,7 +243,6 @@
67	@AMDEP_TRUE@ ./$(DEPDIR)/libbmp_scrobbler_la-wma.Plo \
68	@AMDEP_TRUE@ ./$(DEPDIR)/libbmp_scrobbler_la-xmms_scrobbler.Plo \
69	@AMDEP_TRUE@ ./$(DEPDIR)/libxmms_scrobbler_la-ape.Plo \
70	-@AMDEP_TRUE@ ./$(DEPDIR)/libxmms_scrobbler_la-cdaudio.Plo \
71	@AMDEP_TRUE@ ./$(DEPDIR)/libxmms_scrobbler_la-fmt.Plo \
72	@AMDEP_TRUE@ ./$(DEPDIR)/libxmms_scrobbler_la-gtkstuff.Plo \
73	@AMDEP_TRUE@ ./$(DEPDIR)/libxmms_scrobbler_la-id3genres.Plo \
74	@@ -381,7 +378,6 @@
75	-rm -f *.tab.c
76
77	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libbmp_scrobbler_la-ape.Plo@am__quote@
78	-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libbmp_scrobbler_la-cdaudio.Plo@am__quote@
79	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libbmp_scrobbler_la-fmt.Plo@am__quote@
80	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libbmp_scrobbler_la-gtkstuff.Plo@am__quote@
81	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libbmp_scrobbler_la-id3genres.Plo@am__quote@
82	@@ -397,7 +393,6 @@
83	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libbmp_scrobbler_la-wma.Plo@am__quote@
84	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libbmp_scrobbler_la-xmms_scrobbler.Plo@am__quote@
85	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmms_scrobbler_la-ape.Plo@am__quote@
86	-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmms_scrobbler_la-cdaudio.Plo@am__quote@
87	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmms_scrobbler_la-fmt.Plo@am__quote@
88	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmms_scrobbler_la-gtkstuff.Plo@am__quote@
89	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmms_scrobbler_la-id3genres.Plo@am__quote@
90	@@ -875,39 +870,6 @@
91	@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
92	@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbmp_scrobbler_la_CFLAGS) $(CFLAGS) -c -o libbmp_scrobbler_la-itunes.lo `test -f 'tags/itunes.c' \|\| echo '$(srcdir)/'`tags/itunes.c
93
94	-libbmp_scrobbler_la-cdaudio.o: tags/cdaudio.c
95	-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbmp_scrobbler_la_CFLAGS) $(CFLAGS) -MT libbmp_scrobbler_la-cdaudio.o -MD -MP -MF "$(DEPDIR)/libbmp_scrobbler_la-cdaudio.Tpo" \
96	-@am__fastdepCC_TRUE@ -c -o libbmp_scrobbler_la-cdaudio.o `test -f 'tags/cdaudio.c' \|\| echo '$(srcdir)/'`tags/cdaudio.c; \
97	-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libbmp_scrobbler_la-cdaudio.Tpo" "$(DEPDIR)/libbmp_scrobbler_la-cdaudio.Po"; \
98	-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libbmp_scrobbler_la-cdaudio.Tpo"; exit 1; \
99	-@am__fastdepCC_TRUE@ fi
100	-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tags/cdaudio.c' object='libbmp_scrobbler_la-cdaudio.o' libtool=no @AMDEPBACKSLASH@
101	-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libbmp_scrobbler_la-cdaudio.Po' tmpdepfile='$(DEPDIR)/libbmp_scrobbler_la-cdaudio.TPo' @AMDEPBACKSLASH@
102	-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
103	-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbmp_scrobbler_la_CFLAGS) $(CFLAGS) -c -o libbmp_scrobbler_la-cdaudio.o `test -f 'tags/cdaudio.c' \|\| echo '$(srcdir)/'`tags/cdaudio.c
104	-
105	-libbmp_scrobbler_la-cdaudio.obj: tags/cdaudio.c
106	-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbmp_scrobbler_la_CFLAGS) $(CFLAGS) -MT libbmp_scrobbler_la-cdaudio.obj -MD -MP -MF "$(DEPDIR)/libbmp_scrobbler_la-cdaudio.Tpo" \
107	-@am__fastdepCC_TRUE@ -c -o libbmp_scrobbler_la-cdaudio.obj `if test -f 'tags/cdaudio.c'; then $(CYGPATH_W) 'tags/cdaudio.c'; else $(CYGPATH_W) '$(srcdir)/tags/cdaudio.c'; fi`; \
108	-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libbmp_scrobbler_la-cdaudio.Tpo" "$(DEPDIR)/libbmp_scrobbler_la-cdaudio.Po"; \
109	-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libbmp_scrobbler_la-cdaudio.Tpo"; exit 1; \
110	-@am__fastdepCC_TRUE@ fi
111	-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tags/cdaudio.c' object='libbmp_scrobbler_la-cdaudio.obj' libtool=no @AMDEPBACKSLASH@
112	-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libbmp_scrobbler_la-cdaudio.Po' tmpdepfile='$(DEPDIR)/libbmp_scrobbler_la-cdaudio.TPo' @AMDEPBACKSLASH@
113	-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
114	-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbmp_scrobbler_la_CFLAGS) $(CFLAGS) -c -o libbmp_scrobbler_la-cdaudio.obj `if test -f 'tags/cdaudio.c'; then $(CYGPATH_W) 'tags/cdaudio.c'; else $(CYGPATH_W) '$(srcdir)/tags/cdaudio.c'; fi`
115	-
116	-libbmp_scrobbler_la-cdaudio.lo: tags/cdaudio.c
117	-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbmp_scrobbler_la_CFLAGS) $(CFLAGS) -MT libbmp_scrobbler_la-cdaudio.lo -MD -MP -MF "$(DEPDIR)/libbmp_scrobbler_la-cdaudio.Tpo" \
118	-@am__fastdepCC_TRUE@ -c -o libbmp_scrobbler_la-cdaudio.lo `test -f 'tags/cdaudio.c' \|\| echo '$(srcdir)/'`tags/cdaudio.c; \
119	-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libbmp_scrobbler_la-cdaudio.Tpo" "$(DEPDIR)/libbmp_scrobbler_la-cdaudio.Plo"; \
120	-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libbmp_scrobbler_la-cdaudio.Tpo"; exit 1; \
121	-@am__fastdepCC_TRUE@ fi
122	-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tags/cdaudio.c' object='libbmp_scrobbler_la-cdaudio.lo' libtool=yes @AMDEPBACKSLASH@
123	-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libbmp_scrobbler_la-cdaudio.Plo' tmpdepfile='$(DEPDIR)/libbmp_scrobbler_la-cdaudio.TPlo' @AMDEPBACKSLASH@
124	-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
125	-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbmp_scrobbler_la_CFLAGS) $(CFLAGS) -c -o libbmp_scrobbler_la-cdaudio.lo `test -f 'tags/cdaudio.c' \|\| echo '$(srcdir)/'`tags/cdaudio.c
126	-
127	libbmp_scrobbler_la-id3genres.o: tags/id3genres.c
128	@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbmp_scrobbler_la_CFLAGS) $(CFLAGS) -MT libbmp_scrobbler_la-id3genres.o -MD -MP -MF "$(DEPDIR)/libbmp_scrobbler_la-id3genres.Tpo" \
129	@am__fastdepCC_TRUE@ -c -o libbmp_scrobbler_la-id3genres.o `test -f 'tags/id3genres.c' \|\| echo '$(srcdir)/'`tags/id3genres.c; \

Line 0 Link Here

(-)scrobbler/files/patch-config.h.in (+12 lines)
	1	--- ./config.h.in.orig 2005-02-20 14:26:40.000000000 -0500
	2	+++ ./config.h.in 2012-05-19 08:49:13.000000000 -0400
	3	@@ -12,9 +12,6 @@
	4	/* Define to 1 if you have the <inttypes.h> header file. */
	5	#undef HAVE_INTTYPES_H
	6
	7	-/* Define to 1 if you have the `musicbrainz' library (-lmusicbrainz). */
	8	-#undef HAVE_LIBMUSICBRAINZ
	9	-
	10	/* Define to 1 if you have the <memory.h> header file. */
	11	#undef HAVE_MEMORY_H
	12

Line 0 Link Here

(-)scrobbler/files/patch-configure (+173 lines)
		1	--- ./configure.orig 2005-02-26 21:37:06.000000000 -0500
		2	+++ ./configure 2012-05-19 08:49:13.000000000 -0400
		3	@@ -22548,145 +22548,6 @@
		4
		5
		6
		7	-
		8	-echo "$as_me:$LINENO: checking for mb_GetVersion in -lmusicbrainz" >&5
		9	-echo $ECHO_N "checking for mb_GetVersion in -lmusicbrainz... $ECHO_C" >&6
		10	-if test "${ac_cv_lib_musicbrainz_mb_GetVersion+set}" = set; then
		11	- echo $ECHO_N "(cached) $ECHO_C" >&6
		12	-else
		13	- ac_check_lib_save_LIBS=$LIBS
		14	-LIBS="-lmusicbrainz -lstdc++ $LIBS"
		15	-cat >conftest.$ac_ext <<_ACEOF
		16	-/* confdefs.h. */
		17	-_ACEOF
		18	-cat confdefs.h >>conftest.$ac_ext
		19	-cat >>conftest.$ac_ext <<_ACEOF
		20	-/* end confdefs.h. */
		21	-
		22	-/* Override any gcc2 internal prototype to avoid an error. */
		23	-#ifdef __cplusplus
		24	-extern "C"
		25	-#endif
		26	-/* We use char because int might match the return type of a gcc2
		27	- builtin and then its argument prototype would still apply. */
		28	-char mb_GetVersion ();
		29	-int
		30	-main ()
		31	-{
		32	-mb_GetVersion ();
		33	- ;
		34	- return 0;
		35	-}
		36	-_ACEOF
		37	-rm -f conftest.$ac_objext conftest$ac_exeext
		38	-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
		39	- (eval $ac_link) 2>conftest.er1
		40	- ac_status=$?
		41	- grep -v '^ *+' conftest.er1 >conftest.err
		42	- rm -f conftest.er1
		43	- cat conftest.err >&5
		44	- echo "$as_me:$LINENO: \$? = $ac_status" >&5
		45	- (exit $ac_status); } &&
		46	- { ac_try='test -z "$ac_c_werror_flag"
		47	- \|\| test ! -s conftest.err'
		48	- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
		49	- (eval $ac_try) 2>&5
		50	- ac_status=$?
		51	- echo "$as_me:$LINENO: \$? = $ac_status" >&5
		52	- (exit $ac_status); }; } &&
		53	- { ac_try='test -s conftest$ac_exeext'
		54	- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
		55	- (eval $ac_try) 2>&5
		56	- ac_status=$?
		57	- echo "$as_me:$LINENO: \$? = $ac_status" >&5
		58	- (exit $ac_status); }; }; then
		59	- ac_cv_lib_musicbrainz_mb_GetVersion=yes
		60	-else
		61	- echo "$as_me: failed program was:" >&5
		62	-sed 's/^/\| /' conftest.$ac_ext >&5
		63	-
		64	-ac_cv_lib_musicbrainz_mb_GetVersion=no
65	-fi
66	-rm -f conftest.err conftest.$ac_objext \
67	- conftest$ac_exeext conftest.$ac_ext
68	-LIBS=$ac_check_lib_save_LIBS
69	-fi
70	-echo "$as_me:$LINENO: result: $ac_cv_lib_musicbrainz_mb_GetVersion" >&5
71	-echo "${ECHO_T}$ac_cv_lib_musicbrainz_mb_GetVersion" >&6
72	-if test $ac_cv_lib_musicbrainz_mb_GetVersion = yes; then
73	- cat >>confdefs.h <<_ACEOF
74	-#define HAVE_LIBMUSICBRAINZ 1
75	-_ACEOF
76	-
77	- LIBS="-lmusicbrainz $LIBS"
78	-
79	-else
80	- echo "*"
81	- echo "* The MusicBrainz client library needs to be installed "
82	- echo "* to build this plugin. Please download the library from "
83	- echo "* http://www.musicbrainz.org/download "
84	- echo "*"
85	- { { echo "$as_me:$LINENO: error: \"Cannot build. Stop.\"" >&5
86	-echo "$as_me: error: \"Cannot build. Stop.\"" >&2;}
87	- { (exit 1); exit 1; }; }
88	-
89	-fi
90	-
91	-
92	-LIBS="-lmusicbrainz -lstdc++"
93	-if test "$cross_compiling" = yes; then
94	- have_mbver=false
95	-else
96	- cat >conftest.$ac_ext <<_ACEOF
97	-/* confdefs.h. */
98	-_ACEOF
99	-cat confdefs.h >>conftest.$ac_ext
100	-cat >>conftest.$ac_ext <<_ACEOF
101	-/* end confdefs.h. */
102	-
103	-#include <musicbrainz/mb_c.h>
104	-
105	-int main ()
106	-{
107	- int major, minor, rev;
108	- musicbrainz_t o;
109	-
110	- o = mb_New();
111	- mb_GetVersion(o, &major, &minor, &rev);
112	- mb_Delete(o);
113	- if (major >= 2)
114	- {
115	- return 0;
116	- }
117	-
118	- return -1;
119	-}
120	-
121	-_ACEOF
122	-rm -f conftest$ac_exeext
123	-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
124	- (eval $ac_link) 2>&5
125	- ac_status=$?
126	- echo "$as_me:$LINENO: \$? = $ac_status" >&5
127	- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
128	- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
129	- (eval $ac_try) 2>&5
130	- ac_status=$?
131	- echo "$as_me:$LINENO: \$? = $ac_status" >&5
132	- (exit $ac_status); }; }; then
133	- have_mbver=true
134	-else
135	- echo "$as_me: program exited with status $ac_status" >&5
136	-echo "$as_me: failed program was:" >&5
137	-sed 's/^/\| /' conftest.$ac_ext >&5
138	-
139	-( exit $ac_status )
140	-have_mbver=false
141	-fi
142	-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
143	-fi
144	-
145	-
146	if test "${my_cv_curl_vers+set}" = set; then
147	echo $ECHO_N "(cached) $ECHO_C" >&6
148	else
149	@@ -22727,24 +22588,6 @@
150
151	LIBS="$LIBS $GTKLIBS"
152
153	-echo "$as_me:$LINENO: checking for version >= 2.0.0 in -lmusicbrainz" >&5
154	-echo $ECHO_N "checking for version >= 2.0.0 in -lmusicbrainz... $ECHO_C" >&6
155	-if test "$have_mbver" = "false"; then
156	- echo "$as_me:$LINENO: result: no" >&5
157	-echo "${ECHO_T}no" >&6
158	- echo "*"
159	- echo "* Version 2.0.0 or higher of the MusicBrainz "
160	- echo "* client library needs to be installed to build this application. "
161	- echo "* Please download the library from: "
162	- echo "* http://musicbrainz.org/products/client/download.html "
163	- echo "*"
164	- { { echo "$as_me:$LINENO: error: Cannot build. Stop." >&5
165	-echo "$as_me: error: Cannot build. Stop." >&2;}
166	- { (exit 1); exit 1; }; }
167	-else
168	- echo "$as_me:$LINENO: result: yes" >&5
169	-echo "${ECHO_T}yes" >&6
170	-fi
171
172	ac_config_files="$ac_config_files Makefile"
173	cat >confcache <<\_ACEOF

Line 0 Link Here

(-)scrobbler/files/patch-tags__include__tags.h (+26 lines)
	1	--- ./tags/include/tags.h.orig 2012-05-19 17:35:23.000000000 -0400
	2	+++ ./tags/include/tags.h 2012-05-19 17:36:12.000000000 -0400
	3	@@ -31,7 +31,6 @@
	4	#include "vorbis.h"
	5	#include "itunes.h"
	6	#include "ape.h"
	7	-#include "cdaudio.h"
	8
	9	extern const char *genre_list[148];
	10
	11	@@ -59,7 +58,6 @@
	12	has_oggflac,
	13	has_speex,
	14	has_itunes,
	15	- has_cdaudio,
	16	prefer_ape;
	17	wma_t *wma;
	18	id3v1_t *id3v1;
	19	@@ -70,7 +68,6 @@
	20	*oggflac,
	21	*speex;
	22	itunes_t *itunes;
	23	- cdaudio_t *cdaudio;
	24	} metatag_t;
	25
	26	void get_tag_data(metatag_t , char , int);

Line 0 Link Here

(-)scrobbler/files/patch-tags__tags.c (+58 lines)
	1	--- ./tags/tags.c.orig 2005-02-20 13:08:42.000000000 -0500
	2	+++ ./tags/tags.c 2012-05-19 08:49:13.000000000 -0400
	3	@@ -141,37 +141,6 @@
	4	return;
	5	}
	6
	7	-void metaCD(metatag_t meta, char filename, int track)
	8	-{
	9	- int tmp;
	10	-
	11	- pdebug("Getting CD Audio metadata...", META_DEBUG);
	12	- meta->cdaudio = readCDAudio(filename, track);
	13	- if(meta->cdaudio == NULL)
	14	- {
	15	- pdebug("Error getting metadata", META_DEBUG);
	16	-
	17	- return;
	18	- }
	19	-
	20	- meta->has_cdaudio = 1;
	21	-
	22	- pdebug("Reading metadata into structs...", META_DEBUG);
	23	- meta->artist = meta->cdaudio->artist;
	24	- meta->title = meta->cdaudio->title;
	25	- meta->mb = realloc(meta->mb, strlen(meta->cdaudio->mbid) + 1);
	26	- strcpy(meta->mb, meta->cdaudio->mbid);
	27	- meta->album = meta->cdaudio->album;
	28	- meta->year = NULL;
	29	- meta->genre = NULL;
	30	- /* Special track handling... Yay! */
	31	- meta->track = realloc(meta->track, 4);
	32	- tmp = snprintf(meta->track, 3, "%d", track);
	33	- *(meta->track + tmp) = '\0';
	34	-
	35	- return;
	36	-} /* End CD Audio support */
	37	-
	38	static ape_t fetchAPE(char filename)
	39	{
	40	ape_t *ape;
	41	@@ -693,8 +662,6 @@
	42	{
	43	if(track > 0)
	44	{
	45	- metaCD(meta, filename, track);
	46	-
	47	return;
	48	}
	49	else
	50	@@ -801,8 +768,6 @@
	51	freeVorbis(meta->speex);
	52	if(meta->itunes != NULL)
	53	freeiTunes(meta->itunes);
	54	- if(meta->cdaudio != NULL)
	55	- freeCDAudio(meta->cdaudio);
	56	free(meta);
	57	}
	58