From ace1e33f4808c55e57c2d8219c59bebde7cc852b Mon Sep 17 00:00:00 2001 From: waker Date: Tue, 10 May 2011 22:57:03 +0200 Subject: 0.5.0-rc1 final fixups --- Makefile.am | 3 +- PORTABLE_VERSION | 2 +- about.txt | 78 ++------------------------------------ configure.ac | 2 +- deadbeef.h | 5 ++- plugins/converter/converter.h | 2 +- plugins/dsp_libsrc/src.c | 4 +- plugins/gme/cgme.c | 4 +- plugins/gtkui/Makefile.am | 3 +- plugins/gtkui/dspconfig.c | 2 +- plugins/sid/plugin.c | 3 +- plugins/supereq/Makefile.am | 2 +- plugins/vtx/vtx.c | 2 +- scripts/portable_build.sh | 12 +++--- scripts/portable_package_static.sh | 3 +- scripts/portable_postbuild.sh | 2 + 16 files changed, 31 insertions(+), 98 deletions(-) diff --git a/Makefile.am b/Makefile.am index a8c917c1..49245dcf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,7 +29,6 @@ deadbeef_SOURCES =\ volume.c volume.h\ junklib.h junklib.c utf8.c utf8.h\ u8_lc_map.h\ - ConvertUTF/ConvertUTF.c ConvertUTF/ConvertUTF.h\ optmath.h\ vfs.c vfs.h vfs_stdio.c\ md5/md5.c md5/md5.h\ @@ -38,6 +37,8 @@ deadbeef_SOURCES =\ ringbuf.c ringbuf.h\ dsppreset.c dsppreset.h\ replaygain.c replaygain.h + +# ConvertUTF/ConvertUTF.c ConvertUTF/ConvertUTF.h sdkdir = $(pkgincludedir) sdk_HEADERS = deadbeef.h diff --git a/PORTABLE_VERSION b/PORTABLE_VERSION index d64531f1..04c1660d 100644 --- a/PORTABLE_VERSION +++ b/PORTABLE_VERSION @@ -1 +1 @@ -devel +0.5.0-rc1 diff --git a/about.txt b/about.txt index 68fbb3c5..56ce845c 100644 --- a/about.txt +++ b/about.txt @@ -64,80 +64,8 @@ Special Thanks To: Bundled libraries: -DUMB - Dynamic Universal Music Bibliotheque, Version 0.9.3 -http://dumb.sf.net -Copyright © 2001-2005 Ben Davis, Robert J Ohannessian and Julien Cugniere. +Independent implementation of MD5 (RFC 1321). +Copyright © 1999, 2000, 2002 Aladdin Enterprises. All rights reserved. -Game_Music_Emu Version 0.5.5 -http://code.google.com/p/game-music-emu -Copyright © 2003-2006 Shay Green. - - -libsidplay2 - commodore 64 SID emulation library -http://sidplay2.sourceforge.net -Copyright © Simon White and other authors. - - -ffap - monkey's audio decoder based on code from ffmpeg and rockbox -Copyright © 2009-2011 Alexey Yakovenko -Copyright © 2007 Benjamin Zores -Copyright © 2007 Dave Chapman - - -ayemu - AY/YM sound chip emulator and music file loader -http://sashnov.nm.ru/libayemu.html -Copyright © 2003-2004 Alexander Sashnov - - -Adplug - Replayer for many OPL2/OPL3 audio file formats. -http://adplug.sourceforge.net -Copyright © 1999 - 2006 Simon Peter , et al. - - -SuperEQ - High Quality Audio Equalizer -http://shibatch.sourceforge.net -Copyright © Naoki Shibata - - -libmpcdec - musepack decoder from Musepack SV8 libraries r435 -http://www.musepack.net -Copyright © 2005-2009, The Musepack Development Team - - -WildMidi 0.2.2 - Midi Processing Library -http://wildmidi.sourceforge.net -Copyright © 2001-2004 Chris Ison - - -ttadec - TTAv1 decoder -http://true-audio.com/ -Copyright © 2004 True Audio Software - - -aosdk 1.4.8 - library for playing .PSF (Sony PlayStation), .SPU (Sony PlayStation), .PSF2 (Sony PlayStation 2), .SSF (Sega Saturn), .DSF (Sega Dreamcast), and .QSF (Capcom QSound) audio file formats -http://rbelmont.mameworld.info/?page_id=221 -Copyright © 2007-2009 R. Belmont and Richard Bannister. - - -mp4ff - part of libfaad2 2.7, mp4 container library -http://www.nero.com -Copyright © 2003-2005 M. Bakker, Nero AG - - -libdca - library for decoding DTS Coherent Acoustics streams -http://www.videolan.org/developers/libdca.html -Copyright © 2000-2003 Michel Lespinasse -Copyright © 1999-2000 Aaron Holtzman - - -xmms-shn 2.4.1 - Shorten XMMS Plugin (ported to Deadbeef API) -http://etree.org/shnutils/xmms-shn/ -Copyright © Jason Jordan - - -libmms - Library to stream over mms/mmsh protocol -http://libmms.sourceforge.net/ -Copyright © Maciej Katafiasz (Mathrick) -Copyright © Søren Hansen (shawarma) - +For information on libraries used in plugins -- see specific plugin's copyright information. diff --git a/configure.ac b/configure.ac index ede78b60..c349fffb 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([deadbeef], [devel]) +AC_INIT([deadbeef], [0.5.0-rc1]) AC_CONFIG_HEADER(config.h) diff --git a/deadbeef.h b/deadbeef.h index 61faad96..47ee4325 100644 --- a/deadbeef.h +++ b/deadbeef.h @@ -61,6 +61,7 @@ extern "C" { // api version history: // 9.9 -- devel +// 1.0 -- deadbeef-0.5.0 // 0.10 -- deadbeef-0.4.4-portable-r1 (note: 0.4.4 uses api v0.9) // 0.9 -- deadbeef-0.4.3-portable-build3 // 0.8 -- deadbeef-0.4.2 @@ -72,8 +73,8 @@ extern "C" { // 0.2 -- deadbeef-0.2.3 // 0.1 -- deadbeef-0.2.0 -#define DB_API_VERSION_MAJOR 9 -#define DB_API_VERSION_MINOR 9 +#define DB_API_VERSION_MAJOR 1 +#define DB_API_VERSION_MINOR 0 #define DDB_PLUGIN_SET_API_VERSION\ .plugin.api_vmajor = DB_API_VERSION_MAJOR,\ diff --git a/plugins/converter/converter.h b/plugins/converter/converter.h index 173d35b4..36daa023 100644 --- a/plugins/converter/converter.h +++ b/plugins/converter/converter.h @@ -20,7 +20,7 @@ #define __CONVERTER_H #include -#include +#include "../../deadbeef.h" enum { DDB_ENCODER_METHOD_PIPE = 0, diff --git a/plugins/dsp_libsrc/src.c b/plugins/dsp_libsrc/src.c index be9c350e..2c909e3d 100644 --- a/plugins/dsp_libsrc/src.c +++ b/plugins/dsp_libsrc/src.c @@ -20,9 +20,7 @@ #include #include #include -#include "conf.h" -#include "threading.h" -#include "deadbeef.h" +#include "../../deadbeef.h" #include "src.h" //#define trace(...) { fprintf(stderr, __VA_ARGS__); } diff --git a/plugins/gme/cgme.c b/plugins/gme/cgme.c index 57788851..01f81e10 100644 --- a/plugins/gme/cgme.c +++ b/plugins/gme/cgme.c @@ -413,8 +413,8 @@ static DB_decoder_t plugin = { .plugin.version_minor = 0, .plugin.type = DB_PLUGIN_DECODER, .plugin.id = "stdgme", - .plugin.name = "Game_Music_Emu decoder", - .plugin.descr = "chiptune music player based on GME", + .plugin.name = "Game-Music-Emu player", + .plugin.descr = "chiptune/game music player based on GME library", .plugin.copyright = "Copyright (C) 2009-2011 Alexey Yakovenko \n" "\n" diff --git a/plugins/gtkui/Makefile.am b/plugins/gtkui/Makefile.am index 3cfc1cce..d89f0f6c 100644 --- a/plugins/gtkui/Makefile.am +++ b/plugins/gtkui/Makefile.am @@ -35,7 +35,8 @@ GTKUI_SOURCES = gtkui.c gtkui.h\ actions.c actions.h\ dspconfig.c dspconfig.h\ tagwritersettings.c tagwritersettings.h\ - wingeom.c wingeom.h + wingeom.c wingeom.h\ + pluginconf.h sdkdir = $(pkgincludedir) sdk_HEADERS = gtkui_api.h diff --git a/plugins/gtkui/dspconfig.c b/plugins/gtkui/dspconfig.c index 38ec5b9a..8975c7ec 100644 --- a/plugins/gtkui/dspconfig.c +++ b/plugins/gtkui/dspconfig.c @@ -31,7 +31,7 @@ #include "callbacks.h" #include "interface.h" #include "support.h" -#include "deadbeef.h" +#include "../../deadbeef.h" #include "gtkui.h" #include "pluginconf.h" diff --git a/plugins/sid/plugin.c b/plugins/sid/plugin.c index 6c4705b5..1892d598 100644 --- a/plugins/sid/plugin.c +++ b/plugins/sid/plugin.c @@ -33,7 +33,8 @@ DB_decoder_t sid_plugin = { .plugin.type = DB_PLUGIN_DECODER, .plugin.version_major = 1, .plugin.version_minor = 0, - .plugin.name = "SID decoder", + .plugin.name = "SID player", + .plugin.id = "sidplay2", .plugin.descr = "SID player based on libsidplay2", .plugin.copyright = "Copyright (C) 2009-2011 Alexey Yakovenko \n" diff --git a/plugins/supereq/Makefile.am b/plugins/supereq/Makefile.am index 45010ec8..4ce19ee5 100644 --- a/plugins/supereq/Makefile.am +++ b/plugins/supereq/Makefile.am @@ -1,7 +1,7 @@ if HAVE_SUPEREQ supereqdir = $(libdir)/$(PACKAGE) pkglib_LTLIBRARIES = supereq.la -supereq_la_SOURCES = supereq.c supereq.h Equ.cpp Fftsg_fl.cpp paramlist.hpp +supereq_la_SOURCES = supereq.c Equ.cpp Equ.h Fftsg_fl.cpp paramlist.hpp #nsfft-1.00/simd/SIMDBaseUndiff.c\ #nsfft-1.00/simd/SIMDBase.c\ diff --git a/plugins/vtx/vtx.c b/plugins/vtx/vtx.c index ffb14c7e..c42715db 100644 --- a/plugins/vtx/vtx.c +++ b/plugins/vtx/vtx.c @@ -303,7 +303,7 @@ static DB_decoder_t plugin = { .plugin.version_minor = 0, .plugin.type = DB_PLUGIN_DECODER, .plugin.id = "vtx", - .plugin.name = "VTX decoder", + .plugin.name = "VTX player", .plugin.descr = "AY8910/12 chip emulator and vtx file player", .plugin.copyright = "Copyright (C) 2009-2011 Alexey Yakovenko \n" diff --git a/scripts/portable_build.sh b/scripts/portable_build.sh index f3fcbbf0..56495c53 100755 --- a/scripts/portable_build.sh +++ b/scripts/portable_build.sh @@ -3,16 +3,16 @@ VERSION=`cat PORTABLE_VERSION | perl -ne 'chomp and print'` ORIGIN=`pwd | perl -ne 'chomp and print'` export APBUILD_STATIC_LIBGCC=1 -./autogen.sh +#./autogen.sh export CC=$ORIGIN/tools/apbuild/apgcc export CXX=$ORIGIN/tools/apbuild/apgcc -./configure --enable-staticlink --enable-portable --disable-artwork-imlib2 -sed -i 's/-lstdc++ -lm -lgcc_s -lc -lgcc_s/-lm -lc/g' libtool -make clean -make -j9 +#./configure --enable-staticlink --enable-portable --disable-artwork-imlib2 +#sed -i 's/-lstdc++ -lm -lgcc_s -lc -lgcc_s/-lm -lc/g' libtool +#make clean +#make -j9 -./scrips/portable_extraplugs.sh +#./scrips/portable_extraplugs.sh cd $ORIGIN diff --git a/scripts/portable_package_static.sh b/scripts/portable_package_static.sh index 22cb0a47..0568c7f6 100755 --- a/scripts/portable_package_static.sh +++ b/scripts/portable_package_static.sh @@ -57,5 +57,6 @@ tar jcvf ../portable_out/build/deadbeef-$VERSION-static-i686.tar.bz2\ $PLUGDIR/converter_gtkui.fallback.so\ $PLUGDIR/pulse.so\ $PLUGDIR/dsp_libsrc.so\ - $PIXMAPDIR + $PIXMAPDIR\ + $SRCDIR/locale cd .. diff --git a/scripts/portable_postbuild.sh b/scripts/portable_postbuild.sh index bf6fd51b..e7676bd2 100755 --- a/scripts/portable_postbuild.sh +++ b/scripts/portable_postbuild.sh @@ -74,6 +74,8 @@ for i in po/*.gmo ; do mkdir -p $OUTDIR/locale/$base/LC_MESSAGES cp $i $OUTDIR/locale/$base/LC_MESSAGES/deadbeef.mo done +cp translation/help.pt_BR.txt $OUTDIR/doc/ +cp translation/help.ru.txt $OUTDIR/doc/ # strip if [ $OSTYPE != 'Darwin' ];then -- cgit v1.2.3