Upstream update

This commit is contained in:
Ignacio Vazquez-Abrams 2006-01-03 12:05:15 +00:00
parent e1a3e7ca56
commit 55900095b6
5 changed files with 80 additions and 49 deletions

View File

@ -1 +1 @@
linphone-1.1.0.tar.gz linphone-1.2.0.tar.gz

View File

@ -0,0 +1,29 @@
--- linphone-1.2.0/mediastreamer/audiostream.c.maxrtp 2006-01-03 04:26:06.000000000 -0500
+++ linphone-1.2.0/mediastreamer/audiostream.c 2006-01-03 04:26:28.000000000 -0500
@@ -112,7 +112,7 @@
RtpSession **recvsend){
RtpSession *rtpr;
rtpr=rtp_session_new(RTP_SESSION_SENDRECV);
- rtp_session_max_buf_size_set(rtpr,MAX_RTP_SIZE);
+/* rtp_session_max_buf_size_set(rtpr,MAX_RTP_SIZE);*/
rtp_session_set_profile(rtpr,profile);
rtp_session_set_local_addr(rtpr,get_local_addr_for(remip),locport);
if (remport>0) rtp_session_set_remote_addr(rtpr,remip,remport);
@@ -133,7 +133,7 @@
/* creates two rtp filters to recv send streams (remote part)*/
rtps=rtp_session_new(RTP_SESSION_SENDONLY);
- rtp_session_max_buf_size_set(rtps,MAX_RTP_SIZE);
+/* rtp_session_max_buf_size_set(rtps,MAX_RTP_SIZE);*/
rtp_session_set_profile(rtps,profile);
#ifdef INET6
rtp_session_set_local_addr(rtps,"::",locport+2);
@@ -147,7 +147,7 @@
rtp_session_set_jitter_compensation(rtps,jitt_comp);
rtpr=rtp_session_new(RTP_SESSION_RECVONLY);
- rtp_session_max_buf_size_set(rtpr,MAX_RTP_SIZE);
+/* rtp_session_max_buf_size_set(rtpr,MAX_RTP_SIZE);*/
rtp_session_set_profile(rtpr,profile);
#ifdef INET6
rtp_session_set_local_addr(rtpr,"::",locport);

View File

@ -1,6 +1,6 @@
--- linphone-1.1.0/gnome/Makefile.in.ortp 2005-08-24 18:45:55.000000000 -0400 --- linphone-1.2.0/gnome/Makefile.in.ortp 2005-12-16 17:05:06.000000000 -0500
+++ linphone-1.1.0/gnome/Makefile.in 2005-12-05 17:14:02.000000000 -0500 +++ linphone-1.2.0/gnome/Makefile.in 2006-01-03 00:58:20.000000000 -0500
@@ -343,8 +343,7 @@ @@ -340,8 +340,7 @@
@BUILD_GNOME_TRUE@INCLUDES = \ @BUILD_GNOME_TRUE@INCLUDES = \
@BUILD_GNOME_TRUE@ -I$(top_srcdir)\ @BUILD_GNOME_TRUE@ -I$(top_srcdir)\
@BUILD_GNOME_TRUE@ -I$(top_srcdir)/intl \ @BUILD_GNOME_TRUE@ -I$(top_srcdir)/intl \
@ -10,9 +10,9 @@
@BUILD_GNOME_TRUE@ -I$(top_srcdir)/mediastreamer \ @BUILD_GNOME_TRUE@ -I$(top_srcdir)/mediastreamer \
@BUILD_GNOME_TRUE@ -I$(top_srcdir)/speex/libspeex \ @BUILD_GNOME_TRUE@ -I$(top_srcdir)/speex/libspeex \
@BUILD_GNOME_TRUE@ -I$(top_srcdir)/coreapi \ @BUILD_GNOME_TRUE@ -I$(top_srcdir)/coreapi \
--- linphone-1.1.0/coreapi/Makefile.in.ortp 2005-08-24 18:45:54.000000000 -0400 --- linphone-1.2.0/coreapi/Makefile.in.ortp 2005-12-16 17:05:05.000000000 -0500
+++ linphone-1.1.0/coreapi/Makefile.in 2005-12-05 17:14:02.000000000 -0500 +++ linphone-1.2.0/coreapi/Makefile.in 2006-01-03 00:58:20.000000000 -0500
@@ -292,8 +292,7 @@ @@ -289,8 +289,7 @@
INCLUDES = \ INCLUDES = \
-I$(top_srcdir)\ -I$(top_srcdir)\
-I$(top_srcdir)/exosip\ -I$(top_srcdir)/exosip\
@ -22,9 +22,9 @@
-I$(top_srcdir)/mediastreamer \ -I$(top_srcdir)/mediastreamer \
$(SPEEX_CFLAGS) \ $(SPEEX_CFLAGS) \
-I$(osip_prefix)/include/ -I$(osip_prefix)/include/
--- linphone-1.1.0/Makefile.in.ortp 2005-08-24 18:45:54.000000000 -0400 --- linphone-1.2.0/Makefile.in.ortp 2005-12-16 17:05:05.000000000 -0500
+++ linphone-1.1.0/Makefile.in 2005-12-05 17:14:02.000000000 -0500 +++ linphone-1.2.0/Makefile.in 2006-01-03 00:58:20.000000000 -0500
@@ -62,7 +62,7 @@ @@ -61,7 +61,7 @@
uninstall-recursive uninstall-recursive
ETAGS = etags ETAGS = etags
CTAGS = ctags CTAGS = ctags
@ -33,7 +33,7 @@
win32acm mediastreamer mediastreamer2 media_api exosip coreapi \ win32acm mediastreamer mediastreamer2 media_api exosip coreapi \
console gnome share developer-docs console gnome share developer-docs
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -277,7 +277,7 @@ @@ -274,7 +274,7 @@
sysconfdir = @sysconfdir@ sysconfdir = @sysconfdir@
target_alias = @target_alias@ target_alias = @target_alias@
@BUILD_TRUESPEECH_TRUE@WIN32ACM_DIR = win32acm @BUILD_TRUESPEECH_TRUE@WIN32ACM_DIR = win32acm
@ -42,9 +42,9 @@
$(WIN32ACM_DIR) mediastreamer mediastreamer2\ $(WIN32ACM_DIR) mediastreamer mediastreamer2\
media_api exosip coreapi console gnome share developer-docs media_api exosip coreapi console gnome share developer-docs
--- linphone-1.1.0/console/Makefile.in.ortp 2005-08-24 18:45:54.000000000 -0400 --- linphone-1.2.0/console/Makefile.in.ortp 2005-12-16 17:05:05.000000000 -0500
+++ linphone-1.1.0/console/Makefile.in 2005-12-05 17:14:02.000000000 -0500 +++ linphone-1.2.0/console/Makefile.in 2006-01-03 00:58:20.000000000 -0500
@@ -284,8 +284,7 @@ @@ -281,8 +281,7 @@
-I$(top_srcdir)/coreapi\ -I$(top_srcdir)/coreapi\
-I$(top_srcdir)/osipua/\ -I$(top_srcdir)/osipua/\
-I$(top_srcdir)/osipua/src \ -I$(top_srcdir)/osipua/src \
@ -54,9 +54,9 @@
-I$(top_srcdir)/mediastreamer \ -I$(top_srcdir)/mediastreamer \
$(SPEEX_CFLAGS)\ $(SPEEX_CFLAGS)\
-I$(osip_prefix)/include \ -I$(osip_prefix)/include \
--- linphone-1.1.0/mediastreamer/Makefile.in.ortp 2005-08-24 18:45:56.000000000 -0400 --- linphone-1.2.0/mediastreamer/Makefile.in.ortp 2005-12-16 17:05:07.000000000 -0500
+++ linphone-1.1.0/mediastreamer/Makefile.in 2005-12-05 17:14:02.000000000 -0500 +++ linphone-1.2.0/mediastreamer/Makefile.in 2006-01-03 00:58:20.000000000 -0500
@@ -68,7 +68,7 @@ @@ -67,7 +67,7 @@
@BUILD_TRUESPEECH_TRUE@am__DEPENDENCIES_3 = ../win32acm/libwin32acm.a @BUILD_TRUESPEECH_TRUE@am__DEPENDENCIES_3 = ../win32acm/libwin32acm.a
libmediastreamer_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ libmediastreamer_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
../gsmlib/libgsm.la ../lpc10-1.5/liblpc10.la \ ../gsmlib/libgsm.la ../lpc10-1.5/liblpc10.la \
@ -64,8 +64,8 @@
+ $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
@@ -356,6 +356,7 @@ @@ -348,6 +348,7 @@
MKINSTALLDIRS = @MKINSTALLDIRS@ MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@ MSGFMT = @MSGFMT@
OBJEXT = @OBJEXT@ OBJEXT = @OBJEXT@
@ -73,7 +73,7 @@
OSIP_CFLAGS = @OSIP_CFLAGS@ OSIP_CFLAGS = @OSIP_CFLAGS@
OSIP_LIBS = @OSIP_LIBS@ OSIP_LIBS = @OSIP_LIBS@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
@@ -494,7 +495,7 @@ @@ -485,7 +486,7 @@
libmediastreamer_la_LIBADD = $(GLIB_LIBS) \ libmediastreamer_la_LIBADD = $(GLIB_LIBS) \
../gsmlib/libgsm.la \ ../gsmlib/libgsm.la \
../lpc10-1.5/liblpc10.la \ ../lpc10-1.5/liblpc10.la \
@ -82,7 +82,7 @@
$(JACK_LIBS)\ $(JACK_LIBS)\
$(SAMPLERATE_LIBS)\ $(SAMPLERATE_LIBS)\
$(SUPPORTLIB) \ $(SUPPORTLIB) \
@@ -559,8 +560,7 @@ @@ -551,8 +552,7 @@
INCLUDES = -I$(top_srcdir) \ INCLUDES = -I$(top_srcdir) \
-I$(top_srcdir)/mediastreamer \ -I$(top_srcdir)/mediastreamer \
@ -92,9 +92,9 @@
-I$(top_srcdir)/gsmlib \ -I$(top_srcdir)/gsmlib \
-I$(top_srcdir)/lpc10-1.5 \ -I$(top_srcdir)/lpc10-1.5 \
$(SPEEX_CFLAGS) \ $(SPEEX_CFLAGS) \
--- linphone-1.1.0/mediastreamer2/Makefile.in.ortp 2005-08-24 18:45:57.000000000 -0400 --- linphone-1.2.0/mediastreamer2/Makefile.in.ortp 2005-12-16 17:05:07.000000000 -0500
+++ linphone-1.1.0/mediastreamer2/Makefile.in 2005-12-05 17:14:02.000000000 -0500 +++ linphone-1.2.0/mediastreamer2/Makefile.in 2006-01-03 00:58:20.000000000 -0500
@@ -55,7 +55,7 @@ @@ -54,7 +54,7 @@
@BUILD_UGLIB_TRUE@ $(top_builddir)/support/libuglib.la @BUILD_UGLIB_TRUE@ $(top_builddir)/support/libuglib.la
libmediastreamer2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ libmediastreamer2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
../gsmlib/libgsm.la ../lpc10-1.5/liblpc10.la \ ../gsmlib/libgsm.la ../lpc10-1.5/liblpc10.la \
@ -103,7 +103,7 @@
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_libmediastreamer2_la_OBJECTS = msfilter.lo msAlawdec.lo \ am_libmediastreamer2_la_OBJECTS = msfilter.lo msAlawdec.lo \
@@ -216,6 +216,7 @@ @@ -213,6 +213,7 @@
MKINSTALLDIRS = @MKINSTALLDIRS@ MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@ MSGFMT = @MSGFMT@
OBJEXT = @OBJEXT@ OBJEXT = @OBJEXT@
@ -111,7 +111,7 @@
OSIP_CFLAGS = @OSIP_CFLAGS@ OSIP_CFLAGS = @OSIP_CFLAGS@
OSIP_LIBS = @OSIP_LIBS@ OSIP_LIBS = @OSIP_LIBS@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
@@ -316,7 +317,7 @@ @@ -313,7 +314,7 @@
libmediastreamer2_la_LIBADD = $(GLIB_LIBS) \ libmediastreamer2_la_LIBADD = $(GLIB_LIBS) \
../gsmlib/libgsm.la \ ../gsmlib/libgsm.la \
../lpc10-1.5/liblpc10.la \ ../lpc10-1.5/liblpc10.la \
@ -120,7 +120,7 @@
$(JACK_LIBS)\ $(JACK_LIBS)\
$(SUPPORTLIB) \ $(SUPPORTLIB) \
$(ALSA_LIBS) \ $(ALSA_LIBS) \
@@ -325,8 +326,7 @@ @@ -322,8 +323,7 @@
AM_CFLAGS = $(GLIB_CFLAGS) -DG_LOG_DOMAIN=\"MediaStreamer\" $(TRUESPEECH_CFLAGS) $(IPV6_CFLAGS) AM_CFLAGS = $(GLIB_CFLAGS) -DG_LOG_DOMAIN=\"MediaStreamer\" $(TRUESPEECH_CFLAGS) $(IPV6_CFLAGS)
INCLUDES = -I$(top_srcdir) \ INCLUDES = -I$(top_srcdir) \
-I$(top_srcdir)/mediastreamer2 \ -I$(top_srcdir)/mediastreamer2 \
@ -130,9 +130,9 @@
-I$(top_srcdir)/gsmlib \ -I$(top_srcdir)/gsmlib \
-I$(top_srcdir)/lpc10-1.5 \ -I$(top_srcdir)/lpc10-1.5 \
$(SPEEX_CFLAGS) $(SPEEX_CFLAGS)
--- linphone-1.1.0/media_api/Makefile.in.ortp 2005-08-24 18:45:56.000000000 -0400 --- linphone-1.2.0/media_api/Makefile.in.ortp 2005-12-16 17:05:07.000000000 -0500
+++ linphone-1.1.0/media_api/Makefile.in 2005-12-05 17:14:02.000000000 -0500 +++ linphone-1.2.0/media_api/Makefile.in 2006-01-03 00:58:20.000000000 -0500
@@ -302,8 +302,7 @@ @@ -299,8 +299,7 @@
INCLUDES = -I$(top_srcdir)/mediastreamer \ INCLUDES = -I$(top_srcdir)/mediastreamer \
-I$(top_srcdir)/speex \ -I$(top_srcdir)/speex \
-I$(top_srcdir)/gsmlib \ -I$(top_srcdir)/gsmlib \
@ -142,18 +142,17 @@
-I$(top_srcdir)/lpc10-1.5 \ -I$(top_srcdir)/lpc10-1.5 \
-I$(top_srcdir)/ffmpeg -I$(top_srcdir)/ffmpeg
--- linphone-1.1.0/configure.ortp 2005-08-24 18:37:04.000000000 -0400 --- linphone-1.2.0/configure.ortp 2005-12-16 17:05:11.000000000 -0500
+++ linphone-1.1.0/configure 2005-12-05 17:17:37.000000000 -0500 +++ linphone-1.2.0/configure 2006-01-03 00:59:50.000000000 -0500
@@ -462,8 +462,6 @@ @@ -463,7 +463,6 @@
#if HAVE_UNISTD_H
# include <unistd.h> # include <unistd.h>
#endif" #endif"
-
-ac_subdirs_all="$ac_subdirs_all oRTP" -ac_subdirs_all="$ac_subdirs_all oRTP"
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS LIBLINPHONE_SO_VERSION LINPHONE_VERSION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS PKG_CONFIG GLIB_CFLAGS GLIB_LIBS GLIB_GENMARSHAL GOBJECT_QUERY GLIB_MKENUMS ac_pt_PKG_CONFIG LIBGNOMEUI_CFLAGS LIBGNOMEUI_LIBS LIBGNOME_CFLAGS LIBGNOME_LIBS LIBGTK_CFLAGS LIBGTK_LIBS GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS STRICT_OPTIONS IPV6_CFLAGS TRUESPEECH_CFLAGS BUILD_TRUESPEECH_TRUE BUILD_TRUESPEECH_FALSE JACK_CFLAGS JACK_LIBS SAMPLERATE_CFLAGS SAMPLERATE_LIBS osip_prefix OSIP_CFLAGS OSIP_LIBS EXOSIP_CFLAGS EXOSIP_LIBS SPEEX_CFLAGS SPEEX_LIBS ILBC_CFLAGS ILBC_LIBS ${NAME}_CFLAGS ${NAME}_LIBS VIDEO_CFLAGS VIDEO_LIBS BUILD_MEDIASTREAMER_TRUE BUILD_MEDIASTREAMER_FALSE BUILD_MEDIA_API_TRUE BUILD_MEDIA_API_FALSE BUILD_UGLIB_TRUE BUILD_UGLIB_FALSE BUILD_GNOME_TRUE BUILD_GNOME_FALSE BUILD_GNOME_APPLET_TRUE BUILD_GNOME_APPLET_FALSE BUILD_SPEEX_TRUE BUILD_SPEEX_FALSE ARMBUILD_TRUE ARMBUILD_FALSE BUILD_VIDEO_TRUE BUILD_VIDEO_FALSE ALSA_LIBS subdirs HTML_DIR GTK_DOC_CFLAGS GTK_DOC_LIBS ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE have_db2html ENABLE_MANUAL_TRUE ENABLE_MANUAL_FALSE LINPHONE_CFLAGS LINPHONE_LIBS LIBOBJS LTLIBOBJS' ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS LIBLINPHONE_SO_VERSION LINPHONE_VERSION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS PKG_CONFIG GLIB_CFLAGS GLIB_LIBS GLIB_GENMARSHAL GOBJECT_QUERY GLIB_MKENUMS ac_pt_PKG_CONFIG LIBGNOMEUI_CFLAGS LIBGNOMEUI_LIBS LIBGNOME_CFLAGS LIBGNOME_LIBS LIBGTK_CFLAGS LIBGTK_LIBS GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS STRICT_OPTIONS IPV6_CFLAGS TRUESPEECH_CFLAGS BUILD_TRUESPEECH_TRUE BUILD_TRUESPEECH_FALSE JACK_CFLAGS JACK_LIBS SAMPLERATE_CFLAGS SAMPLERATE_LIBS osip_prefix OSIP_CFLAGS OSIP_LIBS EXOSIP_CFLAGS EXOSIP_LIBS SPEEX_CFLAGS SPEEX_LIBS ${NAME}_CFLAGS ${NAME}_LIBS VIDEO_CFLAGS VIDEO_LIBS BUILD_MEDIASTREAMER_TRUE BUILD_MEDIASTREAMER_FALSE BUILD_MEDIA_API_TRUE BUILD_MEDIA_API_FALSE BUILD_UGLIB_TRUE BUILD_UGLIB_FALSE BUILD_GNOME_TRUE BUILD_GNOME_FALSE BUILD_GNOME_APPLET_TRUE BUILD_GNOME_APPLET_FALSE BUILD_SPEEX_TRUE BUILD_SPEEX_FALSE ARMBUILD_TRUE ARMBUILD_FALSE BUILD_VIDEO_TRUE BUILD_VIDEO_FALSE ALSA_LIBS subdirs HTML_DIR GTK_DOC_CFLAGS GTK_DOC_LIBS ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE have_db2html ENABLE_MANUAL_TRUE ENABLE_MANUAL_FALSE LINPHONE_CFLAGS LINPHONE_LIBS LIBOBJS LTLIBOBJS'
ac_subst_files='' ac_subst_files=''
@@ -29745,9 +29743,6 @@ @@ -30162,9 +30161,6 @@

View File

@ -1,16 +1,16 @@
Name: linphone Name: linphone
Version: 1.1.0 Version: 1.2.0
Release: 2%{?dist} Release: 1%{?dist}
Summary: Phone anywhere in the whole world by using the Internet Summary: Phone anywhere in the whole world by using the Internet
Group: Applications/Communications Group: Applications/Communications
License: GPL License: GPL
URL: http://www.linphone.org/?lang=us&rubrique=1 URL: http://www.linphone.org/?lang=us&rubrique=1
Source0: http://simon.morlat.free.fr/download/1.1.x/source/%{name}-%{version}.tar.gz Source0: http://simon.morlat.free.fr/download/1.2.x/source/%{name}-%{version}.tar.gz
Patch: linphone-1.0.1-pkgconfig.patch Patch: linphone-1.0.1-desktop.patch
Patch1: linphone-1.0.1-desktop.patch Patch1: linphone-1.2.0-ortp.patch
Patch2: linphone-1.1.0-ortp.patch Patch2: linphone-1.1.0-Werror.patch
Patch3: linphone-1.1.0-Werror.patch Patch3: linphone-1.2.0-maxrtp.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gnome-panel-devel libgnomeui-devel glib2-devel alsa-lib-devel BuildRequires: gnome-panel-devel libgnomeui-devel glib2-devel alsa-lib-devel
@ -43,10 +43,10 @@ Libraries and headers required to develop software with linphone.
%prep %prep
%setup -q %setup -q
%patch -p 1 -b .pkgconfig %patch -p 1 -b .old
%patch1 -p 1 -b .old %patch1 -p 1 -b .ortp
%patch2 -p 1 -b .ortp %patch2 -p 1 -b .Werror
%patch3 -p 1 -b .Werror %patch3 -p 1 -b .maxrtp
rm -r oRTP rm -r oRTP
%build %build
@ -99,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/* %{_libdir}/pkgconfig/*
%changelog %changelog
* Tue Jan 3 2006 Ignacio Vazquez-Abrams <ivazquez@ivazquez.net> 1.2.0-1
- Upstream update
* Mon Dec 5 2005 Ignacio Vazquez-Abrams <ivazquez@ivazquez.net> 1.1.0-2 * Mon Dec 5 2005 Ignacio Vazquez-Abrams <ivazquez@ivazquez.net> 1.1.0-2
- Added version on ortp-devel - Added version on ortp-devel

View File

@ -1 +1 @@
9f164b41c76ef1caca164909dea199a1 linphone-1.1.0.tar.gz bd5e513a665ce2e381afce64d569c707 linphone-1.2.0.tar.gz