diff options
| author |   Angus Ainslie <nytowl@openmoko.org> | 2009-04-27 12:25:46 -0600 |
|---|---|---|
| committer | Angus Ainslie <nytowl@openmoko.org> | 2009-04-27 12:25:46 -0600 |
| commit | 7e89c06c2a06083c2f9ce42db86b2cbf9b0fb62f (patch) | |
| tree | 683442d7cea7f7e91141d43a2a3279c427274f81 /recipes/linphone | |
| parent | 9c5bdb238f808239f0e50d39dc7567ca6ebf1319 (diff) | |
| download | openembedded-7e89c06c2a06083c2f9ce42db86b2cbf9b0fb62f.tar.gz | |
linphone: add patch for preferences SIGSEGV
Diffstat (limited to 'recipes/linphone')
| -rw-r--r-- | recipes/linphone/linphone-3.1.0/preferences-segv.patch | 11 | ||||
| -rw-r--r-- | recipes/linphone/linphone-3.1.0/preferences-segv.patch~ | 20 | ||||
| -rw-r--r-- | recipes/linphone/linphone_3.1.0.bb | 3 |
3 files changed, 34 insertions, 0 deletions
diff --git a/recipes/linphone/linphone-3.1.0/preferences-segv.patch b/recipes/linphone/linphone-3.1.0/preferences-segv.patch new file mode 100644 index 0000000000..529688b68f --- /dev/null +++ b/recipes/linphone/linphone-3.1.0/preferences-segv.patch @@ -0,0 +1,11 @@ +--- linphone-3.1.0/coreapi/linphonecore.c 2009/03/24 22:24:49 366 ++++ linphone-3.1.0/coreapi/linphonecore.c 2009/03/24 22:43:14 367 +@@ -2108,7 +2108,7 @@ + if (olddev!=NULL && olddev!=lc->video_conf.device){ + toggle_video_preview(lc,FALSE);/*restart the video local preview*/ + } +- if (lc->ready){ ++ if (lc->ready && lc->video_conf.device){ + vd=ms_web_cam_get_string_id(lc->video_conf.device); + if (vd && strstr(vd,"Static picture")!=NULL){ + vd=NULL; diff --git a/recipes/linphone/linphone-3.1.0/preferences-segv.patch~ b/recipes/linphone/linphone-3.1.0/preferences-segv.patch~ new file mode 100644 index 0000000000..58aef913cc --- /dev/null +++ b/recipes/linphone/linphone-3.1.0/preferences-segv.patch~ @@ -0,0 +1,20 @@ +--- linphone-3.1.0/coreapi/linphonecore.c 2009/03/24 22:24:49 366 ++++ linphone-3.1.0/coreapi/linphonecore.c 2009/03/24 22:43:14 367 +@@ -1443,7 +1443,7 @@ + MSFilter *f=NULL; + if (st->el_type==ELControlMic){ + f=st->volsend; +- if (speed==-1) speed=0.15; ++ if (speed==-1) speed=0.03; + if (force==-1) force=10; + } + else if (st->el_type==ELControlSpeaker){ +@@ -2159,7 +2159,7 @@ + if (olddev!=NULL && olddev!=lc->video_conf.device){ + toggle_video_preview(lc,FALSE);/*restart the video local preview*/ + } +- if (lc->ready){ ++ if (lc->ready && lc->video_conf.device){ + vd=ms_web_cam_get_string_id(lc->video_conf.device); + if (vd && strstr(vd,"Static picture")!=NULL){ + vd=NULL; diff --git a/recipes/linphone/linphone_3.1.0.bb b/recipes/linphone/linphone_3.1.0.bb index 964d68f526..bebaa169e2 100644 --- a/recipes/linphone/linphone_3.1.0.bb +++ b/recipes/linphone/linphone_3.1.0.bb @@ -3,6 +3,8 @@ HOMEPAGE = "http://www.linphone.org/?lang=us" SECTION = "x11/utils" LICENSE = "GPLv2" +PR = "r1" + DEPENDS = "intltool libosip2 speex libogg alsa-lib readline libexosip2" DEPENDS_${PN} = "liblinphone" DEPENDS_${PN}c = "liblinphone readline" @@ -20,6 +22,7 @@ PROVIDES += "linphone linphonec liblinphone" SRC_URI = "http://download.savannah.nongnu.org/releases/linphone/3.1.x/sources/linphone-${PV}.tar.gz \ file://b64_assert.patch;patch=1 \ + file://preferences-segv.patch;patch=1 \ " S = "${WORKDIR}/linphone-${PV}" |