diff options
| author | Sukneet Basuta | 2012-07-29 05:24:00 -0400 |
|---|---|---|
| committer | Sukneet Basuta | 2012-07-29 05:24:00 -0400 |
| commit | a41a08bb69ac24b0364a2ebf3e85334817bfc2e2 (patch) | |
| tree | 86d4d7852771f0fa82c0b78da3ef934745768214 /telephony | |
| parent | 2cdbb5d75a510bcde720d3cc95b199baff06b810 (diff) | |
mediastreamer: apply ffmpeg patch for ffmpeg-svn as well
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/mediastreamer/HISTORY | 3 | ||||
| -rwxr-xr-x | telephony/mediastreamer/PRE_BUILD | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/telephony/mediastreamer/HISTORY b/telephony/mediastreamer/HISTORY index 266da3c6a2..ce3581c95d 100644 --- a/telephony/mediastreamer/HISTORY +++ b/telephony/mediastreamer/HISTORY @@ -1,3 +1,6 @@ +2012-07-29 Sukneet Basuta <sukneet@sourcemage.org> + * PRE_BUILD: apply ffmpeg 0.11 patch for ffmpeg-svn as well + 2012-07-28 Sukneet Basuta <sukneet@sourcemage.org> * DETAILS: updated spell to 2.8.2 * PREPARE: added, to query for video support diff --git a/telephony/mediastreamer/PRE_BUILD b/telephony/mediastreamer/PRE_BUILD index d27057dac4..880fd5e43b 100755 --- a/telephony/mediastreamer/PRE_BUILD +++ b/telephony/mediastreamer/PRE_BUILD @@ -1,8 +1,10 @@ default_pre_build && cd $SOURCE_DIRECTORY && +FFMPEG_VER=0 if is_depends_enabled $SPELL ffmpeg && spell_ok ffmpeg; then - if (( $(installed_version ffmpeg|cut -d. -f2) >= 11 )); then - patch -p1 < $SPELL_DIRECTORY/mediastreamer-ffmpeg-0.11.patch - fi + FFMPEG_VER=$(installed_version ffmpeg|cut -d. -f2) +fi +if (( $FFMPEG_VER >= 11 )) || is_depends_enabled $SPELL ffmpeg-svn; then + patch -p1 < $SPELL_DIRECTORY/mediastreamer-ffmpeg-0.11.patch fi |