update Portfile-devel

diff --git a/Makefile.am b/Makefile.am
index b972eba81f822a082505b1ea660372dbb94a4655..ff9efa459615165cee1e539bae18d6d6d552b126 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -163,14 +163,19 @@ setup.exe: filelist
 newdate:
        cd gtk && $(MAKE) newdate
 
+if HAVE_MD5SUM
+GEN_MD5=$(shell $(MD5SUM) linphone-$(VERSION).tar.gz | awk {'print $$4'})
+else
+GEN_MD5=$(shell $(MD5SUM) linphone-$(VERSION).tar.gz | awk {'print $$1'})
+endif
 
 Portfile:      $(top_srcdir)/scripts/Portfile.tmpl dist
        sed -e 's/\@VERSION\@/$(LINPHONE_VERSION)/g' \
-         -e 's/\@LINPHONE_MD5\@/$(shell md5sum linphone-$(VERSION).tar.gz | awk {'print $$1'})/' < $< > $@
+         -e 's/\@LINPHONE_MD5\@/$(GEN_MD5)/' < $< > $@
 
 Portfile-devel:        $(top_srcdir)/scripts/Portfile-devel.tmpl dist
        sed -e 's/\@VERSION\@/$(LINPHONE_VERSION)/g' \
-         -e 's/\@LINPHONE_MD5\@/$(shell md5sum linphone-$(VERSION).tar.gz | awk {'print $$1'})/' < $< > $@
+         -e 's/\@LINPHONE_MD5\@/$(GEN_MD5)/' < $< > $@
 
 bundle:
        rm -rf $(INSTALLDIR)

diff --git a/README.macos b/README.macos
index 99d2e28165fad38d269c34f16b0d744fec9e93fe..1ed55dc76c1da198a1bcb7e24efdd7df4d7c6989 100644 (file)
--- a/README.macos
+++ b/README.macos
@@ -15,6 +15,21 @@ You need:
  $ port install osip2
  $ port install eXosip2
  $ 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 --disable-video-dummy --disable-video-x11 && make -j4
+ $ sudo make install
+
+When this version will be integrated into macports, only this will be necessary:
  $ port install sdl-devel
 
 - Install gtk. It is recommended to use the quartz backend for better integration.
@@ -27,7 +42,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
+ $ PKG_CONFIG_PATH=/usr/local/lib/pkgconfig ./configure --prefix=/opt/local --with-readline=/opt/local --disable-strict --disable-x11 && make
 
 Install to /opt/local
 

diff --git a/configure.ac b/configure.ac
index 08bcd8bf9e50887b7564ce76c6c495d19dbdf15d..03f65f7d02a692c2a5798c4de37125a8b87bb8bb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([linphone],[3.4.3],[linphone-developers@nongnu.org])
+AC_INIT([linphone],[3.4.99.1],[linphone-developers@nongnu.org])
 AC_CANONICAL_SYSTEM
 AC_CONFIG_SRCDIR([coreapi/linphonecore.c])
 
@@ -41,6 +41,8 @@ AC_C_INLINE
 AM_PROG_CC_STDC
 AC_HEADER_STDC
 AM_PROG_CC_C_O
+AC_CHECK_PROGS(MD5SUM,[md5sum md5])
+AM_CONDITIONAL(HAVE_MD5SUM,test -n $MD5SUM)
 
 case $target_os in
        *mingw32ce)

diff --git a/mediastreamer2 b/mediastreamer2
index 45f2ab75d5261b309c62957b78e11cac15728b3c..340acff0001e92d1f126b484d100e1c1d0746b34 160000 (submodule)
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 45f2ab75d5261b309c62957b78e11cac15728b3c
+Subproject commit 340acff0001e92d1f126b484d100e1c1d0746b34

diff --git a/scripts/Portfile-devel.tmpl b/scripts/Portfile-devel.tmpl
index 418c0a97baf4e9c9d894042f11ed01ee67ed10a1..8a1b46119447f70a5f497ef1d27d0dd7ca682ca1 100644 (file)
--- a/scripts/Portfile-devel.tmpl
+++ b/scripts/Portfile-devel.tmpl
@@ -17,8 +17,14 @@ distname              linphone-${version}
 
 checksums             md5 @LINPHONE_MD5@
 
-depends_lib           port:libglade2 \
+depends_lib           port:ffmpeg \
+                     port:readline \
                       port:speex-devel \
-                      port:libeXosip2 
+                      port:libeXosip2 \
+                     port:libsdl-devel \
+                     port:gtk2  \
+                     port:ige-mac-integration
+
+configure.args-append --disable-x11 --with-readline=/opt/local --disable-strict
+
 
-configure.args-append --disable-video --with-readline=none