Include patch from linphone web version.

Makefile.am

@@ -37,7 +37,7 @@ SDK_EXCLUDED= \
 
 GTK_PREFIX=/
 GTK_THEME=Outcrop
-GTK_FILELIST=gtk+-2.22.1.filelist
+GTK_FILELIST=gtk+-2.24.8.filelist
 GTK_FILELIST_PATH=$(abs_top_srcdir)/$(GTK_FILELIST)
 LINPHONEDEPS_FILELIST=linphone-deps.filelist
 WINBINDIST_FILES=`cat $(abs_top_srcdir)/$(LINPHONEDEPS_FILELIST)`
@@ -101,31 +101,33 @@ endif
 other-cherrypick:
 	cd $(GTK_PREFIX) && \
 	for file in $(WINBINDIST_FILES) ; do \
-		if test -d $$file; then \
+		if test -d $(prefix)/$$file; then \
 			$(MKDIR_P) $(INSTALLDIR_WITH_PREFIX)/$$file ;\
 		else \
-			cp $$file $(INSTALLDIR_WITH_PREFIX)/$$file ;\
+			cp $(prefix)/$$file $(INSTALLDIR_WITH_PREFIX)/$$file ;\
 		fi \
 	done
-	cp /mingw/bin/libgcc_s*.dll \
-		/mingw/bin/libstdc++-6.dll \
-		/mingw/bin/libintl-8.dll \
-		/mingw/bin/libiconv-2.dll \
-		/mingw/bin/pthreadGC2.dll \
-		$(INSTALLDIR_WITH_PREFIX)/bin/.
+	if test -d /mingw/bin ; then \
+		cp /mingw/bin/libgcc_s*.dll \
+			/mingw/bin/libstdc++-6.dll \
+			/mingw/bin/libintl-8.dll \
+			/mingw/bin/libiconv-2.dll \
+			/mingw/bin/pthreadGC2.dll \
+			$(INSTALLDIR_WITH_PREFIX)/bin/. \
+	fi
 
 
 gtk-cherrypick:
 	cd $(GTK_PREFIX) && \
 	for file in `cat $(GTK_FILELIST_PATH)` ; do \
-		if test -d $$file; then \
+		if test -d $(prefix)/$$file; then \
 			$(MKDIR_P) $(INSTALLDIR_WITH_PREFIX)/$$file ;\
 		else \
-			cp $$file $(INSTALLDIR_WITH_PREFIX)/$$file ;\
+			cp $(prefix)/$$file $(INSTALLDIR_WITH_PREFIX)/$$file ;\
 		fi \
 	done && \
 	$(MKDIR_P) $(INSTALLDIR_WITH_PREFIX)/share/themes && \
-	cp -rf share/themes/$(GTK_THEME) $(INSTALLDIR_WITH_PREFIX)/share/themes/.
+	cp -rf $(prefix)/share/themes/$(GTK_THEME) $(INSTALLDIR_WITH_PREFIX)/share/themes/.
 
 zip:
 	rm -f $(ZIPFILE)

configure.ac

@@ -23,6 +23,7 @@ LIBLINPHONE_SO_AGE=0 dnl increment this number when you add an interface, set to
 
 LIBLINPHONE_SO_VERSION=$LIBLINPHONE_SO_CURRENT:$LIBLINPHONE_SO_REVISION:$LIBLINPHONE_SO_AGE
 
+AC_SUBST(LIBLINPHONE_SO_CURRENT, $LIBLINPHONE_SO_CURRENT)
 AC_SUBST(LIBLINPHONE_SO_VERSION, $LIBLINPHONE_SO_VERSION)
 AC_SUBST(LINPHONE_VERSION)
 
@@ -36,6 +37,8 @@ AC_SUBST([docdir], [${datadir}/doc])
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_MACRO_DIR([m4])
 
+gl_LD_OUTPUT_DEF
+
 AC_PROG_CXX(["xcrun clang++" g++])
 AC_PROG_CC(["xcrun clang" gcc])
 
@@ -61,6 +64,7 @@ case $target in
 		GUI_FLAGS="-mwindows"
 		CONSOLE_FLAGS="-mconsole"
 		mingw_found=yes
+		AC_CHECK_TOOL(WINDRES, windres)
 	;;
 	armv6-apple-darwin|armv7-apple-darwin|i386-apple-darwin|armv7s-apple-darwin)
 		CFLAGS="$CFLAGS -DTARGET_OS_IPHONE "
@@ -145,7 +149,7 @@ else
 fi
 
 GETTEXT_PACKAGE=linphone
-AC_SUBST(GETTEXT_PACKAGE)
+AC_SUBST([GETTEXT_PACKAGE])
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[The name of the gettext package name])
 dnl AC_CHECK_LIB(intl,libintl_gettext)
 
@@ -803,6 +807,12 @@ else
                                         ],[foo=bar],[$CUNIT_LIBS])
 fi
 
+case "$target_os" in
+	*linux*)
+		# Eliminate -lstdc++ addition to postdeps for cross compiles.
+		postdeps_CXX=`echo " $postdeps_CXX " | sed 's, -lstdc++ ,,g'`
+	;;
+esac
 
 dnl ##################################################
 dnl # Check for doxygen

console/linphonec.c

@@ -1075,7 +1075,7 @@ linphonec_initialize_readline()
 	rl_attempted_completion_function = linephonec_readline_completion;
 
 	/* printf("Readline initialized.\n"); */
-        setlinebuf(stdout);
+	setlinebuf(stdout);
 	return 0;
 }
 

coreapi/Makefile.am

@@ -82,6 +82,21 @@ endif
 
 liblinphone_la_LDFLAGS= -version-info $(LIBLINPHONE_SO_VERSION) -no-undefined
 
+if HAVE_LD_OUTPUT_DEF
+liblinphone_la_LDFLAGS += -Wl,--output-def,liblinphone-$(LIBLINPHONE_SO_CURRENT).def
+defexecdir = $(libdir)
+defexec_DATA = liblinphone-$(LIBLINPHONE_SO_CURRENT).def
+CLEANFILES = $(defexec_DATA)
+
+liblinphone-$(LIBLINPHONE_SO_CURRENT).def: liblinphone.la
+
+if BUILD_WIN32
+defexec_DATA += liblinphone-$(LIBLINPHONE_SO_CURRENT).lib
+liblinphone-$(LIBLINPHONE_SO_CURRENT).lib: liblinphone-$(LIBLINPHONE_SO_CURRENT).def liblinphone.la
+	$(DLLTOOL) --dllname liblinphone-$(LIBLINPHONE_SO_CURRENT).dll --input-def liblinphone-$(LIBLINPHONE_SO_CURRENT).def --output-lib $@ liblinphone.la
+endif
+endif
+
 liblinphone_la_LIBADD= \
 		$(SIPSTACK_LIBS) \
 		$(MEDIASTREAMER_LIBS) \

gtk+-2.24.8.filelist

+bin
+bin/libasprintf-0.dll
+bin/libatk-1.0-0.dll
+bin/libcairo-2.dll
+bin/libcairo-gobject-2.dll
+bin/libcairo-script-interpreter-2.dll
+bin/libexpat-1.dll
+bin/libffi-5.dll
+bin/libfontconfig-1.dll
+bin/libfreetype-6.dll
+bin/libintl-8.dll
+bin/libgailutil-18.dll
+bin/libgdk-win32-2.0-0.dll
+bin/libgdk_pixbuf-2.0-0.dll
+bin/libgio-2.0-0.dll
+bin/libglib-2.0-0.dll
+bin/libgmodule-2.0-0.dll
+bin/libgobject-2.0-0.dll
+bin/libgthread-2.0-0.dll
+bin/libgtk-win32-2.0-0.dll
+bin/libiconv-2.dll
+bin/libpango-1.0-0.dll
+bin/libpangocairo-1.0-0.dll
+bin/libpangoft2-1.0-0.dll
+bin/libpangowin32-1.0-0.dll
+bin/libpixman-1-0.dll
+bin/libpng15-15.dll
+bin/libxml2-2.dll
+bin/zlib1.dll
+lib/gtk-2.0
+lib/gtk-2.0/2.10.0
+lib/gtk-2.0/2.10.0/engines
+lib/gtk-2.0/2.10.0/engines/libpixmap.dll
+lib/gtk-2.0/2.10.0/engines/libwimp.dll
+lib/gtk-2.0/include
+lib/gtk-2.0/include/gdkconfig.h
+lib/gtk-2.0/modules
+lib/gtk-2.0/modules/libgail.dll
+etc
+etc/fonts
+etc/fonts/fonts.conf
+etc/fonts/fonts.dtd
+etc/gtk-2.0
+etc/gtk-2.0/gtk.immodules
+etc/gtk-2.0/im-multipress.conf
+etc/pango
+etc/pango/pango.modules
+share/locale/fr
+share/locale/fr/LC_MESSAGES
+share/locale/fr/LC_MESSAGES/atk10.mo
+share/locale/fr/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/fr/LC_MESSAGES/gettext-runtime.mo
+share/locale/fr/LC_MESSAGES/glib20.mo
+share/locale/fr/LC_MESSAGES/gtk20-properties.mo
+share/locale/fr/LC_MESSAGES/gtk20.mo
+share/locale/de
+share/locale/de/LC_MESSAGES
+share/locale/de/LC_MESSAGES/atk10.mo
+share/locale/de/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/de/LC_MESSAGES/gettext-runtime.mo
+share/locale/de/LC_MESSAGES/glib20.mo
+share/locale/de/LC_MESSAGES/gtk20-properties.mo
+share/locale/de/LC_MESSAGES/gtk20.mo
+share/locale/sv
+share/locale/sv/LC_MESSAGES
+share/locale/sv/LC_MESSAGES/atk10.mo
+share/locale/sv/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/sv/LC_MESSAGES/gettext-runtime.mo
+share/locale/sv/LC_MESSAGES/glib20.mo
+share/locale/sv/LC_MESSAGES/gtk20-properties.mo
+share/locale/sv/LC_MESSAGES/gtk20.mo
+share/locale/cs
+share/locale/cs/LC_MESSAGES
+share/locale/cs/LC_MESSAGES/atk10.mo
+share/locale/cs/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/cs/LC_MESSAGES/gettext-runtime.mo
+share/locale/cs/LC_MESSAGES/glib20.mo
+share/locale/cs/LC_MESSAGES/gtk20-properties.mo
+share/locale/cs/LC_MESSAGES/gtk20.mo
+share/locale/es
+share/locale/es/LC_MESSAGES
+share/locale/es/LC_MESSAGES/atk10.mo
+share/locale/es/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/es/LC_MESSAGES/gettext-runtime.mo
+share/locale/es/LC_MESSAGES/glib20.mo
+share/locale/es/LC_MESSAGES/gtk20-properties.mo
+share/locale/es/LC_MESSAGES/gtk20.mo
+share/locale/hu
+share/locale/hu/LC_MESSAGES
+share/locale/hu/LC_MESSAGES/atk10.mo
+share/locale/hu/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/hu/LC_MESSAGES/glib20.mo
+share/locale/hu/LC_MESSAGES/gtk20-properties.mo
+share/locale/hu/LC_MESSAGES/gtk20.mo
+share/locale/it
+share/locale/it/LC_MESSAGES
+share/locale/it/LC_MESSAGES/atk10.mo
+share/locale/it/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/it/LC_MESSAGES/gettext-runtime.mo
+share/locale/it/LC_MESSAGES/glib20.mo
+share/locale/it/LC_MESSAGES/gtk20-properties.mo
+share/locale/it/LC_MESSAGES/gtk20.mo
+share/locale/ja
+share/locale/ja/LC_MESSAGES
+share/locale/ja/LC_MESSAGES/atk10.mo
+share/locale/ja/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/ja/LC_MESSAGES/gettext-runtime.mo
+share/locale/ja/LC_MESSAGES/glib20.mo
+share/locale/ja/LC_MESSAGES/gtk20-properties.mo
+share/locale/ja/LC_MESSAGES/gtk20.mo
+share/locale/nl
+share/locale/nl/LC_MESSAGES
+share/locale/nl/LC_MESSAGES/atk10.mo
+share/locale/nl/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/nl/LC_MESSAGES/gettext-runtime.mo
+share/locale/nl/LC_MESSAGES/glib20.mo
+share/locale/nl/LC_MESSAGES/gtk20-properties.mo
+share/locale/nl/LC_MESSAGES/gtk20.mo
+share/locale/pl
+share/locale/pl/LC_MESSAGES
+share/locale/pl/LC_MESSAGES/atk10.mo
+share/locale/pl/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/pl/LC_MESSAGES/gettext-runtime.mo
+share/locale/pl/LC_MESSAGES/glib20.mo
+share/locale/pl/LC_MESSAGES/gtk20-properties.mo
+share/locale/pl/LC_MESSAGES/gtk20.mo
+share/locale/ru
+share/locale/ru/LC_MESSAGES
+share/locale/ru/LC_MESSAGES/atk10.mo
+share/locale/ru/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/ru/LC_MESSAGES/gettext-runtime.mo
+share/locale/ru/LC_MESSAGES/glib20.mo
+share/locale/ru/LC_MESSAGES/gtk20-properties.mo
+share/locale/ru/LC_MESSAGES/gtk20.mo
+share/locale/pt_BR
+share/locale/pt_BR/LC_MESSAGES
+share/locale/pt_BR/LC_MESSAGES/atk10.mo
+share/locale/pt_BR/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/pt_BR/LC_MESSAGES/gettext-runtime.mo
+share/locale/pt_BR/LC_MESSAGES/glib20.mo
+share/locale/pt_BR/LC_MESSAGES/gtk20-properties.mo
+share/locale/pt_BR/LC_MESSAGES/gtk20.mo
+share/themes
+share/themes/Default
+share/themes/Default/gtk-2.0-key
+share/themes/Default/gtk-2.0-key/gtkrc
+share/themes/Emacs
+share/themes/Emacs/gtk-2.0-key
+share/themes/Emacs/gtk-2.0-key/gtkrc
+share/themes/MS-Windows
+share/themes/MS-Windows/gtk-2.0
+share/themes/MS-Windows/gtk-2.0/gtkrc
+share/themes/Raleigh
+share/themes/Raleigh/gtk-2.0
+share/themes/Raleigh/gtk-2.0/gtkrc

gtk/Makefile.am

@@ -61,7 +61,7 @@ linphone_LDADD=	$(top_builddir)/coreapi/liblinphone.la \
 if BUILD_WIN32
 
 linphone.res:	$(LINPHONE_ICO_RC_FILE) $(LINPHONE_ICO_FILE)
-	windres $(srcdir)/$(LINPHONE_ICO_RC_FILE) -O coff -o linphone.res
+	$(WINDRES) $(srcdir)/$(LINPHONE_ICO_RC_FILE) -O coff -o linphone.res
 
 linphone_LDADD+=linphone.res -lwininet
 linphone_LDFLAGS=-Wl,--export-all-symbols -mwindows

linphone-deps.filelist

 ./bin/avcodec-53.dll
+./bin/libspeex-1.dll
+./bin/libspeexdsp-1.dll
 ./bin/avutil-51.dll
 ./bin/libeay32.dll
 ./bin/ssleay32.dll

m4/ld-output-def.m4

+# ld-output-def.m4 serial 2
+dnl Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Simon Josefsson
+
+# gl_LD_OUTPUT_DEF()
+# -------------
+# Check if linker supports -Wl,--output-def and define automake
+# conditional HAVE_LD_OUTPUT_DEF if it is.
+AC_DEFUN([gl_LD_OUTPUT_DEF],
+[
+  AC_CACHE_CHECK([if gcc/ld supports -Wl,--output-def],
+    [gl_cv_ld_output_def],
+    [if test "$enable_shared" = no; then
+       gl_cv_ld_output_def="not needed, shared libraries are disabled"
+     else
+       gl_ldflags_save=$LDFLAGS
+       LDFLAGS="-Wl,--output-def,conftest.def"
+       AC_LINK_IFELSE([AC_LANG_PROGRAM([])],
+                   [gl_cv_ld_output_def=yes],
+                   [gl_cv_ld_output_def=no])
+       rm -f conftest.def
+       LDFLAGS="$gl_ldflags_save"
+     fi])
+  AM_CONDITIONAL([HAVE_LD_OUTPUT_DEF], test "x$gl_cv_ld_output_def" = "xyes")
+])

mediastreamer2 @ 57cc6290

-Subproject commit 8deb23a1b03e343b753d2e896347453ada72e4df
+Subproject commit 57cc62904c856c6822a9b3fb83133f80abd81cf6

oRTP @ 509516fb

-Subproject commit b5d1414e63b21c83eb8e26988a3fe423ff8fc3b3
+Subproject commit 509516fb447d8355496ae3850777aa214f60e048