macosx: Add a missing PL_LOCK in the wizard.

[vlc] / extras / contrib / README

diff --git a/extras/contrib/README b/extras/contrib/README
index fdd6b7280d57c76daa6f0996ed737da21e9dc3e0..72dd6ca9497d9e8eeee4b8d227cb75948e6903ab 100644 (file)
--- a/extras/contrib/README
+++ b/extras/contrib/README
@@ -1,6 +1,6 @@
 This is the contrib build system for VLC Media Player. It has been
 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 in the contrib directory, type :
        ./bootstrap
 
 To use it, first in the contrib directory, type :
        ./bootstrap


@@ -10,16 +10,43 @@ You can specify an argument to cross compile, for example:
 This will look for a i586-pc-beos-gcc cross compiler. Default is to
 build natively.
 
 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' (also from the contrib directory).
 
 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' (also from the contrib directory).
 

-make bin IS NOT WORKING atm USE make src
-

 Once the contribs are built, you can start building VLC.
 See: http://developers.videolan.org/vlc/osx-compile.html 
 Once the contribs are built, you can start building VLC.
 See: http://developers.videolan.org/vlc/osx-compile.html 

-for more details on that.
+or INSTALL.win32 for more details on that.

 
 Happy hacking.
 --Meuuh 2003-11-15
 
 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
+