diff --git a/.gitignore b/.gitignore index 9a23c93..a7d388c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ linphone-3.2.1.tar.gz /linphone-3.5.0.tar.gz /linphone-3.5.1.tar.gz /linphone-3.5.2.tar.gz +/linphone-3.6.1.tar.gz diff --git a/linphone-3.5.1-unusedvar.patch b/linphone-3.5.1-unusedvar.patch deleted file mode 100644 index 1d23a21..0000000 --- a/linphone-3.5.1-unusedvar.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- linphone-3.5.1/mediastreamer2/tests/mediastream.c 2012-01-18 13:00:15.000000000 +0200 -+++ linphone-3.5.1/mediastreamer2/tests/mediastream.c 2012-02-20 16:45:05.961678898 +0200 -@@ -400,7 +400,9 @@ - - void setup_media_streams(MediastreamDatas* args) { - /*create the rtp session */ -+#ifdef VIDEO_ENABLED - MSWebCam *cam=NULL; -+#endif - - ortp_init(); - if (args->is_verbose) { ---- linphone-3.5.1/mediastreamer2/src/nowebcam.c 2012-01-18 13:00:15.000000000 +0200 -+++ linphone-3.5.1/mediastreamer2/src/nowebcam.c 2012-02-19 19:24:12.643525630 +0200 -@@ -1875,10 +1875,11 @@ - } - - int static_image_set_vsize(MSFilter *f, void* data){ -- SIData *d=(SIData*)f->data; - #ifndef NO_FFMPEG -+ SIData *d=(SIData*)f->data; - d->vsize=*(MSVideoSize*)data; - #else -+ __attribute__((__unused__)) SIData *d=(SIData*)f->data; - // no rescaling without ffmpeg - #endif - return 0; diff --git a/linphone-3.5.2-glib-2.31.patch b/linphone-3.5.2-glib-2.31.patch deleted file mode 100644 index ebd21cd..0000000 --- a/linphone-3.5.2-glib-2.31.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/gtk/main.c b/gtk/main.c -index 6e7ca02..76ead50 100644 ---- a/gtk/main.c -+++ b/gtk/main.c -@@ -1643,7 +1643,9 @@ int main(int argc, char *argv[]){ - GdkPixbuf *pbuf; - const char *app_name="Linphone"; - -+#if !GLIB_CHECK_VERSION(2, 31, 0) - g_thread_init(NULL); -+#endif - gdk_threads_init(); - - progpath = strdup(argv[0]); -diff --git a/gtk/setupwizard.c b/gtk/setupwizard.c -index 1c54fca..ae1bcfa 100644 ---- a/gtk/setupwizard.c -+++ b/gtk/setupwizard.c -@@ -270,7 +270,11 @@ static void account_username_changed(GtkEntry *entry, GtkWidget *w) { - linphone_account_creator_set_username(creator, gtk_entry_get_text(username)); - - if (g_regex_match_simple("^[a-zA-Z]+[a-zA-Z0-9.\\-_]{3,}$", gtk_entry_get_text(username), 0, 0)) { -+#if !GLIB_CHECK_VERSION(2, 31, 0) - g_thread_create(check_username_availability, (void*)w, FALSE, NULL); -+#else -+ g_thread_new(NULL, check_username_availability, w); -+#endif - } - else { - if (gtk_entry_get_text_length(username) < LOGIN_MIN_SIZE) { -@@ -534,7 +538,9 @@ GtkWidget * linphone_gtk_create_assistant(void){ - ok = create_pixbuf(linphone_gtk_get_ui_config("ok","ok.png")); - notok = create_pixbuf(linphone_gtk_get_ui_config("notok","notok.png")); - -+#if !GLIB_CHECK_VERSION(2, 31, 0) - g_thread_init (NULL); -+#endif - gdk_threads_init (); - - GtkWidget *p1=create_intro(); diff --git a/linphone.spec b/linphone.spec index 963323a..c4650fd 100644 --- a/linphone.spec +++ b/linphone.spec @@ -1,32 +1,31 @@ -%global novideo 1 - Name: linphone -Version: 3.5.2 -Release: 8%{?dist} +Version: 3.6.1 +Release: 1%{?dist} Summary: Phone anywhere in the whole world by using the Internet License: GPLv2+ URL: http://www.linphone.org/ Source0: http://download.savannah.gnu.org/releases/linphone/3.5.x/sources/%{name}-%{version}.tar.gz -Patch0: linphone-3.5.1-unusedvar.patch -# commit d1d6ab83af4152f9fb719d885a2de20bddcfa96a -# Allow building against glib 2.31 and later -Patch1: linphone-3.5.2-glib-2.31.patch - -%if ! 0%{?novideo} +# for video support +BuildRequires: glew-devel BuildRequires: libtheora-devel BuildRequires: libv4l-devel BuildRequires: libvpx-devel -%endif +# xxd used in mediastreamer2/src/Makefile.in +BuildRequires: vim-common BuildRequires: libosip2-devel >= 3.6.0 BuildRequires: libeXosip2-devel >= 3.6.0 +BuildRequires: libpcap-devel BuildRequires: libsoup-devel +BuildRequires: libudev-devel +BuildRequires: libupnp-devel BuildRequires: openssl-devel BuildRequires: pulseaudio-libs-devel +BuildRequires: sqlite-devel BuildRequires: readline-devel BuildRequires: ncurses-devel @@ -34,6 +33,7 @@ BuildRequires: libnotify-devel BuildRequires: gtk2-devel >= 2.16 BuildRequires: alsa-lib-devel +BuildRequires: opus-devel BuildRequires: speex-devel >= 1.2 BuildRequires: spandsp-devel BuildRequires: gsm-devel @@ -47,10 +47,10 @@ BuildRequires: libglade2-devel BuildRequires: intltool BuildRequires: doxygen -BuildRequires: libtool perl-Carp +BuildRequires: libtool -BuildRequires: ortp-devel >= 1:0.20.0 -Requires: ortp%{?_isa} >= 1:0.20.0 +BuildRequires: ortp-devel >= 1:0.22.0 +Requires: ortp%{?_isa} >= 1:0.22.0 %description Linphone is mostly sip compliant. It works successfully with these @@ -95,8 +95,6 @@ Libraries and headers required to develop software with mediastreamer2. %prep %setup0 -q -%patch0 -p1 -b .unusedvar -%patch1 -p1 -b .glib-2.31 autoreconf -i -f @@ -117,9 +115,7 @@ done %build %configure --disable-static \ -%if 0%{?novideo} - --disable-video \ -%endif + --enable-glx \ --disable-ffmpeg \ --disable-rpath \ --enable-console_ui=yes \ @@ -131,6 +127,7 @@ done --enable-nonstandard-gsm \ --enable-rsvp \ --enable-ssl \ + --enable-zrtp \ --enable-external-ortp make %{?_smp_mflags} @@ -153,8 +150,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la # move docs to %%doc mkdir -p doc/linphone doc/mediastreamer -mv $RPM_BUILD_ROOT%{_datadir}/doc/linphone/linphone*/html doc/linphone -mv $RPM_BUILD_ROOT%{_datadir}/doc/mediastreamer/mediastreamer*/html doc/mediastreamer +mv $RPM_BUILD_ROOT%{_datadir}/doc/linphone*/html doc/linphone +mv $RPM_BUILD_ROOT%{_datadir}/doc/mediastreamer*/html doc/mediastreamer %post -p /sbin/ldconfig @@ -169,7 +166,11 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/mediastreamer/mediastreamer*/html doc/mediastr %{_bindir}/linphone %{_bindir}/linphonec %{_bindir}/linphonecsh -%{_libdir}/liblinphone.so.4* +%{_bindir}/lpc2xml_test +%{_bindir}/xml2lpc_test +%{_libdir}/liblinphone.so.5* +%{_libdir}/liblpc2xml.so.0* +%{_libdir}/libxml2lpc.so.0* %{_mandir}/man1/* %lang(cs) %{_mandir}/cs/man1/* %{_datadir}/applications/*%{name}.desktop @@ -182,22 +183,29 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/mediastreamer/mediastreamer*/html doc/mediastr %doc doc/linphone/html %{_includedir}/linphone %{_libdir}/liblinphone.so +%{_libdir}/liblpc2xml.so +%{_libdir}/libxml2lpc.so %{_libdir}/pkgconfig/linphone.pc %files mediastreamer -f mediastreamer.lang %doc mediastreamer2/AUTHORS mediastreamer2/ChangeLog mediastreamer2/COPYING %doc mediastreamer2/NEWS mediastreamer2/README %{_bindir}/mediastream -%{_libdir}/libmediastreamer.so.1* +%{_libdir}/libmediastreamer_base.so.3* +%{_libdir}/libmediastreamer_voip.so.3* %{_datadir}/images %files mediastreamer-devel %doc doc/mediastreamer/html %{_includedir}/mediastreamer2 -%{_libdir}/libmediastreamer.so +%{_libdir}/libmediastreamer_base.so +%{_libdir}/libmediastreamer_voip.so %{_libdir}/pkgconfig/mediastreamer.pc %changelog +* Sun Jul 7 2013 Alexey Kurov - 3.6.1-1 +- linphone-3.6.1 + * Fri Apr 26 2013 Jon Ciesla - 3.5.2-8 - Drop desktop vendor tag. diff --git a/sources b/sources index 534cd59..b2ec585 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4be6e940372dba1f6793aef849c1ff0d linphone-3.5.2.tar.gz +f59b99ec2501ebbb02969c885be4c4c5 linphone-3.6.1.tar.gz