SOURCES: audacious-general-audioscrobbler-scrobbler.patch (NEW) - ...

freetz freetz at pld-linux.org
Fri Dec 16 11:43:48 CET 2005 

Author: freetz                       Date: Fri Dec 16 10:43:48 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- bmp face lifting

---- Files affected:
SOURCES:
   audacious-general-audioscrobbler-scrobbler.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/audacious-general-audioscrobbler-scrobbler.patch
diff -u /dev/null SOURCES/audacious-general-audioscrobbler-scrobbler.patch:1.1
--- /dev/null	Fri Dec 16 11:43:48 2005
+++ SOURCES/audacious-general-audioscrobbler-scrobbler.patch	Fri Dec 16 11:43:43 2005
@@ -0,0 +1,227 @@
+diff -aurN xmms-scrobbler-0.3.6.orig/configure.in xmms-scrobbler-0.3.6/configure.in
+--- xmms-scrobbler-0.3.6.orig/configure.in	2004-12-10 20:05:40.000000000 +0100
++++ xmms-scrobbler-0.3.6/configure.in	2005-12-08 10:49:27.000000000 +0100
+@@ -17,7 +17,7 @@
+ AC_C_BIGENDIAN
+ AC_CHECK_SIZEOF(long)
+ 
+-dnl Checking for XMMS and/or BMP
++dnl Checking for XMMS and/or Audacious
+ 
+ AC_MSG_CHECKING([if XMMS plugin is to be built])
+ AC_ARG_ENABLE([xmms-plugin],
+@@ -54,50 +54,50 @@
+ ])
+ AM_CONDITIONAL(MAKE_XMMS, [ test $make_xmms = true ])
+ 
+-AC_MSG_CHECKING([if BMP plugin is to be built])
+-AC_ARG_ENABLE([bmp-plugin],
+-AC_HELP_STRING([--disable-bmp-plugin],
+-              [disable building the BMP plugin (default behavior is enabled)]),
++AC_MSG_CHECKING([if Audacious plugin is to be built])
++AC_ARG_ENABLE([audacious-plugin],
++AC_HELP_STRING([--disable-audacious-plugin],
++              [disable building the Audacious plugin (default behavior is enabled)]),
+ [ case "${enableval}" in
+  yes)
+   AC_MSG_RESULT(yes)
+-  make_bmp=true
++  make_audacious=true
+   PKG_CHECK_MODULES(GTK, [glib-2.0 >= 2.4.0 gtk+-2.0 >= 2.4.0],
+     [],
+     [ AC_MSG_WARN([*** GLIB >= 2.4.0 or GTK+ >= 2.4.0 not installed - please install first *** ])
+-      make_bmp=false
++      make_audacious=false
+     ]
+   )
+-  PKG_CHECK_MODULES(BMP, [bmp >= 0.9.7],
++  PKG_CHECK_MODULES(AUD, [audacious >= 0.1.0],
+     [],
+-    [AC_MSG_WARN([*** BMP >= 0.9.7rc2 not installed - please install first ***])
+-      make_bmp=false
++    [AC_MSG_WARN([*** Audacious >= 0.1.0 not installed - please install first ***])
++      make_audacious=false
+     ]
+   )
+   ;;
+  *)
+   AC_MSG_RESULT(no)
+-  make_bmp=false
++  make_audacious=false
+   ;;
+  esac ],
+ [ AC_MSG_RESULT(yes)
+-  make_bmp=true
++  make_audacious=true
+   PKG_CHECK_MODULES(GTK, [glib-2.0 >= 2.4.0 gtk+-2.0 >= 2.4.0],
+     [],
+     [ AC_MSG_WARN([*** GLIB >= 2.4.0 or GTK+ >= 2.4.0 not installed - please install first *** ])
+-      make_bmp=false
++      make_audacious=false
+     ]
+   )
+-  PKG_CHECK_MODULES(BMP, [bmp >= 0.9.7],
++  PKG_CHECK_MODULES(AUD, [audacious >= 0.1.0],
+     [],
+-    [AC_MSG_WARN([*** BMP >= 0.9.7rc2 not installed - please install first ***])
+-      make_bmp=false
++    [AC_MSG_WARN([*** Audacious >= 0.1.0 not installed - please install first ***])
++      make_audacious=false
+     ]
+   )
+ ])
+-AM_CONDITIONAL(MAKE_BMP, [ test $make_bmp = true ])
++AM_CONDITIONAL(MAKE_AUD, [ test $make_audacious = true ])
+ 
+-if test $make_xmms = false -a $make_bmp = false; then
++if test $make_xmms = false -a $make_audacious = false; then
+   AC_MSG_ERROR([No media player specified, or none found. Cannot build.])
+ fi
+ 
+diff -aurN xmms-scrobbler-0.3.6.orig/gtkstuff.c xmms-scrobbler-0.3.6/gtkstuff.c
+--- xmms-scrobbler-0.3.6.orig/gtkstuff.c	2004-09-26 03:27:21.000000000 +0200
++++ xmms-scrobbler-0.3.6/gtkstuff.c	2005-12-08 10:49:27.000000000 +0100
+@@ -2,9 +2,9 @@
+ #include <xmms/util.h>
+ #include <xmms/configfile.h>
+ #endif
+-#ifdef MAKE_BMP
+-#include <bmp/util.h>
+-#include <bmp/configdb.h>
++#ifdef MAKE_AUD
++#include <audacious/util.h>
++#include <audacious/configdb.h>
+ #define ConfigFile ConfigDb
+ #define xmms_cfg_open_default_file bmp_cfg_db_open
+ #define xmms_cfg_read_string bmp_cfg_db_get_string
+@@ -34,12 +34,12 @@
+ 			tmp,
+ 			"OK", FALSE, NULL, NULL);
+ #endif
+-#ifdef MAKE_BMP
+-	tmp = g_strdup_printf("BMP AudioScrobbler Plugin %s\n\n"
++#ifdef MAKE_AUD
++	tmp = g_strdup_printf("Audacious AudioScrobbler Plugin %s\n\n"
+ 				"Created by Audun Hove <audun at nlc.no> and Pipian <pipian at pipian.com>\n", 
+ 				VERSION);
+ 	aboutbox = xmms_show_message(
+-			"About BMP-Scrobbler",
++			"About Audacious-Scrobbler",
+ 			tmp,
+ 			"OK", FALSE, NULL, NULL);
+ #endif
+@@ -82,8 +82,8 @@
+ 			tmp,
+ 			"OK", FALSE, NULL, NULL);
+ #endif
+-#ifdef MAKE_BMP
+-	errorbox = xmms_show_message("BMP-Scrobbler Error",
++#ifdef MAKE_AUD
++	errorbox = xmms_show_message("Audacious-Scrobbler Error",
+ 			tmp,
+ 			"OK", FALSE, NULL, NULL);
+ #endif
+@@ -160,12 +160,12 @@
+ 	gtk_window_set_title(GTK_WINDOW(cnfdlg),
+ 			"XMMS-Scrobbler configuration");
+ #endif
+-#ifdef MAKE_BMP
++#ifdef MAKE_AUD
+ 	cnfdlg = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ 	gtk_window_set_type_hint(GTK_WINDOW(cnfdlg),
+ 			GDK_WINDOW_TYPE_HINT_DIALOG);
+ 	gtk_window_set_title(GTK_WINDOW(cnfdlg),
+-			"BMP-Scrobbler configuration");
++			"Audacious-Scrobbler configuration");
+ #endif
+ 	gtk_signal_connect(GTK_OBJECT(cnfdlg), "destroy",
+ 			GTK_SIGNAL_FUNC(gtk_widget_destroyed), &cnfdlg);
+diff -aurN xmms-scrobbler-0.3.6.orig/Makefile.am xmms-scrobbler-0.3.6/Makefile.am
+--- xmms-scrobbler-0.3.6.orig/Makefile.am	2004-09-26 03:47:29.000000000 +0200
++++ xmms-scrobbler-0.3.6/Makefile.am	2005-12-08 10:49:27.000000000 +0100
+@@ -2,9 +2,9 @@
+ xmmslibdir = @XMMS_GENERAL_PLUGIN_DIR@
+ xmmslib_LTLIBRARIES = libxmms_scrobbler.la
+ endif
+-if MAKE_BMP
+-bmplibdir = `pkg-config bmp --variable=general_plugin_dir`
+-bmplib_LTLIBRARIES = libbmp_scrobbler.la
++if MAKE_AUD
++audlibdir = `pkg-config audacious --variable=general_plugin_dir`
++audlib_LTLIBRARIES = libaud_scrobbler.la
+ endif
+ 
+ AM_CFLAGS = -Wall @CFLAGS@ -I$(top_builddir) -I$(top_srcdir) -DDEBUG=1 \
+@@ -26,12 +26,12 @@
+ 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
+ 
+-libbmp_scrobbler_la_CFLAGS = $(AM_CFLAGS) @BMP_CFLAGS@ -DMAKE_BMP=1 \
+-                             -DCLIENT="\"BMP-Scrobbler\"" \
+-                             -DUSER_AGENT="\"AudioScrobbler/1.1 BMP/`pkg-config bmp --modversion`/0.3.5 `uname -s`\""
+-libbmp_scrobbler_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version
+-libbmp_scrobbler_la_LIBS = $(LIBS) @BMP_LIBS@
+-libbmp_scrobbler_la_SOURCES = xmms_scrobbler.c scrobbler.c scrobbler.h \
++libaud_scrobbler_la_CFLAGS = $(AM_CFLAGS) @AUD_CFLAGS@ -DMAKE_AUD=1 \
++                             -DCLIENT="\"Audacious-Scrobbler\"" \
++                             -DUSER_AGENT="\"AudioScrobbler/1.1 AUD/`pkg-config audacious --modversion`/0.3.5 `uname -s`\""
++libaud_scrobbler_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version
++libaud_scrobbler_la_LIBS = $(LIBS) @AUD_LIBS@
++libaud_scrobbler_la_SOURCES = xmms_scrobbler.c scrobbler.c scrobbler.h \
+ 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 \
+diff -aurN xmms-scrobbler-0.3.6.orig/scrobbler.c xmms-scrobbler-0.3.6/scrobbler.c
+--- xmms-scrobbler-0.3.6.orig/scrobbler.c	2004-12-10 14:54:49.000000000 +0100
++++ xmms-scrobbler-0.3.6/scrobbler.c	2005-12-08 10:49:27.000000000 +0100
+@@ -474,8 +474,8 @@
+ #ifdef MAKE_XMMS
+ 	snprintf(buf, sizeof(buf), "%s/.xmms/scrobblerqueue.txt", home);
+ #endif
+-#ifdef MAKE_BMP
+-	snprintf(buf, sizeof(buf), "%s/.bmp/scrobblerqueue.txt", home);
++#ifdef MAKE_AUD
++	snprintf(buf, sizeof(buf), "%s/.audacious/scrobblerqueue.txt", home);
+ #endif
+ 	if (!(fd = fopen(buf, "r")))
+ 		return;
+@@ -555,8 +555,8 @@
+ #ifdef MAKE_XMMS
+ 	snprintf(buf, sizeof(buf), "%s/.xmms/scrobblerqueue.txt", home);
+ #endif
+-#ifdef MAKE_BMP
+-	snprintf(buf, sizeof(buf), "%s/.bmp/scrobblerqueue.txt", home);
++#ifdef MAKE_AUD
++	snprintf(buf, sizeof(buf), "%s/.audacious/scrobblerqueue.txt", home);
+ #endif
+ 	if (!(fd = fopen(buf, "w")))
+ 		return;
+diff -aurN xmms-scrobbler-0.3.6.orig/xmms_scrobbler.c xmms-scrobbler-0.3.6/xmms_scrobbler.c
+--- xmms-scrobbler-0.3.6.orig/xmms_scrobbler.c	2004-09-24 16:10:48.000000000 +0200
++++ xmms-scrobbler-0.3.6/xmms_scrobbler.c	2005-12-08 10:49:27.000000000 +0100
+@@ -3,10 +3,10 @@
+ #include <xmms/configfile.h>
+ #include <xmms/xmmsctrl.h>
+ #endif
+-#ifdef MAKE_BMP
+-#include <bmp/plugin.h>
+-#include <bmp/configdb.h>
+-#include <bmp/beepctrl.h>
++#ifdef MAKE_AUD
++#include <audacious/plugin.h>
++#include <audacious/configdb.h>
++#include <audacious/beepctrl.h>
+ #define ConfigFile ConfigDb
+ #define xmms_cfg_open_default_file bmp_cfg_db_open
+ #define xmms_cfg_read_string bmp_cfg_db_get_string
+@@ -277,8 +277,8 @@
+ 	xmms_scrobbler.description = g_strdup_printf("XMMS-Scrobbler %s",
+ 							VERSION);
+ #endif
+-#ifdef MAKE_BMP
+-	xmms_scrobbler.description = g_strdup_printf("BMP-Scrobbler %s",
++#ifdef MAKE_AUD
++	xmms_scrobbler.description = g_strdup_printf("Audacious-Scrobbler %s",
+ 							VERSION);
+ #endif
+ 	return &xmms_scrobbler;
================================================================

More information about the pld-cvs-commit mailing list