Update to 3.2.5:

* Changes in ekiga 3.2.5 (2009-07-06)
- Fixed very low rate of sent images during video conversations
- Fixed crash in LDAP
- Fixed crash in presence
- Fixed simultaneous reads from different threads in jitter code
- Fixed crash during idle times
- Fixed crash when accepting a call
- Fixed deadlock in SIP handler
- Fixed freeze upon calling and showing of pc:udp$... in the URI bar
- Fixed crash in G726-16 audio codec
- Allows multiple registrations with the same registrar using
  different user names
- Allows user to choose system iLBC
- Fixed window resizing in chat when entering very long words
- Fixed linking of sbc plugin with libsamplerate
- Fixed compilation with gtk 2.12
- Fixed compilation with gcc 4.4
- Windows and Solaris specific fixes
- Added a small script, ekiga-debug-analyser, not installed, which
  retrieves only the packets exchanged from a Ekiga debug output
- Other minor fixes
- Updated translations: bn_IN, el, or
- Updated help translations: el

* Changes in ekiga 3.2.4 (2009-05-20)
- Fixed OPAL and PTLIB recommended versions

* Changes in ekiga 3.2.3 (2009-05-20)
- Fixed remote uri not being shown in the uri bar when dialing out

* Changes in ekiga 3.2.2 (2009-05-20)
- Fixed a crash on some calls

* Changes in ekiga 3.2.1 (2009-05-19)
- Fixed various crashes on shutdown
- Fixed crash when opening preferences or assistant
- Fixed crash when no account
- Fixed SIP registration
- Fixed DTMF mode for SIP endpoint
- Migrate ekiga.net configuration from 3.0 to 3.2
- Maintain window position on hiding/showing the main window
- On some failed registration, do not show the unuseful
  RequestTerminated code, but the actual error
- In assistant, fill user name field, if empty, with user name
- In preferences, audio/video devices, remove unused FFMPEG and
  WAVFile modules
- Fixed recognition of cameras with non-ascii characters
- Fixed compilation with --disable-tracing
- Various fixes during configuration
- Fixed issue with having multiple registrations with the same SIP registrar
- Fixed problem with not waiting till ACK arrives, some
  implementations get offended if the ACK gets a transaction does not
  exist error. Thanks hongsion for the report
- Fixed bug where if a non-INVITE transaction gets a 1xx response, but
  then the 2xx (or above) response is lost, the command is not
  retransmitted
- Added fix for video plug in shared library loading, current code
  would not look anywhere but default path
- Fixed compiling G722 plug in on SUN
- Fixed correct value for remote party address
- Fixed compilation on NetBSD
- Fixed INVITE sent in response to a REFER command using a different
  local user name to the original call
- Fixed bug where opal tries to install plugins even if they have been disabled
- Fixed crash in PStandardColourConverter::YUY2toYUV420PWithResize
- Fixed include path overrides package include path
- Fixed search for connection matching replaces header dialog info,
  broken during changes to make calls back into the same stack
- Fixed from/to fields reversed in call dialog identifier information,
  needed for a INVITE with replaces header
- Fixed thread leaks
- Fixed video I-frame detection
- Fixed media format matching option additions
- Fixed advanced rate controller support
- Fixed popping frames problem when rate controller skips input frames
- Fixed missing re-lock of mutex on jitter buffer shut down
- Fixed gatekeeper discovery
- Added YUV2 support to DirectX code
- Fixed crash in PInterfaceMonitor::Stop
- If SIP answer to our offer contains only media formats we never
  offered then abort the call as this is SO not to specification!
- Fixed possible assertion if the soundcard blocks and prevents the
  device to be closed
- Fixed possible path through unsubscribe/unregister code that could
  lead to a NULL pointer being used
- Fixed issue in SIP registering, if both a full AOR and a registrar
  host name is provided then we would normally disable all registrar
  searches (e.g. SRV record lookup) and just use the host name
  specified
- Change default TSTO in H.263 to give better quality
- Fixed issue with SIP call hairpinning back into the same stack
- Fixed possibility of closing a channel twice
- Fixed intermittent problem with losing an audio channel when using
  INVITE with a replace header
- Fixed being able to switch off jitter buffer while still a thread
  reading from it
- Fixed bug with "hairpin" SIP calls, subsequent commands to INVITE
  are not routed to the correct connection instance
- H.224 should not be enabled when H.323 is disabled
- Various Solaris build fixes
- Fixed RFC3890 support
- Don't stop a call from clearing due to lack of media just because a
  session has not received any packets
- Fixed memory leaks in the plugins code
- Improved the RTP stack performances
- Fixed various video payload problems
- Fixed issue with outgoing re-INVITE that gets a 401/407
  authentication required error, the re-transmitted INVITE was not a
  re-INVITE but another normal INVITE, so "hold" doesn't work
- Fixed issue with incoming re-INVITE that has no SDp in the INVITE,
  if the eventual ACK has the same streams but only changed the IP
  address/port for RTP, then we did not change our RTP send
  addresss/port
- Add numerous boundary checks to H.263 codec
- Discard out of order packets, mode A frames that don't begin with a
  start code, and frames that don't begin with a start code in H.263
  codec
- Fixed initial H.323 call set up honouring the auto-start
  configuration for "don't offer"
- Fixes for gcc 4.4.0
- Fixed compilation with video, h.323 or sip disabled
- Windows port:
  - DirectX fixes
  - Better LDAP support
  - Add back devices
  - Fixed issue with empty strings for Windows sound devices being
    returned when being used over a Remote Desktop connection
  - Fixed G.722 compilation
  - Fixed linker problems
- Other minor fixes
- Updates translations: ar, as, crh, es, kn, nb, or, zh_CN
- Updated help translation: el, es

Special thanks to Julien Puydt, Michael Rickmann, Mounir Lamouri,
Eugen Dedu, Jan Schampera and Yannick Defais for their continuous work
on Ekiga.

6 files changed, 9 insertions, 130 deletions

diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile
index 6319cee6aab..2026fc64e7f 100644
--- a/net/ekiga/Makefile
+++ b/net/ekiga/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2009/07/22 09:01:41 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2009/08/15 15:39:23 wiz Exp $
 #
 
-DISTNAME=		ekiga-3.2.0
-PKGREVISION=		1
+DISTNAME=		ekiga-3.2.5
 CATEGORIES=		net comms
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/ekiga/3.2/}
 EXTRACT_SUFX=		.tar.bz2
@@ -10,15 +9,16 @@ EXTRACT_SUFX=		.tar.bz2
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.ekiga.org/
 COMMENT=		VoIP and video conferencing application for GNOME
+LICENSE=		gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 PREV_PKGPATH=		net/ekiga-devel
 
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
-USE_TOOLS+=		autoconf
 USE_PKGLOCALEDIR=	yes
 
-CONFIGURE_ARGS+=	--with-ldap-dir=${BUILDLINK_PREFIX.openldap-client:Q}
+CONFIGURE_ARGS+=	--with-ldap-dir=${BUILDLINK_PREFIX.openldap-client}
+CONFIGURE_ARGS+=	--with-libsasl2-dir=${BUILDLINK_PREFIX.cyrus-sasl}
 CONFIGURE_ARGS+=	--enable-gstreamer
 
 .include "options.mk"
@@ -29,9 +29,6 @@ GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 USE_LANGUAGES=		c c++
 
-pre-configure:
-	cd ${WRKSRC} && autoconf
-
 .include "../../audio/esound/buildlink3.mk"
 .include "../../databases/openldap-client/buildlink3.mk"
 .include "../../devel/GConf/schemas.mk"
diff --git a/net/ekiga/distinfo b/net/ekiga/distinfo
index 844e3fb49a0..a8be212a550 100644
--- a/net/ekiga/distinfo
+++ b/net/ekiga/distinfo
@@ -1,9 +1,5 @@
-$NetBSD: distinfo,v 1.6 2009/03/22 08:51:24 wiz Exp $
+$NetBSD: distinfo,v 1.7 2009/08/15 15:39:23 wiz Exp $
 
-SHA1 (ekiga-3.2.0.tar.bz2) = 6a8d6f203cd982cbfb37822b2a96f176176cd763
-RMD160 (ekiga-3.2.0.tar.bz2) = f31e94dbe03038e39fb5b50bd71372992c13ae8b
-Size (ekiga-3.2.0.tar.bz2) = 7679645 bytes
-SHA1 (patch-aa) = feecff1e35c7c55d63354393f2d4c4d14e36a57d
-SHA1 (patch-ab) = 58f5d5c7bd341bba963a01f4aca1b08807b18127
-SHA1 (patch-ac) = e78684eaa3d26817571dd374d4beed61ee529d1b
-SHA1 (patch-ad) = ae3d7eb1886b82bdfd127c256daa15304cd7e5e4
+SHA1 (ekiga-3.2.5.tar.bz2) = fc8b9ed0492ebc083655cf706048032e552d347f
+RMD160 (ekiga-3.2.5.tar.bz2) = 5792890c13d376242defd0757a67c8aa7772ae23
+Size (ekiga-3.2.5.tar.bz2) = 7714135 bytes
diff --git a/net/ekiga/patches/patch-aa b/net/ekiga/patches/patch-aa
deleted file mode 100644
index 91936c9f907..00000000000
--- a/net/ekiga/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2009/03/18 13:08:07 jmcneill Exp $
-
---- configure.ac.orig	2009-03-16 17:42:46.000000000 -0400
-+++ configure.ac
-@@ -340,6 +340,8 @@ if test "x$enable_ldap" = "xyes"; then
-   AC_SUBST(LDAP_LIBS)
-   LDAP="enabled"
-   AC_DEFINE(HAVE_LDAP,1,[LDAP support])
-+
-+  LDAP_LIBS="${LDAP_LIBS} -lsasl2"
- fi
- 
- AM_CONDITIONAL(HAVE_LDAP, test "x$found_ldap" = "xyes")
diff --git a/net/ekiga/patches/patch-ab b/net/ekiga/patches/patch-ab
deleted file mode 100644
index 3584d2923df..00000000000
--- a/net/ekiga/patches/patch-ab
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2009/03/22 08:51:24 wiz Exp $
-
-http://svn.gnome.org/viewvc/ekiga?view=revision&revision=7785
-
---- lib/engine/components/gstreamer/gst-audiooutput.cpp.orig	2009-01-27 20:32:29.000000000 +0000
-+++ lib/engine/components/gstreamer/gst-audiooutput.cpp
-@@ -354,8 +354,11 @@ GST::AudioOutputManager::detect_alsasink
- 	descr = g_strdup_printf ("volume name=ekiga_volume ! alsasink device=%s",
- 				 g_value_get_string (device));
- 
--	devices_by_name[std::pair<std::string,std::string>("ALSA", name)] = descr;
--	g_free (name);
-+	if (name != 0) {
-+
-+	  devices_by_name[std::pair<std::string,std::string>("ALSA", name)] = descr;
-+	  g_free (name);
-+	}
- 	g_free (descr);
-       }
-       g_value_array_free (array);
-@@ -400,8 +403,12 @@ GST::AudioOutputManager::detect_pulsesin
- 	descr = g_strdup_printf ("volume name=ekiga_volume ! pulsesink device=%s",
- 				 g_value_get_string (device));
- 
--	devices_by_name[std::pair<std::string,std::string>("PULSEAUDIO", name)] = descr;
--	g_free (name);
-+	if (name != 0) {
-+
-+	  devices_by_name[std::pair<std::string,std::string>("PULSEAUDIO", name)] = descr;
-+
-+	  g_free (name);
-+	}
- 	g_free (descr);
-       }
-       g_value_array_free (array);
diff --git a/net/ekiga/patches/patch-ac b/net/ekiga/patches/patch-ac
deleted file mode 100644
index 2720c01bf16..00000000000
--- a/net/ekiga/patches/patch-ac
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2009/03/22 08:51:24 wiz Exp $
-
-http://svn.gnome.org/viewvc/ekiga?view=revision&revision=7785
-
---- lib/engine/components/gstreamer/gst-audioinput.cpp.orig	2009-01-18 15:45:41.000000000 +0000
-+++ lib/engine/components/gstreamer/gst-audioinput.cpp
-@@ -304,8 +304,11 @@ GST::AudioInputManager::detect_alsasrc_d
- 	descr = g_strdup_printf ("alsasrc device=%s ! volume name=ekiga_volume",
- 				 g_value_get_string (device));
- 
--	devices_by_name[std::pair<std::string,std::string>("ALSA", name)] = descr;
--	g_free (name);
-+	if (name != 0) {
-+
-+	  devices_by_name[std::pair<std::string,std::string>("ALSA", name)] = descr;
-+	  g_free (name);
-+	}
- 	g_free (descr);
-       }
-       g_value_array_free (array);
-@@ -350,8 +353,11 @@ GST::AudioInputManager::detect_pulsesrc_
- 	descr = g_strdup_printf ("pulsesrc device=%s ! volume name=ekiga_volume",
- 				 g_value_get_string (device));
- 
--	devices_by_name[std::pair<std::string,std::string>("PULSEAUDIO", name)] = descr;
--	g_free (name);
-+	if (name != 0) {
-+
-+	  devices_by_name[std::pair<std::string,std::string>("PULSEAUDIO", name)] = descr;
-+	  g_free (name);
-+	}
- 	g_free (descr);
-       }
-       g_value_array_free (array);
diff --git a/net/ekiga/patches/patch-ad b/net/ekiga/patches/patch-ad
deleted file mode 100644
index c56946f17f2..00000000000
--- a/net/ekiga/patches/patch-ad
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2009/03/22 08:51:24 wiz Exp $
-
-http://svn.gnome.org/viewvc/ekiga?view=revision&revision=7785
-
---- lib/engine/components/gstreamer/gst-videoinput.cpp.orig	2009-01-23 09:29:44.000000000 +0000
-+++ lib/engine/components/gstreamer/gst-videoinput.cpp
-@@ -274,7 +274,11 @@ GST::VideoInputManager::detect_v4l2src_d
- 	descr = g_strdup_printf ("v4l2src device=%s"
- 				 " ! videoscale ! ffmpegcolorspace",
- 				 g_value_get_string (device));
--	devices_by_name[std::pair<std::string,std::string>("V4L2",name)] = descr;
-+	if (name != 0) {
-+
-+	  devices_by_name[std::pair<std::string,std::string>("V4L2",name)] = descr;
-+	  g_free (name);
-+	}
- 	g_free (descr);
-       }
- 
-@@ -339,7 +343,11 @@ GST::VideoInputManager::detect_dv1394src
- 				 " ! videoscale"
- 				 " ! ffmpegcolorspace",
- 				 g_value_get_uint64 (guid));
--	devices_by_name[std::pair<std::string,std::string>("DV",name)] = descr;
-+	if (name != 0) {
-+
-+	  devices_by_name[std::pair<std::string,std::string>("DV",name)] = descr;
-+	  g_free (name);
-+	}
- 	g_free (descr);
-       }
-