# HG changeset patch # User Matti Hamalainen # Date 1191155347 -10800 # Node ID 8b3f1801b9d67dc645431c5966cb455888b6c354 # Parent 52745af33257fc2f14f0fc21553f56ae99c2263e# Parent 5577a3ff7b2729fa1f173d0a8f0beda932447f7e Automated merge with ssh://hg.atheme.org//hg/audacious diff -r 52745af33257 -r 8b3f1801b9d6 Makefile --- a/Makefile Sun Sep 30 15:28:40 2007 +0300 +++ b/Makefile Sun Sep 30 15:29:07 2007 +0300 @@ -101,7 +101,8 @@ Skins/Refugee/text.png \ Skins/Refugee/titlebar.png \ Skins/Refugee/viscolor.txt \ - Skins/Refugee/volume.png + Skins/Refugee/volume.png \ + applications/audacious.desktop DISTCLEAN = extra.mk @@ -116,6 +117,14 @@ ${INSTALL_FAILED}; \ fi; \ done + for i in audacious.desktop; do \ + ${INSTALL_STATUS}; \ + if ${MKDIR_P} ${DESTDIR}${datadir}/applications && ${INSTALL} -m 644 $$i ${DESTDIR}${datadir}/applications/$$i; then \ + ${INSTALL_OK}; \ + else \ + ${INSTALL_FAILED}; \ + fi \ + done uninstall-extra: for i in audacious.pc audclient.pc; do \ @@ -127,3 +136,12 @@ fi \ fi; \ done + for i in audacious.desktop; do \ + if test -f ${DESTDIR}${datadir}/applications/$$i; then \ + if rm -f ${DESTDIR}${datadir}/applications/$$i; then \ + ${DELETE_OK}; \ + else \ + ${DELETE_FAILED}; \ + fi \ + fi \ + done diff -r 52745af33257 -r 8b3f1801b9d6 Skins/Refugee/eqmain.png Binary file Skins/Refugee/eqmain.png has changed diff -r 52745af33257 -r 8b3f1801b9d6 applications/audacious.desktop.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/applications/audacious.desktop.in Sun Sep 30 15:29:07 2007 +0300 @@ -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 52745af33257 -r 8b3f1801b9d6 audacious.desktop --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/audacious.desktop Sun Sep 30 15:29:07 2007 +0300 @@ -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 52745af33257 -r 8b3f1801b9d6 buildsys.mk.in --- a/buildsys.mk.in Sun Sep 30 15:28:40 2007 +0300 +++ b/buildsys.mk.in Sun Sep 30 15:29:07 2007 +0300 @@ -35,6 +35,9 @@ 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@ LIB_LDFLAGS = @LIB_LDFLAGS@ @@ -72,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 \ @@ -90,20 +93,21 @@ regen=0; \ for i in ${SRCS}; do test $$i -nt .deps && regen=1; done; \ if test x"$$regen" = x"1"; then \ - error=0; \ + list=""; \ ${DEPEND_STATUS}; \ - rm -f .deps; \ for i in ${SRCS}; do \ case $${i##*.} in \ c|cc|cxx|m) \ - ${CPP} ${CPPFLAGS} -M $$i >>.deps || error=1; \ + list="$$list $$i"; \ ;; \ esac; \ done; \ - if test x"$$error" = x"0"; 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 @@ -207,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 52745af33257 -r 8b3f1801b9d6 configure.ac --- a/configure.ac Sun Sep 30 15:28:40 2007 +0300 +++ b/configure.ac Sun Sep 30 15:29:07 2007 +0300 @@ -1,3 +1,4 @@ + dnl Process this file with autoconf to produce a configure script. AC_INIT([audacious], [1.4.0], [bugs+audacious@atheme.org]) AC_PREREQ([2.59]) @@ -154,7 +155,14 @@ dnl ======================== dnl Ok, first we find out what flags we need to use. -AM_SHARED_LIB +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 @@ -390,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 - +dnl +dnl Permission to use, copy, modify, and/or distribute this software for any +dnl purpose with or without fee is hereby granted, provided that the above +dnl copyright notice and this permission notice is present in all copies. +dnl +dnl THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +dnl AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +dnl IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +dnl ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +dnl LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +dnl CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +dnl SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +dnl INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +dnl CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +dnl ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +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 + intel-apple-*) + AC_MSG_RESULT([Mac OS X (Intel)]) + LIB_CPPFLAGS='-DPIC' + LIB_CFLAGS='-fPIC' + LIB_LDFLAGS='-dynamiclib -fPIC -install_name ${libdir}/${LIB}' + LIB_PREFIX='lib' + LIB_SUFFIX='.dylib' + PLUGIN_CPPFLAGS='' + PLUGIN_CFLAGS='' + PLUGIN_LDFLAGS='-bundle -fno-common -flat_namespace -undefined suppress' + PLUGIN_SUFFIX='.impl' + INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$$i' + UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib' + CLEAN_LIB='' + ;; + *-apple-*) + AC_MSG_RESULT(Mac OS X) + LIB_CPPFLAGS='-DPIC' + LIB_CFLAGS='' + LIB_LDFLAGS='-dynamiclib -fPIC -install_name ${libdir}/${LIB}' + LIB_PREFIX='lib' + LIB_SUFFIX='.dylib' + PLUGIN_CPPFLAGS='' + PLUGIN_CFLAGS='' + PLUGIN_LDFLAGS='-bundle -fno-common -flat_namespace -undefined suppress' + PLUGIN_SUFFIX='.impl' + INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$$i' + UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib' + CLEAN_LIB='' + ;; + *-*-solaris* | *-openbsd-* | *-mirbsd-*) + AC_MSG_RESULT(Solaris) + LIB_CPPFLAGS='-DPIC' + LIB_CFLAGS='-fPIC' + LIB_LDFLAGS='-shared -fPIC -Wl,-soname=${LIB}.${LIB_MAJOR}.${LIB_MINOR}' + LIB_PREFIX='lib' + LIB_SUFFIX='.so' + PLUGIN_CPPFLAGS='-DPIC' + PLUGIN_CFLAGS='-fPIC' + PLUGIN_LDFLAGS='-shared -fPIC' + PLUGIN_SUFFIX='.so' + INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR} && rm -f ${DESTDIR}${libdir}/$$i && ${LN_S} $$i.${LIB_MAJOR}.${LIB_MINOR} ${DESTDIR}${libdir}/$$i' + UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}' + CLEAN_LIB='' + ;; + *-*-cygwin | *-*-mingw32) + AC_MSG_RESULT(Win32) + LIB_CPPFLAGS='-DPIC' + LIB_CFLAGS='' + LIB_LDFLAGS='-shared -Wl,--out-implib,${LIB}.a' + LIB_PREFIX='lib' + LIB_SUFFIX='.dll' + PLUGIN_CPPFLAGS='' + PLUGIN_CFLAGS='' + PLUGIN_LDFLAGS='-shared' + PLUGIN_SUFFIX='.dll' + INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i && ${INSTALL} -m 755 $$i.a ${DESTDIR}${libdir}/$$i.a' + UNINSTALL_LIB='rm -f ${DESTDIR}${bindir}/$$i ${DESTDIR}${libdir}/$$i.a' + CLEAN_LIB='${LIB}.a' + ;; + *) + AC_MSG_RESULT(POSIX) + LIB_CPPFLAGS='-DPIC' + LIB_CFLAGS='-fPIC' + LIB_LDFLAGS='-shared -fPIC -Wl,-soname=${LIB}.${LIB_MAJOR}.${LIB_MINOR}.0' + LIB_PREFIX='lib' + LIB_SUFFIX='.so' + PLUGIN_CPPFLAGS='-DPIC' + PLUGIN_CFLAGS='-fPIC' + PLUGIN_LDFLAGS='-shared -fPIC' + PLUGIN_SUFFIX='.so' + INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0 && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i' + UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0' + CLEAN_LIB='' + ;; + esac + + AC_SUBST(LIB_CPPFLAGS) + AC_SUBST(LIB_CFLAGS) + AC_SUBST(LIB_LDFLAGS) + AC_SUBST(LIB_PREFIX) + AC_SUBST(LIB_SUFFIX) + AC_SUBST(PLUGIN_CPPFLAGS) + AC_SUBST(PLUGIN_CFLAGS) + AC_SUBST(PLUGIN_LDFLAGS) + AC_SUBST(PLUGIN_SUFFIX) + AC_SUBST(INSTALL_LIB) + AC_SUBST(UNINSTALL_LIB) + AC_SUBST(CLEAN_LIB) +]) diff -r 52745af33257 -r 8b3f1801b9d6 m4/sharedlib.m4 --- a/m4/sharedlib.m4 Sun Sep 30 15:28:40 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,113 +0,0 @@ -dnl -dnl Copyright (c) 2007, Jonathan Schleifer -dnl -dnl Permission to use, copy, modify, and/or distribute this software for any -dnl purpose with or without fee is hereby granted, provided that the above -dnl copyright notice and this permission notice is present in all copies. -dnl -dnl THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -dnl AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -dnl IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -dnl ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -dnl LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -dnl CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -dnl SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -dnl INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -dnl CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -dnl ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -dnl POSSIBILITY OF SUCH DAMAGE. -dnl - -AC_DEFUN([AM_SHARED_LIB], [ - AC_MSG_CHECKING(for shared library system) - case "$target" in - intel-apple-*) - AC_MSG_RESULT([Mac OS X (Intel)]) - LIB_CPPFLAGS='-DPIC' - LIB_CFLAGS='-fPIC' - LIB_LDFLAGS='-dynamiclib -fPIC -install_name ${libdir}/${LIB}' - LIB_PREFIX='lib' - LIB_SUFFIX='.dylib' - PLUGIN_CPPFLAGS='' - PLUGIN_CFLAGS='' - PLUGIN_LDFLAGS='-bundle -fno-common -flat_namespace -undefined suppress' - PLUGIN_SUFFIX='.impl' - INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$$i' - UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib' - CLEAN_LIB='' - ;; - *-apple-*) - AC_MSG_RESULT(Mac OS X) - LIB_CPPFLAGS='-DPIC' - LIB_CFLAGS='' - LIB_LDFLAGS='-dynamiclib -fPIC -install_name ${libdir}/${LIB}' - LIB_PREFIX='lib' - LIB_SUFFIX='.dylib' - PLUGIN_CPPFLAGS='' - PLUGIN_CFLAGS='' - PLUGIN_LDFLAGS='-bundle -fno-common -flat_namespace -undefined suppress' - PLUGIN_SUFFIX='.impl' - INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$$i' - UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib' - CLEAN_LIB='' - ;; - *-*-solaris* | *-openbsd-* | *-mirbsd-*) - AC_MSG_RESULT(Solaris) - LIB_CPPFLAGS='-DPIC' - LIB_CFLAGS='-fPIC' - LIB_LDFLAGS='-shared -fPIC -Wl,-soname=${LIB}.${LIB_MAJOR}.${LIB_MINOR}' - LIB_PREFIX='lib' - LIB_SUFFIX='.so' - PLUGIN_CPPFLAGS='-DPIC' - PLUGIN_CFLAGS='-fPIC' - PLUGIN_LDFLAGS='-shared -fPIC' - PLUGIN_SUFFIX='.so' - INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR} && rm -f ${DESTDIR}${libdir}/$$i && ${LN_S} $$i.${LIB_MAJOR}.${LIB_MINOR} ${DESTDIR}${libdir}/$$i' - UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}' - CLEAN_LIB='' - ;; - *-*-mingw32 | *-*-cygwin) - AC_MSG_RESULT(Win32) - LIB_CPPFLAGS='-DPIC' - LIB_CFLAGS='' - LIB_LDFLAGS='-shared -Wl,--out-implib,${LIB}.a' - LIB_PREFIX='lib' - LIB_SUFFIX='.dll' - PLUGIN_CPPFLAGS='' - PLUGIN_CFLAGS='' - PLUGIN_LDFLAGS='-shared' - PLUGIN_SUFFIX='.dll' - INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i && ${INSTALL} -m 755 $$i.a ${DESTDIR}${libdir}/$$i.a' - UNINSTALL_LIB='rm -f ${DESTDIR}${bindir}/$$i ${DESTDIR}${libdir}/$$i.a' - CLEAN_LIB='${LIB}.a' - ;; - *) - AC_MSG_RESULT(POSIX) - LIB_CPPFLAGS='-DPIC' - LIB_CFLAGS='-fPIC' - LIB_LDFLAGS='-shared -fPIC -Wl,-soname=${LIB}.${LIB_MAJOR}.${LIB_MINOR}.0' - LIB_PREFIX='lib' - LIB_SUFFIX='.so' - PLUGIN_CPPFLAGS='-DPIC' - PLUGIN_CFLAGS='-fPIC' - PLUGIN_LDFLAGS='-shared -fPIC' - PLUGIN_SUFFIX='.so' - INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0 && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i' - UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0' - CLEAN_LIB='' - ;; - esac - - AC_SUBST(LIB_CPPFLAGS) - AC_SUBST(LIB_CFLAGS) - AC_SUBST(LIB_LDFLAGS) - AC_SUBST(LIB_PREFIX) - AC_SUBST(LIB_SUFFIX) - AC_SUBST(PLUGIN_CPPFLAGS) - AC_SUBST(PLUGIN_CFLAGS) - AC_SUBST(PLUGIN_LDFLAGS) - AC_SUBST(PLUGIN_SUFFIX) - AC_SUBST(INSTALL_LIB) - AC_SUBST(UNINSTALL_LIB) - AC_SUBST(CLEAN_LIB) -]) diff -r 52745af33257 -r 8b3f1801b9d6 src/audacious/Makefile --- a/src/audacious/Makefile Sun Sep 30 15:28:40 2007 +0300 +++ b/src/audacious/Makefile Sun Sep 30 15:29:07 2007 +0300 @@ -2,7 +2,7 @@ SUBDIRS = ${INTL_OBJECTIVE} -PROG = audacious +PROG = audacious${PROG_SUFFIX} SRCS = auddrct.c \ build_stamp.c \ configdb.c \ @@ -153,15 +153,11 @@ ui/playlist.ui \ ui/carbon-menubar.ui -CLEAN = build_stamp.c - -LIB_DEPS += ../libguess/libguess.a +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 @@ -184,7 +180,8 @@ -I.. -I../.. \ -I./intl -LIBS += ${LIBINTL} \ +LIBS += ${LDADD} \ + ${LIBINTL} \ ${samplerate_LIBS} \ ../libguess/libguess.a \ ${GTK_LIBS} \ @@ -194,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`; \ @@ -217,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 52745af33257 -r 8b3f1801b9d6 src/audacious/audacious.desktop.in --- a/src/audacious/audacious.desktop.in Sun Sep 30 15:28:40 2007 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -[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 52745af33257 -r 8b3f1801b9d6 src/audacious/glade/prefswin.glade --- a/src/audacious/glade/prefswin.glade Sun Sep 30 15:28:40 2007 +0300 +++ b/src/audacious/glade/prefswin.glade Sun Sep 30 15:29:07 2007 +0300 @@ -39,7 +39,6 @@ False False True - True True @@ -133,9 +132,6 @@ - - False - @@ -147,7 +143,6 @@ tab - False False @@ -238,7 +233,6 @@ 1 - False @@ -250,7 +244,6 @@ tab 1 - False False @@ -341,7 +334,6 @@ 2 - False @@ -353,7 +345,6 @@ tab 2 - False False @@ -444,7 +435,6 @@ 3 - False @@ -456,16 +446,12 @@ tab 3 - False False - - False - @@ -474,7 +460,6 @@ tab - False False @@ -608,23 +593,38 @@ 2 8 - + True - 12 - 6 - - - True - 1 - _Player: - True - True - mainwin_font_button - - + True + 0 + Select playlist font: + True + True + + - + 1 + 2 + 1 + 2 + + + + + + True + True + 0 + Select main player window font: + True + True + + + + + 1 + 2 @@ -653,38 +653,23 @@ - + True - True - 0 - Select main player window font: - True - True - - + 12 + 6 + + + True + 1 + _Player: + True + True + mainwin_font_button + + - 1 - 2 - - - - - - True - True - 0 - Select playlist font: - True - True - - - - - 1 - 2 - 1 - 2 + @@ -881,7 +866,6 @@ 1 - False @@ -892,7 +876,6 @@ tab 1 - False False @@ -932,39 +915,33 @@ 3 6 - + + True + True + 5 0 100 1 10 10 + 1 + True + + + + + 1 + 2 + + + 4 + + + + True 0 4 - Changes volume by - - - - - - - - - True - 0 - 4 - percent + lines 2 3 - - - - - - - True - 0 - 4 - Scrolls playlist by - - 1 2 @@ -991,15 +968,13 @@ - + True 0 4 - lines + Scrolls playlist by - 2 - 3 1 2 @@ -1007,21 +982,29 @@ - + True - True - 5 0 100 1 10 10 - 1 - True - - + 0 + 4 + percent - 1 - 2 + 2 + 3 - 4 + + + + + True + 0 + 4 + Changes volume by + + + + @@ -1038,7 +1021,6 @@ 2 - False @@ -1049,7 +1031,6 @@ tab 2 - False False @@ -1237,20 +1218,30 @@ 2 2 - + True 1 - Fallback character encodings: + Auto character encoding detector for: GTK_JUSTIFY_RIGHT - 1 - 2 + + True + + + + + 1 + 2 + + + + True True @@ -1267,25 +1258,15 @@ - - True - - - - - 1 - 2 - - - - - + True 1 - Auto character encoding detector for: + Fallback character encodings: GTK_JUSTIFY_RIGHT + 1 + 2 @@ -1380,25 +1361,22 @@ 12 4 - + True - 1 - Title format: - GTK_JUSTIFY_RIGHT + Show information about titlestring format + GTK_RELIEF_HALF + False + 0 + + + True + gtk-index + + - - - - - - - True - 1 - Custom string: - GTK_JUSTIFY_RIGHT - - + 2 + 3 1 2 @@ -1406,21 +1384,6 @@ - - True - True - - - - - 1 - 2 - 1 - 2 - - - - True TITLE @@ -1438,24 +1401,42 @@ - + True - Show information about titlestring format - GTK_RELIEF_HALF - False - 0 - - - True - gtk-index - - + True + + - 2 - 3 + 1 + 2 1 2 + + + + + + True + 1 + Custom string: + GTK_JUSTIFY_RIGHT + + + 1 + 2 + + + + + + + True + 1 + Title format: + GTK_JUSTIFY_RIGHT + + @@ -1552,7 +1533,6 @@ 3 - False @@ -1563,7 +1543,6 @@ tab 3 - False False @@ -1609,15 +1588,26 @@ 6 6 - + True - True - - + 0 + File preset extension: - 1 - 2 + 1 + 2 + + + + + + + True + 0 + Directory preset file: + + + @@ -1637,26 +1627,15 @@ - + True - 0 - Directory preset file: + True + + - - - - - - - True - 0 - File preset extension: - - - 1 - 2 - + 1 + 2 @@ -1760,7 +1739,6 @@ 4 - False @@ -1771,7 +1749,6 @@ tab 4 - False False @@ -1836,14 +1813,30 @@ 6 6 - + True - 0 - 0 - Proxy hostname: + True + + - + 1 + 2 + 1 + 2 + + + + + + True + True + + + + + 1 + 2 @@ -1861,30 +1854,14 @@ - + True - True - - + 0 + 0 + Proxy hostname: - 1 - 2 - - - - - - True - True - - - - - 1 - 2 - 1 - 2 + @@ -1927,14 +1904,31 @@ 6 6 - + True - 0 - 0 - Proxy username: + True + False + + - + 1 + 2 + 1 + 2 + + + + + + True + True + + + + + 1 + 2 @@ -1952,31 +1946,14 @@ - + True - True - - + 0 + 0 + Proxy username: - 1 - 2 - - - - - - True - True - False - - - - - 1 - 2 - 1 - 2 + @@ -2038,7 +2015,6 @@ 5 - False @@ -2048,7 +2024,6 @@ tab 5 - False False @@ -2062,129 +2037,35 @@ tab 6 - False False - + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + GTK_POLICY_NEVER - + True - 12 + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + GTK_RESIZE_QUEUE + GTK_SHADOW_NONE - - True - 0 - <b>Audio System</b> - True - - - - - False - False - - - - - True - 6 - 12 - - + True - + True - 3 - 2 - 6 - 6 + 12 - + True 0 - Current output plugin: - - - - - - - - - True - - - - - 1 - 2 - - - - - - True - True - 0 0 600000 100 1000 1000 - 1 - - + <b>Audio System</b> + True - - 1 - 2 - 1 - 2 - - - - - - True - 0 - <span size="small">This is the amount of time to prebuffer audio streams by, in milliseconds. -Increase this value if you are experiencing audio skipping. -Please note however, that high values will result in Audacious performing poorly.</span> - True - True - - - 1 - 2 - 2 - 3 - - - - - - - True - 1 - Buffer size: - - - 1 - 2 - - - - - - True - 1 - 0 - gtk-info - - - 2 - 3 - GTK_FILL - @@ -2192,319 +2073,222 @@ False - - - - - False - False - 1 - - - - - True - 12 - - - True - 8 - GTK_BUTTONBOX_START - + True - False - True - True - 0 + 6 + 12 - + True - 0 - 0 - + True - 2 + 3 + 2 + 6 + 6 - + True - gtk-preferences + 1 + 0 + gtk-info - False - False + 2 + 3 + GTK_FILL + + + + + True + 1 + Buffer size: + + + 1 + 2 + - + True - Output Plugin Preferences - True + 0 + <span size="small">This is the amount of time to prebuffer audio streams by, in milliseconds. +Increase this value if you are experiencing audio skipping. +Please note however, that high values will result in Audacious performing poorly.</span> + True + True + + + 1 + 2 + 2 + 3 + + + + + + + True + True + 0 0 600000 100 1000 1000 + 1 + + - False - False - 1 + 1 + 2 + 1 + 2 + + + + + + True + + + + + 1 + 2 + + + + + + True + 0 + Current output plugin: + + + + - - - - - - - - True - False - True - True - 0 - - - True - 0 - 0 - - - True - 2 - - - True - gtk-about - - - False - False - - - - - True - Output Plugin Information - True - - - False - False - 1 - - - + + False + False + - 1 - - - - - - - False - False - 2 - - - - - True - 12 - 12 - - - True - 0 - <b>Format Detection</b> - True - - - - - False - False - 3 - - - - - True - 12 - - - True - True - When checked, Audacious will detect file formats on demand. This can result in a messier playlist, but delivers a major speed benefit. - Detect file formats on demand, instead of immediately. - True - 0 - True - - - - - - - False - False - 4 - - - - - True - 12 - - - True - True - When checked, Audacious will detect file formats based by extension. This is slightly slower than detection on demand, but still provides a minimal level of format detection. - Detect file formats by extension. - True - 0 - True - - - - - - - False - False - 5 - - - - - True - 12 - 12 - - - True - 0 - <b>Playback</b> - True - - - - - False - False - 6 - - - - - True - 12 - - - True - True - When Audacious starts, automatically begin playing from the point where we stopped before. - Continue playback on startup - True - 0 - True - - - - - - - False - False - 7 - - - - - True - 12 - - - True - True - When finished playing a song, don't automatically advance to the next. - Don't advance in the playlist - True - 0 - True - - - - - - - False - False - 8 - - - - - True - 12 - - - True - True - Pause between songs - True - 0 - True - - - - - False - False - 9 - - - - - True - 45 - - - True - - - True - 4 - Pause for - - - False - False - - - - - True - True - 2 0 100 1 10 10 - 1 - - - - False False 1 - + True - 4 - seconds + 12 + + + True + 8 + GTK_BUTTONBOX_START + + + True + False + True + True + 0 + + + True + 0 + 0 + + + True + 2 + + + True + gtk-preferences + + + False + False + + + + + True + Output Plugin Preferences + True + + + False + False + 1 + + + + + + + + + + + True + False + True + True + 0 + + + True + 0 + 0 + + + True + 2 + + + True + gtk-about + + + False + False + + + + + True + Output Plugin Information + True + + + False + False + 1 + + + + + + + + + 1 + + + + False @@ -2512,228 +2296,434 @@ 2 - - - - - False - False - 10 - - - - - True - 12 - 12 - - - True - 0 - <b>Sampling Rate Converter</b> - True - - - - - False - False - 11 - - - - - True - 12 - - - True - True - Enable Sampling Rate Converter - True - 0 - True - True - - - - - - - False - False - 12 - - - - - True - 6 - 12 - - - True + + + True + 12 + 12 + + + True + 0 + <b>Format Detection</b> + True + + + + + False + False + 3 + + - + + True + 12 + + + True + True + When checked, Audacious will detect file formats on demand. This can result in a messier playlist, but delivers a major speed benefit. + Detect file formats on demand, instead of immediately. + True + 0 + True + + + + + + + False + False + 4 + + + + True - 3 - 2 - 6 - 6 + 12 - + + True + True + When checked, Audacious will detect file formats based by extension. This is slightly slower than detection on demand, but still provides a minimal level of format detection. + Detect file formats by extension. + True + 0 + True + + + + + + + False + False + 5 + + + + + True + 12 + 12 + + True 0 - Sampling Rate [Hz]: + <b>Playback</b> + True - - GTK_FILL - - + + + False + False + 6 + + + + + True + 12 - + + True + True + When Audacious starts, automatically begin playing from the point where we stopped before. + Continue playback on startup + True + 0 + True + + + + + + + False + False + 7 + + + + + True + 12 + + True True - 96000 1000 768000 1000 1000 1000 - 1 - - + When finished playing a song, don't automatically advance to the next. + Don't advance in the playlist + True + 0 + True + + - - 1 - 2 - - + + + False + False + 8 + + + + + True + 12 - + True - 1 - 0 - gtk-info - - - 2 - 3 - GTK_FILL - - - - - True - 0 - <span size="small">All streams will be converted to this sampling rate. -This should be the max supported sampling rate of -the sound card or output plugin.</span> - True - True + True + Pause between songs + True + 0 + True - - 1 - 2 - 2 - 3 - GTK_FILL - - + + + False + False + 9 + + + + + True + 45 - + True - 0 - Interpolation Engine: + + + True + 4 + Pause for + + + False + False + + + + + True + True + 2 0 100 1 10 10 + 1 + + + + + False + False + 1 + + + + + True + 4 + seconds + + + False + False + 2 + + - - 1 - 2 - GTK_FILL - - - - - - True - Best Sinc Interpolation -Medium Sinc Interpolation -Fastest Sinc Interpolation -ZOH Interpolation -Linear Interpolation - - - - - 1 - 2 - 1 - 2 - GTK_FILL - GTK_FILL - False False + 10 + + + + + True + 12 + 12 + + + True + 0 + <b>Sampling Rate Converter</b> + True + + + + + False + False + 11 + + + + + True + 12 + + + True + True + Enable Sampling Rate Converter + True + 0 + True + True + + + + + + + False + False + 12 + + + + + True + 6 + 12 + + + True + + + True + 3 + 2 + 6 + 6 + + + True + Best Sinc Interpolation +Medium Sinc Interpolation +Fastest Sinc Interpolation +ZOH Interpolation +Linear Interpolation + + + + + 1 + 2 + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + 0 + Interpolation Engine: + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + <span size="small">All streams will be converted to this sampling rate. +This should be the max supported sampling rate of +the sound card or output plugin.</span> + True + True + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + + True + 1 + 0 + gtk-info + + + 2 + 3 + GTK_FILL + + + + + True + True + 96000 1000 768000 1000 1000 1000 + 1 + + + + + 1 + 2 + + + + + + True + 0 + Sampling Rate [Hz]: + + + GTK_FILL + + + + + + False + False + + + + + + + False + False + 13 + + + + + True + 12 + 12 + + + True + 0 + <b>Volume Control</b> + True + + + + + False + False + 14 + + + + + True + 12 + + + True + True + Use software volume control. This may be useful for situations where your audio system does not support controlling the playback volume. + Use software volume control + True + 0 + True + + + + + + + False + False + 15 - - False - False - 13 - - - - - True - 12 - 12 - - - True - 0 - <b>Volume Control</b> - True - - - - - False - False - 14 - - - - - True - 12 - - - True - True - Use software volume control. This may be useful for situations where your audio system does not support controlling the playback volume. - Use software volume control - True - 0 - True - - - - - - - False - False - 15 - 7 - False + True @@ -2743,7 +2733,6 @@ tab 7 - False False @@ -2757,7 +2746,6 @@ tab 8 - False False @@ -2917,7 +2905,7 @@ 4 4 - + True True True @@ -2925,20 +2913,6 @@ 1 2 - 1 - 2 - - - - - - True - 0 - 12 - Include: - - - @@ -2957,7 +2931,19 @@ - + + True + 0 + 12 + Include: + + + + + + + + True True True @@ -2965,6 +2951,8 @@ 1 2 + 1 + 2 @@ -3186,17 +3174,59 @@ 12 6 - + + True + 1 + Blue + GTK_JUSTIFY_RIGHT + + + 2 + 3 + GTK_FILL + + + + + + True + 1 + Green + GTK_JUSTIFY_RIGHT + + + 1 + 2 + GTK_FILL + + + + + + True + 1 + Red + GTK_JUSTIFY_RIGHT + + + GTK_FILL + + + + + True True 0 0 255 0 0 0 - 3 False - + 1 2 + 2 + 3 + GTK_FILL @@ -3216,59 +3246,17 @@ - + True True 0 0 255 0 0 0 + 3 False - + 1 2 - 2 - 3 - GTK_FILL - - - - - True - 1 - Red - GTK_JUSTIFY_RIGHT - - - GTK_FILL - - - - - - True - 1 - Green - GTK_JUSTIFY_RIGHT - - - 1 - 2 - GTK_FILL - - - - - - True - 1 - Blue - GTK_JUSTIFY_RIGHT - - - 2 - 3 - GTK_FILL - diff -r 52745af33257 -r 8b3f1801b9d6 src/audacious/ui_fileopener.c --- a/src/audacious/ui_fileopener.c Sun Sep 30 15:28:40 2007 +0300 +++ b/src/audacious/ui_fileopener.c Sun Sep 30 15:29:07 2007 +0300 @@ -35,7 +35,6 @@ { GSList *cur; gchar *ptr; - guint ctr = 0; Playlist *playlist = playlist_get_active(); for (cur = files; cur; cur = g_slist_next(cur)) { diff -r 52745af33257 -r 8b3f1801b9d6 src/audacious/ui_main.c --- a/src/audacious/ui_main.c Sun Sep 30 15:28:40 2007 +0300 +++ b/src/audacious/ui_main.c Sun Sep 30 15:29:07 2007 +0300 @@ -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 52745af33257 -r 8b3f1801b9d6 src/audacious/ui_main.h --- a/src/audacious/ui_main.h Sun Sep 30 15:28:40 2007 +0300 +++ b/src/audacious/ui_main.h Sun Sep 30 15:29:07 2007 +0300 @@ -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 52745af33257 -r 8b3f1801b9d6 src/audacious/ui_preferences.c --- a/src/audacious/ui_preferences.c Sun Sep 30 15:28:40 2007 +0300 +++ b/src/audacious/ui_preferences.c Sun Sep 30 15:29:07 2007 +0300 @@ -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 52745af33257 -r 8b3f1801b9d6 src/libguess/cjk_impl.c --- a/src/libguess/cjk_impl.c Sun Sep 30 15:28:40 2007 +0300 +++ b/src/libguess/cjk_impl.c Sun Sep 30 15:29:07 2007 +0300 @@ -38,7 +38,6 @@ */ #include "libguess.h" -#define NULL ((void *)0) /* take precedence if scores are same. you can customize the order as: */ /* ORDER_** &highest, &second, ... &lowest */ diff -r 52745af33257 -r 8b3f1801b9d6 src/libid3tag/Makefile --- a/src/libid3tag/Makefile Sun Sep 30 15:28:40 2007 +0300 +++ b/src/libid3tag/Makefile Sun Sep 30 15:29:07 2007 +0300 @@ -29,4 +29,4 @@ CPPFLAGS += ${LIB_CPPFLAGS} -I.. ${GLIB_CFLAGS} CFLAGS += ${LIB_CFLAGS} -LIBS += ${GLIB_LIBS} +LIBS += ${IMPLIB_LIBS} ${GLIB_LIBS} -lz