Date: Sun, 20 Sep 2009 12:41:38 -0300 (BRT) From: Sylvio Cesar <scjamorim@bsd.com.br> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/138992: [PATCH] net/linphone-base: update to 3.2.0. Take maintainership. Message-ID: <20090920154138.B5AA04DA20F@fbsd9.scjamorim.org> Resent-Message-ID: <200909201550.n8KFo1Pt032750@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 138992 >Category: ports >Synopsis: [PATCH] net/linphone-base: update to 3.2.0. Take maintainership. >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Sep 20 15:50:01 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Sylvio Cesar >Release: FreeBSD 9.0-CURRENT i386 >Organization: >Environment: System: FreeBSD fbsd9.scjamorim.org 9.0-CURRENT FreeBSD 9.0-CURRENT #0: Mon Sep 14 01:24:51 BRT 2009 >Description: - Update to 3.2.0 - Added patch to file dsptools - Rename old incorrect names of patch files - Changed pkg-plist that makes reference to net/linphone-base - Changed pkg-plist.gui that makes reference to net/linphone - Take maintainership. Added file(s): - files/patch-coreapi_linphonecore.c - files/patch-gtk-glade_Makefile.in - files/patch-mediastreamer2_src_dsptools.c - files/patch-mediastreamer2_src_ice.c Removed file(s): - files/patch-coreapi::linphonecore.c - files/patch-gtk-glade__Makefile.in - files/patch-mediastreamer2__src__ice.c You can see the log in my tinderbox: AMD64 http://www.scjamorim.org/Home/linphone-base-3.2.0,1-8amd64.log http://www.scjamorim.org/Home/linphone-3.2.0_1,1-8amd64.log i386 http://www.scjamorim.org/Home/linphone-base-3.2.0,1-8i386.log http://www.scjamorim.org/Home/linphone-3.2.0_1,1-8i386.log Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- linphone-base-3.2.0,1.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/net/linphone-base/Makefile,v retrieving revision 1.51 diff -u -u -r1.51 Makefile --- Makefile 2 Aug 2009 19:35:01 -0000 1.51 +++ Makefile 20 Sep 2009 15:30:15 -0000 @@ -6,12 +6,12 @@ # PORTNAME= linphone -PORTVERSION= 3.1.2 +PORTVERSION= 3.2.0 PORTEPOCH= 1 CATEGORIES?= net MASTER_SITES= SAVANNAH/${PORTNAME}/stable/sources -MAINTAINER= ports@FreeBSD.org +MAINTAINER= scjamorim@bsd.com.br COMMENT= A web phone that supports SIP protocol LIB_DEPENDS= gsm.1:${PORTSDIR}/audio/gsm \ @@ -45,8 +45,8 @@ .endif .if defined(LINPHONE_GUI) -BUILD_DEPENDS+= linphone-base>=3.1.2:${PORTSDIR}/net/linphone-base -RUN_DEPENDS+= linphone-base>=3.1.2:${PORTSDIR}/net/linphone-base +BUILD_DEPENDS+= linphone-base>=${PORTVERSION}:${PORTSDIR}/net/linphone-base +RUN_DEPENDS+= linphone-base>=${PORTVERSION}:${PORTSDIR}/net/linphone-base DESCR= ${PKGDIR}/pkg-descr.gui PLIST= ${PKGDIR}/pkg-plist.gui USE_GNOME+= libglade2 Index: distinfo =================================================================== RCS file: /home/ncvs/ports/net/linphone-base/distinfo,v retrieving revision 1.22 diff -u -u -r1.22 distinfo --- distinfo 10 May 2009 18:34:09 -0000 1.22 +++ distinfo 20 Sep 2009 15:30:16 -0000 @@ -1,3 +1,3 @@ -MD5 (linphone-3.1.2.tar.gz) = f0a6e48a2b3cf276f78f8499444be732 -SHA256 (linphone-3.1.2.tar.gz) = 2e676f2bc6aeed7753458079355fc64362c75b530913e9226cd4abd9257cbf17 -SIZE (linphone-3.1.2.tar.gz) = 7732132 +MD5 (linphone-3.2.0.tar.gz) = e5b99322b0de6e8ae4a22eb27fb56b77 +SHA256 (linphone-3.2.0.tar.gz) = f7b8db970e20898f5cefb8bb9a5133ebb3064d6d466301241e659d93e52e6cef +SIZE (linphone-3.2.0.tar.gz) = 7880590 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/net/linphone-base/pkg-plist,v retrieving revision 1.24 diff -u -u -r1.24 pkg-plist --- pkg-plist 3 Apr 2009 09:28:02 -0000 1.24 +++ pkg-plist 20 Sep 2009 15:30:16 -0000 @@ -7,15 +7,18 @@ include/linphone/sipsetup.h include/mediastreamer2/allfilters.h include/mediastreamer2/dtmfgen.h +include/mediastreamer2/dsptools.h include/mediastreamer2/ice.h include/mediastreamer2/mediastream.h include/mediastreamer2/mscommon.h +include/mediastreamer2/msequalizer.h include/mediastreamer2/msfileplayer.h include/mediastreamer2/msfilerec.h include/mediastreamer2/msfilter.h include/mediastreamer2/msqueue.h include/mediastreamer2/msrtp.h include/mediastreamer2/mssndcard.h +include/mediastreamer2/msspeexec.h include/mediastreamer2/mstee.h include/mediastreamer2/msticker.h include/mediastreamer2/msv4l.h @@ -43,7 +46,7 @@ lib/liblinphone.a lib/liblinphone.la lib/liblinphone.so -lib/liblinphone.so.4 +lib/liblinphone.so.5 lib/libmediastreamer.a lib/libmediastreamer.la lib/libmediastreamer.so Index: pkg-plist.gui =================================================================== RCS file: /home/ncvs/ports/net/linphone-base/pkg-plist.gui,v retrieving revision 1.6 diff -u -u -r1.6 pkg-plist.gui --- pkg-plist.gui 10 May 2009 18:34:09 -0000 1.6 +++ pkg-plist.gui 20 Sep 2009 15:30:16 -0000 @@ -1,6 +1,7 @@ bin/linphone bin/linphone-3 share/applications/linphone.desktop +%%DATADIR%%/COPYING %%DATADIR%%/about.glade %%DATADIR%%/buddylookup.glade %%DATADIR%%/call_logs.glade @@ -16,9 +17,11 @@ %%DATADIR%%/sip_account.glade %%DATADIR%%/stock_people.png %%DATADIR%%/waiting.glade +share/pixmaps/linphone/green.png share/pixmaps/linphone/linphone.png share/pixmaps/linphone/linphone2.png share/pixmaps/linphone/linphone2.xpm +share/pixmaps/linphone/red.png share/pixmaps/linphone/sip-away.png share/pixmaps/linphone/sip-bifm.png share/pixmaps/linphone/sip-busy.png Index: files/patch-coreapi::linphonecore.c =================================================================== RCS file: files/patch-coreapi::linphonecore.c diff -N files/patch-coreapi::linphonecore.c --- files/patch-coreapi::linphonecore.c 10 May 2009 18:34:10 -0000 1.10 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,23 +0,0 @@ ---- coreapi/linphonecore.c.orig 2009-03-10 00:22:47.000000000 +0900 -+++ coreapi/linphonecore.c 2009-03-26 01:38:40.000000000 +0900 -@@ -29,11 +29,9 @@ - #include "exevents.h" - - --#ifdef INET6 - #ifndef WIN32 - #include <netdb.h> - #endif --#endif - - #ifdef WIN32 - #define HAVE_EXOSIP_GET_VERSION 1 -@@ -341,7 +339,7 @@ - const char **devices; - int ndev; - int i; --#ifndef WIN32 -+#ifdef __linux - /*alsadev let the user use custom alsa device within linphone*/ - devid=lp_config_get_string(lc->config,"sound","alsadev",NULL); - if (devid){ Index: files/patch-coreapi_linphonecore.c =================================================================== RCS file: files/patch-coreapi_linphonecore.c diff -N files/patch-coreapi_linphonecore.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-coreapi_linphonecore.c 20 Sep 2009 15:30:16 -0000 @@ -0,0 +1,14 @@ +--- coreapi/linphonecore.c.orig 2009-09-19 13:56:58.000000000 -0300 ++++ coreapi/linphonecore.c 2009-09-19 13:58:01.000000000 -0300 +@@ -31,11 +31,9 @@ + #include "exevents.h" + + +-#ifdef INET6 + #ifndef WIN32 + #include <netdb.h> + #endif +-#endif + + #ifdef WIN32 + #define HAVE_EXOSIP_GET_VERSION 1 Index: files/patch-gtk-glade_Makefile.in =================================================================== RCS file: files/patch-gtk-glade_Makefile.in diff -N files/patch-gtk-glade_Makefile.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-gtk-glade_Makefile.in 20 Sep 2009 15:30:16 -0000 @@ -0,0 +1,41 @@ +--- gtk-glade/Makefile.in.orig 2009-09-18 20:07:22.000000000 -0300 ++++ gtk-glade/Makefile.in 2009-09-18 20:38:19.000000000 -0300 +@@ -77,9 +77,6 @@ + @BUILD_GLADE_UI_TRUE@@BUILD_WIN32_TRUE@am__DEPENDENCIES_2 = \ + @BUILD_GLADE_UI_TRUE@@BUILD_WIN32_TRUE@ linphone.res + @BUILD_GLADE_UI_TRUE@linphone_3_DEPENDENCIES = \ +-@BUILD_GLADE_UI_TRUE@ $(top_builddir)/oRTP/src/libortp.la \ +-@BUILD_GLADE_UI_TRUE@ $(top_builddir)/mediastreamer2/src/libmediastreamer.la \ +-@BUILD_GLADE_UI_TRUE@ $(top_builddir)/coreapi/liblinphone.la \ + @BUILD_GLADE_UI_TRUE@ $(am__DEPENDENCIES_1) \ + @BUILD_GLADE_UI_TRUE@ $(am__DEPENDENCIES_1) \ + @BUILD_GLADE_UI_TRUE@ $(am__DEPENDENCIES_1) \ +@@ -335,9 +332,9 @@ + @BUILD_GLADE_UI_TRUE@ linphone.h + + @BUILD_GLADE_UI_TRUE@linphone_3_LDADD = \ +-@BUILD_GLADE_UI_TRUE@ $(top_builddir)/oRTP/src/libortp.la \ +-@BUILD_GLADE_UI_TRUE@ $(top_builddir)/mediastreamer2/src/libmediastreamer.la \ +-@BUILD_GLADE_UI_TRUE@ $(top_builddir)/coreapi/liblinphone.la \ ++@BUILD_GLADE_UI_TRUE@ `$(PKG_CONFIG) --libs ortp` \ ++@BUILD_GLADE_UI_TRUE@ `$(PKG_CONFIG) --libs mediastreamer` \ ++@BUILD_GLADE_UI_TRUE@ `$(PKG_CONFIG) --libs linphone` \ + @BUILD_GLADE_UI_TRUE@ $(LIBGTK_LIBS) $(INTLLIBS) \ + @BUILD_GLADE_UI_TRUE@ $(LIBGLADE_LIBS) $(am__append_1) + @BUILD_GLADE_UI_TRUE@@BUILD_WIN32_FALSE@linphone_3_LDFLAGS = -export-dynamic +@@ -349,10 +346,12 @@ + + #gtk-linphone.ui: gtk-linphone.glade + # gtk-builder-convert gtk-linphone.glade $@ +-AM_CFLAGS = -DIN_LINPHONE -I$(top_srcdir)/coreapi/ \ +- -I$(top_srcdir)/mediastreamer2/include/ \ ++AM_CFLAGS = -DIN_LINPHONE \ ++ `$(PKG_CONFIG) --cflags ortp` \ ++ `$(PKG_CONFIG) --cflags mediastreamer` \ ++ `$(PKG_CONFIG) --cflags linphone` \ + $(LIBGLADE_CFLAGS) $(STRICT_OPTIONS) $(LIBGTK_CFLAGS) $(IPV6_CFLAGS) \ +- $(ORTP_CFLAGS) $(OSIP_CFLAGS) ++ $(OSIP_CFLAGS) + + CLEANFILES = version_date.h + all: $(BUILT_SOURCES) Index: files/patch-gtk-glade__Makefile.in =================================================================== RCS file: files/patch-gtk-glade__Makefile.in diff -N files/patch-gtk-glade__Makefile.in --- files/patch-gtk-glade__Makefile.in 3 Apr 2009 09:28:02 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,41 +0,0 @@ ---- gtk-glade/Makefile.in.orig 2009-03-17 21:12:10.000000000 +0900 -+++ gtk-glade/Makefile.in 2009-03-17 21:17:21.000000000 +0900 -@@ -69,9 +69,6 @@ - linphone_3_OBJECTS = $(am_linphone_3_OBJECTS) - am__DEPENDENCIES_1 = - @BUILD_GLADE_UI_TRUE@linphone_3_DEPENDENCIES = \ --@BUILD_GLADE_UI_TRUE@ $(top_builddir)/oRTP/src/libortp.la \ --@BUILD_GLADE_UI_TRUE@ $(top_builddir)/mediastreamer2/src/libmediastreamer.la \ --@BUILD_GLADE_UI_TRUE@ $(top_builddir)/coreapi/liblinphone.la \ - @BUILD_GLADE_UI_TRUE@ $(am__DEPENDENCIES_1) \ - @BUILD_GLADE_UI_TRUE@ $(am__DEPENDENCIES_1) \ - @BUILD_GLADE_UI_TRUE@ $(am__DEPENDENCIES_1) -@@ -315,9 +312,9 @@ - @BUILD_GLADE_UI_TRUE@ buddylookup.c \ - @BUILD_GLADE_UI_TRUE@ linphone.h - --@BUILD_GLADE_UI_TRUE@linphone_3_LDADD = $(top_builddir)/oRTP/src/libortp.la \ --@BUILD_GLADE_UI_TRUE@ $(top_builddir)/mediastreamer2/src/libmediastreamer.la \ --@BUILD_GLADE_UI_TRUE@ $(top_builddir)/coreapi/liblinphone.la \ -+@BUILD_GLADE_UI_TRUE@linphone_3_LDADD = `$(PKG_CONFIG) --libs ortp` \ -+@BUILD_GLADE_UI_TRUE@ `$(PKG_CONFIG) --libs mediastreamer` \ -+@BUILD_GLADE_UI_TRUE@ `$(PKG_CONFIG) --libs linphone` \ - @BUILD_GLADE_UI_TRUE@ $(LIBGTK_LIBS) $(INTLLIBS) \ - @BUILD_GLADE_UI_TRUE@ $(LIBGLADE_LIBS) - -@@ -329,10 +326,12 @@ - - #gtk-linphone.ui: gtk-linphone.glade - # gtk-builder-convert gtk-linphone.glade $@ --AM_CFLAGS = -DIN_LINPHONE -I$(top_srcdir)/coreapi/ \ -- -I$(top_srcdir)/mediastreamer2/include/ \ -+AM_CFLAGS = -DIN_LINPHONE \ -+ `$(PKG_CONFIG) --cflags ortp` \ -+ `$(PKG_CONFIG) --cflags mediastreamer` \ -+ `$(PKG_CONFIG) --cflags linphone` \ - $(LIBGLADE_CFLAGS) $(STRICT_OPTIONS) $(LIBGTK_CFLAGS) $(IPV6_CFLAGS) \ -- $(ORTP_CFLAGS) $(OSIP_CFLAGS) -+ $(OSIP_CFLAGS) - - all: all-am - Index: files/patch-mediastreamer2__src__ice.c =================================================================== RCS file: files/patch-mediastreamer2__src__ice.c diff -N files/patch-mediastreamer2__src__ice.c --- files/patch-mediastreamer2__src__ice.c 31 Mar 2008 20:33:54 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ ---- mediastreamer2/src/ice.c.orig 2007-10-18 22:05:10.000000000 +0200 -+++ mediastreamer2/src/ice.c 2008-03-31 10:12:57.000000000 +0200 -@@ -18,9 +18,7 @@ - */ - - #if !defined(WIN32) && !defined(_WIN32_WCE) --#ifdef __APPLE__ - #include <sys/types.h> --#endif - #include <sys/socket.h> - #include <netdb.h> - #endif Index: files/patch-mediastreamer2_src_dsptools.c =================================================================== RCS file: files/patch-mediastreamer2_src_dsptools.c diff -N files/patch-mediastreamer2_src_dsptools.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-mediastreamer2_src_dsptools.c 20 Sep 2009 15:30:16 -0000 @@ -0,0 +1,13 @@ +--- mediastreamer2/src/dsptools.c.orig 2009-09-19 14:00:35.000000000 -0300 ++++ mediastreamer2/src/dsptools.c 2009-09-19 14:01:21.000000000 -0300 +@@ -56,10 +56,6 @@ + + #ifdef HAVE_ALLOCA_H + #include <alloca.h> +-#else +-#if !defined(__APPLE__) +-#include <malloc.h> +-#endif + #endif + + #define ALLOC(var,size,type) var = alloca(sizeof(type)*(size)) Index: files/patch-mediastreamer2_src_ice.c =================================================================== RCS file: files/patch-mediastreamer2_src_ice.c diff -N files/patch-mediastreamer2_src_ice.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-mediastreamer2_src_ice.c 20 Sep 2009 15:30:16 -0000 @@ -0,0 +1,12 @@ +--- mediastreamer2/src/ice.c.orig 2007-10-18 22:05:10.000000000 +0200 ++++ mediastreamer2/src/ice.c 2008-03-31 10:12:57.000000000 +0200 +@@ -18,9 +18,7 @@ + */ + + #if !defined(WIN32) && !defined(_WIN32_WCE) +-#ifdef __APPLE__ + #include <sys/types.h> +-#endif + #include <sys/socket.h> + #include <netdb.h> + #endif --- linphone-base-3.2.0,1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090920154138.B5AA04DA20F>