Attachment 95034 Details for Bug 133322 – file.shar

file.shar

file.shar (text/plain), 8.18 KB, created by tkato432 on 2009-04-02 19:10:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2009-04-02 19:10:06 UTC

Size: 8.18 KB

patch

obsolete

># This is a shell archive.  Save it in a file, remove anything before
># this line, and then unpack it by entering "sh file".  Note, it may
># create directories; files and directories will be owned by you and
># have default permissions.
>#
># This archive contains:
>#
>#	net_linphone-base.diff
>#	net_libexosip2.diff
>#
>echo x - net_linphone-base.diff
>sed 's/^X//' >net_linphone-base.diff << 'a9e957ed89c7b0dd011d93d8f55de3a0'
>Xdiff -urN /usr/ports/net/linphone-base/Makefile net/linphone-base/Makefile
>X--- /usr/ports/net/linphone-base/Makefile	2009-01-24 03:22:23.000000000 +0900
>X+++ net/linphone-base/Makefile	2009-03-17 21:34:00.000000000 +0900
>X@@ -6,7 +6,7 @@
>X #
>X 
>X PORTNAME=	linphone
>X-PORTVERSION=	3.0.0
>X+PORTVERSION=	3.1.0
>X PORTEPOCH=	1
>X CATEGORIES?=	net
>X MASTER_SITES=	SAVANNAH/${PORTNAME}/stable/sources
>X@@ -45,8 +45,8 @@
>X .endif
>X 
>X .if defined(LINPHONE_GUI)
>X-BUILD_DEPENDS+=	linphone-base>=3.0.0:${PORTSDIR}/net/linphone-base
>X-RUN_DEPENDS+=	linphone-base>=3.0.0:${PORTSDIR}/net/linphone-base
>X+BUILD_DEPENDS+=	linphone-base>=3.1.0:${PORTSDIR}/net/linphone-base
>X+RUN_DEPENDS+=	linphone-base>=3.1.0:${PORTSDIR}/net/linphone-base
>X DESCR=		${PKGDIR}/pkg-descr.gui
>X PLIST=		${PKGDIR}/pkg-plist.gui
>X USE_GNOME+=	libglade2
>X@@ -65,10 +65,10 @@
>X 	@${REINPLACE_CMD} -e '/^SUBDIRS =/s| =| ?=|g' ${WRKSRC}/Makefile.in
>X 	@${REINPLACE_CMD} -e '/^imgdir =/s|(datadir)|(pkgdatadir)|g' \
>X 		${WRKSRC}/mediastreamer2/src/Makefile.in
>X-.for file in configure src/gsm.c
>X+	@${REINPLACE_CMD} -e 's|gsm/gsm\.h|gsm.h|g ; \
>X+		 s| -O2 -g ||g' ${WRKSRC}/mediastreamer2/configure
>X 	@${REINPLACE_CMD} -e 's|gsm/gsm\.h|gsm.h|g' \
>X-		${WRKSRC}/mediastreamer2/${file}
>X-.endfor
>X+		${WRKSRC}/mediastreamer2/src/gsm.c
>X 
>X post-install:
>X .if defined(LINPHONE_GUI)
>Xdiff -urN /usr/ports/net/linphone-base/distinfo net/linphone-base/distinfo
>X--- /usr/ports/net/linphone-base/distinfo	2009-01-24 03:22:23.000000000 +0900
>X+++ net/linphone-base/distinfo	2009-03-17 16:18:51.000000000 +0900
>X@@ -1,3 +1,3 @@
>X-MD5 (linphone-3.0.0.tar.gz) = 8c883bb267da5d2b6c7c2a5c52641a35
>X-SHA256 (linphone-3.0.0.tar.gz) = 68657f5efe147bd00ec1375daf3fe13ae1c81f906bf9d81ab4fad8f0ef1fabec
>X-SIZE (linphone-3.0.0.tar.gz) = 7577336
>X+MD5 (linphone-3.1.0.tar.gz) = ed40cf4088c306400b005bbd63ac36be
>X+SHA256 (linphone-3.1.0.tar.gz) = e41e99925e8c81a9e6c7f4cf399da1d9f571927413196898af46ecbebee6a91b
>X+SIZE (linphone-3.1.0.tar.gz) = 7794213
>Xdiff -urN /usr/ports/net/linphone-base/files/patch-coreapi::linphonecore.c net/linphone-base/files/patch-coreapi::linphonecore.c
>X--- /usr/ports/net/linphone-base/files/patch-coreapi::linphonecore.c	2008-04-01 14:08:35.000000000 +0900
>X+++ net/linphone-base/files/patch-coreapi::linphonecore.c	2009-03-26 01:39:19.000000000 +0900
>X@@ -1,5 +1,5 @@
>X---- coreapi/linphonecore.c.orig	2008-02-12 20:18:04.000000000 +0900
>X-+++ coreapi/linphonecore.c	2008-02-14 02:54:42.000000000 +0900
>X+--- coreapi/linphonecore.c.orig	2009-03-10 00:22:47.000000000 +0900
>X++++ coreapi/linphonecore.c	2009-03-26 01:38:40.000000000 +0900
>X @@ -29,11 +29,9 @@
>X  #include "exevents.h"
>X  
>X@@ -12,7 +12,7 @@
>X  
>X  #ifdef WIN32
>X  #define HAVE_EXOSIP_GET_VERSION 1
>X-@@ -318,7 +316,7 @@
>X+@@ -341,7 +339,7 @@
>X  	const char **devices;
>X  	int ndev;
>X  	int i;
>X@@ -21,3 +21,12 @@
>X  	/*alsadev let the user use custom alsa device within linphone*/
>X  	devid=lp_config_get_string(lc->config,"sound","alsadev",NULL);
>X  	if (devid){
>X+@@ -2108,7 +2106,7 @@
>X+ 	if (olddev!=NULL && olddev!=lc->video_conf.device){
>X+ 		toggle_video_preview(lc,FALSE);/*restart the video local preview*/
>X+ 	}
>X+-	if (lc->ready){
>X++	if (lc->ready && lc->video_conf.device){
>X+ 		vd=ms_web_cam_get_string_id(lc->video_conf.device);
>X+ 		if (vd && strstr(vd,"Static picture")!=NULL){
>X+ 			vd=NULL;
>Xdiff -urN /usr/ports/net/linphone-base/files/patch-gtk-glade__Makefile.in net/linphone-base/files/patch-gtk-glade__Makefile.in
>X--- /usr/ports/net/linphone-base/files/patch-gtk-glade__Makefile.in	2009-01-23 23:49:07.000000000 +0900
>X+++ net/linphone-base/files/patch-gtk-glade__Makefile.in	2009-03-17 21:18:03.000000000 +0900
>X@@ -1,6 +1,6 @@
>X---- gtk-glade/Makefile.in.orig	2008-10-10 21:54:08.000000000 +0900
>X-+++ gtk-glade/Makefile.in	2008-10-20 05:14:41.000000000 +0900
>X-@@ -67,9 +67,6 @@
>X+--- gtk-glade/Makefile.in.orig	2009-03-17 21:12:10.000000000 +0900
>X++++ gtk-glade/Makefile.in	2009-03-17 21:17:21.000000000 +0900
>X+@@ -69,9 +69,6 @@
>X  linphone_3_OBJECTS = $(am_linphone_3_OBJECTS)
>X  am__DEPENDENCIES_1 =
>X  @BUILD_GLADE_UI_TRUE@linphone_3_DEPENDENCIES =  \
>X@@ -10,8 +10,8 @@
>X  @BUILD_GLADE_UI_TRUE@	$(am__DEPENDENCIES_1) \
>X  @BUILD_GLADE_UI_TRUE@	$(am__DEPENDENCIES_1) \
>X  @BUILD_GLADE_UI_TRUE@	$(am__DEPENDENCIES_1)
>X-@@ -310,9 +307,9 @@
>X- @BUILD_GLADE_UI_TRUE@			logging.c \
>X+@@ -315,9 +312,9 @@
>X+ @BUILD_GLADE_UI_TRUE@			buddylookup.c \
>X  @BUILD_GLADE_UI_TRUE@			linphone.h
>X  
>X -@BUILD_GLADE_UI_TRUE@linphone_3_LDADD = $(top_builddir)/oRTP/src/libortp.la \
>X@@ -23,13 +23,13 @@
>X  @BUILD_GLADE_UI_TRUE@			$(LIBGTK_LIBS) $(INTLLIBS) \
>X  @BUILD_GLADE_UI_TRUE@			$(LIBGLADE_LIBS)
>X  
>X-@@ -324,10 +321,12 @@
>X+@@ -329,10 +326,12 @@
>X  
>X  #gtk-linphone.ui:	gtk-linphone.glade
>X  #	gtk-builder-convert gtk-linphone.glade $@
>X--AM_CFLAGS = -I$(top_srcdir)/coreapi/ \
>X+-AM_CFLAGS = -DIN_LINPHONE -I$(top_srcdir)/coreapi/ \
>X -		-I$(top_srcdir)/mediastreamer2/include/ \
>X-+AM_CFLAGS = \
>X++AM_CFLAGS = -DIN_LINPHONE \
>X +		`$(PKG_CONFIG) --cflags ortp` \
>X +		`$(PKG_CONFIG) --cflags mediastreamer` \
>X +		`$(PKG_CONFIG) --cflags linphone` \
>Xdiff -urN /usr/ports/net/linphone-base/pkg-plist net/linphone-base/pkg-plist
>X--- /usr/ports/net/linphone-base/pkg-plist	2009-01-24 03:22:23.000000000 +0900
>X+++ net/linphone-base/pkg-plist	2009-03-17 21:36:54.000000000 +0900
>X@@ -1,8 +1,10 @@
>X bin/linphonec
>X+bin/linphonecsh
>X bin/sipomatic
>X include/linphone/config.h
>X include/linphone/linphonecore.h
>X include/linphone/lpconfig.h
>X+include/linphone/sipsetup.h
>X include/mediastreamer2/allfilters.h
>X include/mediastreamer2/dtmfgen.h
>X include/mediastreamer2/ice.h
>X@@ -41,7 +43,7 @@
>X lib/liblinphone.a
>X lib/liblinphone.la
>X lib/liblinphone.so
>X-lib/liblinphone.so.3
>X+lib/liblinphone.so.4
>X lib/libmediastreamer.a
>X lib/libmediastreamer.la
>X lib/libmediastreamer.so
>X@@ -75,6 +77,7 @@
>X %%NLS%%share/locale/nl/LC_MESSAGES/linphone.mo
>X %%NLS%%share/locale/pl/LC_MESSAGES/linphone.mo
>X %%NLS%%share/locale/pt_BR/LC_MESSAGES/linphone.mo
>X+%%NLS%%share/locale/ru/LC_MESSAGES/linphone.mo
>X %%NLS%%share/locale/sv/LC_MESSAGES/linphone.mo
>X share/mediastreamer/images/nowebcamCIF.jpg
>X @dirrm share/mediastreamer/images
>Xdiff -urN /usr/ports/net/linphone-base/pkg-plist.gui net/linphone-base/pkg-plist.gui
>X--- /usr/ports/net/linphone-base/pkg-plist.gui	2009-01-24 03:22:24.000000000 +0900
>X+++ net/linphone-base/pkg-plist.gui	2009-03-17 21:39:20.000000000 +0900
>X@@ -2,10 +2,10 @@
>X bin/linphone-3
>X share/applications/linphone.desktop
>X %%DATADIR%%/about.glade
>X+%%DATADIR%%/buddylookup.glade
>X %%DATADIR%%/call_logs.glade
>X %%DATADIR%%/chatroom.glade
>X %%DATADIR%%/contact.glade
>X-%%DATADIR%%/gtk-linphone.glade
>X %%DATADIR%%/incoming_call.glade
>X %%DATADIR%%/linphone.png
>X %%DATADIR%%/linphone2.png
>a9e957ed89c7b0dd011d93d8f55de3a0
>echo x - net_libexosip2.diff
>sed 's/^X//' >net_libexosip2.diff << '1b292d0d1b73542529c51ee00020e468'
>Xdiff -urN /usr/ports/net/libexosip2/Makefile net/libexosip2/Makefile
>X--- /usr/ports/net/libexosip2/Makefile	2009-01-24 03:22:22.000000000 +0900
>X+++ net/libexosip2/Makefile	2009-03-17 16:03:52.000000000 +0900
>X@@ -6,7 +6,7 @@
>X #
>X 
>X PORTNAME=	libeXosip2
>X-PORTVERSION=	3.2.0
>X+PORTVERSION=	3.3.0
>X CATEGORIES=	net
>X MASTER_SITES=	SAVANNAH/exosip
>X 
>Xdiff -urN /usr/ports/net/libexosip2/distinfo net/libexosip2/distinfo
>X--- /usr/ports/net/libexosip2/distinfo	2009-01-24 03:22:22.000000000 +0900
>X+++ net/libexosip2/distinfo	2009-03-17 16:07:00.000000000 +0900
>X@@ -1,3 +1,3 @@
>X-MD5 (libeXosip2-3.2.0.tar.gz) = 2186453c58b3da4e302d1456fffa02bf
>X-SHA256 (libeXosip2-3.2.0.tar.gz) = 0eedfc9e79244c37b35477c686e9e9f94193e68a8b4fb15c58dade254d5ac452
>X-SIZE (libeXosip2-3.2.0.tar.gz) = 502201
>X+MD5 (libeXosip2-3.3.0.tar.gz) = a2739067b51c1e417c5aef9606b285b2
>X+SHA256 (libeXosip2-3.3.0.tar.gz) = 89fe5718028cd00bd5a21a0f2862e3340ce5b41ce339dcb8db06f20939cff0c3
>X+SIZE (libeXosip2-3.3.0.tar.gz) = 503100
>1b292d0d1b73542529c51ee00020e468
>exit

Actions: View

Attachments on bug 133322: 95034