X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=extras%2Fcontrib%2FREADME;h=72dd6ca9497d9e8eeee4b8d227cb75948e6903ab;hb=deb641c7c5e45770b3b1e2510e8bfc42a057af6c;hp=41df0d455c84326e10c9f31a9ee78e58f0e33d5a;hpb=3b099bef9abb9143b2a0c45b6d9bf83aaea3ef9e;p=vlc

diff --git a/extras/contrib/README b/extras/contrib/README
index 41df0d455c..72dd6ca949 100644
--- a/extras/contrib/README
+++ b/extras/contrib/README
@@ -1,24 +1,52 @@
 This is the contrib build system for VLC Media Player. It has been
-primarily developed for Mac OS X, though it should be easy to adapt to
-other operating systems.
+primarily developed for Mac, it has been adapted for BeOs and win32.
+It would be not too difficult to extend it to other sytem.
 
-To use it, first type :
+To use it, first in the contrib directory, type :
 	./bootstrap
 
-Customize config.mak if you need type, then you need to choose between
+You can specify an argument to cross compile, for example:
+    ./bootstrap i586-pc-beos
+This will look for a i586-pc-beos-gcc cross compiler. Default is to
+build natively.
+
+Bootstrap generates your default contrib configuration and puts it in a file
+named 'distro.mak'. Edit this file to fine-tune your preferences for 3rd-party
+libraries that will be build in the contrib system.
+
+Customize config.mak if you need to, then you need to choose between
 building from source (can take a long time but is easily customizable)
 and fetching a pre-compiled binary package. Either type 'make src'
-or 'make bin'.
-
-Once the contribs are built, you can start building VLC. VLC's bootstrap
-and configure scripts will automatically detect the contrib directory,
-but you still need to specify which plug-ins you want to build (though
-it is unnecessary to add --with-* or --with-*-tree). For instance my
-configure line is :
-	./configure --disable-x11 --disable-xvideo --disable-gtk --disable-sdl --enable-ffmpeg --with-ffmpeg-mp3lame --enable-mad --enable-libdvbpsi --enable-a52 --enable-dvdplay --enable-faad --enable-vorbis --enable-theora --enable-ogg --enable-slp --enable-flac --enable-libmpeg2 --enable-mkv --enable-speex --enable-debug
+or 'make bin' (also from the contrib directory).
 
-Then for Darwin, 'make' will build the VLC.app application and copy the
-contrib libs to VLC.app/Contents/MacOS/lib. The application is ready.
+Once the contribs are built, you can start building VLC.
+See: http://developers.videolan.org/vlc/osx-compile.html 
+or INSTALL.win32 for more details on that.
 
 Happy hacking.
 --Meuuh 2003-11-15
+
+Appendix: 
+ I) BUILDING AMR SUPPORT IN FFMPEG
+
+To build ffmpeg with AMR support add HAVE_AMR=1 to config.mak or do:
+
+echo "HAVE_AMR=1" >> config.mak
+
+and add .libamrwb .libamrnb (before .ffmpeg) to your distro.mak. Then rebuild the contrib with: 
+
+make src
+
+
+ II) The following patches have already been sent to the upstream developers:
+
+ffmpeg-cvs-mactel.patch - split in 5 and sent to ffmpeg-devel@mplayerhq.hu
+ o patch-ffmpeg-0b.diff
+ o patch-ffmpeg-darwin-support.diff
+ o patch-ffmpeg-inline-asm-macros.diff
+ o patch-ffmpeg-nop.diff
+ o patch-ffmpeg-p2align.diff
+flac-mactel.patch - sent to flac-dev@lists.sourceforge.net
+libdvdnav-mactel.patch - sent to dvd-devel@lists.sourceforge.net
+mpeg2dec.patch - committed upstream, will be in the 0.4.1 release
+