Merge branch 'master' into next

[paraslash.git] / REQUIREMENTS

diff --git a/REQUIREMENTS b/REQUIREMENTS
index 4fd2568fabfacfb6d70586cffa7ffc66524f3616..1991737b2817eceab575265133e83153336e675f 100644 (file)
--- a/REQUIREMENTS
+++ b/REQUIREMENTS
@@ -3,6 +3,10 @@ Requirements
 
 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)
@@ -29,8 +33,8 @@ Optional features:
        - *id3 tags*:
          For version-2 id3 tag support, you'll need libid3tag which
          is also available through the above link (alternatively:
-         install package libid3tag0). Without libid3tag, only version
-         one tags are recognized.
+         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/.
@@ -39,12 +43,8 @@ Optional features:
 
        - *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.
@@ -57,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
+       - m4: ftp://ftp.gnu.org/pub/gnu/m4/