Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (8aaf8e85d47a05da058e94327a85b97b5c17d019)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (8aaf8e85d47a05da058e94327a85b97b5c17d019)
  • Date: Mon, 23 Sep 2013 13:41:38 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

video/ffmpeg/DETAILS | 2
+-
video/ffmpeg/HISTORY | 6
++++++
video/ffmpeg/PRE_SUB_DEPENDS | 4
++--
video/ffmpeg/REPAIR^2994eb49747c30e2162e04fb1a7cd960^PRE_SUB_DEPENDS | 5
+++++
4 files changed, 14 insertions(+), 3 deletions(-)

New commits:
commit 8aaf8e85d47a05da058e94327a85b97b5c17d019
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ffmpeg: => 0.7.15 (legacy); fixed branch detection

diff --git a/video/ffmpeg/DETAILS b/video/ffmpeg/DETAILS
index 03df390..89e617a 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 03262c0..a9083a0 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,3 +1,9 @@
+2013-09-23 Vlad Glagolev <stealth AT 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 AT 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 064b98b..969f032 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 0000000..969f032
--- /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



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (8aaf8e85d47a05da058e94327a85b97b5c17d019), Vlad Glagolev, 09/23/2013

Archive powered by MHonArc 2.6.24.

Top of Page