diff options
| author | Vlad Glagolev | 2013-09-23 22:41:22 +0400 |
|---|---|---|
| committer | Vlad Glagolev | 2013-09-23 22:41:22 +0400 |
| commit | 8aaf8e85d47a05da058e94327a85b97b5c17d019 (patch) | |
| tree | 927729f9c0443f5ecb72c0717a44b201b6248ef2 | |
| parent | c9304c04b5c73e1f3dc22639e96457b3f6695f1c (diff) | |
ffmpeg: => 0.7.15 (legacy); fixed branch detection
| -rwxr-xr-x | video/ffmpeg/DETAILS | 2 | ||||
| -rw-r--r-- | video/ffmpeg/HISTORY | 6 | ||||
| -rwxr-xr-x | video/ffmpeg/PRE_SUB_DEPENDS | 4 | ||||
| -rwxr-xr-x | video/ffmpeg/REPAIR^2994eb49747c30e2162e04fb1a7cd960^PRE_SUB_DEPENDS | 5 |
4 files changed, 14 insertions, 3 deletions
diff --git a/video/ffmpeg/DETAILS b/video/ffmpeg/DETAILS index 03df3905f7..89e617af79 100755 --- a/video/ffmpeg/DETAILS +++ b/video/ffmpeg/DETAILS @@ -3,7 +3,7 @@ if [[ $FFMPEG_RELEASE == stable ]]; then VERSION=1.2.1 SECURITY_PATCH=14 else - VERSION=0.7.13 + VERSION=0.7.15 SECURITY_PATCH=11 fi SOURCE=$SPELL-$VERSION.tar.bz2 diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY index 03262c0219..a9083a00c3 100644 --- a/video/ffmpeg/HISTORY +++ b/video/ffmpeg/HISTORY @@ -1,3 +1,9 @@ +2013-09-23 Vlad Glagolev <stealth@sourcemage.org> + * DETAILS: updated spell to 0.7.15 (legacy) + * PRE_SUB_DEPENDS: fixed branch detection + * REPAIR^2994eb49747c30e2162e04fb1a7cd960^PRE_SUB_DEPENDS: added, to + replace buggy PRE_SUB_DEPENDS file + 2013-05-26 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * DETAILS: version 1.2.1 diff --git a/video/ffmpeg/PRE_SUB_DEPENDS b/video/ffmpeg/PRE_SUB_DEPENDS index 064b98b09d..969f0328d7 100755 --- a/video/ffmpeg/PRE_SUB_DEPENDS +++ b/video/ffmpeg/PRE_SUB_DEPENDS @@ -1,5 +1,5 @@ case ${THIS_SUB_DEPENDS} in -"LEGACY") [[ "$(installed_version ffmpeg)" == "0.7.13" ]] && return 0 ;; -"STABLE") [[ "$(installed_version ffmpeg)" != "0.7.13" ]] && return 0 ;; +"LEGACY") [[ "$(installed_version ffmpeg | cut -d. -f-2)" == "0.7" ]] && return 0 ;; +"STABLE") [[ "$(installed_version ffmpeg | cut -d. -f-2)" != "0.7" ]] && return 0 ;; esac return 1 diff --git a/video/ffmpeg/REPAIR^2994eb49747c30e2162e04fb1a7cd960^PRE_SUB_DEPENDS b/video/ffmpeg/REPAIR^2994eb49747c30e2162e04fb1a7cd960^PRE_SUB_DEPENDS new file mode 100755 index 0000000000..969f0328d7 --- /dev/null +++ b/video/ffmpeg/REPAIR^2994eb49747c30e2162e04fb1a7cd960^PRE_SUB_DEPENDS @@ -0,0 +1,5 @@ +case ${THIS_SUB_DEPENDS} in +"LEGACY") [[ "$(installed_version ffmpeg | cut -d. -f-2)" == "0.7" ]] && return 0 ;; +"STABLE") [[ "$(installed_version ffmpeg | cut -d. -f-2)" != "0.7" ]] && return 0 ;; +esac +return 1 |