Merge branch 'master' into next

[paraslash.git] / REQUIREMENTS

diff --git a/REQUIREMENTS b/REQUIREMENTS
index a83c4f39b9571e108200a992852cf73cee4650fc..1991737b2817eceab575265133e83153336e675f 100644 (file)
--- a/REQUIREMENTS
+++ b/REQUIREMENTS
@@ -3,6 +3,10 @@ Requirements
 
 In any case you need
 
 
 In any case you need
 

+       - libosl: If you are compiling from git the osl sources should
+         have been cloned automatically. It is also available for
+         download from http://git.tuebingen.mpg.de/osl. Or run the
+         command "git clone git://git.tuebingen.mpg.de/osl"

        - gcc, the gnu compiler collection (shipped with distro): gcc-3.3
          or newer is required.
        - gnu make (shipped with disto, might be called gmake)
        - gcc, the gnu compiler collection (shipped with distro): gcc-3.3
          or newer is required.
        - gnu make (shipped with disto, might be called gmake)


@@ -19,17 +23,19 @@ In any case you need
 Optional features:
 
        - *mp3*: The mp3 decoder of para_filter is based on libmad:
 Optional features:
 
        - *mp3*: The mp3 decoder of para_filter is based on libmad:

-         http://www.underbit.com/products/mad/. If you prefer to use
-         the libmad package provided by your distributor, make sure
-         to install the corresponding development package as well.
-
-         For version 2 id3 tag support, you'll need libid3tag which
-         is also available through the above link. Without libid3tag,
-         only version 1 tags are recognized.
-
+         http://www.underbit.com/products/mad/. If you prefer to
+         use the libmad package provided by your distributor, make
+         sure to install the corresponding development package as
+         well. It is called libmad0-dev on debian-based systems.

          Note that libmad is not necessary for the server side,
          i.e. for sending mp3 files.
 
          Note that libmad is not necessary for the server side,
          i.e. for sending mp3 files.
 

+       - *id3 tags*:
+         For version-2 id3 tag support, you'll need libid3tag which
+         is also available through the above link (alternatively:
+         install package libid3tag0-dev). Without libid3tag, only
+         version one tags are recognized.
+

        - *ogg vorbis*: For ogg vorbis streams you'll need libogg,
          libvorbis, libvorbisfile: http://www.xiph.org/downloads/.
          The corresponding Debian packages are called libogg-dev
        - *ogg vorbis*: For ogg vorbis streams you'll need libogg,
          libvorbis, libvorbisfile: http://www.xiph.org/downloads/.
          The corresponding Debian packages are called libogg-dev


@@ -37,12 +43,8 @@ Optional features:
 
        - *aac*:
          For aac files (m4a) you'll need libfaad. Get it at
 
        - *aac*:
          For aac files (m4a) you'll need libfaad. Get it at

-         http://www.audiocoding.com/modules/wiki/?page=AAC
-
-       - *ortp*:
-         If you intend to use the optional ortp streamer, you'll
-         need libortp which is contained in the linphone source code:
-         http://www.linphone.org/index.php/eng
+         http://www.audiocoding.com/.
+         Debian package: libfaad-dev.

 
        - On Linux, you'll need to have ALSA's development package
          installed. The Debian package is called libasound2-dev.
 
        - On Linux, you'll need to have ALSA's development package
          installed. The Debian package is called libasound2-dev.


@@ -55,3 +57,4 @@ Hacking the source:
        - grutatxt http://www.triptico.com/software/grutatxt.html
        - doxygen http://www.stack.nl/~dimitri/doxygen/
        - global ftp://ftp.gnu.org/pub/gnu/global
        - grutatxt http://www.triptico.com/software/grutatxt.html
        - doxygen http://www.stack.nl/~dimitri/doxygen/
        - global ftp://ftp.gnu.org/pub/gnu/global

+       - m4: ftp://ftp.gnu.org/pub/gnu/m4/