X-Git-Url: http://sjero.net/git/?p=linphone;a=blobdiff_plain;f=README.macos;h=dd39c2f6e866db181b7ccca97e3df6f6913d0fe8;hp=99d2e28165fad38d269c34f16b0d744fec9e93fe;hb=9b7ac9b79375f845edd0e8366e602863a223d2c0;hpb=12bcc48f1864bc1e98b14d7d5749fe0322a91c7c

diff --git a/README.macos b/README.macos
index 99d2e281..dd39c2f6 100644
--- a/README.macos
+++ b/README.macos
@@ -8,33 +8,111 @@ You need:
    Download and install macports using its user friendly installer.
 
 - Install build time dependencies
- $ port install automake autoconf libtool intltool
+ $ sudo port install automake autoconf libtool intltool
 
 - Install some linphone dependencies with macports
- $ port install speex-dev
- $ port install osip2
- $ port install eXosip2
- $ port install ffmpeg-devel
- $ port install sdl-devel
+ $ sudo port install speex
+ $ sudo port install libosip2 # WARNING: currently outdated in macport
+ $ sudo port install libeXosip2 #WARNING: currently outdated in macport
+ $ sudo port install ffmpeg-devel -gpl2
+ $ sudo port install libvpx
+ $ sudo port install readline
+ 
+- Install srtp (optional) for call encryption
+ $ sudo 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
+
+- Install zrtpcpp (optional), for unbreakable call encryption
+ $ sudo port install cmake
+ $ git clone git://git.linphone.org/zrtpcpp.git
+ $ cd zrtpcpp && cmake -Denable-ccrtp=false . && make
+ $ sudo make install
 
 - Install gtk. It is recommended to use the quartz backend for better integration.
- $ port install gtk2 +no_x11
- $ port install ige-mac-integration
+ $ sudo port install gtk2 +quartz +no_x11
+ $ sudo port install gtk-osx-application -python27
+ $ sudo port install hicolor-icon-theme
+ 
+- Install additional librairies required for wizard (linphone.org account creation assistant)
+ $ sudo port install libsoup
+ 
+ - Install sqlite3 for message storage
+ $ sudo port install sqlite3
+ 
+ ** WARNING 2013-03-06 glib-networking is currently broken in macports - generates crashes or hangs when used in a bundle **
+ As a temporary workaround, build a newer version by yourself:
+ $ wget http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.34/glib-networking-2.34.2.tar.xz
+ $ tar -xvzf glib-networking-2.34.2.tar.xz
+ $ cd glib-networking-2.34.2
+ $ ./configure --prefix=/opt/local --without-ca-certificates && make 
+ $ sudo make install
+
+- Compile and install the tunnel library (optional, proprietary extension only)
+
+ If you got the source code from git, run ./autogen.sh first
+
+ Then or otherwise, do:
+
+ $ ./configure --prefix=/opt/local && make && sudo make install
+
 
 - Compile linphone
 
-If you got the source code from git, run ./autogen.sh first.
+ If you got the source code from git, run ./autogen.sh first.
 
-Then or otherwise, do:
+ 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-x11 --with-srtp=/opt/local --with-gsm=/opt/local --enable-zrtp && make
 
-Install to /opt/local
+ Install to /opt/local
 
  $ sudo make install 
 
-Done.
+ Done.
+
+If you want to generate a portable bundle, then install gtk-mac-bundler.
+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.
+ 
+ $ make
+ $ make bundle
+
+The resulting bundle is located in linphone build directory, together with a zipped version.
+
+For a better appearance, you can install the gtk-quartz-engine (a gtk theme) that make gtk application more similar to other mac applications (but not perfect).
+
+ $ git clone https://github.com/jralls/gtk-quartz-engine.git
+ $ cd gtk-quartz-engine
+ $ autoreconf -i 
+ $ ./configure --prefix=/opt/local && make 
+ $ sudo make install
+
+Generate a new bundle to have it included.
+
+libiconv hack 
+*************
+
+The Makefile.am rules used to generate the bundle fetch a libiconv.2.dylib from a linphone download page.
+This library adds some additional symbols so that dependencies requiring the iconv from /usr/lib and the ones requiring from the bundle are both satisfied.
+In case this library needs to generated, here are the commands:
+ $ wget http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.14.tar.gz
+ $ cd libiconv-1.14
+ $ patch -p1 < ../linphone/build/macos/libiconv-macos.patch
+ $ ./configure --prefix=/opt/local --disable-static 'CFLAGS=-arch i386 -arch x86_64 -mmacosx-version-min=10.5' 'LDFLAGS=-arch i386 -arch x86_64 -mmacosx-version-min=10.5'  CXXFLAGS="-arch i386 -arch x86_64 -mmacosx-version-min=10.5" && make
+ $ make install DESTDIR=/tmp
 
+The resulted library can be found in /tmp/opt/local/lib
 
+