Commit 12f8197d authored by Simon Morlat's avatar Simon Morlat

updated for latest gtk+2 bundle

parent 55af0b6a
......@@ -113,7 +113,7 @@ other-cherrypick:
/mingw/bin/libintl-8.dll \
/mingw/bin/libiconv-2.dll \
/mingw/bin/pthreadGC2.dll \
$(INSTALLDIR_WITH_PREFIX)/bin/. \
$(INSTALLDIR_WITH_PREFIX)/bin/. ;\
fi
......
......@@ -26,7 +26,7 @@ Download lastest linphone-deps-win32 zip from
http://download.savannah.gnu.org/releases-noredirect/linphone/misc
using your browser.
Download lastest gtk+2 win32 bundle from http://www.gtk.org
Download lastest gtk+-2.24.10 win32 _bundle_ from http://www.gtk.org
Install all these three package in /:
......@@ -70,14 +70,14 @@ Kill it. Don't know what it is, but once killed, windows runs normally.
./autogen.sh
./configure --prefix=/opt/linphone --enable-shared --disable-static
./configure --prefix=/usr --enable-shared --disable-static
#note: in order to use the tunnel, append --enable-tunnel to the configure line above.
#compile:
make
#now install to /opt/linphone, required for compilation of plugins.
#now install to /usr, required for compilation of plugins.
make install
......@@ -96,7 +96,7 @@ make setup.exe
#build plugins
cd mediastreamer2/plugins/msx264
./autogen.sh
PKG_CONFIG_PATH=/opt/linphone/lib/pkgconfig ./configure --prefix=/opt/linphone --enable-shared --disable-static
PKG_CONFIG_PATH=/usr/lib/pkgconfig ./configure --prefix=/usr --enable-shared --disable-static
#make a binary zip of this plugin
make zip
#or make an installer
......@@ -105,7 +105,7 @@ make setup.exe
#the buddylookup plugin enables lookup of buddies in a remote database using xml-rpc over http/https.
cd coreapi/plugins/buddylookup
./autogen.sh
PKG_CONFIG_PATH=/opt/linphone/lib/pkgconfig ./configure --prefix=/opt/linphone --enable-shared --disable-static
PKG_CONFIG_PATH=/usr/lib/pkgconfig ./configure --prefix=/usr --enable-shared --disable-static
make
#make a binary zip of this plugin
make zip
......@@ -129,7 +129,7 @@ libavcodec, libavutil, libavformat, libavdevice, libswscale (compiled, all these
libtheora (from the web)
libx264 (compiled from the version distributed from linphone's web site)
libogg (from the web)
libspeex, libspeexdsp (compiled, statically to workaround a dll-related crash)
libspeex, libspeexdsp (compiled)
libgnutls (from the web)
libgsm (from the web)
libxml2 (compiled)
......
......@@ -16,7 +16,6 @@ find share/locale/hu
find share/locale/it
find share/locale/ja
find share/locale/nb
find share/locale/nb_NO
find share/locale/nl
find share/locale/pl
find share/locale/pt
......@@ -24,7 +23,6 @@ find share/locale/pt_BR
find share/locale/ru
find share/locale/sr
find share/locale/sv
find share/locale/zh
find share/locale/zh_CN
find share/locale/zh_TW
find share/themes
bin
bin/freetype6.dll
bin/intl.dll
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/libgcc_s_dw2-1.dll
bin/libgdk-win32-2.0-0.dll
bin/libgdk_pixbuf-2.0-0.dll
bin/libgio-2.0-0.dll
......@@ -18,14 +18,11 @@ 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/libpng14-14.dll
bin/zlib1.dll
lib/gtk-2.0
lib/gtk-2.0/2.10.0
......@@ -37,6 +34,9 @@ lib/gtk-2.0/include/gdkconfig.h
lib/gtk-2.0/modules
lib/gtk-2.0/modules/libgail.dll
etc
etc/bash_completion.d
etc/bash_completion.d/gdbus-bash-completion.sh
etc/bash_completion.d/gsettings-bash-completion.sh
etc/fonts
etc/fonts/fonts.conf
etc/fonts/fonts.dtd
......@@ -45,30 +45,6 @@ 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
......@@ -77,6 +53,14 @@ 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/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/es
share/locale/es/LC_MESSAGES
share/locale/es/LC_MESSAGES/atk10.mo
......@@ -85,6 +69,21 @@ 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/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/he
share/locale/he/LC_MESSAGES
share/locale/he/LC_MESSAGES/atk10.mo
share/locale/he/LC_MESSAGES/gdk-pixbuf.mo
share/locale/he/LC_MESSAGES/glib20.mo
share/locale/he/LC_MESSAGES/gtk20-properties.mo
share/locale/he/LC_MESSAGES/gtk20.mo
share/locale/hu
share/locale/hu/LC_MESSAGES
share/locale/hu/LC_MESSAGES/atk10.mo
......@@ -108,6 +107,14 @@ 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/nb
share/locale/nb/LC_MESSAGES
share/locale/nb/LC_MESSAGES/atk10.mo
share/locale/nb/LC_MESSAGES/gdk-pixbuf.mo
share/locale/nb/LC_MESSAGES/gettext-runtime.mo
share/locale/nb/LC_MESSAGES/glib20.mo
share/locale/nb/LC_MESSAGES/gtk20-properties.mo
share/locale/nb/LC_MESSAGES/gtk20.mo
share/locale/nl
share/locale/nl/LC_MESSAGES
share/locale/nl/LC_MESSAGES/atk10.mo
......@@ -124,14 +131,14 @@ 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
share/locale/pt/LC_MESSAGES
share/locale/pt/LC_MESSAGES/atk10.mo
share/locale/pt/LC_MESSAGES/gdk-pixbuf.mo
share/locale/pt/LC_MESSAGES/gettext-runtime.mo
share/locale/pt/LC_MESSAGES/glib20.mo
share/locale/pt/LC_MESSAGES/gtk20-properties.mo
share/locale/pt/LC_MESSAGES/gtk20.mo
share/locale/pt_BR
share/locale/pt_BR/LC_MESSAGES
share/locale/pt_BR/LC_MESSAGES/atk10.mo
......@@ -140,6 +147,46 @@ 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/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/sr
share/locale/sr/LC_MESSAGES
share/locale/sr/LC_MESSAGES/atk10.mo
share/locale/sr/LC_MESSAGES/gdk-pixbuf.mo
share/locale/sr/LC_MESSAGES/gettext-runtime.mo
share/locale/sr/LC_MESSAGES/glib20.mo
share/locale/sr/LC_MESSAGES/gtk20-properties.mo
share/locale/sr/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/zh_CN
share/locale/zh_CN/LC_MESSAGES
share/locale/zh_CN/LC_MESSAGES/atk10.mo
share/locale/zh_CN/LC_MESSAGES/gdk-pixbuf.mo
share/locale/zh_CN/LC_MESSAGES/gettext-runtime.mo
share/locale/zh_CN/LC_MESSAGES/glib20.mo
share/locale/zh_CN/LC_MESSAGES/gtk20-properties.mo
share/locale/zh_CN/LC_MESSAGES/gtk20.mo
share/locale/zh_TW
share/locale/zh_TW/LC_MESSAGES
share/locale/zh_TW/LC_MESSAGES/atk10.mo
share/locale/zh_TW/LC_MESSAGES/gdk-pixbuf.mo
share/locale/zh_TW/LC_MESSAGES/gettext-runtime.mo
share/locale/zh_TW/LC_MESSAGES/glib20.mo
share/locale/zh_TW/LC_MESSAGES/gtk20-properties.mo
share/locale/zh_TW/LC_MESSAGES/gtk20.mo
share/themes
share/themes/Default
share/themes/Default/gtk-2.0-key
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment