dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-linphone-1.2.0.tar.gz

.gitignore

@@ -0,0 +1 @@
+linphone-1.7.1.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: linphone
-# $Id$
-NAME := linphone
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

linphone-1.0.1-desktop.patch

@@ -1,11 +0,0 @@
---- linphone-1.0.1/share/linphone.desktop.old	2003-02-03 11:52:01.000000000 -0500
-+++ linphone-1.0.1/share/linphone.desktop	2005-05-27 12:42:58.000000000 -0400
-@@ -5,6 +5,6 @@
- Comment[de]=Linphone ist ein web-phone.
- Type=Application
- Exec=linphone
--Icon=linphone/linphone2.png
--Terminal=0
-+Icon=linphone2.png
-+Terminal=false
- Categories=Application;Network;

linphone-1.0.1-pkgconfig.patch

@@ -1,25 +0,0 @@
---- linphone-0.12.2/share/linphone.pc.in.orig	2005-03-23 21:10:49.392763407 -0500
-+++ linphone-0.12.2/share/linphone.pc.in	2005-03-23 21:11:21.983938389 -0500
-@@ -1,7 +1,7 @@
--prefix=@prefix@
--exec_prefix=${prefix}
--libdir=${exec_prefix}/lib
--includedir=${prefix}/include
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
- 
- 
- Name: liblinphone
---- linphone-1.0.1/share/Makefile.in.pkgconfig	2005-03-23 03:17:48.000000000 -0500
-+++ linphone-1.0.1/share/Makefile.in	2005-03-24 13:40:41.828557116 -0500
-@@ -286,7 +286,7 @@
- #to be compliant with freedesktop.org:
- linphone_fddir = $(prefix)/share/applications/
- linphone_fd_DATA = linphone.desktop
--pkgconfigdir = $(prefix)/lib/pkgconfig
-+pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = linphone.pc
- EXTRA_DIST = $(LINPHONE_SOUNDS) \
- 								$(LINPHONE_RINGS) \

linphone-1.1.0-Werror.patch

@@ -1,13 +0,0 @@
---- linphone-1.1.0/configure.Werror	2005-12-05 17:54:55.000000000 -0500
-+++ linphone-1.1.0/configure	2005-12-05 17:55:13.000000000 -0500
-@@ -23816,10 +23816,6 @@
- 		;;
- esac
- 
--if test "$GCC" = "yes" ; then
--	STRICT_OPTIONS="-Wall -Werror"
--fi
--
- 
- 
- # Check whether --with-realprefix or --without-realprefix was given.

linphone-1.2.0-gtkentry.patch

@@ -1,11 +0,0 @@
---- linphone-1.2.0/gnome/addressbook.c.gtkentry	2006-01-22 10:22:24.000000000 -0500
-+++ linphone-1.2.0/gnome/addressbook.c	2006-01-22 10:23:12.000000000 -0500
-@@ -164,7 +164,7 @@
- 		gtk_tree_model_get (model, &iter,SIP_ADDRESS_COLUMN , &address, -1);
- 	}
- 	if (address!=NULL){
--		gtk_entry_set_text (GTK_ENTRY(gnome_entry_gtk_entry(GNOME_ENTRY(addressentry))),address);
-+		gtk_entry_set_text (GTK_ENTRY(addressentry),address);
- 		g_free(address);
- 	}
- 	gtk_widget_destroy(ab);

linphone-1.2.0-maxrtp.patch

@@ -1,29 +0,0 @@
---- 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);

linphone-1.2.0-ortp.patch

@@ -1,164 +0,0 @@
---- linphone-1.2.0/gnome/Makefile.in.ortp	2005-12-16 17:05:06.000000000 -0500
-+++ linphone-1.2.0/gnome/Makefile.in	2006-01-03 00:58:20.000000000 -0500
-@@ -340,8 +340,7 @@
- @BUILD_GNOME_TRUE@INCLUDES = \
- @BUILD_GNOME_TRUE@	-I$(top_srcdir)\
- @BUILD_GNOME_TRUE@	-I$(top_srcdir)/intl \
--@BUILD_GNOME_TRUE@	-I$(top_srcdir)/oRTP/src \
--@BUILD_GNOME_TRUE@	-I$(top_srcdir)/oRTP/ \
-+@BUILD_GNOME_TRUE@	-I$(includedir)/ortp/ \
- @BUILD_GNOME_TRUE@	-I$(top_srcdir)/mediastreamer \
- @BUILD_GNOME_TRUE@	-I$(top_srcdir)/speex/libspeex \
- @BUILD_GNOME_TRUE@	-I$(top_srcdir)/coreapi \
---- linphone-1.2.0/coreapi/Makefile.in.ortp	2005-12-16 17:05:05.000000000 -0500
-+++ linphone-1.2.0/coreapi/Makefile.in	2006-01-03 00:58:20.000000000 -0500
-@@ -289,8 +289,7 @@
- INCLUDES = \
- 	-I$(top_srcdir)\
- 	-I$(top_srcdir)/exosip\
--	-I$(top_srcdir)/oRTP/include \
--	-I$(top_srcdir)/oRTP/ \
-+	-I$(includedir)/ortp/ \
- 	-I$(top_srcdir)/mediastreamer \
- 	$(SPEEX_CFLAGS) \
- 	-I$(osip_prefix)/include/ 
---- linphone-1.2.0/Makefile.in.ortp	2005-12-16 17:05:05.000000000 -0500
-+++ linphone-1.2.0/Makefile.in	2006-01-03 00:58:20.000000000 -0500
-@@ -61,7 +61,7 @@
- 	uninstall-recursive
- ETAGS = etags
- CTAGS = ctags
--DIST_SUBDIRS = m4 support pixmaps po ipkg oRTP gsmlib lpc10-1.5 \
-+DIST_SUBDIRS = m4 support pixmaps po ipkg gsmlib lpc10-1.5 \
- 	win32acm mediastreamer mediastreamer2 media_api exosip coreapi \
- 	console gnome share developer-docs
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-@@ -274,7 +274,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- @BUILD_TRUESPEECH_TRUE@WIN32ACM_DIR = win32acm
--SUBDIRS = m4 support pixmaps po ipkg oRTP gsmlib lpc10-1.5 \
-+SUBDIRS = m4 support pixmaps po ipkg gsmlib lpc10-1.5 \
-                 $(WIN32ACM_DIR) mediastreamer mediastreamer2\
- 		media_api exosip coreapi console gnome share developer-docs
- 
---- linphone-1.2.0/console/Makefile.in.ortp	2005-12-16 17:05:05.000000000 -0500
-+++ linphone-1.2.0/console/Makefile.in	2006-01-03 00:58:20.000000000 -0500
-@@ -281,8 +281,7 @@
- 	-I$(top_srcdir)/coreapi\
- 	-I$(top_srcdir)/osipua/\
- 	-I$(top_srcdir)/osipua/src \
--	-I$(top_srcdir)/oRTP/include \
--	-I$(top_srcdir)/oRTP/ \
-+	-I$(includedir)/ortp/ \
- 	-I$(top_srcdir)/mediastreamer \
- 	$(SPEEX_CFLAGS)\
- 	-I$(osip_prefix)/include \
---- linphone-1.2.0/mediastreamer/Makefile.in.ortp	2005-12-16 17:05:07.000000000 -0500
-+++ linphone-1.2.0/mediastreamer/Makefile.in	2006-01-03 00:58:20.000000000 -0500
-@@ -67,7 +67,7 @@
- @BUILD_TRUESPEECH_TRUE@am__DEPENDENCIES_3 = ../win32acm/libwin32acm.a
- libmediastreamer_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- 	../gsmlib/libgsm.la ../lpc10-1.5/liblpc10.la \
--	../oRTP/src/libortp.la $(am__DEPENDENCIES_1) \
-+	$(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-@@ -348,6 +348,7 @@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
- OBJEXT = @OBJEXT@
-+ORTP_LIBS = -lortp
- OSIP_CFLAGS = @OSIP_CFLAGS@
- OSIP_LIBS = @OSIP_LIBS@
- PACKAGE = @PACKAGE@
-@@ -485,7 +486,7 @@
- libmediastreamer_la_LIBADD = $(GLIB_LIBS) \
- 							../gsmlib/libgsm.la \
- 							../lpc10-1.5/liblpc10.la \
--							../oRTP/src/libortp.la \
-+							$(ORTP_LIBS) \
- 							$(JACK_LIBS)\
- 							$(SAMPLERATE_LIBS)\
- 							$(SUPPORTLIB) \
-@@ -551,8 +552,7 @@
- 
- INCLUDES = -I$(top_srcdir) \
- 						-I$(top_srcdir)/mediastreamer \
--						-I$(top_srcdir)/oRTP/include \
--						-I$(top_srcdir)/oRTP \
-+						-I$(includedir)/ortp \
- 						-I$(top_srcdir)/gsmlib   \
- 						-I$(top_srcdir)/lpc10-1.5    \
- 						$(SPEEX_CFLAGS) \
---- linphone-1.2.0/mediastreamer2/Makefile.in.ortp	2005-12-16 17:05:07.000000000 -0500
-+++ linphone-1.2.0/mediastreamer2/Makefile.in	2006-01-03 00:58:20.000000000 -0500
-@@ -54,7 +54,7 @@
- @BUILD_UGLIB_TRUE@	$(top_builddir)/support/libuglib.la
- libmediastreamer2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- 	../gsmlib/libgsm.la ../lpc10-1.5/liblpc10.la \
--	../oRTP/src/libortp.la $(am__DEPENDENCIES_1) \
-+	$(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1)
- am_libmediastreamer2_la_OBJECTS = msfilter.lo msAlawdec.lo \
-@@ -213,6 +213,7 @@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
- OBJEXT = @OBJEXT@
-+ORTP_LIBS = -lortp
- OSIP_CFLAGS = @OSIP_CFLAGS@
- OSIP_LIBS = @OSIP_LIBS@
- PACKAGE = @PACKAGE@
-@@ -313,7 +314,7 @@
- libmediastreamer2_la_LIBADD = $(GLIB_LIBS) \
- 							../gsmlib/libgsm.la \
- 							../lpc10-1.5/liblpc10.la \
--							../oRTP/src/libortp.la \
-+							$(ORTP_LIBS) \
- 							$(JACK_LIBS)\
- 							$(SUPPORTLIB) \
- 							$(ALSA_LIBS) \
-@@ -322,8 +323,7 @@
- AM_CFLAGS = $(GLIB_CFLAGS) -DG_LOG_DOMAIN=\"MediaStreamer\" $(TRUESPEECH_CFLAGS) $(IPV6_CFLAGS)
- INCLUDES = -I$(top_srcdir) \
- 						-I$(top_srcdir)/mediastreamer2 \
--						-I$(top_srcdir)/oRTP/include \
--						-I$(top_srcdir)/oRTP \
-+						-I$(includedir)/ortp \
- 						-I$(top_srcdir)/gsmlib   \
- 						-I$(top_srcdir)/lpc10-1.5    \
- 						$(SPEEX_CFLAGS)
---- linphone-1.2.0/media_api/Makefile.in.ortp	2005-12-16 17:05:07.000000000 -0500
-+++ linphone-1.2.0/media_api/Makefile.in	2006-01-03 00:58:20.000000000 -0500
-@@ -299,8 +299,7 @@
- INCLUDES = -I$(top_srcdir)/mediastreamer \
- 		-I$(top_srcdir)/speex \
- 		-I$(top_srcdir)/gsmlib \
--		-I$(top_srcdir)/oRTP \
--		-I$(top_srcdir)/oRTP/src \
-+		-I$(includedir)/ortp \
- 		-I$(top_srcdir)/lpc10-1.5 \
- 		-I$(top_srcdir)/ffmpeg 
- 
---- linphone-1.2.0/configure.ortp	2005-12-16 17:05:11.000000000 -0500
-+++ linphone-1.2.0/configure	2006-01-03 00:59:50.000000000 -0500
-@@ -463,7 +463,6 @@
- # include <unistd.h>
- #endif"
- 
--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 ${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=''
- 
-@@ -30162,9 +30161,6 @@
- 
- 
- 
--subdirs="$subdirs oRTP"
--
--
- ##################################################
- # Check for gtk-doc.
- ##################################################

linphone-1.7.1-extgsm.patch

@@ -0,0 +1,199 @@
+diff --git a/Makefile.am b/Makefile.am
+index 90a6343..872ca5e 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -9,7 +9,13 @@ else
+ ORTP_DIR = oRTP
+ endif
+ 
+-SUBDIRS = m4 pixmaps po ipkg $(ORTP_DIR) gsmlib mediastreamer2\
++if EXTERNAL_GSM
++GSM_DIR =
++else
++GSM_DIR = gsmlib
++endif
++
++SUBDIRS = m4 pixmaps po ipkg $(ORTP_DIR) $(GSM_DIR) mediastreamer2\
+ 		media_api exosip coreapi console gtk share
+ 
+ 
+diff --git a/configure.in b/configure.in
+index 5c55410..81e917c 100644
+--- a/configure.in
++++ b/configure.in
+@@ -320,6 +320,30 @@ AC_SUBST(ORTP_LIBS)
+ 
+ AM_CONDITIONAL(EXTERNAL_ORTP, [test "$external_ortp" = 'true'])
+ 
++AC_ARG_WITH(gsm,
++         AS_HELP_STRING([--with-gsm],[Sets the installation prefix of GSM codec library (default=/usr)]),
++	 [ gsmdir=${withval}],[ gsmdir=/usr ])
++
++AC_ARG_ENABLE(external-gsm,
++      AS_HELP_STRING([--enable-external-gsm],[Use external GSM library (default=false)]),
++      [case "${enableval}" in
++        yes) external_gsm=true ;;
++        no)  external_gsm=false ;;
++        *) AC_MSG_ERROR(bad value ${enableval} for --enable-external-gsm) ;;
++      esac],[external_gsm=false])
++
++if test "$external_gsm" = 'true'; then
++	LP_CHECK_GSM
++else
++	AC_CONFIG_SUBDIRS(gsmlib)
++	GSM_CFLAGS="-I\$(top_srcdir)/gsmlib"
++	GSM_LIBS="\$(top_builddir)/gsmlib/libgsm.la"
++	AC_SUBST(GSM_CFLAGS)
++	AC_SUBST(GSM_LIBS)
++fi
++
++AM_CONDITIONAL(EXTERNAL_GSM, [test "$external_gsm" = 'true'])
++
+ dnl Packaging: Pick oRTP version from ${top_srcdir}/oRTP/configure.ac
+ dnl Feel free to propose an alternative & cleaner version...
+ top_srcdir=`dirname $0`
+diff --git a/m4/gsm.m4 b/m4/gsm.m4
+new file mode 100644
+index 0000000..7471c75
+--- /dev/null
++++ b/m4/gsm.m4
+@@ -0,0 +1,29 @@
++AC_DEFUN([LP_CHECK_GSM],[
++
++gsm_pkgconfig=true
++
++PKG_CHECK_MODULES([GSM], [gsm], , [gsm_pkgconfig=false])
++
++if test $gsm_pkgconfig = false; then
++	if ${gsmdir} != "/usr"; then
++		CFLAGS_save=$CFLAGS
++		CFLAGS="$CFLAGS -I${gsmdir}/include"
++	fi
++	AC_CHECK_HEADER([gsm/gsm.h], , AC_MSG_ERROR([Could not find GSM headers !]))
++	if ${gsmdir} != "/usr"; then
++		GSM_CFLAGS="-I{gsmdir}/include"
++		CFLAGS=$CFLAGS_save
++		LIBS_save=$LIBS
++		LIBS="$LIBS -L${gsmdir}/lib"
++	fi
++	AC_CHECK_LIB([gsm], [gsm_create], , AC_MSG_ERROR([Could not find GSM library]))
++	if ${gsmdir} != "/usr"; then
++		GSM_LIBS="-L${gsmdir}/lib -lgsm"
++		LIBS=$LIBS_save
++	else
++		GSM_LIBS="-lgsm"
++	fi
++fi
++AC_SUBST([GSM_LIBS])
++AC_SUBST([GSM_CFLAGS])
++])
+diff --git a/mediastreamer2/autogen.sh b/mediastreamer2/autogen.sh
+index 64516e8..fb71734 100755
+--- a/mediastreamer2/autogen.sh
++++ b/mediastreamer2/autogen.sh
+@@ -14,6 +14,6 @@ echo "Generating build scripts in mediastreamer..."
+ set -x
+ libtoolize --copy --force
+ autoheader
+-$ACLOCAL 
++$ACLOCAL -I m4
+ $AUTOMAKE --force-missing --add-missing --copy
+ autoconf
+diff --git a/mediastreamer2/configure.ac b/mediastreamer2/configure.ac
+index 89d66fa..9621a5e 100644
+--- a/mediastreamer2/configure.ac
++++ b/mediastreamer2/configure.ac
+@@ -263,31 +263,40 @@ AC_SUBST(SPEEX_LIBS)
+ AM_CONDITIONAL(BUILD_SPEEX, test x$build_speex = xyes )
+ 
+ dnl check for gsm
+-AC_ARG_WITH( gsm,
+-		  [  --with-gsm		Sets the installation prefix of gsm codec library [default=/usr] ],
+-		  [ gsmdir=${withval}],[ gsmdir=/usr ])
+-if test -e ../gsmlib/gsm.h ; then 
+-	echo "building from linphone source tree, using ../gsmlib/gsm.h"
+-	GSM_CFLAGS="-I\$(top_srcdir)/../gsmlib"
+-	GSM_LIBS="\$(top_builddir)/../gsmlib/libgsm.la"
+-	build_gsm=yes
+-	AC_SUBST(GSM_CFLAGS)
+-	AC_SUBST(GSM_LIBS)
+-else
+-	MS_CHECK_DEP([gsm codec],[GSM],[${gsmdir}/include],
+-		[${gsmdir}/lib],[gsm.h],[gsm],[gsm_create])
+-
+-	if test "$GSM_found" = "yes" ; then
+-	   build_gsm=yes
++AC_ARG_WITH(gsm,
++	AS_HELP_STRING([--with-gsm],[Sets the installation prefix of gsm codec library (default=/usr)]),
++	[ gsmdir=${withval}],[ gsmdir=/usr ])
++AC_ARG_ENABLE(external-gsm,
++	AS_HELP_STRING([--enable-external-gsm],[Use external GSM library]),
++	[case "${enableval}" in
++	      yes) external_gsm=true ;;
++	      no)  external_gsm=false ;;
++	      *) AC_MSG_ERROR(bad value ${enableval} for --enable-external-gsm) ;;
++	 esac],[external_gsm=false])
++
++if test "$external_gsm" = 'false'; then
++	if test -e $srcdir/../gsmlib/gsm.h ; then 
++		echo "building from linphone source tree, using ../gsmlib/gsm.h"
++		GSM_CFLAGS="-I\$(top_srcdir)/../gsmlib"
++		GSM_LIBS="\$(top_builddir)/../gsmlib/libgsm.la"
++		AC_SUBST(GSM_CFLAGS)
++		AC_SUBST(GSM_LIBS)
++		build_gsm=yes
++	else
++		external_gsm=true
+ 	fi
+ fi
++if test "$external_gsm" = 'true'; then
++	MS_CHECK_GSM
++	build_gsm=yes
++fi
++
++AM_CONDITIONAL(BUILD_GSM, test x$build_gsm = xyes )
+ 
+ build_resample=false
+ AC_CHECK_LIB(resample,resample_open,[LIBS="$LIBS -lresample"; build_resample=yes])
+ AM_CONDITIONAL(BUILD_RESAMPLE, test x$build_resample = xyes )
+ 
+-AM_CONDITIONAL(BUILD_GSM, test x$build_gsm = xyes )
+-
+ MS_CHECK_VIDEO
+ AM_CONDITIONAL(BUILD_VIDEO, test "$video" = "true")
+ AM_CONDITIONAL(BUILD_THEORA, test "$have_theora" = "yes")
+diff --git a/mediastreamer2/m4/gsm.m4 b/mediastreamer2/m4/gsm.m4
+new file mode 100644
+index 0000000..73d0568
+--- /dev/null
++++ b/mediastreamer2/m4/gsm.m4
+@@ -0,0 +1,29 @@
++AC_DEFUN([MS_CHECK_GSM],[
++
++gsm_pkgconfig=true
++
++PKG_CHECK_MODULES([GSM], [gsm], , [gsm_pkgconfig=false])
++
++if test $gsm_pkgconfig = false; then
++	if ${gsmdir} != "/usr"; then
++		CFLAGS_save=$CFLAGS
++		CFLAGS="$CFLAGS -I${gsmdir}/include"
++	fi
++	AC_CHECK_HEADER([gsm/gsm.h], , AC_MSG_ERROR([Could not find GSM headers !]))
++	if ${gsmdir} != "/usr"; then
++		GSM_CFLAGS="-I{gsmdir}/include"
++		CFLAGS=$CFLAGS_save
++		LIBS_save=$LIBS
++		LIBS="$LIBS -L${gsmdir}/lib"
++	fi
++	AC_CHECK_LIB([gsm], [gsm_create], , AC_MSG_ERROR([Could not find GSM library]))
++	if ${gsmdir} != "/usr"; then
++		GSM_LIBS="-L${gsmdir}/lib -lgsm"
++		LIBS=$LIBS_save
++	else
++		GSM_LIBS="-lgsm"
++	fi
++fi
++AC_SUBST([GSM_LIBS])
++AC_SUBST([GSM_CFLAGS])
++])

linphone-1.7.1-gtkosip.patch

@@ -0,0 +1,27 @@
+From 6ebb0b61d9634dd24db0148b05f383977474aa44 Mon Sep 17 00:00:00 2001
+From: Jeffrey C. Ollie <jeff@ocjtech.us>
+Date: Mon, 23 Apr 2007 10:22:34 -0500
+Subject: [PATCH] Use OSIP_CFLAGS to compile gtk front end.
+
+
+Signed-off-by: Jeffrey C. Ollie <jeff@ocjtech.us>
+---
+ gtk/Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/gtk/Makefile.am b/gtk/Makefile.am
+index b98149d..cb05421 100644
+--- a/gtk/Makefile.am
++++ b/gtk/Makefile.am
+@@ -20,7 +20,7 @@ INCLUDES = \
+ 	$(ORTP_CFLAGS) \
+ 	-I$(top_srcdir)/coreapi \
+ 	-I$(top_srcdir)/mediastreamer2/include \
+-	-I$(osip_prefix)/include
++	$(OSIP_CFLAGS)
+ 
+ 
+ 
+-- 
+1.5.1.2
+

linphone-1.7.1-imagedir.patch

@@ -0,0 +1,28 @@
+diff --git a/mediastreamer2/src/Makefile.am b/mediastreamer2/src/Makefile.am
+index 4940246..3e1df60 100644
+--- a/mediastreamer2/src/Makefile.am
++++ b/mediastreamer2/src/Makefile.am
+@@ -105,7 +105,7 @@ AM_CFLAGS=	-I$(top_srcdir)  \
+ 		$(GSM_CFLAGS)    \
+ 		$(STRICT_OPTIONS)
+ 
+-imgdir=$(datadir)/images/
++imgdir=$(datadir)/images/linphone/
+ 
+ img_DATA=nowebcamCIF.jpg
+ 
+diff --git a/mediastreamer2/src/nowebcam.c b/mediastreamer2/src/nowebcam.c
+index 6e06ee6..917a927 100644
+--- a/mediastreamer2/src/nowebcam.c
++++ b/mediastreamer2/src/nowebcam.c
+@@ -81,8 +81,8 @@ mblk_t *ms_load_jpeg_as_yuv(const char *jpgpath, MSVideoSize *reqsize){
+ mblk_t *ms_load_nowebcam(MSVideoSize *reqsize, int idx){
+ 	char tmp[256];
+ 	if (idx<0)
+-		snprintf(tmp, sizeof(tmp), "%s/images/%s.jpg", PACKAGE_DATA_DIR, NOWEBCAM_JPG);
++		snprintf(tmp, sizeof(tmp), "%s/images/linphone/%s.jpg", PACKAGE_DATA_DIR, NOWEBCAM_JPG);
+ 	else
+-		snprintf(tmp, sizeof(tmp), "%s/images/%s%i.jpg", PACKAGE_DATA_DIR, NOWEBCAM_JPG, idx);
++		snprintf(tmp, sizeof(tmp), "%s/images/linphone/%s%i.jpg", PACKAGE_DATA_DIR, NOWEBCAM_JPG, idx);
+ 	return ms_load_jpeg_as_yuv(tmp,reqsize);
+ }

linphone-1.7.1-ortpm4.patch

@@ -0,0 +1,23 @@
+diff --git a/m4/ortp.m4 b/m4/ortp.m4
+new file mode 100644
+index 0000000..f0c0216
+--- /dev/null
++++ b/m4/ortp.m4
+@@ -0,0 +1,17 @@
++AC_DEFUN([LP_CHECK_ORTP],[
++
++ortp_pkgconfig=true
++
++PKG_CHECK_MODULES([ORTP], [ortp], , [ortp_pkgconfig=false])
++
++if test $ortp_pkgconfig = false; then
++	AC_CHECK_HEADER([ortp/ortp.h], ,AC_MSG_ERROR([Could not find oRTP headers !]))
++	LIBS_save=$LIBS
++	AC_CHECK_LIB([ortp], [ortp_init], , AC_MSG_ERROR([Could not find oRTP library]))
++	ORTP_LIBS='-lortp'
++	LIBS=$LIBS_save
++fi
++AC_SUBST([ORTP_LIBS])
++AC_SUBST([ORTP_CFLAGS])
++
++])

linphone.spec

@@ -1,24 +1,42 @@
 Name:           linphone
-Version:        1.2.0
-Release:        7%{?dist}
+Version:        1.7.1
+Release:        2%{?dist}
 Summary:        Phone anywhere in the whole world by using the Internet
 
 Group:          Applications/Communications
 License:        GPL
-URL:            http://www.linphone.org/?lang=us&rubrique=1
-Source0:        http://simon.morlat.free.fr/download/1.2.x/source/%{name}-%{version}.tar.gz
-Patch:          linphone-1.0.1-desktop.patch
-Patch1:         linphone-1.2.0-ortp.patch
-Patch2:         linphone-1.1.0-Werror.patch
-Patch3:         linphone-1.2.0-maxrtp.patch
-Patch4:         linphone-1.2.0-gtkentry.patch
+URL:            http://www.linphone.org/
+Source0:        http://download.savannah.nongnu.org/releases/linphone/1.7.x/sources/%{name}-%{version}.tar.gz
+Patch0:         linphone-1.7.1-ortpm4.patch
+Patch1:         linphone-1.7.1-imagedir.patch
+Patch2:         linphone-1.7.1-gtkosip.patch
+Patch3:         linphone-1.7.1-extgsm.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gnome-panel-devel libgnomeui-devel glib2-devel alsa-lib-devel
-BuildRequires:  libosip2-devel speex-devel >= 1.0.5  gettext desktop-file-utils
-BuildRequires:  ortp-devel >= 0.7.1
+BuildRequires:  compat-libosip2-devel
+BuildRequires:  ortp-devel >= 0.13.1
+
+BuildRequires:  readline-devel
+BuildRequires:  ncurses-devel
+
+BuildRequires:  gtk2-devel
+BuildRequires:  alsa-lib-devel
+
+BuildRequires:  speex-devel >= 1.2
+BuildRequires:  gsm-devel
+
+BuildRequires:  desktop-file-utils
+
 BuildRequires:  perl(XML::Parser)
 
+BuildRequires:  docbook-utils
+
+BuildRequires:  automake
+BuildRequires:  autoconf
+BuildRequires:  libtool
+BuildRequires:  intltool
+BuildRequires:  gettext
+
 %description
 Linphone is mostly sip compliant. It works successfully with these
 implementations:
@@ -27,7 +45,7 @@ implementations:
     * Hotsip, a free of charge phone for Windows.
     * Vocal, an open source SIP stack from Vovida that includes a SIP proxy
         that works with linphone since version 0.7.1.
-    * Siproxd is a free sip proxy being developped by Thomas Ries because he
+    * Siproxd is a free sip proxy being developed by Thomas Ries because he
         would like to have linphone working behind his firewall. Siproxd is
         simple to setup and works perfectly with linphone.
     * Partysip aims at being a generic and fully functionnal SIP proxy. Visit
@@ -44,16 +62,37 @@ Requires:       %{name} = %{version}-%{release} glib2-devel
 Libraries and headers required to develop software with linphone.
 
 %prep
-%setup -q
-%patch -p 1 -b .old
-%patch1 -p 1 -b .ortp
-%patch2 -p 1 -b .Werror
-%patch3 -p 1 -b .maxrtp
-%patch4 -p 1 -b .gtkentry
-rm -r oRTP
+%setup0 -q
+%patch0 -p1 -b .ortpm4
+%patch1 -p1 -b .imagedir
+%patch2 -p1 -b .gtkosip
+%patch3 -p1 -b .extgsm
+
+pushd share/cs
+for f in *.1
+do
+        /usr/bin/iconv --from-code iso-8859-2 --to-code utf-8 --output $f.new $f && sed -i -e 's/Encoding: ISO-8859-2/Encoding: UTF-8/' $f.new && mv $f.new $f
+done
+popd
 
 %build
-%configure
+
+libtoolize --copy --force
+aclocal -I m4
+autoheader
+automake --force-missing --add-missing --copy
+autoconf
+rm -rf config.cache
+
+pushd mediastreamer2
+libtoolize --copy --force
+aclocal -I m4
+autoheader
+automake --force-missing --add-missing --copy
+autoconf
+popd
+
+%configure --disable-static --disable-rpath --disable-video --enable-alsa --enable-strict --enable-external-ortp --with-osip-version=2.2.2 --enable-external-gsm
 make %{?_smp_mflags}
 
 %install
@@ -65,10 +104,11 @@ rm $RPM_BUILD_ROOT%{_datadir}/gnome/apps/Internet/linphone.desktop
 desktop-file-install --vendor=fedora \
   --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
+  --remove-category Application \
   --add-category Telephony \
   --add-category GTK \
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+rm -f %{buildroot}%{_libdir}/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -81,27 +121,63 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING NEWS README TODO
 %{_bindir}/*
-%{_libdir}/bonobo/servers/*.server
 %{_libdir}/liblinphone.so.*
+%{_libdir}/libmediastreamer.so.*
+%{_libdir}/libquickstream.so.*
 %{_libexecdir}/*
 %{_mandir}/man1/*
+%lang(cs) %{_mandir}/cs/man1/*
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/gnome/help/linphone
-%{_datadir}/gnome-2.0/ui/*.xml
-%{_datadir}/gtk-doc/html/mediastreamer
 %{_datadir}/pixmaps/linphone
 %{_datadir}/pixmaps/linphone2.png
 %{_datadir}/sounds/linphone
+%{_datadir}/images/linphone
 
 %files devel
 %defattr(-,root,root)
 %{_includedir}/linphone
-%{_libdir}/liblinphone.a
-%{_libdir}/liblinphone.la
+%{_includedir}/mediastreamer2
 %{_libdir}/liblinphone.so
+%{_libdir}/libmediastreamer.so
+%{_libdir}/libquickstream.so
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon May 14 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.7.1-2
+- Add patch for compiling against external GSM library.
+
+* Tue Apr 17 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.7.1-1
+- Update to 1.7.1
+- Drop linphone-1.0.1-desktop.patch, linphone-1.4.1-libs.patch and
+  linphone-1.5.1-osipcompat.patch
+
+* Fri Mar 16 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.6.0-4
+- Fix up encodings in Czech manpages
+
+* Fri Mar 16 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.6.0-3
+- Move autoheader after aclocal, fixes 232592
+
+* Mon Jan 29 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.6.0-2
+- Fix buildrequires
+
+* Mon Jan 29 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.6.0-1
+- Update to 1.6.0
+
+* Wed Nov 22 2006 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.5.1-2
+- Mark translated man pages with lang macro
+
+* Tue Nov 21 2006 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.5.1-1
+- Update to 1.5.1
+
+* Thu Oct 26 2006 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.5.0-2
+- Don't forget to add new files and remove old ones!
+
+* Thu Oct 26 2006 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.5.0-1
+- Update to 1.5.0
+- Fix spelling error in description.
+- Remove invalid categories on desktop file.
+
 * Wed Aug 30 2006 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.2.0-7
 - Bump release so that I can "make tag"
 

sources

@@ -1 +1 @@
-bd5e513a665ce2e381afce64d569c707  linphone-1.2.0.tar.gz
+6fe246d072fad2f4a9533317ab7e9060  linphone-1.7.1.tar.gz