Update to 2.1.0

This commit is contained in:
Jeffrey C. Ollie 2008-02-05 14:15:25 +00:00
parent 6edc43a8b2
commit 2cd04a6344
10 changed files with 34 additions and 446 deletions

View File

@ -1 +1 @@
linphone-1.7.1.tar.gz
linphone-2.1.0.tar.gz

View File

@ -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;

View File

@ -1,38 +0,0 @@
diff -ru linphone-1.4.1.old/configure.in linphone-1.4.1.new/configure.in
--- linphone-1.4.1.old/configure.in 2006-09-18 02:28:20.000000000 -0500
+++ linphone-1.4.1.new/configure.in 2006-10-09 08:49:20.000000000 -0500
@@ -242,7 +242,7 @@
AC_SUBST(STRICT_OPTIONS)
-AC_CONFIG_SUBDIRS( oRTP mediastreamer2 )
+AC_CONFIG_SUBDIRS( mediastreamer2 )
dnl check for db2html (docbook) to generate html user manual
AC_CHECK_PROG(have_db2html,db2html, yes, no)
@@ -258,12 +258,7 @@
AC_DEFINE_UNQUOTED(LINPHONE_VERSION,"$PACKAGE_VERSION",[Linphone's version number])
-dnl Packaging: Pick oRTP version from ${top_srcdir}/oRTP/configure.ac
-dnl Feel free to propose an alternative & cleaner version...
-top_srcdir=`dirname $0`
-changequote(, )dnl
-ORTP_VERSION=`grep -E ^[AC]+_INIT ${top_srcdir}/oRTP/configure.ac | sed -e 's:^.*_INIT(.*,\[\(.*\)\]):\1:g'`
-changequote([, ])dnl
+ORTP_VERSION=0.11.0
AC_SUBST([ORTP_VERSION])
AC_OUTPUT([
diff -ru linphone-1.4.1.old/Makefile.am linphone-1.4.1.new/Makefile.am
--- linphone-1.4.1.old/Makefile.am 2006-09-11 07:58:46.000000000 -0500
+++ linphone-1.4.1.new/Makefile.am 2006-10-09 08:49:33.000000000 -0500
@@ -3,7 +3,7 @@
# let make re-run automake upon need
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = m4 pixmaps po ipkg oRTP gsmlib mediastreamer2\
+SUBDIRS = m4 pixmaps po ipkg gsmlib mediastreamer2\
media_api exosip coreapi console gnome share

View File

@ -1,94 +0,0 @@
Index: console/Makefile.am
===================================================================
RCS file: /sources/linphone/linphone/console/Makefile.am,v
retrieving revision 1.45
diff -u -r1.45 Makefile.am
--- console/Makefile.am 18 Oct 2006 13:41:21 -0000 1.45
+++ console/Makefile.am 22 Nov 2006 04:02:08 -0000
@@ -6,7 +6,7 @@
-I$(top_srcdir)/oRTP/include \
-I$(top_srcdir)/exosip \
-I$(top_srcdir)/mediastreamer2/include \
- -I$(osip_prefix)/include
+ -I$(osip_prefix)/include/osip2-2.2.2
Index: coreapi/Makefile.am
===================================================================
RCS file: /sources/linphone/linphone/coreapi/Makefile.am,v
retrieving revision 1.38
diff -u -r1.38 Makefile.am
--- coreapi/Makefile.am 21 Jul 2006 14:35:35 -0000 1.38
+++ coreapi/Makefile.am 22 Nov 2006 04:02:08 -0000
@@ -10,7 +10,7 @@
-I$(top_srcdir)/exosip\
-I$(top_srcdir)/oRTP/include \
-I$(top_srcdir)/mediastreamer2/include \
- -I$(osip_prefix)/include/
+ -I$(osip_prefix)/include/osip2-2.2.2
lib_LTLIBRARIES=liblinphone.la
Index: exosip/Makefile.am
===================================================================
RCS file: /sources/linphone/linphone/exosip/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- exosip/Makefile.am 15 Feb 2005 16:12:13 -0000 1.3
+++ exosip/Makefile.am 22 Nov 2006 04:02:09 -0000
@@ -1,7 +1,7 @@
noinst_LTLIBRARIES = libeXosip.la
-AM_CFLAGS = $(EXOSIP_CFLAGS)
+AM_CFLAGS = $(EXOSIP_CFLAGS) $(OSIP_CFLAGS)
libeXosip_la_SOURCES = eXosip.c \
jrequest.c jresponse.c jcallback.c jdialog.c udp.c \
Index: gnome/Makefile.am
===================================================================
RCS file: /sources/linphone/linphone/gnome/Makefile.am,v
retrieving revision 1.33
diff -u -r1.33 Makefile.am
--- gnome/Makefile.am 25 Aug 2006 14:15:17 -0000 1.33
+++ gnome/Makefile.am 22 Nov 2006 04:02:09 -0000
@@ -20,7 +20,7 @@
-I$(top_srcdir)/oRTP/include \
-I$(top_srcdir)/coreapi \
-I$(top_srcdir)/mediastreamer2/include \
- -I$(osip_prefix)/include
+ -I$(osip_prefix)/include/osip2-2.2.2
Index: m4/osip.m4
===================================================================
RCS file: /sources/linphone/linphone/m4/osip.m4,v
retrieving revision 1.2
diff -u -r1.2 osip.m4
--- m4/osip.m4 22 Feb 2005 17:31:03 -0000 1.2
+++ m4/osip.m4 22 Nov 2006 04:02:09 -0000
@@ -6,7 +6,7 @@
AC_SUBST(osip_prefix)
-OSIP_CFLAGS="-I$osip_prefix/include"
+OSIP_CFLAGS="-I$osip_prefix/include/osip2-2.2.2"
OSIP_LIBS="-L$osip_prefix/lib"
dnl check osip2 headers
@@ -20,11 +20,11 @@
LDFLAGS=$OSIP_LIBS
dnl AC_CHECK_LIB adds osipparser2 to LIBS, I don't want that !
LIBS_save=$LIBS
-AC_CHECK_LIB(osipparser2,osip_message_init, , AC_MSG_ERROR([Could not find osip2 libraries !]))
+AC_CHECK_LIB(osipparser2-2.2.2,osip_message_init, , AC_MSG_ERROR([Could not find osip2 libraries !]))
LDFLAGS=$LDFLAGS_save
LIBS=$LIBS_save
-OSIP_LIBS="$OSIP_LIBS -losipparser2 -losip2"
+OSIP_LIBS="$OSIP_LIBS -losipparser2-2.2.2 -losip2-2.2.2"
AC_SUBST(OSIP_CFLAGS)
AC_SUBST(OSIP_LIBS)

View File

@ -1,199 +0,0 @@
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])
+])

View File

@ -1,27 +0,0 @@
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

View File

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

View File

@ -1,23 +0,0 @@
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])
+
+])

View File

@ -1,20 +1,19 @@
Name: linphone
Version: 1.7.1
Release: 4%{?dist}
Version: 2.1.0
Release: 1%{?dist}
Summary: Phone anywhere in the whole world by using the Internet
Group: Applications/Communications
License: GPLv2+
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
Source0: http://download.savannah.nongnu.org/releases/linphone/2.1.x/sources/%{name}-%{version}.tar.gz
Patch0: linphone-2.1.0-imagedir.patch
Patch1: linphone-2.1.0-novideo.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: compat-libosip2-devel
BuildRequires: ortp-devel >= 0.13.1
BuildRequires: libosip2-devel >= 3.0.3-2
BuildRequires: libeXosip2-devel >= 3.0.3-2
BuildRequires: ortp-devel >= 0.14.1
BuildRequires: readline-devel
BuildRequires: ncurses-devel
@ -37,7 +36,7 @@ BuildRequires: libtool
BuildRequires: intltool
BuildRequires: gettext
BuildRequires: popt-devel
#BuildRequires: popt-devel
%description
Linphone is mostly sip compliant. It works successfully with these
@ -65,17 +64,15 @@ Libraries and headers required to develop software with linphone.
%prep
%setup0 -q
%patch0 -p1 -b .ortpm4
%patch1 -p1 -b .imagedir
%patch2 -p1 -b .gtkosip
%patch3 -p1 -b .extgsm
%patch0 -p1
%patch1 -p1
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
#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
@ -88,13 +85,23 @@ rm -rf config.cache
pushd mediastreamer2
libtoolize --copy --force
aclocal -I m4
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
%configure --disable-static \
--disable-rpath \
--enable-console_ui=yes \
--enable-gtk_ui=yes \
--enable-ipv6 \
--enable-truespeech \
--disable-video \
--enable-alsa \
--enable-strict \
--enable-external-ortp
make %{?_smp_mflags}
%install
@ -125,7 +132,6 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/*
%{_libdir}/liblinphone.so.*
%{_libdir}/libmediastreamer.so.*
%{_libdir}/libquickstream.so.*
%{_libexecdir}/*
%{_mandir}/man1/*
%lang(cs) %{_mandir}/cs/man1/*
@ -142,10 +148,12 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/mediastreamer2
%{_libdir}/liblinphone.so
%{_libdir}/libmediastreamer.so
%{_libdir}/libquickstream.so
%{_libdir}/pkgconfig/*
%changelog
* Fri Feb 1 2008 Jeffrey C. Ollie <jeff@ocjtech.us> - 2.1.0-1
- Update to 2.1.0
* Wed Aug 29 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.7.1-4
- Update license tag.

View File

@ -1 +1 @@
6fe246d072fad2f4a9533317ab7e9060 linphone-1.7.1.tar.gz
5f388166f98c4dd985f155f7988eabc7 linphone-2.1.0.tar.gz