From b8c4f623fbe63b7a3aeceff8a7c60c68f4133a2b Mon Sep 17 00:00:00 2001
From: "Jeffrey C. Ollie" <jcollie@fedoraproject.org>
Date: Tue, 5 Feb 2008 19:06:42 +0000
Subject: [PATCH] Add patches to CVS.

---
 linphone-2.1.0-imagedir.patch | 41 +++++++++++++++++++++++++++++++++++
 linphone-2.1.0-novideo.patch  | 35 ++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+)
 create mode 100644 linphone-2.1.0-imagedir.patch
 create mode 100644 linphone-2.1.0-novideo.patch

diff --git a/linphone-2.1.0-imagedir.patch b/linphone-2.1.0-imagedir.patch
new file mode 100644
index 0000000..e026360
--- /dev/null
+++ b/linphone-2.1.0-imagedir.patch
@@ -0,0 +1,41 @@
+From da74486ae265d7736032e4e51602d54449de11b0 Mon Sep 17 00:00:00 2001
+From: Jeffrey C. Ollie <jeff@ocjtech.us>
+Date: Tue, 17 Apr 2007 15:27:06 -0500
+Subject: [PATCH] Move nowebcam image to subdir.
+
+---
+ mediastreamer2/src/Makefile.am |    2 +-
+ mediastreamer2/src/nowebcam.c  |    4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/mediastreamer2/src/Makefile.am b/mediastreamer2/src/Makefile.am
+index 9c9050c..8717329 100644
+--- a/mediastreamer2/src/Makefile.am
++++ b/mediastreamer2/src/Makefile.am
+@@ -121,7 +121,7 @@ if BUILD_VIDEO
+ AM_CFLAGS+=$(VIDEO_CFLAGS)
+ endif
+ 
+-imgdir=$(datadir)/images/
++imgdir=$(datadir)/images/linphone/
+ 
+ img_DATA=nowebcamCIF.jpg
+ 
+diff --git a/mediastreamer2/src/nowebcam.c b/mediastreamer2/src/nowebcam.c
+index 1c694f9..f8eaaf9 100644
+--- a/mediastreamer2/src/nowebcam.c
++++ b/mediastreamer2/src/nowebcam.c
+@@ -85,8 +85,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);
+ }
+-- 
+1.5.3.8
+
diff --git a/linphone-2.1.0-novideo.patch b/linphone-2.1.0-novideo.patch
new file mode 100644
index 0000000..0ed74e0
--- /dev/null
+++ b/linphone-2.1.0-novideo.patch
@@ -0,0 +1,35 @@
+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
+