ekiga r5937 - in trunk: . lib/engine/addressbook/ldap lib/engine/display/dx win32 win32/diff

[mschneid svn gnome org]

Author: mschneid
Date: Thu Jan 24 10:25:20 2008
New Revision: 5937
URL: http://svn.gnome.org/viewvc/ekiga?rev=5937&view=rev

Log:
- Adapted ot latest opal and ptlib.
- Windows cannot restart running threads -> we have to close it first.
- Addded missing include for ldap support.



Modified:
   trunk/ChangeLog
   trunk/lib/engine/addressbook/ldap/ldap-book.cpp
   trunk/lib/engine/display/dx/display-manager-dx.cpp
   trunk/win32/Makefile
   trunk/win32/diff/opal_Makefile.am
   trunk/win32/diff/ptlib_Makefile.am
   trunk/win32/diff/ptlib_configure.ac

Modified: trunk/lib/engine/addressbook/ldap/ldap-book.cpp
==============================================================================
--- trunk/lib/engine/addressbook/ldap/ldap-book.cpp	(original)
+++ trunk/lib/engine/addressbook/ldap/ldap-book.cpp	Thu Jan 24 10:25:20 2008
@@ -39,6 +39,8 @@
 #include <cstdlib>
 #include <string>
 #include <sstream>
+#include <sys/time.h>
+
 #define LDAP_DEPRECATED 1
 #include <ldap.h>
 #include <glib.h>

Modified: trunk/lib/engine/display/dx/display-manager-dx.cpp
==============================================================================
--- trunk/lib/engine/display/dx/display-manager-dx.cpp	(original)
+++ trunk/lib/engine/display/dx/display-manager-dx.cpp	Thu Jan 24 10:25:20 2008
@@ -41,6 +41,13 @@
 : GMDisplayManager(_core)
 {
   dxWindow = NULL;
+  this->Resume ();
+  thread_sync_point.Wait ();
+  end_thread = true;
+
+  /* Wait for the Main () method to be terminated */
+  frame_available_sync_point.Signal();
+  PWaitAndSignal m(quit_mutex);
 }
 
 GMDisplayManager_dx::~GMDisplayManager_dx ()

Modified: trunk/win32/Makefile
==============================================================================
--- trunk/win32/Makefile	(original)
+++ trunk/win32/Makefile	Thu Jan 24 10:25:20 2008
@@ -69,11 +69,11 @@
 EKIGA_URL1 := http://snapshots.buildserver.net/cvs
 EKIGA_URL2 := http://snapshots.voxgratia.org/cvs
 
-OPAL_VER:= 3.1.0
+OPAL_VER:= 3.1.3
 OPAL_DIR:= $(BUILDROOT)/opal
 OPAL_ARCHIVE := opal-snapshot.tar.gz
 
-PTLIB_VER:= 2.1.0
+PTLIB_VER:= 2.1.3
 PTLIB_DIR:= $(BUILDROOT)/ptlib
 PTLIB_ARCHIVE := ptlib-snapshot.tar.gz
 

Modified: trunk/win32/diff/opal_Makefile.am
==============================================================================
--- trunk/win32/diff/opal_Makefile.am	(original)
+++ trunk/win32/diff/opal_Makefile.am	Thu Jan 24 10:25:20 2008
@@ -166,7 +166,8 @@
 	$(OPAL_PLUGIN_DIR)/video/H.263-1998/h263pframe.cxx \
 	$(OPAL_PLUGIN_DIR)/video/common/trace.cxx \
 	$(OPAL_PLUGIN_DIR)/video/common/dyna.cxx \
-	$(OPAL_PLUGIN_DIR)/video/H.263-1998/h263-1998.cxx
+	$(OPAL_PLUGIN_DIR)/video/H.263-1998/h263-1998.cxx \
+	$(OPAL_PLUGIN_DIR)/video/common/mpi.cxx
 
 libMPEG4_pwplugin_la_LDFLAGS = -module -avoid-version -no-undefined
 

Modified: trunk/win32/diff/ptlib_Makefile.am
==============================================================================
--- trunk/win32/diff/ptlib_Makefile.am	(original)
+++ trunk/win32/diff/ptlib_Makefile.am	Thu Jan 24 10:25:20 2008
@@ -191,6 +191,10 @@
 	$(COMPONENT_SRC_DIR)/inetmail.cxx 
 endif
 
+if COMPILE_URL
+libpt_la_SOURCES += \
+	$(COMPONENT_SRC_DIR)/url.cxx
+
 if COMPILE_HTTP
 libpt_la_SOURCES += \
 	$(COMPONENT_SRC_DIR)/http.cxx \
@@ -210,6 +214,8 @@
 endif #COMPILE_OPENSSL
 endif #COMPILE_HTTPSVC
 
+endif #COMPILE_URL
+
 if COMPILE_CONFIG_FILE
 libpt_la_SOURCES += $(BASE_SRC_DIR)/wincfg.cxx 
 endif

Modified: trunk/win32/diff/ptlib_configure.ac
==============================================================================
--- trunk/win32/diff/ptlib_configure.ac	(original)
+++ trunk/win32/diff/ptlib_configure.ac	Thu Jan 24 10:25:20 2008
@@ -180,6 +180,15 @@
 HAS_DNS=1
 HAS_RESOLVER=1
 P_DNS=1
+P_URL=1
+HAS_URL=1
+HAS_HTTPFORMS=1
+P_HTTPFORMS=1
+P_USE_STANDARD_CXX_BOOL=1
+P_TTS=1
+HAS_TTS=1
+P_VXML=1
+HAS_VXML=1
 
 P_LDAP=${HAS_OPENLDAP}
 P_SNMP=${HAS_SNMP}
@@ -205,6 +214,15 @@
 AC_DEFINE([P_AUDIO], 1, [check if audio support is in])
 AC_DEFINE([P_VIDEO], 1, [check if video support is in])
 AC_DEFINE([P_DNS], 1, [check if dns support is in])
+AC_DEFINE([P_URL], 1, [check if url support is in])
+AC_DEFINE([HAS_URL], 1, [check if url support is in])
+AC_DEFINE([P_HTTPFORMS], 1, [check if url support is in])
+AC_DEFINE([HAS_HTTPFORMS], 1, [check if url support is in])
+AC_DEFINE([P_USE_STANDARD_CXX_BOOL], 1, [check if url support is in])
+AC_DEFINE([P_TTS], 1, [check if url support is in])
+AC_DEFINE([HAS_TTS], 1, [check if url support is in])
+AC_DEFINE([HAS_VXML], 1, [check if url support is in])
+AC_DEFINE([P_VXML], 1, [check if url support is in])
 
 AM_CONDITIONAL(COMPILE_OPENLDAP, test "${HAS_OPENLDAP}" = "1")
 AM_CONDITIONAL(COMPILE_REGEX, test "${HAS_REGEX}" = "1")
@@ -220,6 +238,7 @@
 AM_CONDITIONAL(COMPILE_TELNET, test "${HAS_TELNET}" = "1")
 AM_CONDITIONAL(COMPILE_SERIAL, test "${HAS_SERIAL}" = "1")
 AM_CONDITIONAL(COMPILE_POP3SMTP, test "${HAS_POP3SMTP}" = "1")
+AM_CONDITIONAL(COMPILE_URL, test "${HAS_URL}" = "1")
 AM_CONDITIONAL(COMPILE_HTTP, test "${HAS_HTTP}" = "1")
 AM_CONDITIONAL(COMPILE_HTTPSVC, test "${HAS_HTTPSVC}" = "1")
 AM_CONDITIONAL(COMPILE_EXPAT, test "${P_WINEXPAT}" = "1")