Compare commits

...

90 Commits
fc6 ... master

Author SHA1 Message Date
Fedora Release Engineering a678a9e59d - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-25 14:58:50 +00:00
nucleo 8d609883d3 --disable-upnp added 2019-05-10 22:59:38 +03:00
nucleo afe749ae52 disabled upnp on i386 and armv7hl 2019-05-10 22:43:09 +03:00
Igor Gnatenko 2962185299 Rebuild for readline 8.0 2019-02-17 09:30:51 +01:00
Björn Esser 47a07ad55e
rebuilt (libvpx) 2019-02-05 15:03:36 +01:00
Fedora Release Engineering 2a10e6b772 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-01 08:47:47 +00:00
Igor Gnatenko 06d7031ec6
Remove obsolete ldconfig scriptlets
References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-01-22 18:40:18 +01:00
Nicolas Chauvet 09d156bb99 - Rebuilt for glew 2.1.0 2018-08-23 14:02:23 +02:00
Fedora Release Engineering 2958783fdb - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-13 09:13:25 +00:00
Igor Gnatenko c8c4c17be4 add BuildRequires: gcc-c++
Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot
2018-07-10 16:21:01 +02:00
nucleo c5b3bd33f7 apply upnp patch for F29+ 2018-05-27 22:53:42 +03:00
nucleo 71c6969951 bump Release 2018-05-27 22:23:35 +03:00
nucleo 3406e4357f fix upnp FTBFS (rhbz #1582911) 2018-05-27 22:14:42 +03:00
Nicolas Chauvet b173988182 Rebuilt 2018-04-13 13:26:17 +02:00
Fedora Release Engineering 4d55518c94 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-07 23:56:59 +00:00
Tom Callaway 3dcb4f3719 rebuild for new libvpx again 2018-02-02 09:26:48 -05:00
Tom Callaway f6686c9818 rebuild for new libvpx 2018-01-26 22:20:55 -05:00
Fedora Release Engineering a0bf2827a1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild 2017-08-03 02:39:01 +00:00
Fedora Release Engineering 1675efdd2e - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-26 20:10:13 +00:00
Fedora Release Engineering 3b065b58c8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild 2017-02-10 19:51:44 +00:00
Igor Gnatenko b30a68120b Rebuild for readline 7.x
Signed-off-by: Igor Gnatenko <ignatenko@redhat.com>
2017-01-12 17:30:33 +01:00
Orion Poplawski 0a7ec941d3 Rebuild for glew 2.0.0 2017-01-10 08:37:11 -07:00
Tom Callaway 78e7d08f90 rebuild for libvpx 1.6.0 2016-07-22 11:05:52 -04:00
Dennis Gilmore c696ae762e - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild 2016-02-04 04:18:02 +00:00
Adam Jackson 833a8ef489 disable-strict to work around libsoup deprecation warnings 2016-01-15 12:34:51 -05:00
Adam Jackson c74b6adda9 Rebuild for glew 1.13 2016-01-14 13:09:10 -05:00
Tom Callaway a0f6e5d597 rebuild for libvpx 1.5.0 2015-12-01 16:33:49 -05:00
Dennis Gilmore b5e1683ac3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild 2015-06-17 18:20:08 +00:00
Kalev Lember d629ee3180 Rebuilt for GCC 5 C++11 ABI change 2015-05-02 15:40:22 +02:00
Tom Callaway 75ed5ca29f rebuild for libvpx 1.4.0 2015-04-06 16:22:53 -04:00
Peter Robinson 7e7798560f Add speexdsp-devel as a dep to fix FTBFS 2015-01-29 15:56:27 +00:00
Tom Callaway 79614fa03e add theora fix 2014-11-14 14:40:28 -05:00
Tom Callaway e1f44ea44d rebuild for new libsrtp 2014-11-14 11:06:02 -05:00
Peter Robinson 1827aef767 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild 2014-08-17 07:18:45 +00:00
Dennis Gilmore 8b55c2de56 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild 2014-06-07 01:28:42 -05:00
Dave Airlie 1ce559c7a2 rebuilt for GLEW 1.10 2013-11-18 10:52:55 +10:00
nucleo 9c6ee76d22 more arm fixes 2013-07-27 13:37:47 +03:00
nucleo 16195623df fix armv7hl compilation 2013-07-27 13:03:04 +03:00
nucleo 87f15469d5 use /etc/ssl/certs/ca-bundle.crt root_ca 2013-07-27 12:19:41 +03:00
nucleo 613a020647 linphone-3.6.1 2013-07-07 18:07:26 +03:00
Jon Ciesla 5488c8fd90 Drop vendor tag. 2013-04-26 08:45:47 -05:00
nucleo 7ea548c0bb autoreconf in %prep (#926078) 2013-03-23 18:26:42 +02:00
Dennis Gilmore 4cca8026e4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild 2013-02-13 23:40:20 -06:00
nucleo 2b991479fc add -mediastreamer and -mediastreamer-devel subpackages 2012-12-31 19:08:19 +02:00
Dennis Gilmore aaae5deb6f - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild 2012-07-19 16:54:57 -05:00
nucleo ac38eac736 drop regression patch 2012-03-05 21:36:58 +02:00
nucleo 99aa4e4543 new glib-2.31 patch 2012-03-01 19:06:48 +02:00
nucleo ca9d4f4970 update glib-2.31 patch 2012-03-01 19:03:03 +02:00
nucleo 1c1c09d41c Update to 0.0.2 2012-03-01 18:53:31 +02:00
nucleo bd505105c7 linphone-3.5.2 2012-02-22 20:35:54 +02:00
nucleo 718487ede0 fix patch 2012-02-20 16:47:48 +02:00
nucleo a7bfbe3f1d fix Requires 2012-02-20 16:26:58 +02:00
nucleo 901a4fbd3e Requires: ortp >= 1:0.18.0 2012-02-20 16:24:57 +02:00
nucleo 42db7b953f linphone-3.5.1
- BR: libsoup-devel
2012-02-20 16:21:13 +02:00
Dennis Gilmore ca610796b6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild 2012-01-13 02:46:54 -06:00
nucleo ad570e4e99 enable spandsp 2011-12-27 23:44:57 +02:00
nucleo 65be87e79a remove BR: gettext 2011-12-27 03:13:36 +02:00
nucleo 31c5735417 remove BR: libsamplerate-devel jack-audio-connection-kit-devel 2011-12-27 02:54:41 +02:00
nucleo bc67da50b5 g_thread_init has been deprecated 2011-12-26 07:47:02 +02:00
nucleo 164f6a2b41 disable spandsp (#691039) 2011-12-26 07:09:52 +02:00
nucleo f624db6ad0 add --exec-prefix=%{_prefix} 2011-12-26 06:37:46 +02:00
nucleo e8cbb3ea91 linphone-3.5.0
add BR: libnotify-devel spandsp-devel
2011-12-26 05:53:13 +02:00
Adam Jackson f2af6203f2 Rebuild for new libpng 2011-12-06 00:13:33 -05:00
nucleo 31a235c5d9 linphone-3.4.3
BR: openssl-devel libsamplerate-devel gettext
BR: pulseaudio-libs-devel jack-audio-connection-kit-devel
drop 3.2.1 patches
2011-09-02 14:36:13 +03:00
Dennis Gilmore 147a09c9d4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild 2011-02-08 07:15:59 -06:00
Fedora Release Engineering c1cf9f118b dist-git conversion 2010-07-29 02:25:48 +00:00
Jesse Keating be371105d0 New upstream release fixes FTBFS 2010-03-17 16:50:27 +00:00
Bill Nottingham 233d0d162f Fix typo that causes a failure to update the common directory. (releng
#2781)
2009-11-25 23:51:31 +00:00
Jesse Keating 2e1ed2e567 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild 2009-07-25 11:06:33 +00:00
corsepiu ad15c2a0ce - Re-base patches to fix rebuild breakdowns.
- Fix various autotool source file bugs.
- Use pre-built autotool-generated files.
2009-03-13 12:15:20 +00:00
corsepiu b6131d2690 Remove. 2009-03-13 12:13:51 +00:00
corsepiu 2b822611ff New. 2009-03-13 12:10:57 +00:00
Jesse Keating 169ed51081 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild 2009-02-25 20:27:47 +00:00
Jeffrey C. Ollie 95a7e38771 Update BR, get rid of no longer needed patch 2008-02-15 03:46:00 +00:00
Jeffrey C. Ollie 36a328b3d6 Update to 2.1.1 2008-02-14 20:47:28 +00:00
Jeffrey C. Ollie d39befdb8e Add patches to fix some compile errors. 2008-02-06 12:14:31 +00:00
Jeffrey C. Ollie b8c4f623fb Add patches to CVS. 2008-02-05 19:06:42 +00:00
Jeffrey C. Ollie 2cd04a6344 Update to 2.1.0 2008-02-05 14:15:25 +00:00
Jeffrey C. Ollie 6edc43a8b2 BR popt-devel 2007-08-29 05:33:06 +00:00
Jeffrey C. Ollie cc71892142 Update license tag. 2007-08-29 05:23:07 +00:00
Jeffrey C. Ollie 24028d944d Link against external GSM library. 2007-05-15 20:43:30 +00:00
Jeffrey C. Ollie b6b616362c Update to 1.7.1 2007-04-23 16:36:34 +00:00
Jeffrey C. Ollie 1058ccfcde Fix up encodings in Czech manpages 2007-03-16 16:03:54 +00:00
Jeffrey C. Ollie 4663f8fea1 Move autoheader after aclocal, fixes 232592 2007-03-16 14:01:53 +00:00
Jeffrey C. Ollie 3d9104fe71 Fix buildrequires 2007-01-30 01:49:53 +00:00
Jeffrey C. Ollie 278dcded0c Update to 1.6.0 2007-01-30 01:39:10 +00:00
Jeffrey C. Ollie cc4b3036ce Mark translated man pages with lang macro 2006-11-23 04:12:47 +00:00
Jeffrey C. Ollie d093241ebf Update to 1.5.1 2006-11-22 04:50:55 +00:00
Jeffrey C. Ollie 533ad7cf24 - Don't forget to add new files and remove old ones! 2006-10-26 13:46:59 +00:00
Jeffrey C. Ollie cd12836d49 - Update to 1.5.0
- Fix spelling error in description.
- Remove invalid categories on desktop file.
2006-10-26 13:30:25 +00:00
15 changed files with 896 additions and 323 deletions

View File

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

6
.gitignore vendored Normal file
View File

@ -0,0 +1,6 @@
linphone-3.2.1.tar.gz
/linphone-3.4.3.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

View File

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

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,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) \

View File

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

View File

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

View File

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

View File

@ -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.
##################################################

81
linphone-3.6.1-arm.patch Normal file
View File

@ -0,0 +1,81 @@
--- linphone-3.6.1/mediastreamer2/src/voip/msvideo_neon.c 2013-01-14 17:13:45.990192572 +0200
+++ linphone-3.6.1/mediastreamer2/src/voip/msvideo_neon.c 2013-07-27 12:58:00.366301016 +0300
@@ -379,8 +379,8 @@
#endif
}
-static void reverse_and_down_scale_32bytes_neon(unsigned char* src, unsigned char* dest) {
#ifdef __ARM_NEON__
+static void reverse_and_down_scale_32bytes_neon(unsigned char* src, unsigned char* dest) {
__asm (/*load 16x1 pixel
[ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]*/
"vld2.8 {q0,q1},[%0] \n\t"
@@ -395,11 +395,11 @@
: "r"(src),"r"(dest)/*in*/
: "r4","q0","q1","memory" /*modified*/
);
-#endif
}
+#endif
-static void reverse_16bytes_neon(unsigned char* src, unsigned char* dest) {
#ifdef __ARM_NEON__
+static void reverse_16bytes_neon(unsigned char* src, unsigned char* dest) {
__asm (/*load 16x1 pixel
[ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]*/
"vld1.8 {d0,d1},[%0] \n\t"
@@ -414,11 +414,11 @@
: "r"(src),"r"(dest)/*in*/
: "r4","d0","d1","memory" /*modified*/
);
-#endif
}
+#endif
-static void deinterlace_and_reverse_2x8bytes_neon(unsigned char* src, unsigned char* udest, unsigned char* vdest) {
#ifdef __ARM_NEON__
+static void deinterlace_and_reverse_2x8bytes_neon(unsigned char* src, unsigned char* udest, unsigned char* vdest) {
__asm (/*load 16x1 values
[ U0, V0, U1, V1, U2, V2, U3, V3, U4, V4, U5, V5, U6, V6, U7, V7]
[ U0, U1, U2, U3, U4, U5, U6, U7, V0, V1, V2, V3, V4, V5, V6, V7]*/
@@ -434,10 +434,10 @@
: "r"(src),"r"(udest),"r"(vdest)/*in*/
: "r4","d0","d1","memory" /*modified*/
);
-#endif
}
-static void deinterlace_down_scale_and_reverse_2x16bytes_neon(unsigned char* src, unsigned char* udest, unsigned char* vdest) {
+#endif
#ifdef __ARM_NEON__
+static void deinterlace_down_scale_and_reverse_2x16bytes_neon(unsigned char* src, unsigned char* udest, unsigned char* vdest) {
__asm (/*load 32x1 values*/
"vld4.8 {d0,d1,d2,d3},[%0] \n\t" /*only keep half*/
@@ -453,8 +453,8 @@
: "r"(src),"r"(udest),"r"(vdest)/*in*/
: "r4","q0","q1","memory" /*modified*/
);
-#endif
}
+#endif
void deinterlace_down_scale_neon(uint8_t* ysrc, uint8_t* cbcrsrc, uint8_t* ydst, uint8_t* u_dst, uint8_t* v_dst, int w, int h, int y_byte_per_row,int cbcr_byte_per_row,bool_t down_scale) {
#ifdef __ARM_NEON__
--- linphone-3.6.1/mediastreamer2/src/voip/videostream.c 2013-06-14 18:21:26.654950046 +0300
+++ linphone-3.6.1/mediastreamer2/src/voip/videostream.c 2013-07-27 13:36:17.176984897 +0300
@@ -223,6 +223,7 @@
return wished_size;
}
+#ifndef __arm__
static MSVideoSize get_with_same_orientation(MSVideoSize size, MSVideoSize refsize){
if (ms_video_size_get_orientation(refsize)!=ms_video_size_get_orientation(size)){
int tmp;
@@ -232,6 +233,7 @@
}
return size;
}
+#endif
static void configure_video_source(VideoStream *stream){
MSVideoSize vsize,cam_vsize;

View File

@ -0,0 +1,11 @@
--- linphone-3.6.1/coreapi/linphonecore.c 2013-06-12 17:20:14.020039579 +0300
+++ linphone-3.6.1/coreapi/linphonecore.c 2013-07-26 11:36:51.014342101 +0300
@@ -638,7 +638,7 @@
}
#ifdef __linux
- sal_set_root_ca(lc->sal, lp_config_get_string(lc->config,"sip","root_ca", "/etc/ssl/certs"));
+ sal_set_root_ca(lc->sal, lp_config_get_string(lc->config,"sip","root_ca", "/etc/ssl/certs/ca-bundle.crt"));
#else
sal_set_root_ca(lc->sal, lp_config_get_string(lc->config,"sip","root_ca", ROOT_CA_FILE));
#endif

View File

@ -0,0 +1,12 @@
diff -up linphone-3.6.1/mediastreamer2/src/videofilters/theora.c.fix linphone-3.6.1/mediastreamer2/src/videofilters/theora.c
--- linphone-3.6.1/mediastreamer2/src/videofilters/theora.c.fix 2014-11-14 14:34:59.416313134 -0500
+++ linphone-3.6.1/mediastreamer2/src/videofilters/theora.c 2014-11-14 14:35:44.657985230 -0500
@@ -332,7 +332,7 @@ static void enc_process(MSFilter *f){
if (need_send_conf(s,elapsed)){
if (s->packed_conf) {
om=dupmsg(s->packed_conf);
- ms_message("sending theora packed conf (%i bytes)",msgdsize(om));
+ ms_message("sending theora packed conf (%i bytes)",(int)msgdsize(om));
packetize_and_send(f,s,om,timestamp,THEORA_PACKED_CONF);
}else {
ms_error("No packed conf to send.");

View File

@ -0,0 +1,405 @@
diff --git a/linphone-3.12.0/mediastreamer2/src/upnp/upnp_igd.c b/linphone-3.12.0/mediastreamer2/src/upnp/upnp_igd.c
index 4f7d161..cee436c 100644
--- a/linphone-3.12.0/mediastreamer2/src/upnp/upnp_igd.c
+++ b/linphone-3.12.0/mediastreamer2/src/upnp/upnp_igd.c
@@ -395,7 +395,7 @@ int upnp_igd_send_action(upnp_igd_context* igd_ctxt, upnp_igd_device_node *devic
* d_event -- event associated with the new device
*
********************************************************************************/
-void upnp_igd_add_device(upnp_igd_context *igd_ctxt, IXML_Document *desc_doc, struct Upnp_Discovery *d_event) {
+void upnp_igd_add_device(upnp_igd_context *igd_ctxt, IXML_Document *desc_doc, UpnpDiscovery *d_event) {
upnp_igd_device_node *deviceNode, *tmpdevnode;
int found = 0;
int ret;
@@ -423,7 +423,7 @@ void upnp_igd_add_device(upnp_igd_context *igd_ctxt, IXML_Document *desc_doc, st
baseURL = upnp_igd_get_first_document_item(igd_ctxt, desc_doc, "URLBase");
relURL = upnp_igd_get_first_document_item(igd_ctxt, desc_doc, "presentationURL");
- ret = UpnpResolveURL((baseURL ? baseURL : d_event->Location), relURL, presURL);
+ ret = UpnpResolveURL((baseURL ? baseURL : UpnpString_get_String(UpnpDiscovery_get_Location(d_event))), relURL, presURL);
if (UPNP_E_SUCCESS != ret) {
upnp_igd_print(igd_ctxt, UPNP_IGD_ERROR, "Error generating presURL from %s + %s", baseURL, relURL);
@@ -444,7 +444,7 @@ void upnp_igd_add_device(upnp_igd_context *igd_ctxt, IXML_Document *desc_doc, st
if (found) {
/* The device is already there, so just update */
/* the advertisement timeout field */
- tmpdevnode->device.advr_time_out = d_event->Expires;
+ tmpdevnode->device.advr_time_out = UpnpDiscovery_get_Expires(d_event);
upnp_igd_print(igd_ctxt, UPNP_IGD_DEBUG, "IGD device: %s[%s] | Update expires(%d)", friendlyName, UDN, tmpdevnode->device.advr_time_out);
} else {
upnp_igd_print(igd_ctxt, UPNP_IGD_MESSAGE, "Add IGD device: %s[%s]", friendlyName, UDN);
@@ -449,10 +449,10 @@ void upnp_igd_add_device(upnp_igd_context *igd_ctxt, IXML_Document *desc_doc, st
deviceNode = (upnp_igd_device_node *) malloc(sizeof(upnp_igd_device_node));
memset(deviceNode->device.services, '\0', sizeof(upnp_igd_service) * IGD_SERVICE_SERVCOUNT);
strncpy(deviceNode->device.udn, UDN, sizeof(deviceNode->device.udn));
- strncpy(deviceNode->device.desc_doc_url, d_event->Location, sizeof(deviceNode->device.desc_doc_url));
+ strncpy(deviceNode->device.desc_doc_url, UpnpString_get_String(UpnpDiscovery_get_Location(d_event)), sizeof(deviceNode->device.desc_doc_url));
strncpy(deviceNode->device.friendly_name, friendlyName, sizeof(deviceNode->device.friendly_name));
strncpy(deviceNode->device.pres_url, presURL, sizeof(deviceNode->device.pres_url));
- deviceNode->device.advr_time_out = d_event->Expires;
+ deviceNode->device.advr_time_out = UpnpDiscovery_get_Expires(d_event);
// Reset values
serviceId = NULL;
@@ -468,7 +468,7 @@ void upnp_igd_add_device(upnp_igd_context *igd_ctxt, IXML_Document *desc_doc, st
for (service = 0; service < IGD_SERVICE_SERVCOUNT;
service++) {
- if (upnp_igd_get_find_and_parse_service(igd_ctxt, desc_doc, d_event->Location,
+ if (upnp_igd_get_find_and_parse_service(igd_ctxt, desc_doc, UpnpString_get_String(UpnpDiscovery_get_Location(d_event)),
IGDServiceType[service], &serviceId, &event_url, &controlURL)) {
upnp_igd_print(igd_ctxt, UPNP_IGD_DEBUG, "Subscribing to EventURL %s...",event_url);
ret =
@@ -891,16 +891,16 @@ int upnp_igd_callback(Upnp_EventType event_type, void* event, void *cookie) {
switch(event_type) {
case UPNP_DISCOVERY_ADVERTISEMENT_ALIVE:
case UPNP_DISCOVERY_SEARCH_RESULT: {
- struct Upnp_Discovery *d_event = (struct Upnp_Discovery *)event;
+ UpnpDiscovery *d_event = (UpnpDiscovery *)event;
IXML_Document *desc_doc = NULL;
int ret;
- if (d_event->ErrCode != UPNP_E_SUCCESS) {
- upnp_igd_print(igd_ctxt, UPNP_IGD_ERROR, "Error in Discovery Callback -- %d", d_event->ErrCode);
+ if (UpnpDiscovery_get_ErrCode(d_event) != UPNP_E_SUCCESS) {
+ upnp_igd_print(igd_ctxt, UPNP_IGD_ERROR, "Error in Discovery Callback -- %d", UpnpDiscovery_get_ErrCode(d_event));
}
- ret = UpnpDownloadXmlDoc(d_event->Location, &desc_doc);
+ ret = UpnpDownloadXmlDoc(UpnpString_get_String(UpnpDiscovery_get_Location(d_event)), &desc_doc);
if (ret != UPNP_E_SUCCESS) {
- upnp_igd_print(igd_ctxt, UPNP_IGD_ERROR, "Error obtaining device description from %s -- error = %d", d_event->Location, ret);
+ upnp_igd_print(igd_ctxt, UPNP_IGD_ERROR, "Error obtaining device description from %s -- error = %d", UpnpString_get_String(UpnpDiscovery_get_Location(d_event)), ret);
} else {
upnp_igd_add_device(igd_ctxt, desc_doc, d_event);
}
@@ -910,64 +910,64 @@ int upnp_igd_callback(Upnp_EventType event_type, void* event, void *cookie) {
}
break;
case UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE: {
- struct Upnp_Discovery *d_event = (struct Upnp_Discovery *)event;
- if (d_event->ErrCode != UPNP_E_SUCCESS) {
- upnp_igd_print(igd_ctxt, UPNP_IGD_ERROR, "Error in Discovery ByeBye Callback -- %d", d_event->ErrCode);
+ UpnpDiscovery *d_event = (UpnpDiscovery *)event;
+ if (UpnpDiscovery_get_ErrCode(d_event) != UPNP_E_SUCCESS) {
+ upnp_igd_print(igd_ctxt, UPNP_IGD_ERROR, "Error in Discovery ByeBye Callback -- %d", UpnpDiscovery_get_ErrCode(d_event));
}
- upnp_igd_remove_device(igd_ctxt, d_event->DeviceId);
+ upnp_igd_remove_device(igd_ctxt, UpnpString_get_String(UpnpDiscovery_get_DeviceID(d_event)));
}
break;
/* SOAP Stuff */
case UPNP_CONTROL_ACTION_COMPLETE: {
- struct Upnp_Action_Complete *a_event = (struct Upnp_Action_Complete *)event;
+ UpnpActionComplete *a_event = (UpnpActionComplete *)event;
- if (a_event->ErrCode != UPNP_E_SUCCESS) {
- upnp_igd_print(igd_ctxt, UPNP_IGD_ERROR, "Error in Action Complete Callback -- %d", a_event->ErrCode);
+ if (UpnpActionComplete_get_ErrCode(a_event) != UPNP_E_SUCCESS) {
+ upnp_igd_print(igd_ctxt, UPNP_IGD_ERROR, "Error in Action Complete Callback -- %d", UpnpActionComplete_get_ErrCode(a_event));
} else {
- upnp_igd_handle_send_action(igd_ctxt, UPNP_STRING(a_event->CtrlUrl), a_event->ActionRequest, a_event->ActionResult);
+ upnp_igd_handle_send_action(igd_ctxt, UPNP_STRING(UpnpActionComplete_get_CtrlUrl(a_event)), UpnpActionComplete_get_ActionRequest(a_event), UpnpActionComplete_get_ActionResult(a_event));
}
}
break;
case UPNP_CONTROL_GET_VAR_COMPLETE: {
- struct Upnp_State_Var_Complete *sv_event = (struct Upnp_State_Var_Complete *)event;
+ UpnpStateVarComplete *sv_event = (UpnpStateVarComplete *)event;
- if (sv_event->ErrCode != UPNP_E_SUCCESS) {
- upnp_igd_print(igd_ctxt, UPNP_IGD_ERROR, "Error in Get Var Complete Callback -- %d", sv_event->ErrCode);
+ if (UpnpStateVarComplete_get_ErrCode(sv_event) != UPNP_E_SUCCESS) {
+ upnp_igd_print(igd_ctxt, UPNP_IGD_ERROR, "Error in Get Var Complete Callback -- %d", UpnpStateVarComplete_get_ErrCode(sv_event));
} else {
- upnp_igd_handle_get_var(igd_ctxt, UPNP_STRING(sv_event->CtrlUrl), sv_event->StateVarName, sv_event->CurrentVal);
+ upnp_igd_handle_get_var(igd_ctxt, UPNP_STRING(UpnpStateVarComplete_get_CtrlUrl(sv_event)), UpnpString_get_String(UpnpStateVarComplete_get_StateVarName(sv_event)), UpnpStateVarComplete_get_CurrentVal(sv_event));
}
}
break;
/* GENA Stuff */
case UPNP_EVENT_RECEIVED: {
- struct Upnp_Event *e_event = (struct Upnp_Event *)event;
+ UpnpEvent *e_event = (UpnpEvent *)event;
- upnp_igd_handle_event(igd_ctxt, e_event->Sid, e_event->EventKey, e_event->ChangedVariables);
+ upnp_igd_handle_event(igd_ctxt, UpnpString_get_String(UpnpEvent_get_SID(e_event)), UpnpEvent_get_EventKey(e_event), UpnpEvent_get_ChangedVariables(e_event));
}
break;
case UPNP_EVENT_SUBSCRIBE_COMPLETE:
case UPNP_EVENT_UNSUBSCRIBE_COMPLETE:
case UPNP_EVENT_RENEWAL_COMPLETE: {
- struct Upnp_Event_Subscribe *es_event = (struct Upnp_Event_Subscribe *)event;
+ UpnpEventSubscribe *es_event = (UpnpEventSubscribe *)event;
- if (es_event->ErrCode != UPNP_E_SUCCESS) {
- upnp_igd_print(igd_ctxt, UPNP_IGD_ERROR, "Error in Event Subscribe Callback -- %d", es_event->ErrCode);
+ if (UpnpEventSubscribe_get_ErrCode(es_event) != UPNP_E_SUCCESS) {
+ upnp_igd_print(igd_ctxt, UPNP_IGD_ERROR, "Error in Event Subscribe Callback -- %d", UpnpEventSubscribe_get_ErrCode(es_event));
} else {
- upnp_igd_handle_subscribe_update(igd_ctxt, UPNP_STRING(es_event->PublisherUrl), es_event->Sid, es_event->TimeOut);
+ upnp_igd_handle_subscribe_update(igd_ctxt, UPNP_STRING(UpnpEventSubscribe_get_PublisherUrl(es_event)), UpnpString_get_String(UpnpEventSubscribe_get_SID(es_event)), UpnpEventSubscribe_get_TimeOut(es_event));
}
}
break;
case UPNP_EVENT_AUTORENEWAL_FAILED:
case UPNP_EVENT_SUBSCRIPTION_EXPIRED: {
- struct Upnp_Event_Subscribe *es_event = (struct Upnp_Event_Subscribe *)event;
+ UpnpEventSubscribe *es_event = (UpnpEventSubscribe *)event;
int TimeOut = 1801;
Upnp_SID newSID;
int ret;
- ret = UpnpSubscribe(igd_ctxt->upnp_handle, UPNP_STRING(es_event->PublisherUrl), &TimeOut, newSID);
+ ret = UpnpSubscribe(igd_ctxt->upnp_handle, UPNP_STRING(UpnpEventSubscribe_get_PublisherUrl(es_event)), &TimeOut, newSID);
if (ret == UPNP_E_SUCCESS) {
upnp_igd_print(igd_ctxt, UPNP_IGD_DEBUG, "Subscribed to EventURL with SID=%s", newSID);
- upnp_igd_handle_subscribe_update(igd_ctxt, UPNP_STRING(es_event->PublisherUrl), newSID, TimeOut);
+ upnp_igd_handle_subscribe_update(igd_ctxt, UPNP_STRING(UpnpEventSubscribe_get_PublisherUrl(es_event)), newSID, TimeOut);
} else {
upnp_igd_print(igd_ctxt, UPNP_IGD_ERROR, "Error Subscribing to EventURL -- %d", ret);
}
diff --git a/linphone-3.12.0/mediastreamer2/src/upnp/upnp_igd_cmd.c b/linphone-3.12.0/mediastreamer2/src/upnp/upnp_igd_cmd.c
index 108fced..9378b8c 100644
--- a/linphone-3.12.0/mediastreamer2/src/upnp/upnp_igd_cmd.c
+++ b/linphone-3.12.0/mediastreamer2/src/upnp/upnp_igd_cmd.c
@@ -103,8 +103,8 @@ int upnp_igd_port_mapping_callback(Upnp_EventType event_type, void* event, void
switch(event_type) {
case UPNP_CONTROL_ACTION_COMPLETE: {
- struct Upnp_Action_Complete *a_event = (struct Upnp_Action_Complete *)event;
- upnp_igd_port_mapping_handle_action(igd_port_mapping_ctxt, a_event->ErrCode, UPNP_STRING(a_event->CtrlUrl), a_event->ActionRequest, a_event->ActionResult);
+ UpnpActionComplete *a_event = (UpnpActionComplete *)event;
+ upnp_igd_port_mapping_handle_action(igd_port_mapping_ctxt, UpnpActionComplete_get_ErrCode(a_event), UPNP_STRING(UpnpActionComplete_get_CtrlUrl(a_event)), UpnpActionComplete_get_ActionRequest(a_event), UpnpActionComplete_get_ActionResult(a_event));
}
break;
diff --git a/linphone-3.12.0/mediastreamer2/src/upnp/upnp_igd_utils.c b/linphone-3.12.0/mediastreamer2/src/upnp/upnp_igd_utils.c
index 5329362..075c6be 100644
--- a/linphone-3.12.0/mediastreamer2/src/upnp/upnp_igd_utils.c
+++ b/linphone-3.12.0/mediastreamer2/src/upnp/upnp_igd_utils.c
@@ -188,18 +188,18 @@ void upnp_igd_print_event(upnp_igd_context *igd_ctxt, upnp_igd_print_level level
case UPNP_DISCOVERY_ADVERTISEMENT_ALIVE:
case UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE:
case UPNP_DISCOVERY_SEARCH_RESULT: {
- struct Upnp_Discovery *d_event = (struct Upnp_Discovery *)Event;
+ UpnpDiscovery *d_event = (UpnpDiscovery *)Event;
upnp_igd_print(igd_ctxt, level, "ErrCode = %s(%d)",
- UpnpGetErrorMessage(d_event->ErrCode), d_event->ErrCode);
- upnp_igd_print(igd_ctxt, level, "Expires = %d", d_event->Expires);
- upnp_igd_print(igd_ctxt, level, "DeviceId = %s", d_event->DeviceId);
- upnp_igd_print(igd_ctxt, level, "DeviceType = %s", d_event->DeviceType);
- upnp_igd_print(igd_ctxt, level, "ServiceType = %s", d_event->ServiceType);
- upnp_igd_print(igd_ctxt, level, "ServiceVer = %s", d_event->ServiceVer);
- upnp_igd_print(igd_ctxt, level, "Location = %s", d_event->Location);
- upnp_igd_print(igd_ctxt, level, "OS = %s", d_event->Os);
- upnp_igd_print(igd_ctxt, level, "Ext = %s", d_event->Ext);
+ UpnpGetErrorMessage(UpnpDiscovery_get_ErrCode(d_event)), UpnpDiscovery_get_ErrCode(d_event));
+ upnp_igd_print(igd_ctxt, level, "Expires = %d", UpnpDiscovery_get_Expires(d_event));
+ upnp_igd_print(igd_ctxt, level, "DeviceId = %s", UpnpString_get_String(UpnpDiscovery_get_DeviceID(d_event)));
+ upnp_igd_print(igd_ctxt, level, "DeviceType = %s", UpnpString_get_String(UpnpDiscovery_get_DeviceType(d_event)));
+ upnp_igd_print(igd_ctxt, level, "ServiceType = %s", UpnpString_get_String(UpnpDiscovery_get_ServiceType(d_event)));
+ upnp_igd_print(igd_ctxt, level, "ServiceVer = %s", UpnpString_get_String(UpnpDiscovery_get_ServiceVer(d_event)));
+ upnp_igd_print(igd_ctxt, level, "Location = %s", UpnpString_get_String(UpnpDiscovery_get_Location(d_event)));
+ upnp_igd_print(igd_ctxt, level, "OS = %s", UpnpString_get_String(UpnpDiscovery_get_Os(d_event)));
+ upnp_igd_print(igd_ctxt, level, "Ext = %s", UpnpString_get_String(UpnpDiscovery_get_Os(d_event)));
break;
}
case UPNP_DISCOVERY_SEARCH_TIMEOUT:
@@ -207,18 +207,18 @@ void upnp_igd_print_event(upnp_igd_context *igd_ctxt, upnp_igd_print_level level
break;
/* SOAP */
case UPNP_CONTROL_ACTION_REQUEST: {
- struct Upnp_Action_Request *a_event =
- (struct Upnp_Action_Request *)Event;
+ UpnpActionRequest *a_event =
+ (UpnpActionRequest *)Event;
char *xmlbuff = NULL;
upnp_igd_print(igd_ctxt, level, "ErrCode = %s(%d)",
- UpnpGetErrorMessage(a_event->ErrCode), a_event->ErrCode);
- upnp_igd_print(igd_ctxt, level, "ErrStr = %s", a_event->ErrStr);
- upnp_igd_print(igd_ctxt, level, "ActionName = %s", a_event->ActionName);
- upnp_igd_print(igd_ctxt, level, "UDN = %s", a_event->DevUDN);
- upnp_igd_print(igd_ctxt, level, "ServiceID = %s", a_event->ServiceID);
- if (a_event->ActionRequest) {
- xmlbuff = ixmlPrintNode((IXML_Node *)a_event->ActionRequest);
+ UpnpGetErrorMessage(UpnpActionRequest_get_ErrCode(a_event)), UpnpActionRequest_get_ErrCode(a_event));
+ upnp_igd_print(igd_ctxt, level, "ErrStr = %s", UpnpString_get_String(UpnpActionRequest_get_ErrStr(a_event)));
+ upnp_igd_print(igd_ctxt, level, "ActionName = %s", UpnpString_get_String(UpnpActionRequest_get_ActionName(a_event)));
+ upnp_igd_print(igd_ctxt, level, "UDN = %s", UpnpString_get_String(UpnpActionRequest_get_DevUDN(a_event)));
+ upnp_igd_print(igd_ctxt, level, "ServiceID = %s", UpnpString_get_String(UpnpActionRequest_get_ServiceID(a_event)));
+ if (UpnpActionRequest_get_ActionRequest(a_event)) {
+ xmlbuff = ixmlPrintNode((IXML_Node *)UpnpActionRequest_get_ActionRequest(a_event));
if (xmlbuff) {
upnp_igd_print(igd_ctxt, level, "ActRequest = %s", xmlbuff);
ixmlFreeDOMString(xmlbuff);
@@ -227,8 +227,8 @@ void upnp_igd_print_event(upnp_igd_context *igd_ctxt, upnp_igd_print_level level
} else {
upnp_igd_print(igd_ctxt, level, "ActRequest = (null)");
}
- if (a_event->ActionResult) {
- xmlbuff = ixmlPrintNode((IXML_Node *)a_event->ActionResult);
+ if (UpnpActionRequest_get_ActionResult(a_event)) {
+ xmlbuff = ixmlPrintNode((IXML_Node *)UpnpActionRequest_get_ActionResult(a_event));
if (xmlbuff) {
upnp_igd_print(igd_ctxt, level, "ActResult = %s", xmlbuff);
ixmlFreeDOMString(xmlbuff);
@@ -240,15 +240,15 @@ void upnp_igd_print_event(upnp_igd_context *igd_ctxt, upnp_igd_print_level level
break;
}
case UPNP_CONTROL_ACTION_COMPLETE: {
- struct Upnp_Action_Complete *a_event =
- (struct Upnp_Action_Complete *)Event;
+ UpnpActionComplete *a_event =
+ (UpnpActionComplete *)Event;
char *xmlbuff = NULL;
upnp_igd_print(igd_ctxt, level, "ErrCode = %s(%d)",
- UpnpGetErrorMessage(a_event->ErrCode), a_event->ErrCode);
- upnp_igd_print(igd_ctxt, level, "CtrlUrl = %s", a_event->CtrlUrl);
- if (a_event->ActionRequest) {
- xmlbuff = ixmlPrintNode((IXML_Node *)a_event->ActionRequest);
+ UpnpGetErrorMessage(UpnpActionComplete_get_ErrCode(a_event)), UpnpActionComplete_get_ErrCode(a_event));
+ upnp_igd_print(igd_ctxt, level, "CtrlUrl = %s", UpnpString_get_String(UpnpActionComplete_get_CtrlUrl(a_event)));
+ if (UpnpActionComplete_get_ActionRequest(a_event)) {
+ xmlbuff = ixmlPrintNode((IXML_Node *)UpnpActionComplete_get_ActionRequest(a_event));
if (xmlbuff) {
upnp_igd_print(igd_ctxt, level, "ActRequest = %s", xmlbuff);
ixmlFreeDOMString(xmlbuff);
@@ -257,8 +257,8 @@ void upnp_igd_print_event(upnp_igd_context *igd_ctxt, upnp_igd_print_level level
} else {
upnp_igd_print(igd_ctxt, level, "ActRequest = (null)");
}
- if (a_event->ActionResult) {
- xmlbuff = ixmlPrintNode((IXML_Node *)a_event->ActionResult);
+ if (UpnpActionComplete_get_ActionResult(a_event)) {
+ xmlbuff = ixmlPrintNode((IXML_Node *)UpnpActionComplete_get_ActionResult(a_event));
if (xmlbuff) {
upnp_igd_print(igd_ctxt, level, "ActResult = %s", xmlbuff);
ixmlFreeDOMString(xmlbuff);
@@ -270,83 +270,83 @@ void upnp_igd_print_event(upnp_igd_context *igd_ctxt, upnp_igd_print_level level
break;
}
case UPNP_CONTROL_GET_VAR_REQUEST: {
- struct Upnp_State_Var_Request *sv_event =
- (struct Upnp_State_Var_Request *)Event;
+ UpnpStateVarRequest *sv_event =
+ (UpnpStateVarRequest *)Event;
upnp_igd_print(igd_ctxt, level, "ErrCode = %s(%d)",
- UpnpGetErrorMessage(sv_event->ErrCode), sv_event->ErrCode);
- upnp_igd_print(igd_ctxt, level, "ErrStr = %s", sv_event->ErrStr);
- upnp_igd_print(igd_ctxt, level, "UDN = %s", sv_event->DevUDN);
- upnp_igd_print(igd_ctxt, level, "ServiceID = %s", sv_event->ServiceID);
- upnp_igd_print(igd_ctxt, level, "StateVarName= %s", sv_event->StateVarName);
- upnp_igd_print(igd_ctxt, level, "CurrentVal = %s", sv_event->CurrentVal);
+ UpnpGetErrorMessage(UpnpStateVarRequest_get_ErrCode(sv_event)), UpnpStateVarRequest_get_ErrCode(sv_event));
+ upnp_igd_print(igd_ctxt, level, "ErrStr = %s", UpnpString_get_String(UpnpStateVarRequest_get_ErrStr(sv_event)));
+ upnp_igd_print(igd_ctxt, level, "UDN = %s", UpnpString_get_String(UpnpStateVarRequest_get_DevUDN(sv_event)));
+ upnp_igd_print(igd_ctxt, level, "ServiceID = %s", UpnpString_get_String(UpnpStateVarRequest_get_ServiceID(sv_event)));
+ upnp_igd_print(igd_ctxt, level, "StateVarName= %s", UpnpString_get_String(UpnpStateVarRequest_get_StateVarName(sv_event)));
+ upnp_igd_print(igd_ctxt, level, "CurrentVal = %s", UpnpStateVarRequest_get_CurrentVal(sv_event));
break;
}
case UPNP_CONTROL_GET_VAR_COMPLETE: {
- struct Upnp_State_Var_Complete *sv_event =
- (struct Upnp_State_Var_Complete *)Event;
+ UpnpStateVarComplete *sv_event =
+ (UpnpStateVarComplete *)Event;
upnp_igd_print(igd_ctxt, level, "ErrCode = %s(%d)",
- UpnpGetErrorMessage(sv_event->ErrCode), sv_event->ErrCode);
- upnp_igd_print(igd_ctxt, level, "CtrlUrl = %s", sv_event->CtrlUrl);
- upnp_igd_print(igd_ctxt, level, "StateVarName= %s", sv_event->StateVarName);
- upnp_igd_print(igd_ctxt, level, "CurrentVal = %s", sv_event->CurrentVal);
+ UpnpGetErrorMessage(UpnpStateVarComplete_get_ErrCode(sv_event)), UpnpStateVarComplete_get_ErrCode(sv_event));
+ upnp_igd_print(igd_ctxt, level, "CtrlUrl = %s", UpnpString_get_String(UpnpStateVarComplete_get_CtrlUrl(sv_event)));
+ upnp_igd_print(igd_ctxt, level, "StateVarName= %s", UpnpString_get_String(UpnpStateVarComplete_get_StateVarName(sv_event)));
+ upnp_igd_print(igd_ctxt, level, "CurrentVal = %s", UpnpStateVarComplete_get_CurrentVal(sv_event));
break;
}
/* GENA */
case UPNP_EVENT_SUBSCRIPTION_REQUEST: {
- struct Upnp_Subscription_Request *sr_event =
- (struct Upnp_Subscription_Request *)Event;
+ UpnpSubscriptionRequest *sr_event =
+ (UpnpSubscriptionRequest *)Event;
- upnp_igd_print(igd_ctxt, level, "ServiceID = %s", sr_event->ServiceId);
- upnp_igd_print(igd_ctxt, level, "UDN = %s", sr_event->UDN);
- upnp_igd_print(igd_ctxt, level, "SID = %s", sr_event->Sid);
+ upnp_igd_print(igd_ctxt, level, "ServiceID = %s", UpnpString_get_String(UpnpSubscriptionRequest_get_ServiceId(sr_event)));
+ upnp_igd_print(igd_ctxt, level, "UDN = %s", UpnpString_get_String(UpnpSubscriptionRequest_get_UDN(sr_event)));
+ upnp_igd_print(igd_ctxt, level, "SID = %s", UpnpString_get_String(UpnpSubscriptionRequest_get_SID(sr_event)));
break;
}
case UPNP_EVENT_RECEIVED: {
- struct Upnp_Event *e_event = (struct Upnp_Event *)Event;
+ UpnpEvent *e_event = (UpnpEvent *)Event;
char *xmlbuff = NULL;
- upnp_igd_print(igd_ctxt, level, "SID = %s", e_event->Sid);
- upnp_igd_print(igd_ctxt, level, "EventKey = %d", e_event->EventKey);
- xmlbuff = ixmlPrintNode((IXML_Node *)e_event->ChangedVariables);
+ upnp_igd_print(igd_ctxt, level, "SID = %s", UpnpString_get_String(UpnpEvent_get_SID(e_event)));
+ upnp_igd_print(igd_ctxt, level, "EventKey = %d", UpnpEvent_get_EventKey(e_event));
+ xmlbuff = ixmlPrintNode((IXML_Node *)UpnpEvent_get_ChangedVariables(e_event));
upnp_igd_print(igd_ctxt, level, "ChangedVars = %s", xmlbuff);
ixmlFreeDOMString(xmlbuff);
xmlbuff = NULL;
break;
}
case UPNP_EVENT_RENEWAL_COMPLETE: {
- struct Upnp_Event_Subscribe *es_event =
- (struct Upnp_Event_Subscribe *)Event;
+ UpnpEventSubscribe *es_event =
+ (UpnpEventSubscribe *)Event;
- upnp_igd_print(igd_ctxt, level, "SID = %s", es_event->Sid);
+ upnp_igd_print(igd_ctxt, level, "SID = %s", UpnpString_get_String(UpnpEventSubscribe_get_SID(es_event)));
upnp_igd_print(igd_ctxt, level, "ErrCode = %s(%d)",
- UpnpGetErrorMessage(es_event->ErrCode), es_event->ErrCode);
- upnp_igd_print(igd_ctxt, level, "TimeOut = %d", es_event->TimeOut);
+ UpnpGetErrorMessage(UpnpEventSubscribe_get_ErrCode(es_event)), UpnpEventSubscribe_get_ErrCode(es_event));
+ upnp_igd_print(igd_ctxt, level, "TimeOut = %d", UpnpEventSubscribe_get_TimeOut(es_event));
break;
}
case UPNP_EVENT_SUBSCRIBE_COMPLETE:
case UPNP_EVENT_UNSUBSCRIBE_COMPLETE: {
- struct Upnp_Event_Subscribe *es_event =
- (struct Upnp_Event_Subscribe *)Event;
+ UpnpEventSubscribe *es_event =
+ (UpnpEventSubscribe *)Event;
- upnp_igd_print(igd_ctxt, level, "SID = %s", es_event->Sid);
+ upnp_igd_print(igd_ctxt, level, "SID = %s", UpnpString_get_String(UpnpEventSubscribe_get_SID(es_event)));
upnp_igd_print(igd_ctxt, level, "ErrCode = %s(%d)",
- UpnpGetErrorMessage(es_event->ErrCode), es_event->ErrCode);
- upnp_igd_print(igd_ctxt, level, "PublisherURL= %s", es_event->PublisherUrl);
- upnp_igd_print(igd_ctxt, level, "TimeOut = %d", es_event->TimeOut);
+ UpnpGetErrorMessage(UpnpEventSubscribe_get_ErrCode(es_event)), UpnpEventSubscribe_get_ErrCode(es_event));
+ upnp_igd_print(igd_ctxt, level, "PublisherURL= %s", UpnpString_get_String(UpnpEventSubscribe_get_PublisherUrl(es_event)));
+ upnp_igd_print(igd_ctxt, level, "TimeOut = %d", UpnpEventSubscribe_get_TimeOut(es_event));
break;
}
case UPNP_EVENT_AUTORENEWAL_FAILED:
case UPNP_EVENT_SUBSCRIPTION_EXPIRED: {
- struct Upnp_Event_Subscribe *es_event =
- (struct Upnp_Event_Subscribe *)Event;
+ UpnpEventSubscribe *es_event =
+ (UpnpEventSubscribe *)Event;
- upnp_igd_print(igd_ctxt, level, "SID = %s", es_event->Sid);
+ upnp_igd_print(igd_ctxt, level, "SID = %s", UpnpString_get_String(UpnpEventSubscribe_get_SID(es_event)));
upnp_igd_print(igd_ctxt, level, "ErrCode = %s(%d)",
- UpnpGetErrorMessage(es_event->ErrCode), es_event->ErrCode);
- upnp_igd_print(igd_ctxt, level, "PublisherURL= %s", es_event->PublisherUrl);
- upnp_igd_print(igd_ctxt, level, "TimeOut = %d", es_event->TimeOut);
+ UpnpGetErrorMessage(UpnpEventSubscribe_get_ErrCode(es_event)), UpnpEventSubscribe_get_ErrCode(es_event));
+ upnp_igd_print(igd_ctxt, level, "PublisherURL= %s", UpnpString_get_String(UpnpEventSubscribe_get_PublisherUrl(es_event)));
+ upnp_igd_print(igd_ctxt, level, "TimeOut = %d", UpnpEventSubscribe_get_TimeOut(es_event));
break;
}
}

View File

@ -1,24 +1,64 @@
Name: linphone
Version: 1.2.0
Release: 7%{?dist}
Version: 3.6.1
Release: 33%{?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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: GPLv2+
URL: http://www.linphone.org/
Source0: http://download.savannah.gnu.org/releases/linphone/3.7.x/sources/%{name}-%{version}.tar.gz
Patch0: linphone-3.6.1-rootca.patch
Patch1: linphone-3.6.1-arm.patch
Patch2: linphone-3.6.1-theora-fix.patch
Patch3: linphone-3.6.1-upnp-fix.patch
# for video support
BuildRequires: gcc-c++
BuildRequires: glew-devel
BuildRequires: libtheora-devel
BuildRequires: libv4l-devel
BuildRequires: libvpx-devel
# 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
# on i386, armv7hl error: libupnp uses large file support, so users must do that, too
BuildRequires: libupnp-devel
BuildRequires: openssl-devel
BuildRequires: pulseaudio-libs-devel
BuildRequires: sqlite-devel
BuildRequires: readline-devel
BuildRequires: ncurses-devel
BuildRequires: libnotify-devel
BuildRequires: gtk2-devel >= 2.16
BuildRequires: alsa-lib-devel
BuildRequires: opus-devel
BuildRequires: speex-devel >= 1.2
BuildRequires: speexdsp-devel >= 1.2
BuildRequires: spandsp-devel
BuildRequires: gsm-devel
BuildRequires: desktop-file-utils
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: perl(XML::Parser)
BuildRequires: libglade2-devel
BuildRequires: intltool
BuildRequires: doxygen
BuildRequires: libtool
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
implementations:
@ -27,7 +67,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
@ -37,71 +77,364 @@ Linphone may work also with other sip phones, but this has not been tested yet.
%package devel
Summary: Development libraries for linphone
Group: Development/Libraries
Requires: %{name} = %{version}-%{release} glib2-devel
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: linphone-mediastreamer-devel%{?_isa} = %{version}-%{release}
Requires: glib2-devel%{?_isa}
%description devel
Libraries and headers required to develop software with linphone.
%package mediastreamer
Summary: A media streaming library for telephony applications
%description mediastreamer
Mediastreamer2 is a GPL licensed library to make audio and video
real-time streaming and processing. Written in pure C, it is based
upon the oRTP library.
%package mediastreamer-devel
Summary: Development libraries for mediastreamer2
Requires: linphone-mediastreamer%{?_isa} = %{version}-%{release}
Requires: ortp-devel%{?_isa}
%description mediastreamer-devel
Libraries and headers required to develop software with mediastreamer2.
%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 .rootca
%ifarch %{arm}
%patch1 -p1 -b .arm
%endif
%patch2 -p1 -b .theora-fix
%if 0%{?fedora} > 28
%patch3 -p2 -b .upnp-fix
%endif
autoreconf -i -f
# remove bundled oRTP
rm -rf oRTP
# Fix encoding
for f in share/cs/*.1; do
/usr/bin/iconv -f iso-8859-2 -t utf-8 -o $f.new $f
sed -i -e 's/Encoding: ISO-8859-2/Encoding: UTF-8/' $f.new
mv $f.new $f
done
for f in ChangeLog AUTHORS; do
/usr/bin/iconv -f iso-8859-1 -t utf-8 -o $f.new $f
mv $f.new $f
done
%build
%configure
%configure --disable-static \
--enable-glx \
--disable-ffmpeg \
--disable-rpath \
--enable-console_ui=yes \
--enable-gtk_ui=yes \
--enable-ipv6 \
--enable-truespeech \
--enable-alsa \
--disable-strict \
--enable-nonstandard-gsm \
--enable-rsvp \
--enable-ssl \
--enable-zrtp \
%ifarch i686 armv7hl
--disable-upnp \
%endif
--enable-external-ortp
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
install -p -m 0644 pixmaps/linphone2.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
%find_lang %{name}
rm $RPM_BUILD_ROOT%{_datadir}/gnome/apps/Internet/linphone.desktop
desktop-file-install --vendor=fedora \
%find_lang mediastreamer
desktop-file-install \
--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
%clean
rm -rf $RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%post -p /sbin/ldconfig
# move docs to %%doc
mkdir -p doc/linphone doc/mediastreamer
mv $RPM_BUILD_ROOT%{_datadir}/doc/linphone*/html doc/linphone
mv $RPM_BUILD_ROOT%{_datadir}/doc/mediastreamer*/html doc/mediastreamer
%postun -p /sbin/ldconfig
%ldconfig_scriptlets
%ldconfig_scriptlets mediastreamer
%files -f %{name}.lang
%defattr(-,root,root)
%doc AUTHORS ChangeLog COPYING NEWS README TODO
%{_bindir}/*
%{_libdir}/bonobo/servers/*.server
%{_libdir}/liblinphone.so.*
%{_libexecdir}/*
%{_bindir}/linphone
%{_bindir}/linphonec
%{_bindir}/linphonecsh
%{_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
%{_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}/linphone
%files devel
%defattr(-,root,root)
%doc doc/linphone/html
%{_includedir}/linphone
%{_libdir}/liblinphone.a
%{_libdir}/liblinphone.la
%{_libdir}/liblinphone.so
%{_libdir}/pkgconfig/*
%{_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_base.so.3*
%{_libdir}/libmediastreamer_voip.so.3*
%{_datadir}/images
%files mediastreamer-devel
%doc doc/mediastreamer/html
%{_includedir}/mediastreamer2
%{_libdir}/libmediastreamer_base.so
%{_libdir}/libmediastreamer_voip.so
%{_libdir}/pkgconfig/mediastreamer.pc
%changelog
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-33
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri May 10 2019 Alexey Kurov <nucleo@fedoraproject.org> - 3.6.1-32
- disabled upnp on i686 and armv7hl
* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.6.1-31
- Rebuild for readline 8.0
* Tue Feb 05 2019 Björn Esser <besser82@fedoraproject.org> - 3.6.1-30
- rebuilt (libvpx)
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-29
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Aug 23 2018 Nicolas Chauvet <kwizart@gmail.com> - 3.6.1-28
- Rebuilt for glew 2.1.0
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-27
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Sun May 27 2018 Alexey Kurov <nucleo@fedoraproject.org> - 3.6.1-26
- apply upnp patch for F29+
* Sun May 27 2018 Alexey Kurov <nucleo@fedoraproject.org> - 3.6.1-25
- fix upnp FTBFS (rhbz #1582911)
* Fri Apr 13 2018 Nicolas Chauvet <kwizart@gmail.com> - 3.6.1-24
- Rebuilt for libupnp 1.8x
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Fri Feb 2 2018 Tom Callaway <spot@fedoraproject.org> - 3.6.1-22
- again.
* Fri Jan 26 2018 Tom Callaway <spot@fedoraproject.org> - 3.6.1-21
- rebuild for new libvpx
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Thu Jan 12 2017 Igor Gnatenko <ignatenko@redhat.com> - 3.6.1-17
- Rebuild for readline 7.x
* Tue Jan 10 2017 Orion Poplawski <orion@cora.nwra.com> - 3.6.1-16
- Rebuild for glew 2.0.0
* Fri Jul 22 2016 Tom Callaway <spot@fedoraproject.org> - 3.6.1-15
- rebuild for libvpx 1.6.0
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Fri Jan 15 2016 Adam Jackson <ajax@redhat.com> 3.6.1-13
- --disable-strict to work around libsoup deprecation warnings
* Thu Jan 14 2016 Adam Jackson <ajax@redhat.com> - 3.6.1-12
- Rebuild for glew 1.13
* Tue Dec 1 2015 Tom Callaway <spot@fedoraproject.org> - 3.6.1-11
- rebuild for libvpx 1.5.0
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.6.1-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 3.6.1-9
- Rebuilt for GCC 5 C++11 ABI change
* Mon Apr 6 2015 Tom Callaway <spot@fedoraproject.org> - 3.6.1-8
- rebuild for libvpx 1.4.0
* Thu Jan 29 2015 Peter Robinson <pbrobinson@fedoraproject.org> 3.6.1-7
- Add speexdsp-devel as a dep to fix FTBFS
* Fri Nov 14 2014 Tom Callaway <spot@fedoraproject.org> - 3.6.1-6
- rebuild for new libsrtp
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.6.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.6.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Mon Nov 18 2013 Dave Airlie <airlied@redhat.com> - 3.6.1-3
- rebuilt for GLEW 1.10
* Sat Jul 27 2013 Alexey Kurov <nucleo@fedoraproject.org> - 3.6.1-2
- use /etc/ssl/certs/ca-bundle.crt root_ca
- fix armv7hl compilation
* Sun Jul 7 2013 Alexey Kurov <nucleo@fedoraproject.org> - 3.6.1-1
- linphone-3.6.1
* Fri Apr 26 2013 Jon Ciesla <limburgher@gmail.com> - 3.5.2-8
- Drop desktop vendor tag.
* Sat Mar 23 2013 Alexey Kurov <nucleo@fedoraproject.org> - 3.5.2-7
- autoreconf in %%prep (#926078)
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.5.2-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Mon Dec 31 2012 Alexey Kurov <nucleo@fedoraproject.org> - 3.5.2-5
- add -mediastreamer and -mediastreamer-devel subpackages
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.5.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Mon Mar 5 2012 Alexey Kurov <nucleo@fedoraproject.org> - 3.5.2-3
- drop regression patch
* Mon Feb 27 2012 Alexey Kurov <nucleo@fedoraproject.org> - 3.5.2-2
- install docs in -devel
- update glib-2.31 patch
- revert commit causing regression in 3.5.2
* Wed Feb 22 2012 Alexey Kurov <nucleo@fedoraproject.org> - 3.5.2-1
- linphone-3.5.2
* Sun Feb 19 2012 Alexey Kurov <nucleo@fedoraproject.org> - 3.5.1-1
- linphone-3.5.1
- BR: libsoup-devel
- Requires: ortp >= 1:0.18.0
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.5.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Tue Dec 27 2011 Alexey Kurov <nucleo@fedoraproject.org> - 3.5.0-2
- enable spandsp
* Mon Dec 26 2011 Alexey Kurov <nucleo@fedoraproject.org> - 3.5.0-1
- linphone-3.5.0
- add BR: libnotify-devel
- disable spandsp (#691039)
* Tue Dec 06 2011 Adam Jackson <ajax@redhat.com> - 3.4.3-2
- Rebuild for new libpng
* Fri Sep 2 2011 Alexey Kurov <nucleo@fedoraproject.org> - 3.4.3-1
- linphone-3.4.3
- BR: openssl-devel libsamplerate-devel gettext
- BR: pulseaudio-libs-devel jack-audio-connection-kit-devel
- drop 3.2.1 patches
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Wed Mar 17 2010 Jesse Keating <jkeating@redhat.com> - 3.2.1-2
- Apply patches from bug 555510 to update linphone
- Drop the doc/mediastreamer dir from devel package
* Mon Mar 01 2010 Adam Jackson <ajax@redhat.com> 2.1.1-5
- Rebuild for libortp.so.7
* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* Fri Mar 13 2009 Ralf Corsépius <corsepiu@fedoraproject.org> - 2.1.1-3
- Re-base patches to fix rebuild breakdowns.
- Fix various autotool source file bugs.
- Use pre-built autotool-generated files.
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Thu Feb 14 2008 Jeffrey C. Ollie <jeff@ocjtech.us> - 2.1.1-1
- Update to 2.1.1
* 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.
* Wed Aug 29 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.7.1-3
- Update license tag.
* 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"

View File

@ -1 +1 @@
bd5e513a665ce2e381afce64d569c707 linphone-1.2.0.tar.gz
f59b99ec2501ebbb02969c885be4c4c5 linphone-3.6.1.tar.gz