diff options
| author | Sukneet Basuta | 2013-02-15 15:08:43 -0500 |
|---|---|---|
| committer | Sukneet Basuta | 2013-02-15 15:08:43 -0500 |
| commit | c5bde2d3423b0a8393332d67864503d9b7d3b36d (patch) | |
| tree | d45f552fdfc106dc3d211e5c964f1245fac96b3f /telephony | |
| parent | 2cc52405aa2cd488d581bf260c2d2393ed76041d (diff) | |
mediastreamer: fixed ffmpeg version check in PRE_BUILD
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/mediastreamer/HISTORY | 3 | ||||
| -rwxr-xr-x | telephony/mediastreamer/PRE_BUILD | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/telephony/mediastreamer/HISTORY b/telephony/mediastreamer/HISTORY index ce3581c95d..96858a67a1 100644 --- a/telephony/mediastreamer/HISTORY +++ b/telephony/mediastreamer/HISTORY @@ -1,3 +1,6 @@ +2013-02-15 Sukneet Basuta <sukneet@sourcemage.org> + * PRE_BUILD: fixed ffmpeg version check + 2012-07-29 Sukneet Basuta <sukneet@sourcemage.org> * PRE_BUILD: apply ffmpeg 0.11 patch for ffmpeg-svn as well diff --git a/telephony/mediastreamer/PRE_BUILD b/telephony/mediastreamer/PRE_BUILD index 880fd5e43b..d0795c9616 100755 --- a/telephony/mediastreamer/PRE_BUILD +++ b/telephony/mediastreamer/PRE_BUILD @@ -1,10 +1,11 @@ default_pre_build && cd $SOURCE_DIRECTORY && +. "$GRIMOIRE/FUNCTIONS" && FFMPEG_VER=0 if is_depends_enabled $SPELL ffmpeg && spell_ok ffmpeg; then - FFMPEG_VER=$(installed_version ffmpeg|cut -d. -f2) + FFMPEG_VER=$(installed_version ffmpeg) fi -if (( $FFMPEG_VER >= 11 )) || is_depends_enabled $SPELL ffmpeg-svn; then +if is_version_less 0.11.0 $FFMPEG_VER || is_depends_enabled $SPELL ffmpeg-svn; then patch -p1 < $SPELL_DIRECTORY/mediastreamer-ffmpeg-0.11.patch fi |