diff options
Diffstat (limited to 'audio/scrobbler/files')
-rw-r--r-- | audio/scrobbler/files/extra-encodings-patch | 245 | ||||
-rw-r--r-- | audio/scrobbler/files/patch-Makefile.in | 129 | ||||
-rw-r--r-- | audio/scrobbler/files/patch-config.h.in | 12 | ||||
-rw-r--r-- | audio/scrobbler/files/patch-configure | 173 | ||||
-rw-r--r-- | audio/scrobbler/files/patch-scrobbler.c | 15 | ||||
-rw-r--r-- | audio/scrobbler/files/patch-tags_include_tags.h | 26 | ||||
-rw-r--r-- | audio/scrobbler/files/patch-tags_tags.c | 58 |
7 files changed, 0 insertions, 658 deletions
diff --git a/audio/scrobbler/files/extra-encodings-patch b/audio/scrobbler/files/extra-encodings-patch deleted file mode 100644 index 6a88ab913194..000000000000 --- a/audio/scrobbler/files/extra-encodings-patch +++ /dev/null @@ -1,245 +0,0 @@ -diff -urp xmms-scrobbler-0.3.8.1/gtkstuff.c xmms-scrobbler-0.3.8.1-enc/gtkstuff.c ---- xmms-scrobbler-0.3.8.1/gtkstuff.c 2005-02-20 05:26:08.000000000 +0100 -+++ xmms-scrobbler-0.3.8.1-enc/gtkstuff.c 2005-12-13 22:02:56.000000000 +0100 -@@ -13,11 +13,14 @@ - #endif - #include <stdio.h> - #include <string.h> -+#include <wchar.h> - #include "config.h" - #include "md5.h" -+#include "tags/include/unicode.h" - - static GtkWidget *eduname, -- *edpwd; -+ *edpwd, -+ *edenc; - static int errorbox_done; - void about_show(void) - { -@@ -115,6 +118,10 @@ - - const char *pwd = gtk_entry_get_text(GTK_ENTRY(edpwd)); - const char *uid = gtk_entry_get_text(GTK_ENTRY(eduname)); -+ const char *enc = gtk_entry_get_text(GTK_ENTRY(edenc)); -+ -+ g_free(tags_encoding); -+ tags_encoding = g_strdup(enc); - - if ((cfgfile = xmms_cfg_open_default_file())) { - -@@ -130,6 +137,9 @@ - xmms_cfg_write_string(cfgfile, "audioscrobbler", "password", - (char *)hexify(md5pword, sizeof(md5pword))); - } -+ -+ xmms_cfg_write_string(cfgfile, "audioscrobbler", "encoding", (char *)enc); -+ - #ifdef MAKE_XMMS - xmms_cfg_write_default_file(cfgfile); - #endif -@@ -147,8 +157,10 @@ - *hbox, - *unhbox, - *pwhbox, -+ *enhbox, - *lblun, - *lblpw, -+ *lblen, - *frame; - - ConfigFile *cfgfile; -@@ -184,9 +196,16 @@ - gtk_entry_set_visibility(GTK_ENTRY(edpwd), FALSE); - gtk_box_pack_start(GTK_BOX(pwhbox), lblpw, FALSE, FALSE, 3); - gtk_box_pack_start(GTK_BOX(pwhbox), edpwd, FALSE, FALSE, 3); -+ -+ enhbox = gtk_hbox_new(FALSE, 0); -+ edenc = gtk_entry_new(); -+ lblen = gtk_label_new("Tags encoding"); -+ gtk_box_pack_start(GTK_BOX(enhbox), lblen, FALSE, FALSE, 3); -+ gtk_box_pack_start(GTK_BOX(enhbox), edenc, FALSE, FALSE, 3); - - gtk_box_pack_start(GTK_BOX(vbox), unhbox, FALSE, FALSE, 3); - gtk_box_pack_start(GTK_BOX(vbox), pwhbox, FALSE, FALSE, 3); -+ gtk_box_pack_start(GTK_BOX(vbox), enhbox, FALSE, FALSE, 3); - - hbox = gtk_hbox_new(FALSE, 0); - -@@ -202,17 +221,26 @@ - - gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 3); - -- frame = gtk_frame_new(" The plugin will have to be restarted for changes to take effect! "); -+ frame = gtk_frame_new(" The plugin will have to be restarted for username/password changes to take effect! "); - gtk_container_add(GTK_CONTAINER(frame), vbox); - gtk_container_add(GTK_CONTAINER(cnfdlg), frame); - if ((cfgfile = xmms_cfg_open_default_file())) { -- gchar *username = NULL; -- xmms_cfg_read_string(cfgfile, "audioscrobbler", "username", -- &username); -- if (username) { -- gtk_entry_set_text(GTK_ENTRY(eduname), username); -- g_free(username); -+ gchar *entry; -+ -+ entry = NULL; -+ xmms_cfg_read_string(cfgfile, "audioscrobbler", "username", &entry); -+ if (entry) { -+ gtk_entry_set_text(GTK_ENTRY(eduname), entry); -+ g_free(entry); -+ } -+ -+ entry = NULL; -+ xmms_cfg_read_string(cfgfile, "audioscrobbler", "encoding", &entry); -+ if (entry) { -+ gtk_entry_set_text(GTK_ENTRY(edenc), entry); -+ g_free(entry); - } -+ - xmms_cfg_free(cfgfile); - } - -diff -urp xmms-scrobbler-0.3.8.1/tags/include/unicode.h xmms-scrobbler-0.3.8.1-enc/tags/include/unicode.h ---- xmms-scrobbler-0.3.8.1/tags/include/unicode.h 2004-03-28 19:34:56.000000000 +0200 -+++ xmms-scrobbler-0.3.8.1-enc/tags/include/unicode.h 2005-12-13 22:00:35.000000000 +0100 -@@ -26,4 +26,6 @@ void iso88591_to_utf8(unsigned char *, s - void utf16bom_to_utf8(unsigned char *, size_t, unsigned char **); - void utf16be_to_utf8(unsigned char *, size_t, unsigned char **); - void utf16le_to_utf8(unsigned char *, size_t, unsigned char **); -+ -+extern char *tags_encoding; - #endif -diff -urp xmms-scrobbler-0.3.8.1/tags/unicode.c xmms-scrobbler-0.3.8.1-enc/tags/unicode.c ---- xmms-scrobbler-0.3.8.1/tags/unicode.c 2004-03-28 20:15:37.000000000 +0200 -+++ xmms-scrobbler-0.3.8.1-enc/tags/unicode.c 2005-12-13 22:31:34.000000000 +0100 -@@ -21,9 +21,84 @@ - #include <stdlib.h> - #include <wchar.h> - #include <string.h> -+#include <iconv.h> -+#include <glib.h> -+#include <errno.h> - #include "include/endian.h" - #include "include/unicode.h" - -+char *tags_encoding = NULL; -+ -+/* -+ * generic iconv function -+ * taken from gentoo libxmms - looks nice and works -+ * -+ * Tue Dec 13 22:15:06 CET 2005 - Kosma Moczek <kosmam@op.pl> -+ */ -+static char* generic_iconv(const unsigned char *string, size_t insize, char *from, char *to) -+{ -+ size_t outleft, outsize; -+ iconv_t cd; -+ char *out, *outptr; -+ char *input = (char *) string; -+ -+ if (!string) return NULL; -+ -+// g_message("converting %s from %s to %s (%u)", string, from, to, insize); -+ -+ /* check if the conversion is needed */ -+ if (!strcmp(from,to)) return g_strdup(string); -+ -+ if ((cd = iconv_open(to, from)) == (iconv_t)-1) -+ { -+ g_warning("convert_string(): Conversion not supported. " -+ "Charsets: %s -> %s", from, to); -+ return g_strdup(string); -+ } -+ -+ /* Due to a GLIBC bug, round outbuf_size up to a multiple of 4 */ -+ /* + 1 for nul in case len == 1 */ -+ outsize = ((insize + 3) & ~3) + 1; -+ out = g_malloc(outsize); -+ outleft = outsize - 1; -+ outptr = out; -+ -+ retry: -+ if (iconv(cd, &input, &insize, &outptr, &outleft) == -1) -+ { -+ int used; -+ switch (errno) -+ { -+ case E2BIG: -+ used = outptr - out; -+ outsize = (outsize - 1) * 2 + 1; -+ out = g_realloc(out, outsize); -+ outptr = out + used; -+ outleft = outsize - 1 - used; -+ goto retry; -+ case EINVAL: -+ /* incomplete multibyte sequence (at the end of string) -+ * - just quit, nothing to do here */ -+ break; -+ case EILSEQ: -+ /* Invalid sequence, try to get the -+ rest of the string */ -+ input++; -+ insize--; -+ goto retry; -+ default: -+ g_warning("convert_string(): Conversion failed. " -+ "Inputstring: %s; Error: %s", -+ string, strerror(errno)); -+ break; -+ } -+ } -+ *outptr = '\0'; -+ -+ iconv_close(cd); -+ return out; -+} -+ - wchar_t *utf8_to_wchar(unsigned char *utf, size_t memsize) - { - int i, j = 0; -@@ -141,6 +216,12 @@ unsigned char *wchar_to_utf8(wchar_t *wc - void iso88591_to_utf8(unsigned char *iso, size_t memsize, - unsigned char **utf) - { -+ /* don't run recoder of setting is incomplete */ -+ if (tags_encoding && *tags_encoding) { -+ *utf = generic_iconv(iso, memsize, tags_encoding, "UTF-8"); -+ return; -+ } -+ - int i; - wchar_t *wchar; - -diff -urp xmms-scrobbler-0.3.8.1/xmms_scrobbler.c xmms-scrobbler-0.3.8.1-enc/xmms_scrobbler.c ---- xmms-scrobbler-0.3.8.1/xmms_scrobbler.c 2005-02-21 02:25:47.000000000 +0100 -+++ xmms-scrobbler-0.3.8.1-enc/xmms_scrobbler.c 2005-12-13 22:53:29.000000000 +0100 -@@ -59,7 +59,7 @@ static GeneralPlugin xmms_scrobbler = - - static void init(void) - { -- char *username = NULL, *password = NULL; -+ char *username = NULL, *password = NULL, *encoding = NULL; - ConfigFile *cfgfile; - going = 1; - -@@ -68,6 +68,8 @@ static void init(void) - &username); - xmms_cfg_read_string(cfgfile, "audioscrobbler", "password", - &password); -+ xmms_cfg_read_string(cfgfile, "audioscrobbler", "encoding", -+ &encoding); - xmms_cfg_free(cfgfile); - } - if ((!username || !password) || (!*username || !*password)) { -@@ -76,6 +78,10 @@ static void init(void) - going = 0; - return; - } -+ if (encoding) { -+ tags_encoding = g_strdup(encoding); -+ g_free(encoding); -+ } - sc_init(username, password); - g_free(username); - g_free(password); diff --git a/audio/scrobbler/files/patch-Makefile.in b/audio/scrobbler/files/patch-Makefile.in deleted file mode 100644 index b79c6fd6f82a..000000000000 --- a/audio/scrobbler/files/patch-Makefile.in +++ /dev/null @@ -1,129 +0,0 @@ ---- Makefile.in.orig 2005-02-27 02:37:07 UTC -+++ Makefile.in -@@ -78,7 +78,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - LDFLAGS = @LDFLAGS@ - LIBOBJS = @LIBOBJS@ --LIBS = `curl-config --libs` -lmusicbrainz -lm -lstdc++ -+LIBS = `curl-config --libs` -lm - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -@@ -173,9 +173,9 @@ libxmms_scrobbler_la_SOURCES = xmms_scro - 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 @@ libbmp_scrobbler_la_SOURCES = xmms_scrob - 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 @@ am_libbmp_scrobbler_la_OBJECTS = libbmp_ - 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 @@ am_libxmms_scrobbler_la_OBJECTS = libxmm - 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 @@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I. - 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 @@ am__depfiles_maybe = depfiles - @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 @@ distclean-compile: - -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 @@ distclean-compile: - @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 @@ libbmp_scrobbler_la-itunes.lo: tags/itun - @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; \ diff --git a/audio/scrobbler/files/patch-config.h.in b/audio/scrobbler/files/patch-config.h.in deleted file mode 100644 index 85ef6e41c99c..000000000000 --- a/audio/scrobbler/files/patch-config.h.in +++ /dev/null @@ -1,12 +0,0 @@ ---- config.h.in.orig 2005-02-20 19:26:40 UTC -+++ config.h.in -@@ -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 - diff --git a/audio/scrobbler/files/patch-configure b/audio/scrobbler/files/patch-configure deleted file mode 100644 index 8e49da6c3cf3..000000000000 --- a/audio/scrobbler/files/patch-configure +++ /dev/null @@ -1,173 +0,0 @@ ---- configure.orig 2005-02-27 02:37:06 UTC -+++ configure -@@ -22548,145 +22548,6 @@ fi - - - -- --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 @@ fi - - 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 diff --git a/audio/scrobbler/files/patch-scrobbler.c b/audio/scrobbler/files/patch-scrobbler.c deleted file mode 100644 index 277913c39516..000000000000 --- a/audio/scrobbler/files/patch-scrobbler.c +++ /dev/null @@ -1,15 +0,0 @@ ---- scrobbler.c.orig 2005-02-21 00:45:05 UTC -+++ scrobbler.c -@@ -382,9 +382,9 @@ static int sc_parse_sb_res(void) - - static gchar *sc_itemtag(char c, int n, char *str) - { -- static char buf[256]; -- snprintf(buf, 256, "&%c[%d]=%s", c, n, str); -- return buf; -+ static char buf[1024]; -+ snprintf(buf, 1024, "&%c[%d]=%s", c, n, str); -+ return buf; - } - - #define cfa(f, l, n, v) \ diff --git a/audio/scrobbler/files/patch-tags_include_tags.h b/audio/scrobbler/files/patch-tags_include_tags.h deleted file mode 100644 index b6e8a6d9baa4..000000000000 --- a/audio/scrobbler/files/patch-tags_include_tags.h +++ /dev/null @@ -1,26 +0,0 @@ ---- tags/include/tags.h.orig 2004-09-24 01:23:17 UTC -+++ tags/include/tags.h -@@ -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 @@ typedef struct { - has_oggflac, - has_speex, - has_itunes, -- has_cdaudio, - prefer_ape; - wma_t *wma; - id3v1_t *id3v1; -@@ -70,7 +68,6 @@ typedef struct { - *oggflac, - *speex; - itunes_t *itunes; -- cdaudio_t *cdaudio; - } metatag_t; - - void get_tag_data(metatag_t *, char *, int); diff --git a/audio/scrobbler/files/patch-tags_tags.c b/audio/scrobbler/files/patch-tags_tags.c deleted file mode 100644 index 0f3e3013952d..000000000000 --- a/audio/scrobbler/files/patch-tags_tags.c +++ /dev/null @@ -1,58 +0,0 @@ ---- tags/tags.c.orig 2005-02-20 18:08:42 UTC -+++ tags/tags.c -@@ -141,37 +141,6 @@ void tag_exists(metatag_t *meta, char *f - 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 @@ void get_tag_data(metatag_t *meta, char - { - if(track > 0) - { -- metaCD(meta, filename, track); -- - return; - } - else -@@ -801,8 +768,6 @@ void metatag_delete(metatag_t *meta) - freeVorbis(meta->speex); - if(meta->itunes != NULL) - freeiTunes(meta->itunes); -- if(meta->cdaudio != NULL) -- freeCDAudio(meta->cdaudio); - free(meta); - } - |