From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Sun, 19 Feb 2012 15:07:59 +0000 (+0100)
Subject: add all available ms2 plugins to the macosx bundle
X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=11e7f7e723c180d57cc8229e24586e789f99245d

add all available ms2 plugins to the macosx bundle
---

diff --git a/Makefile.am b/Makefile.am
index 68af730b..899ba663 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -215,6 +215,7 @@ bundle: $(LIBICONV_HACK)
 	BUNDLE_PREFIX=$(BUNDLEPREFIX) \
 	LINPHONE_INSTALL_PREFIX=$(INSTALLDIR_WITH_PREFIX) \
 	LIBLINPHONE_INSTALL_PREFIX=$(INSTALLDIR_WITH_PREFIX) \
+	MS2_PLUGINS_INSTALL_PREFIX=$(prefix) \
 	gtk-mac-bundler $(PACKAGE_BUNDLE_FILE)
 	printf "[Pango]\nModuleFiles=./etc/pango/pango.modules\n" \
 	> $(BUNDLEDIR)/Contents/Resources/etc/pango/pangorc 
diff --git a/README.macos b/README.macos
index a07f1661..4dc23693 100644
--- a/README.macos
+++ b/README.macos
@@ -66,7 +66,7 @@ Then run, inside linphone source tree:
  $ make
  $ make bundle
 
-The resulting bundle is located in ~/Desktop, together with a zipped version.
+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).
 
diff --git a/build/macos/linphone.bundle b/build/macos/linphone.bundle
index 8d920933..def3a4c5 100644
--- a/build/macos/linphone.bundle
+++ b/build/macos/linphone.bundle
@@ -15,6 +15,7 @@
     <prefix name="default">/opt/local</prefix>
     <prefix name="linphone">${env:LINPHONE_INSTALL_PREFIX}</prefix>
     <prefix name="liblinphone">${env:LIBLINPHONE_INSTALL_PREFIX}</prefix>
+    <prefix name="ms2plugins">${env:MS2_PLUGINS_INSTALL_PREFIX}</prefix>
     <prefix name="macports">/opt/local</prefix>
     <!-- The project directory is the default location of the created
          app. If you leave out the path, the current directory is
@@ -79,8 +80,8 @@
     ${prefix:macports}/lib/libsoup-2.4*.dylib
   </binary>
 
-  <binary dest="${bundle}/Contents/Resources/lib/liblinphone/plugins/libmssilk.so">
-    ${prefix}/lib/mediastreamer/plugins/libmssilk.so
+  <binary >
+    ${prefix:ms2plugins}/lib/mediastreamer/plugins/*.so
   </binary>
 
   <!-- Copy in GTK+ modules.  Note the ${gtkdir} macro, which expands
diff --git a/mediastreamer2 b/mediastreamer2
index 405a3d14..4cee8324 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 405a3d140e76e28ee5c762321a8dbca133a9fe07
+Subproject commit 4cee83249c8cfb1357c0dd3691a90c6ea9284ac2
diff --git a/oRTP b/oRTP
index 9e186f31..a936749f 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 9e186f31a97618cc77d41d5b45ee6eb73873555d
+Subproject commit a936749fac4d3e2f788a0c03b3c4ea2021b3ae13