ekiga r7129 - in branches/gnome-2-24/win32: . diff

[mschneid svn gnome org]

Author: mschneid
Date: Mon Sep 29 19:46:38 2008
New Revision: 7129
URL: http://svn.gnome.org/viewvc/ekiga?rev=7129&view=rev

Log:
Make the win32 build compile out of the box with all codecs and devices..


Added:
   branches/gnome-2-24/win32/diff/ptlib_makefile.patch
Removed:
   branches/gnome-2-24/win32/diff/opal_Makefile.am
   branches/gnome-2-24/win32/diff/opal_configure.ac
   branches/gnome-2-24/win32/diff/opal_opal.pc.in
   branches/gnome-2-24/win32/diff/ptlib_Makefile.am
   branches/gnome-2-24/win32/diff/ptlib_configure.ac
   branches/gnome-2-24/win32/diff/ptlib_ptlib.pc.in
   branches/gnome-2-24/win32/diff/ptlib_pwlib.pc.in
Modified:
   branches/gnome-2-24/win32/Makefile

Modified: branches/gnome-2-24/win32/Makefile
==============================================================================
--- branches/gnome-2-24/win32/Makefile	(original)
+++ branches/gnome-2-24/win32/Makefile	Mon Sep 29 19:46:38 2008
@@ -338,10 +338,11 @@
 	echo --- Getting PTLib $(PTLIB_REV) ...
 	$(SVN) co $(PTLIB_URL) $(SRCDIR)/$(PTLIB_ARCHIVE) -r $(PTLIB_REV)
 
-$(PTLIB_DIR)/configure: binaries $(LIBDIR)/libldap.dll $(LIBDIR)/libogg.a $(LIBDIR)/libspeex.a $(SRCDIR)/$(PTLIB_ARCHIVE) $(EKIGA_WIN32_DIFF_DIR)/ptlib_Makefile.am $(LIBDIR)/libexpat.a $(EKIGA_WIN32_DIFF_DIR)/ptlib_configure.ac $(EKIGA_WIN32_DIFF_DIR)/ptlib_ptlib.pc.in
+$(PTLIB_DIR)/configure: binaries $(LIBDIR)/libldap.dll $(LIBDIR)/libogg.a $(LIBDIR)/libspeex.a $(SRCDIR)/$(PTLIB_ARCHIVE)  $(LIBDIR)/libexpat.a
 	rm -f $(LIBDIR)/libpt_s.a
 	rm -rf $(PTLIB_DIR)
 	$(CP) -r $(SRCDIR)/$(PTLIB_ARCHIVE) $(PTLIB_DIR)	
+	(cd $(PTLIB_DIR)/; patch -p0 < ../diff/ptlib_makefile.patch )
 
 $(PTLIB_DIR)/config.status: binaries $(PTLIB_DIR)/configure
 	rm -f $(LIBDIR)/libpt_s.a

Added: branches/gnome-2-24/win32/diff/ptlib_makefile.patch
==============================================================================
--- (empty file)
+++ branches/gnome-2-24/win32/diff/ptlib_makefile.patch	Mon Sep 29 19:46:38 2008
@@ -0,0 +1,51 @@
+Index: Makefile.in
+===================================================================
+--- Makefile.in	(revision 21191)
++++ Makefile.in	(working copy)
+@@ -43,7 +43,7 @@
+ 
+ include make/ptlib.mak
+ 
+-SUBDIRS := src/ptlib/$(TARGETDIR)
++SUBDIRS := src
+ ifeq (1, $(HAS_PLUGINS))
+ SUBDIRS += plugins
+ endif
+@@ -71,7 +71,7 @@
+ 	$(MAKE) bothdepend both
+ 
+ ptlib:
+-	$(MAKE) -C src/ptlib/$(TARGETDIR) both
++	$(MAKE) -C src both
+ 
+ docs: 
+ 	doxygen ptlib_cfg.dxy
+Index: src/ptlib/common/pluginmgr.cxx
+===================================================================
+--- src/ptlib/common/pluginmgr.cxx	(revision 21191)
++++ src/ptlib/common/pluginmgr.cxx	(working copy)
+@@ -382,12 +382,15 @@
+              PPluginServiceDescriptor * descriptor)
+ {
+   PWaitAndSignal m(servicesMutex);
++  std::cerr << "-->PLUGIN\tRegistering Service " << serviceName << "_" << serviceType << std::endl;
+ 
+   // first, check if it something didn't already register that name and type
+   for (PINDEX i = 0; i < services.GetSize(); i++) {
+     if (services[i].serviceName == serviceName &&
+-        services[i].serviceType == serviceType)
++        services[i].serviceType == serviceType) {
++      std::cerr << "-->PLUGIN\tService " << serviceName << "_" << serviceType << " already registered" << std::endl;
+       return PFalse;
++    }
+   }  
+ 
+   PPluginService * service = new PPluginService(serviceName, serviceType, descriptor);
+@@ -434,6 +437,7 @@
+ PPluginModuleManager::PPluginModuleManager(const char * _signatureFunctionName, PPluginManager * _pluginMgr)
+   : signatureFunctionName(_signatureFunctionName)
+ {
++  std::cerr << "-->PLUGIN\tCreating PPluginModuleManager with signature function " << _signatureFunctionName << std::endl;
+   pluginDLLs.DisallowDeleteObjects();
+   pluginMgr = _pluginMgr;;
+   if (pluginMgr == NULL)