Git commit 9133de7aa0e829ce297fd770c597eec33810f0b7 by Thomas Eschenbacher. Committed on 03/05/2015 at 11:55. Pushed by eschenbacher into branch 'master'.
minor README, comments, updates M +14 -13 CMakeLists.txt M +11 -10 README M +4 -4 doc/en/index.docbook http://commits.kde.org/kwave/9133de7aa0e829ce297fd770c597eec33810f0b7 diff --git a/CMakeLists.txt b/CMakeLists.txt index c301d9d..2401ca0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,19 +39,20 @@ PROJECT(kwave) ############################################################################# ### toplevel build targets: ### -# all - default target, build all files -# clean - clean up the current build directory -# deb - create a debian package -# doc - generate docbook files for online help -# distfiles - generate subdirectory with all files for distribution -# html_doc - generate HTML help (for the web) -# install - install the package, with support for DESTDIR -# rpm - create a RPM package + a src.rpm file -# src_rpm - create the source RPM only -# tarball - create a tar.bz2 archive with the sources + specfile -# uninstall - uninstall the package, with support for DESTDIR -# version-labels - update all version numbers and build dates -# tarball - create a tar.gz file with the sources +# all - default target, build all files +# clean - clean up the current build directory +# deb - create a debian package +# doc - generate docbook files for online help +# distfiles - generate subdirectory with all files for distribution +# html_doc - generate HTML help (for the web) +# install - install the package, with support for DESTDIR +# rpm - create a RPM package + a src.rpm file +# src_rpm - create the source RPM only +# tarball - create a tar.bz2 archive with the sources + specfile +# uninstall - uninstall the package, with support for DESTDIR +# update-translations - update translation files from KDE SVN +# version-labels - update all version numbers and build dates +# tarball - create a tar.gz file with the sources ############################################################################# ### check for the proper cmake version ### diff --git a/README b/README index 09c35ae..e3be740 100644 --- a/README +++ b/README @@ -32,10 +32,10 @@ of your choice and then generate it in a separate build directory. For example: cd ${HOME}/src -tar -xvzf kwave-0.8.12-1.tar.bz2 +tar -xvzf kwave-0.9.0-1.tar.bz2 mkdir kwave-build cd kwave-build -cmake ../kwave-0.8.12 +cmake ../kwave-0.9.0 make make install @@ -59,15 +59,15 @@ Installing the rpm package normally requires root permissions. 2.1 Building a binary rpm from archive file: ------------------------------------------- -Simply get the source archive (for example kwave-0.8.12-1.tar.bz2) and +Simply get the source archive (for example kwave-0.9.0-1.tar.bz2) and then type: -rpmbuild -ta kwave-0.8.12-1.tar.bz2 +rpmbuild -ta kwave-0.9.0-1.tar.bz2 If you want to build for a different architecture than your current, you might want to add the parameter "--target ...", for example: -rpmbuild -ta --target i586 kwave-0.8.12-1.tar.bz2 +rpmbuild -ta --target i586 kwave-0.9.0-1.tar.bz2 compiles for i586 architecture. @@ -85,7 +85,7 @@ make rpm (and you get both, a binary and a source rpm) Instructions on how to get the sources via GIT can be found in the Kwave handbook and on the Kwave project homepage at SourceForge -(see "http://sourceforge.net/git/?group_id=6478";). +(see "http://sourceforge.net/p/kwave/code/ci/master/tree/";). Please note that the online documentation in not included in GIT, it will created from the corresponding docbook source which is included. @@ -101,7 +101,7 @@ build the package on a system with the KDE base directory set to some location (like for example /usr) and install it on some other system and/or into a different directory. -rpm -Uvh --prefix=/usr/local kwave-0.8.12-1.i586.rpm +rpm -Uvh --prefix=/usr/local kwave-0.9.0-1.i586.rpm This modifies the path where the program is installed and it is strongly recommended that this is a directory that is contained in the KDEDIRS @@ -123,8 +123,8 @@ C/C++ compiler, the qt and the kde libraries. I am currently developing under a Gentoo Linux distribution (i586 architecture) using at least the following packages: -* cmake >= 2.4.6 (the cmake build system) -* gcc >= 3.0 (the C / C++ compiler) +* cmake >= 2.6.0 (the cmake build system) +* gcc >= 4.7 (the C / C++ compiler) * make >= 3.80 * libstdc++-v3 >= 3.3.4 (C++ library, including STL) @@ -135,11 +135,12 @@ I am currently developing under a Gentoo Linux distribution * ImageMagick >= 6.1 (needed to create scaled Kwave icons) * libmad + libmad-devel >= 0.15 (for MP3 import) -* id3lib >= 3.8.2 (for MP3 tag import, see www.id3lib.org) +* id3lib >= 3.8.1 (for MP3 tag import, see www.id3lib.org) * libogg >= 1.1.2 (for Ogg/Vorbis import/export) * libvorbis >= 1.1.0 (for Ogg/Vorbis import/export) * flac >= 1.2.0 (for FLAC import/export) * fftw >= 3.0 (for Sonagram plugin / FFT) +* pulseaudio >= 0.9.16 (for record/playback via PulseAudio) * samplerate >= 0.1.3 (for sample rate conversion) Some tools that are normally installed in every distribution: diff --git a/doc/en/index.docbook b/doc/en/index.docbook index 0a1173d..71c6ee3 100644 --- a/doc/en/index.docbook +++ b/doc/en/index.docbook @@ -18,7 +18,7 @@ <!ENTITY url_homepage "http://kwave.sourceforge.net/";> <!ENTITY url_id3lib "http://id3lib.sourceforge.net/";> <!ENTITY url_lame "http://lame.sourceforge.net/";> - <!ENTITY url_levelmeter "http://www.rikkus.info/esound-level-meter/";> + <!ENTITY url_levelmeter "https://web.archive.org/web/*/http://www.rikkus.info/esound-level-meter/";> <!ENTITY url_libaudiofile "http://www.68k.org/~michael/audiofile/";> <!ENTITY url_libmad "http://www.underbit.com/products/mad/";> <!ENTITY url_libsndfile "http://www.mega-nerd.com/libsndfile/";> @@ -607,11 +607,11 @@ If you intend to compile &kwave; from the sources, you will need at least: <itemizedlist> <listitem><para> - <ulink url="&url_cmake;">cmake</ulink>-2.4.6 or newer + <ulink url="&url_cmake;">cmake</ulink>-2.6.0 or newer </para></listitem> <listitem><para> A recent C/C++ compiler. GCC-4.x works fine, some older and any - newer version (like gcc-4.8 and newer) may work too. + newer version (like gcc-5.0) may work too. </para></listitem> <listitem><para> The glibc2 (libc-6) development environment. On SuSE systems @@ -627,7 +627,7 @@ the package is normally called "qt4-devel" or similar. </para></listitem> <listitem><para> - pulseaudio-4.0 or newer + pulseaudio-0.9.16 or newer </para></listitem> <listitem><para> id3lib-devel-3.8.1 or newer
