add all available ms2 plugins to the macosx bundle

diff --git a/Makefile.am b/Makefile.am
index 68af730ba2d667c4d34d60aff0347302534ebf4b..899ba66310f4a33b1674c6a5066aedc014631d6e 100644 (file)
--- 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 a07f1661895d2564a3d3fdeb968bc53cced66c15..4dc23693365a8f023a5b2820880511079f2e05f4 100644 (file)
--- 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 8d920933b300f19efb5ef564eadb38c479563825..def3a4c583a5b4d25ba3bdab9a56a35fd76e11e5 100644 (file)
--- 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 405a3d140e76e28ee5c762321a8dbca133a9fe07..4cee83249c8cfb1357c0dd3691a90c6ea9284ac2 160000 (submodule)
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 405a3d140e76e28ee5c762321a8dbca133a9fe07
+Subproject commit 4cee83249c8cfb1357c0dd3691a90c6ea9284ac2

diff --git a/oRTP b/oRTP
index 9e186f31a97618cc77d41d5b45ee6eb73873555d..a936749fac4d3e2f788a0c03b3c4ea2021b3ae13 160000 (submodule)
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 9e186f31a97618cc77d41d5b45ee6eb73873555d
+Subproject commit a936749fac4d3e2f788a0c03b3c4ea2021b3ae13