fix macos build and crash at exit from dock.

[linphone] / README.macos

diff --git a/README.macos b/README.macos
index 98b5b9fb60adf78a30ae815e577d859bf7b38878..d8c07159056b4c6d8b3a7a46b72ae3294f52fee7 100644 (file)
--- a/README.macos
+++ b/README.macos
@@ -15,26 +15,18 @@ You need:
  $ port install libosip2
  $ port install libeXosip2
  $ port install ffmpeg-devel
-
-- Install SDL (for video display)
-Unfortunately the current (august 2011) version of sdl in macports crashes all the time. Fortunately these bugs are fixed in the development branch of SDL.
-So we recommend to download SDL 1.3 with mercurial (hg) and compile it by yourself, like this:
-First, make sure you have mercurial:
- $ sudo port install mercurial
-Fetch SDL:
- $ hg clone http://hg.libsdl.org/SDL
-Compile:
- $ cd SDL 
- $ ./autogen.sh
- $ ./configure --prefix=/opt/local && make -j4
+ 
+- Install srtp (optional) for call encryption
+ $ port install srtp
+ If that fails, get from source:
+ $ git clone git://git.linphone.org/srtp.git
+ $ cd srtp && autoconf && ./configure --prefix=/opt/local && make libsrtp.a
  $ sudo make install
 
 When this version will be integrated into macports, only this will be necessary:
  $ port install libsdl-devel
 
 - Install gtk. It is recommended to use the quartz backend for better integration.
- $ port install cairo +quartz +no_x11
- $ port install pango +quartz +no_x11
  $ port install gtk2 +quartz +no_x11
  $ port install ige-mac-integration
  $ port install hicolor-icon-theme
@@ -45,7 +37,7 @@ If you got the source code from git, run ./autogen.sh first.
 
 Then or otherwise, do:
        
- $ ./configure --prefix=/opt/local --with-readline=/opt/local --disable-strict --disable-x11 && make
+ $ ./configure --prefix=/opt/local --with-readline=/opt/local --disable-strict --disable-x11 --with-srtp=/opt/local && make
 
 Install to /opt/local
 
@@ -58,6 +50,8 @@ Use git:
  $ git clone https://github.com/jralls/gtk-mac-bundler.git 
  $ cd gtk-mac-bundler && make install
  $ export PATH=$PATH:~/.local/bin
+ #make this dummy charset.alias file for the bundler to be happy:
+ $ sudo touch touch /opt/local/lib/charset.alias
 
 Then run, inside linphone source tree:
  1. Run configure as told before but with "--enable-relativeprefix" appended.