From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Mar 15 18:10:41 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2A03516A424 for ; Wed, 15 Mar 2006 18:10:41 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id BB28C43D5F for ; Wed, 15 Mar 2006 18:10:25 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k2FIAOug000400 for ; Wed, 15 Mar 2006 18:10:24 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k2FIAO1q000399; Wed, 15 Mar 2006 18:10:24 GMT (envelope-from gnats) Resent-Date: Wed, 15 Mar 2006 18:10:24 GMT Resent-Message-Id: <200603151810.k2FIAO1q000399@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6BC8416A425 for ; Wed, 15 Mar 2006 18:02:33 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from nm05omta059.dion.ne.jp (nm05mta.dion.ne.jp [219.125.112.9]) by mx1.FreeBSD.org (Postfix) with SMTP id B2C5A43D49 for ; Wed, 15 Mar 2006 18:02:32 +0000 (GMT) (envelope-from tkato432@yahoo.com) Received: from localhost ([61.198.243.224]) by nm05mta.dion.ne.jp id <20060316030227329.MA99.8190A70@nm05mta.dion.ne.jp>; Thu, 16 Mar 2006 03:02:27 +0900 Message-Id: <20060316030047.c81944bb.tkato432@yahoo.com> Date: Thu, 16 Mar 2006 03:00:47 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/94502: Update port: net/linphone-base to 1.3.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Mar 2006 18:10:41 -0000 >Number: 94502 >Category: ports >Synopsis: Update port: net/linphone-base to 1.3.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Mar 15 18:10:24 GMT 2006 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.11-RELEASE-p15 i386 >Organization: >Environment: >Description: - Update to version 1.3.0 New file: files/patch-mediastreamer2__mssync.c files/patch-oRTP__src__rtpparse.c Remove file: files/patch-console__linphonec.c >How-To-Repeat: >Fix: diff -urN /usr/ports/net/linphone-base/Makefile net/linphone-base/Makefile --- /usr/ports/net/linphone-base/Makefile Fri Feb 24 00:44:58 2006 +++ net/linphone-base/Makefile Sat Mar 11 01:20:15 2006 @@ -24,14 +24,12 @@ osip2.3:${PORTSDIR}/net/libosip2 USE_GNOME= glib20 gnomehack gnometarget intlhack pkgconfig -USE_REINPLACE= yes USE_GMAKE= yes -GNU_CONFIGURE= yes +USE_AUTOTOOLS= libtool:15 LIBTOOLFILES= configure oRTP/configure -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ - LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --disable-ipv6 --disable-gtk-doc --enable-gnome_ui=no \ - --disable-ewarning --without-ilbc \ + --disable-ewarning --without-ilbc --disable-strict \ --with-speex=${LOCALBASE} --with-osip=${LOCALBASE} \ --with-html-dir=${DOCSDIR} INSTALLS_SHLIB= yes @@ -41,6 +39,8 @@ CFLAGS+= -DPACKAGE_LOCALE_DIR='\"${PREFIX}/share/locale\"' \ -DPACKAGE_DATA_DIR='\"${PREFIX}/share\"' \ -DPACKAGE_SOUND_DIR='\"${DATADIR}/sounds\"' +CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} .include "Makefile.common" .include diff -urN /usr/ports/net/linphone-base/Makefile.common net/linphone-base/Makefile.common --- /usr/ports/net/linphone-base/Makefile.common Tue Dec 27 13:37:20 2005 +++ net/linphone-base/Makefile.common Thu Mar 9 23:13:02 2006 @@ -3,7 +3,7 @@ # LINPHONE_PORTNAME= linphone -LINPHONE_PORTVERSION= 1.2.0 +LINPHONE_PORTVERSION= 1.3.0 LINPHONE_PORTREVISION= 0 LINPHONE_PORTEPOCH= 1 LINPHONE_MASTER_SITES= http://simon.morlat.free.fr/download/stable/source/ diff -urN /usr/ports/net/linphone-base/distinfo net/linphone-base/distinfo --- /usr/ports/net/linphone-base/distinfo Tue Dec 27 13:37:20 2005 +++ net/linphone-base/distinfo Sat Mar 11 00:57:51 2006 @@ -1,3 +1,3 @@ -MD5 (linphone-1.2.0.tar.gz) = bd5e513a665ce2e381afce64d569c707 -SHA256 (linphone-1.2.0.tar.gz) = 24496cae7c4919473d6f8e78506d762e671fe84a627a5dfda5cb44cda5c421d2 -SIZE (linphone-1.2.0.tar.gz) = 7372152 +MD5 (linphone-1.3.0.tar.gz) = a96ab62413949ec2977df38ea830f7ce +SHA256 (linphone-1.3.0.tar.gz) = 29e8e6238b02a17058a2150df97be227428e43cd009f1f8eadb8b72eceb5daa3 +SIZE (linphone-1.3.0.tar.gz) = 7388450 diff -urN /usr/ports/net/linphone-base/files/patch-configure net/linphone-base/files/patch-configure --- /usr/ports/net/linphone-base/files/patch-configure Sun Sep 4 13:50:34 2005 +++ net/linphone-base/files/patch-configure Sat Mar 11 01:28:37 2006 @@ -1,22 +1,9 @@ ---- configure.orig Thu Aug 25 07:37:04 2005 -+++ configure Thu Aug 25 23:31:24 2005 -@@ -23818,10 +23818,6 @@ - ;; - esac - --if test "$GCC" = "yes" ; then -- STRICT_OPTIONS="-Wall -Werror" --fi -- +--- configure.orig Sat Mar 4 01:55:47 2006 ++++ configure Sat Mar 11 01:28:23 2006 +@@ -23532,23 +23532,6 @@ + fi - # Check whether --with-realprefix or --without-realprefix was given. -@@ -23930,23 +23926,6 @@ - if test "x${realprefix}" = "xnone"; then - realprefix=${prefix} - fi -- -- -cat >>confdefs.h <<_ACEOF -#define PACKAGE_LOCALE_DIR "${realprefix}/${DATADIRNAME}/locale" -_ACEOF @@ -32,6 +19,8 @@ -cat >>confdefs.h <<_ACEOF -#define PACKAGE_SOUND_DIR "${realprefix}/${DATADIRNAME}/sounds/linphone" -_ACEOF +- +- + found_sound=no - found_sound=no diff -urN /usr/ports/net/linphone-base/files/patch-console__linphonec.c net/linphone-base/files/patch-console__linphonec.c --- /usr/ports/net/linphone-base/files/patch-console__linphonec.c Tue Dec 27 11:40:49 2005 +++ net/linphone-base/files/patch-console__linphonec.c Thu Jan 1 09:00:00 1970 @@ -1,32 +0,0 @@ ---- console/linphonec.c.orig Wed Nov 30 21:11:54 2005 -+++ console/linphonec.c Tue Dec 20 13:29:42 2005 -@@ -71,8 +71,8 @@ - //Process termination handling - void term(int sig) - { -- terminate = TRUE; - char input[LINE_MAX_LEN]; -+ terminate = TRUE; - snprintf (input,sizeof(LINE_MAX_LEN),"%s", "terminate"); - linphonec_parse_command_line(&linphonec,input); - snprintf (input,sizeof(LINE_MAX_LEN), "%s", "quit"); -@@ -161,9 +161,6 @@ - int - linphonec_main_loop (LinphoneCore * opm, char * sipAddr) - { -- if (terminate_on_close) { -- signal(SIGTERM, term); -- } - //auto call handling - gboolean firstTimeInLoop=TRUE; - char input[LINE_MAX_LEN]; -@@ -171,6 +168,9 @@ - fd_set fdset; - struct timeval timeout; - gboolean run=TRUE; -+ if (terminate_on_close) { -+ signal(SIGTERM, term); -+ } - printf("linphonec> ");fflush(stdout); - while (run && !terminate) - { diff -urN /usr/ports/net/linphone-base/files/patch-gnome::Makefile.in net/linphone-base/files/patch-gnome::Makefile.in --- /usr/ports/net/linphone-base/files/patch-gnome::Makefile.in Tue Apr 5 13:35:10 2005 +++ net/linphone-base/files/patch-gnome::Makefile.in Sat Mar 11 01:04:31 2006 @@ -1,6 +1,6 @@ ---- gnome/Makefile.in.orig Tue Mar 22 00:53:38 2005 -+++ gnome/Makefile.in Wed Mar 23 19:37:16 2005 -@@ -69,8 +69,7 @@ +--- gnome/Makefile.in.orig Sat Mar 4 01:55:42 2006 ++++ gnome/Makefile.in Sat Mar 11 01:04:15 2006 +@@ -70,8 +70,7 @@ linphone_OBJECTS = $(am_linphone_OBJECTS) am__DEPENDENCIES_1 = @BUILD_GNOME_TRUE@linphone_DEPENDENCIES = $(am__DEPENDENCIES_1) \ @@ -10,30 +10,30 @@ am__linphone_applet_SOURCES_DIST = linphone.c linphone.h gui_utils.c \ gui_utils.h support.c support.h interface.c interface.h \ callbacks.c callbacks.h presence.c presence.h propertybox.c \ -@@ -90,8 +89,7 @@ +@@ -91,8 +90,7 @@ @BUILD_GNOME_APPLET_TRUE@ linphone_applet-applet.$(OBJEXT) linphone_applet_OBJECTS = $(am_linphone_applet_OBJECTS) @BUILD_GNOME_APPLET_TRUE@linphone_applet_DEPENDENCIES = \ -@BUILD_GNOME_APPLET_TRUE@ $(am__DEPENDENCIES_1) \ --@BUILD_GNOME_APPLET_TRUE@ $(top_srcdir)/coreapi/liblinphone.la +-@BUILD_GNOME_APPLET_TRUE@ $(top_builddir)/coreapi/liblinphone.la +@BUILD_GNOME_APPLET_TRUE@ $(am__DEPENDENCIES_1) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles -@@ -355,7 +353,7 @@ +@@ -363,7 +361,7 @@ @BUILD_GNOME_TRUE@linphone_LDADD = $(LIBGNOMEUI_LIBS) $(INTLLIBS) \ @BUILD_GNOME_TRUE@ $(LIBGNOME_LIBS) \ -@BUILD_GNOME_TRUE@ $(top_builddir)/coreapi/liblinphone.la -+@BUILD_GNOME_TRUE@ -llinphone ++@BUILD_GNOME_TRUE@ -llinphone - AM_CFLAGS = $(LIBGNOMEUI_CFLAGS) $(LIBGNOME_CFLAGS) $(GNOME_APPLETS_CFLAGS) $(IPV6_CFLAGS) + AM_CFLAGS = $(STRICT_OPTIONS) $(LIBGNOMEUI_CFLAGS) $(LIBGNOME_CFLAGS) $(GNOME_APPLETS_CFLAGS) $(IPV6_CFLAGS) @BUILD_GNOME_APPLET_TRUE@gnome_appletdir = $(libexecdir) -@@ -366,7 +364,7 @@ +@@ -374,7 +372,7 @@ @BUILD_GNOME_APPLET_TRUE@linphone_applet_CFLAGS = $(AM_CFLAGS) -DLINPHONE_APPLET @BUILD_GNOME_APPLET_TRUE@linphone_applet_LDADD = \ @BUILD_GNOME_APPLET_TRUE@ $(GNOME_APPLETS_LIBS) \ --@BUILD_GNOME_APPLET_TRUE@ $(top_srcdir)/coreapi/liblinphone.la +-@BUILD_GNOME_APPLET_TRUE@ $(top_builddir)/coreapi/liblinphone.la +@BUILD_GNOME_APPLET_TRUE@ -llinphone diff -urN /usr/ports/net/linphone-base/files/patch-mediastreamer2::Makefile.in net/linphone-base/files/patch-mediastreamer2::Makefile.in --- /usr/ports/net/linphone-base/files/patch-mediastreamer2::Makefile.in Tue Apr 5 06:42:06 2005 +++ net/linphone-base/files/patch-mediastreamer2::Makefile.in Sat Mar 11 01:24:05 2006 @@ -1,20 +1,12 @@ ---- mediastreamer2/Makefile.in.orig Tue Mar 22 00:53:40 2005 -+++ mediastreamer2/Makefile.in Wed Mar 23 17:53:26 2005 -@@ -53,7 +53,7 @@ - @BUILD_UGLIB_TRUE@am__DEPENDENCIES_2 = \ - @BUILD_UGLIB_TRUE@ $(top_builddir)/support/libuglib.la - libmediastreamer2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -- ../gsmlib/libgsm.la ../lpc10-1.5/liblpc10.la \ -+ ../lpc10-1.5/liblpc10.la \ - ../oRTP/src/libortp.la $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) -@@ -311,7 +311,7 @@ - msringplayer.c msringplayer.h waveheader.h +--- mediastreamer2/Makefile.in.orig Wed Mar 8 19:41:19 2006 ++++ mediastreamer2/Makefile.in Sat Mar 11 01:23:47 2006 +@@ -310,8 +310,7 @@ + msfileplayer.c msfileplayer.h waveheader.h\ + $(am__append_1) + libmediastreamer2_la_LIBADD = $(top_builddir)/oRTP/src/libortp.la \ +- $(ALSA_LIBS) \ +- -lrt ++ $(ALSA_LIBS) - libmediastreamer2_la_LIBADD = $(GLIB_LIBS) \ -- ../gsmlib/libgsm.la \ -+ -lgsm \ - ../lpc10-1.5/liblpc10.la \ - ../oRTP/src/libortp.la \ - $(JACK_LIBS)\ + INCLUDES = -I$(top_srcdir)/oRTP/include + ORTP_CFLAGS = `cat $(top_builddir)/oRTP/ortp.defs` diff -urN /usr/ports/net/linphone-base/files/patch-mediastreamer2__mssync.c net/linphone-base/files/patch-mediastreamer2__mssync.c --- /usr/ports/net/linphone-base/files/patch-mediastreamer2__mssync.c Thu Jan 1 09:00:00 1970 +++ net/linphone-base/files/patch-mediastreamer2__mssync.c Sat Mar 11 01:22:32 2006 @@ -0,0 +1,19 @@ +--- mediastreamer2/mssync.c.orig Sat Mar 4 06:07:01 2006 ++++ mediastreamer2/mssync.c Sat Mar 11 01:21:51 2006 +@@ -194,6 +194,7 @@ + MSSync *s=(MSSync*)arg; + uint64_t realtime; + uint64_t orig=get_cur_time(); ++ int64_t diff; + s->ticks=1; + ms_mutex_lock(&s->lock); + while(s->run){ +@@ -203,7 +204,7 @@ + s->time+=s->interval; + while(1){ + realtime=get_cur_time()-orig; +- int64_t diff=s->time-realtime; ++ diff=s->time-realtime; + if (diff>0){ + /* sleep until next tick */ + sleepMs(diff); diff -urN /usr/ports/net/linphone-base/files/patch-oRTP__src__rtpparse.c net/linphone-base/files/patch-oRTP__src__rtpparse.c --- /usr/ports/net/linphone-base/files/patch-oRTP__src__rtpparse.c Thu Jan 1 09:00:00 1970 +++ net/linphone-base/files/patch-oRTP__src__rtpparse.c Sat Mar 11 01:13:03 2006 @@ -0,0 +1,19 @@ +--- oRTP/src/rtpparse.c.orig Wed Feb 1 01:06:16 2006 ++++ oRTP/src/rtpparse.c Sat Mar 11 01:12:41 2006 +@@ -70,6 +70,7 @@ + int msgsize; + RtpStream *rtpstream=&session->rtp; + rtp_stats_t *stats=&rtpstream->stats; ++ poly32_t *extseq; + + return_if_fail(mp!=NULL); + +@@ -120,7 +121,7 @@ + }else session->recv_ssrc=rtp->ssrc; + + /* update some statistics */ +- poly32_t *extseq=(poly32_t*)&rtpstream->hwrcv_extseq; ++ extseq=(poly32_t*)&rtpstream->hwrcv_extseq; + if (rtp->seq_number>extseq->split.lo){ + extseq->split.lo=rtp->seq_number; + }else if (rtp->seq_number<200 && extseq->split.lo>((1<<16) - 200)){ diff -urN /usr/ports/net/linphone-base/pkg-plist net/linphone-base/pkg-plist --- /usr/ports/net/linphone-base/pkg-plist Fri Feb 24 00:44:58 2006 +++ net/linphone-base/pkg-plist Sat Mar 11 01:38:34 2006 @@ -8,12 +8,11 @@ include/linphone/lpconfig.h include/linphone/sndcard.h include/linphone/uglib.h -include/ortp/ortp-config.h include/ortp/ortp.h include/ortp/payloadtype.h +include/ortp/port.h include/ortp/rtcp.h include/ortp/rtp.h -include/ortp/rtpport.h include/ortp/rtpsession.h include/ortp/rtpsignaltable.h include/ortp/sessionset.h @@ -22,13 +21,14 @@ lib/liblinphone.a lib/liblinphone.la lib/liblinphone.so -lib/liblinphone.so.3 +lib/liblinphone.so.4 lib/libortp.a lib/libortp.la lib/libortp.so -lib/libortp.so.2 +lib/libortp.so.4 libdata/pkgconfig/linphone.pc libdata/pkgconfig/ortp.pc +libexec/mediastream %%DATADIR%%/sounds/hello16000.wav %%DATADIR%%/sounds/hello8000.wav %%DATADIR%%/sounds/ringback.wav >Release-Note: >Audit-Trail: >Unformatted: