# HG changeset patch
# User William Pitcock <nenolod@atheme.org>
# Date 1191115831 18000
# Node ID c9264d1e398285d978fa864ab230f6b55abed78a
# Parent  f600566f92e59b25241485ece639006cfa1af5fb# Parent  ae980534f08c8ae58fcc5b2208d293534a7e146b
Automated merge with ssh://hg.atheme.org//hg/audacious

diff -r f600566f92e5 -r c9264d1e3982 Skins/Refugee/eqmain.png
Binary file Skins/Refugee/eqmain.png has changed
diff -r f600566f92e5 -r c9264d1e3982 applications/audacious.desktop
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/applications/audacious.desktop	Sat Sep 29 20:30:31 2007 -0500
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=Audacious
+GenericName=Audio Player
+Comment=Play music
+Comment[hu]=Zene lejátszása
+Exec=audacious %U
+Icon=audacious
+MimeType=application/x-ogg;audio/mp3;audio/mpeg;audio/mpegurl;audio/prs.sid;audio/x-flac;audio/x-it;audio/x-mod;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-s3m;audio/x-scpls;audio/x-stm;audio/x-wav;audio/x-xm;application/ogg;audio/x-vorbis+ogg
+Categories=Application;GTK;AudioVideo;Player;
+Terminal=false
+Type=Application
+Encoding=UTF-8
diff -r f600566f92e5 -r c9264d1e3982 buildsys.mk.in
--- a/buildsys.mk.in	Sat Sep 29 20:30:23 2007 -0500
+++ b/buildsys.mk.in	Sat Sep 29 20:30:31 2007 -0500
@@ -35,6 +35,8 @@
 OBJCFLAGS = @OBJCFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
+PROG_IMPLIB_NEEDED = @PROG_IMPLIB_NEEDED@
+PROG_IMPLIB_LDFLAGS = @PROG_IMPLIB_LDFLAGS@
 PROG_SUFFIX = @EXEEXT@
 LIB_CPPFLAGS = @LIB_CPPFLAGS@
 LIB_CFLAGS = @LIB_CFLAGS@
@@ -73,7 +75,7 @@
 
 .SILENT:
 .SUFFIXES: .beam .c .cc .cxx .d .erl .m
-.PHONY: all subdirs depend install uninstall clean distclean
+.PHONY: all subdirs pre-depend depend install install-extra uninstall uninstall-extra clean distclean
 
 all:
 	for i in subdirs depend ${STATIC_LIB} ${STATIC_LIB_NOINST} ${LIB} ${LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${PROG} ${PROG_NOINST}; do \
@@ -93,7 +95,6 @@
 	if test x"$$regen" = x"1"; then \
 		list=""; \
 		${DEPEND_STATUS}; \
-		rm -f .deps; \
 		for i in ${SRCS}; do \
 			case $${i##*.} in \
 			c|cc|cxx|m) \
@@ -101,10 +102,12 @@
 				;; \
 			esac; \
 		done; \
-		if ${CPP} ${CPPFLAGS} -M $$list >.deps; then \
-			${DEPEND_OK}; \
-		else \
-			${DEPEND_FAILED}; \
+		if test x"$$list" != "x"; then \
+			if ${CPP} ${CPPFLAGS} -M $$list >.deps; then \
+				${DEPEND_OK}; \
+			else \
+				${DEPEND_FAILED}; \
+			fi; \
 		fi; \
 	fi
 
@@ -208,7 +211,7 @@
 
 	for i in ${STATIC_LIB}; do \
 		${INSTALL_STATUS}; \
-		if ${MKDIR_P} ${DESTDIR}${libdir} && ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i; then \
+		if ${MKDIR_P} ${DESTDIR}${libdir} && ${INSTALL} -m 644 $$i ${DESTDIR}${libdir}/$$i; then \
 			${INSTALL_OK}; \
 		else \
 			${INSTALL_FAILED}; \
diff -r f600566f92e5 -r c9264d1e3982 configure.ac
--- a/configure.ac	Sat Sep 29 20:30:23 2007 -0500
+++ b/configure.ac	Sat Sep 29 20:30:31 2007 -0500
@@ -155,7 +155,14 @@
 dnl ========================
 
 dnl Ok, first we find out what flags we need to use.
+BUILDSYS_PROG_IMPLIB
 BUILDSYS_SHARED_LIB
+if test x"$PROG_IMPLIB_NEEDED" = x"yes"; then
+	IMPLIB_LIBS='-L../audacious -laudacious.exe'
+else
+	IMPLIB_LIBS=''
+fi
+AC_SUBST(IMPLIB_LIBS)
 
 dnl XXX
 SHARED_SUFFIX=$PLUGIN_SUFFIX
@@ -391,6 +398,11 @@
 AC_SUBST(TRANSPORT_PLUGIN_DIR)
 AC_SUBST(pluginsubs)
 
+dnl setup rpath if prefix or exec-prefix is specified
+if test "$prefix" != "NONE" || test "$exec_prefix" != "NONE" ; then
+	test x"`$CC -dM -E - </dev/null | grep __ELF__`" != x"" && RPATH="-Wl,-rpath $libdir"
+fi
+
 dnl XXX Work around some autoconf bugs.
 if test "$prefix" = "NONE"; then
         prefix="${ac_default_prefix}"
@@ -425,11 +437,11 @@
        AC_DEFINE(HAVE_XSPF_PLAYLIST, 1, [Define if XSPF playlists are available.])
 fi
 
-# Use -rpath?
+dnl disable rpath
 AC_ARG_ENABLE(rpath,
-	      [  --enable-rpath	   enable use of -rpath on ELF systems (default=yes)], [enable_rpath=$enableval], [enable_rpath=no])
+	      [  --disable-rpath	  force to disable -rpath. (-rpath is required and automatically appended when --prefix or --exec-prefix is specified on ELF systems.)], [enable_rpath=$enableval], [enable_rpath=yes])
 if test "x$enable_rpath" = "xyes"; then
-	test x"`$CC -dM -E - </dev/null | grep __ELF__`" != x"" && LDFLAGS="$LDFLAGS -Wl,-rpath $libdir"
+	LDFLAGS="$LDFLAGS $RPATH"
 fi
 
 AC_SUBST(beepdir)
diff -r f600566f92e5 -r c9264d1e3982 extra.mk.in
--- a/extra.mk.in	Sat Sep 29 20:30:23 2007 -0500
+++ b/extra.mk.in	Sat Sep 29 20:30:31 2007 -0500
@@ -340,3 +340,4 @@
 TRANSPORT_PLUGINS ?= @TRANSPORT_PLUGINS@
 PCH ?= @PCH@
 EXPORTDYN ?= @EXPORTDYN@
+IMPLIB_LIBS = @IMPLIB_LIBS@
diff -r f600566f92e5 -r c9264d1e3982 m4/buildsys.m4
--- a/m4/buildsys.m4	Sat Sep 29 20:30:23 2007 -0500
+++ b/m4/buildsys.m4	Sat Sep 29 20:30:31 2007 -0500
@@ -18,6 +18,25 @@
 dnl POSSIBILITY OF SUCH DAMAGE.
 dnl
 
+AC_DEFUN([BUILDSYS_PROG_IMPLIB], [
+	AC_MSG_CHECKING(wether we need an implib)
+	case "$target" in
+		*-*-cygwin | *-*-mingw32)
+			AC_MSG_RESULT(yes)
+			PROG_IMPLIB_NEEDED='yes'
+			PROG_IMPLIB_LDFLAGS='-Wl,-export-all-symbols,--out-implib,lib${PROG}.a'
+			;;
+		*)
+			AC_MSG_RESULT(no)
+			PROG_IMPLIB_NEEDED='no'
+			PROG_IMPLIB_LDFLAGS=''
+			;;
+	esac
+	
+	AC_SUBST(PROG_IMPLIB_NEEDED)
+	AC_SUBST(PROG_IMPLIB_LDFLAGS)
+])
+
 AC_DEFUN([BUILDSYS_SHARED_LIB], [
 	AC_MSG_CHECKING(for shared library system)
 	case "$target" in
diff -r f600566f92e5 -r c9264d1e3982 src/audacious/Makefile
--- a/src/audacious/Makefile	Sat Sep 29 20:30:23 2007 -0500
+++ b/src/audacious/Makefile	Sat Sep 29 20:30:31 2007 -0500
@@ -153,13 +153,11 @@
        ui/playlist.ui				\
        ui/carbon-menubar.ui
 
-CLEAN = build_stamp.c
+CLEAN = build_stamp.c libaudacious.exe.a
+EXT_DEPS = ../libguess/libguess.a
 
 include ../../buildsys.mk
 
-LDFLAGS += ${EXPORTDYN}
-LIBS += ${LDADD}
-
 ifdef USE_DBUS
 CPPFLAGS += -I../libaudclient
 DBUS_BINDINGS = dbus-server-bindings.h dbus-client-bindings.h
@@ -182,7 +180,8 @@
 	    -I.. -I../..		\
 	    -I./intl
 
-LIBS += ${LIBINTL}		\
+LIBS += ${LDADD}		\
+	${LIBINTL}		\
 	${samplerate_LIBS}	\
 	../libguess/libguess.a	\
 	${GTK_LIBS}		\
@@ -192,6 +191,8 @@
 	${LIBGLADE_LIBS}	\
 	${REGEX_LIBS}
 
+LDFLAGS += ${EXPORTDYN} ${PROG_IMPLIB_LDFLAGS}
+
 build_stamp.c: 
 	if [ -d ../../.hg ]; then \
 		revh=`hg tip --template 'const char *svn_stamp = "#rev#:#node|short#";\n' 2>/dev/null`; \
@@ -215,4 +216,29 @@
 dbus-client-bindings.h: ${DBUS_BINDINGS_SOURCES}
 	${DBUS_BINDING_TOOL} --mode=glib-client --prefix=audacious_rc objects.xml > $@
 
-OBJECTIVE_DATA = audacious.desktop:${datadir}/applications
+install-extra:
+	if test x"${PROG_IMPLIB_NEEDED}" = x"yes"; then \
+		for i in ${PROG}; do \
+			i="lib$$i.a"; \
+			${INSTALL_STATUS}; \
+			if ${MKDIR_P} ${DESTDIR}${libdir} && install -m 644 $$i ${DESTDIR}${libdir}/$$i; then \
+				${INSTALL_OK}; \
+			else \
+				${INSTALL_FAILED}; \
+			fi \
+		done \
+	fi
+
+uninstall-extra:
+	if test x"${PROG_IMPLIB_NEEDED}" = x"yes"; then \
+		for i in ${PROG}; do \
+			i="lib$$i.a"; \
+			if test -f ${DESTDIR}${libdir}/$$i; then \
+				if rm -f ${DESTDIR}${libdir}/$$i; then \
+					${DELETE_OK}; \
+				else \
+					${DELETE_FAILED}; \
+				fi \
+			fi \
+		done \
+	fi
diff -r f600566f92e5 -r c9264d1e3982 src/audacious/ui_main.c
--- a/src/audacious/ui_main.c	Sat Sep 29 20:30:23 2007 -0500
+++ b/src/audacious/ui_main.c	Sat Sep 29 20:30:31 2007 -0500
@@ -134,10 +134,11 @@
 static GtkWidget *mainwin_shuffle, *mainwin_repeat;
 GtkWidget *mainwin_eq, *mainwin_pl;
 
-GtkWidget *mainwin_info, *mainwin_othertext;
+GtkWidget *mainwin_info;
 GtkWidget *mainwin_stime_min, *mainwin_stime_sec;
 
-static GtkWidget *mainwin_rate_text, *mainwin_freq_text;
+static GtkWidget *mainwin_rate_text, *mainwin_freq_text,
+    *mainwin_othertext;
 
 GtkWidget *mainwin_playstatus;
 
@@ -2446,7 +2447,6 @@
     g_signal_connect(mainwin_info, "right-clicked", mainwin_info_right_clicked_cb, NULL);
 
     mainwin_othertext = ui_skinned_textbox_new(SKINNED_WINDOW(mainwin)->fixed, 112, 43, 153, 1, SKIN_TEXT);
-    ui_skinned_textbox_set_xfont(mainwin_othertext, cfg.mainwin_use_xfont, cfg.mainwin_font);
 
     mainwin_rate_text = ui_skinned_textbox_new(SKINNED_WINDOW(mainwin)->fixed, 111, 43, 15, 0, SKIN_TEXT);
 
diff -r f600566f92e5 -r c9264d1e3982 src/audacious/ui_main.h
--- a/src/audacious/ui_main.h	Sat Sep 29 20:30:23 2007 -0500
+++ b/src/audacious/ui_main.h	Sat Sep 29 20:30:31 2007 -0500
@@ -99,7 +99,7 @@
 
 extern GtkWidget *mainwin_jtf;
 extern GtkWidget *mainwin_eq, *mainwin_pl;
-extern GtkWidget *mainwin_info, *mainwin_othertext;
+extern GtkWidget *mainwin_info;
 
 extern GtkWidget *mainwin_stime_min, *mainwin_stime_sec;
 
diff -r f600566f92e5 -r c9264d1e3982 src/audacious/ui_preferences.c
--- a/src/audacious/ui_preferences.c	Sat Sep 29 20:30:23 2007 -0500
+++ b/src/audacious/ui_preferences.c	Sat Sep 29 20:30:31 2007 -0500
@@ -585,7 +585,6 @@
     cfg.mainwin_font = g_strdup(gtk_font_button_get_font_name(button));
 
     ui_skinned_textbox_set_xfont(mainwin_info, cfg.mainwin_use_xfont, cfg.mainwin_font);
-    ui_skinned_textbox_set_xfont(mainwin_othertext, cfg.mainwin_use_xfont, cfg.mainwin_font);
 }
 
 static void
@@ -603,7 +602,6 @@
     gboolean useit = gtk_toggle_button_get_active(button);
     cfg.mainwin_use_xfont = useit != FALSE ? FALSE : TRUE;
     ui_skinned_textbox_set_xfont(mainwin_info, cfg.mainwin_use_xfont, cfg.mainwin_font);
-    ui_skinned_textbox_set_xfont(mainwin_othertext, cfg.mainwin_use_xfont, cfg.mainwin_font);
     playlistwin_set_sinfo_font(cfg.playlist_font);
 
     if (cfg.playlist_shaded) {
diff -r f600566f92e5 -r c9264d1e3982 src/libid3tag/Makefile
--- a/src/libid3tag/Makefile	Sat Sep 29 20:30:23 2007 -0500
+++ b/src/libid3tag/Makefile	Sat Sep 29 20:30:31 2007 -0500
@@ -29,4 +29,4 @@
 
 CPPFLAGS += ${LIB_CPPFLAGS} -I.. ${GLIB_CFLAGS}
 CFLAGS += ${LIB_CFLAGS}
-LIBS += ../audacious/vfs.o -lz ${GLIB_LIBS}
+LIBS += ${IMPLIB_LIBS} ${GLIB_LIBS} -lz