Update BR, get rid of no longer needed patch
This commit is contained in:
parent
36a328b3d6
commit
95a7e38771
@ -1,35 +0,0 @@
|
||||
From 3ca7c2a2d5ca6d60d861e7c0e3fbb2b40ddf5a70 Mon Sep 17 00:00:00 2001
|
||||
From: Jeffrey C. Ollie <jeff@ocjtech.us>
|
||||
Date: Fri, 1 Feb 2008 10:40:52 -0600
|
||||
Subject: [PATCH] Fix compilation with video disabled.
|
||||
|
||||
---
|
||||
coreapi/linphonecore.c | 4 ++++
|
||||
1 files changed, 4 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
|
||||
index c77ebae..1e56f33 100644
|
||||
--- a/coreapi/linphonecore.c
|
||||
+++ b/coreapi/linphonecore.c
|
||||
@@ -980,14 +980,18 @@ void linphone_core_iterate(LinphoneCore *lc)
|
||||
vs=lc->videostream->session;
|
||||
display_bandwidth(as,vs);
|
||||
}
|
||||
+#ifdef VIDEO_ENABLED
|
||||
if (lc->videostream!=NULL)
|
||||
video_stream_iterate(lc->videostream);
|
||||
+#endif
|
||||
}
|
||||
}
|
||||
if (linphone_core_video_preview_enabled(lc)){
|
||||
if (lc->previewstream==NULL)
|
||||
toggle_video_preview(lc,TRUE);
|
||||
+#ifdef VIDEO_ENABLED
|
||||
else video_stream_iterate(lc->previewstream);
|
||||
+#endif
|
||||
}else{
|
||||
if (lc->previewstream!=NULL)
|
||||
toggle_video_preview(lc,FALSE);
|
||||
--
|
||||
1.5.3.8
|
||||
|
@ -8,13 +8,12 @@ License: GPLv2+
|
||||
URL: http://www.linphone.org/
|
||||
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
|
||||
Patch2: linphone-2.1.0-ni_maxhost_hack.patch
|
||||
Patch3: linphone-2.1.0-no_werror.patch
|
||||
Patch1: linphone-2.1.0-ni_maxhost_hack.patch
|
||||
Patch2: linphone-2.1.0-no_werror.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
BuildRequires: libosip2-devel >= 3.0.3-2
|
||||
BuildRequires: libeXosip2-devel >= 3.0.3-2
|
||||
BuildRequires: libosip2-devel >= 3.1.0
|
||||
BuildRequires: libeXosip2-devel >= 3.1.0
|
||||
BuildRequires: ortp-devel >= 0.14.2
|
||||
|
||||
BuildRequires: readline-devel
|
||||
@ -69,7 +68,6 @@ Libraries and headers required to develop software with linphone.
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
|
||||
#pushd share/cs
|
||||
#for f in *.1
|
||||
|
Loading…
Reference in New Issue
Block a user