GNOME.org
 

Re: [Ekiga-devel-list] Win32 mingw trunk under Debian SID/ Repost with good patch format

Here are some patches and procedure I followed :
  • I change Makefile and especially some URL due to server failure.
  • patch contain.h
  • patch ptime.cxx
  • rm -r src/opal/plugins/audio/G722/
    rm -r opal/plugins/audio/G722/
  • src/ekiga/lib/platform/platform-win32.c seems to be OK now (line #53)
Feedbacks :
ekiga 3.1 7662 has the same comportment under Linux and Windows (for me). I use ekiga as SIP client on my asterisk.
Both clients crash when accepting an incoming call. Unfortunately : No debug

Thierry Simonnet wrote:
I succeded to have an Ekiga win32 exe using trunk branch of svn.

I followed wiki instruction for cross compiling (packages...)
mingw32 version : 4.2.1

Then some minor modifications :
Win32 Makefile :
  • Opal version : 3.5.2
  • PTLib version : 2.5.2
  • unable to use DEBUG. In fact DEBUG=1 generates a libopal_d_s.a but ekiga needs a libopal_s.a library. It will be useful to use  a  variable.
  • --disable-ldap for ekiga. First win32/include/sasl is missing (need a link from /usr/include/sasl) and some other stuff.
Opal:
  • I had to remove [src/]opal/plugin/audio/G722 directory due to compiling troubles
Ptlib :
  • I modified WINVER from 0x0500 to 0x0501 in [src/]ptlib/src/include/ptlib/msos/ptlib/contain.h
  • I modified [src/]ptlib/src/ptlib/common/ptime.cxx using Michael Cronenworth's patch
Ekiga :
  • modified [src/]ekiga/lib/platform/platform-win32.c line #53. g_win32_get_package_installation module has only one parameter. Then remove one NULL.
Hope these informations will help. I need to perform some test (Monday)

Best regards
--

Thierry Simonnet

ESIEE – Paris

Environnement Par respect pour l’environnement, n’imprimez ce mail que si nécessaire


_______________________________________________
Ekiga-devel-list mailing list
Ekiga-devel-list gnome org
http://mail.gnome.org/mailman/listinfo/ekiga-devel-list


--

Thierry Simonnet

ESIEE – Paris

Environnement Par respect pour l’environnement, n’imprimez ce mail que si nécessaire

--- Makefile.orig	2009-02-16 08:35:12.000000000 +0100
+++ Makefile	2009-02-16 12:12:50.000000000 +0100
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 SILENT := 0
-DEBUG := 1
+DEBUG := 0
 MAKEFLAGS:=
 MAKEOPTS:=$(MAKEFLAGS)
 MAKE_LIB_OPTS:=$(MAKEFLAGS)
@@ -18,7 +18,7 @@
 export DEB_BUILD_GNU_TYPE:=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 export DEB_HOST_GNU_TYPE:="i586-pc-mingw32"
 
-WGET := wget -nv -T 60 -N --no-proxy
+WGET := wget -nv -T 60 -N 
 
 HOST_TOOL_PREFIX:=i586-mingw32msvc
 
@@ -61,7 +61,7 @@
 export LDD:=$(BUILDROOT)/$(HOST_TOOL_PREFIX)-ldd.sh
 
 
-EKIGA_VER = 2.9
+EKIGA_VER = 3.1_7662
 EKIGA_REV = HEAD
 EKIGA_URL = http://svn.gnome.org/svn/ekiga/trunk
 EKIGA_ARCHIVE := ekiga
@@ -72,19 +72,19 @@
 EKIGA_INSTALLER_DIR := $(BUILDROOT)/nsisinstaller
 EKIGA_INSTALLER := ekiga-setup-${EKIGA_VER}.exe
 
-OPAL_VER:= 3.4.1
+OPAL_VER:= 3.5.2
 OPAL_REV:= HEAD
-OPAL_URL:= https://opalvoip.svn.sourceforge.net/svnroot/opalvoip/opal/tags/v3_4_1
+OPAL_URL:= https://opalvoip.svn.sourceforge.net/svnroot/opalvoip/opal/tags/v3_5_2
 OPAL_ARCHIVE := opal
 OPAL_DIR:= $(BUILDROOT)/opal
 
-PTLIB_VER:= 2.4.1
+PTLIB_VER:= 2.5.2
 PTLIB_REV:= HEAD
-PTLIB_URL:= https://opalvoip.svn.sourceforge.net/svnroot/opalvoip/ptlib/tags/v2_4_1
+PTLIB_URL:= https://opalvoip.svn.sourceforge.net/svnroot/opalvoip/ptlib/tags/v2_5_2
 PTLIB_DIR:= $(BUILDROOT)/ptlib
 PTLIB_ARCHIVE := ptlib
 
-OPENLDAP_VER := 2.3.28
+OPENLDAP_VER := 2.3.43
 OPENLDAP_DIR := $(BUILDROOT)/openldap-$(OPENLDAP_VER)
 OPENLDAP_ARCHIVE := openldap-$(OPENLDAP_VER).tgz
 OPENLDAP_URL := http://www.openldap.org/software/download/OpenLDAP/openldap-release
@@ -104,7 +104,7 @@
 GTK_ARCHIVE := gtk+-dev-$(GTK_VER).zip
 
 GTK_BIN_VER := 2.12.11
-GTK_INSTALLER_URL := http://mesh.dl.sourceforge.net/gtk-win
+GTK_INSTALLER_URL := http://freefr.dl.sourceforge.net/gtk-win
 GTK_BIN_EXE := gtk2-runtime-2.12.11-2008-07-25-ash.exe
 
 GLIB_VER := 2.18.0-2
@@ -123,13 +123,13 @@
 PANGO_URL := http://ftp.gnome.org/pub/gnome/binaries/win32/pango/1.20
 PANGO_ARCHIVE := pango-dev-$(PANGO_VER).zip
 
-XML2_VER := 2.6.26
+XML2_VER := 2.6.32
 XML2_DIR := libxml2-$(XML2_VER)
 XML2_URL := ftp://xmlsoft.org/libxml2
 XML2_ARCHIVE := libxml2-$(XML2_VER).tar.gz
 
-LIBPNG_VER := 1.2.8
-GNUWIN32_URL := http://mesh.dl.sourceforge.net/gnuwin32
+LIBPNG_VER := 1.2.34-1
+GNUWIN32_URL := http://freefr.dl.sourceforge.net/sourceforge/gnuwin32
 
 EXPAT_VER = 2.0.0
 EXPAT_DIR = $(BUILDROOT)/expat-$(EXPAT_VER)
@@ -182,7 +182,7 @@
 MV:=mv
 SVN:=svn
 GIT:=git
-ACLOCAL:=aclocal-1.9
+ACLOCAL:=aclocal-1.10
 
 DOC_LINGUAS=bg de es fr pt_BR sv uk
 
@@ -201,8 +201,10 @@
 	    --with-directx-dir=$(BUILDROOT)/directx --prefix=$(EKIGA_PREFIX) \
 	    --bindir=$(EKIGA_PREFIX) --datadir=$(EKIGA_PREFIX) \
 	    --sysconfdir=$(EKIGA_PREFIX) --libdir=$(EKIGA_PREFIX) --disable-gnome \
-	    --disable-dbus --disable-avahi --disable-xv --with-ldap-dir=$(OPENLDAP_DIR) \
-	    --enable-static-libs
+	    --disable-dbus --disable-avahi --disable-xv \
+	    --enable-static-libs --disable-ldap
+
+#--with-ldap-dir=$(OPENLDAP_DIR) \
 
 confffmpeg:=--cross-prefix=i586-mingw32msvc- --enable-shared --enable-memalign-hack \
 	    --enable-cross-compile --disable-ffserver --target-os=mingw32 \
@@ -230,7 +232,7 @@
 binaries:
 	echo Checking prerequisites...
 	hash $(REALCC) $(REALCXX) $(LD) $(NM) $(AR) $(RANLIB) $(DLLTOOL) $(DLLWRAP) $(OBJDUMP) $(WINDRES) $(AS)||(echo You need to install mingw32;exit 1)
-	hash tar unzip zip wget $(ACLOCAL) autoheader libtoolize automake-1.9 autoconf pkg-config gnome-autogen.sh bison gdk-pixbuf-csource||(echo we need more binaries ;exit 1)
+	hash tar unzip zip wget $(ACLOCAL) autoheader libtoolize automake-1.10 autoconf pkg-config gnome-autogen.sh bison gdk-pixbuf-csource||(echo we need more binaries ;exit 1)
 	[ -f /usr/share/gnome-doc-utils/gnome-doc-utils.make ]||(echo gnome-doc-tools not installed;exit 1)
 	[ -f /usr/lib/pkgconfig/gconf-2.0.pc ]||(echo libgconf2-dev not installed;exit 1)
 	[ -f /usr/lib/pkgconfig/avahi-glib.pc ]||(echo libavahi-glib-dev not installed;exit 1)

--- src/ptlib/include/ptlib/msos/ptlib/contain.h.orig	2009-02-16 09:19:23.000000000 +0100
+++ src/ptlib/include/ptlib/msos/ptlib/contain.h	2009-02-16 09:19:38.000000000 +0100
@@ -88,7 +88,7 @@
 
   // At least Windows 2000
   #ifndef WINVER
-    #define WINVER 0x0500
+    #define WINVER 0x0501
   #endif
 
   #if !defined(_WIN32_WINNT) && !defined(_WIN32_WCE)

--- ./src/ptlib/src/ptlib/common/ptime.cxx.orig	2009-02-16 11:01:41.000000000 +0100
+++ ./src/ptlib/src/ptlib/common/ptime.cxx	2009-02-16 11:02:34.000000000 +0100
@@ -549,7 +549,11 @@
 #define STDAPICALLTYPE
 #endif
 
-time_t STDAPICALLTYPE PTimeParse(void *, struct tm *, int);
+time_t STDAPICALLTYPE PTimeParse(void *, struct tm *, int)
+{
+  return 0;
+}
+
 
 int STDAPICALLTYPE PTimeGetChar(void * stream)
 {
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]