Source Mage code commit list

[Florian Franzmann <scm AT sourcemage.org>]

GIT changes to master grimoire by Florian Franzmann 
<siflfran AT hawo.stw.uni-erlangen.de>:

 libs/openscenegraph/DEPENDS  |    1 +
 libs/openscenegraph/HISTORY  |    3 +++
 video/ffmpeg/HISTORY         |    4 ++++
 video/ffmpeg/PRE_SUB_DEPENDS |    5 +++++
 video/ffmpeg/SUB_DEPENDS     |    5 +++++
 5 files changed, 18 insertions(+)

New commits:
commit accee6ca184cfe86e880da97919c1ec579e45b4c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    libs/openscenegraph: add dependency on legacy release of ffmpeg

commit d5aead0a4f4994f8069ac437d278bcfb62208fc5
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    video/ffmpeg: offer sub depencency on legacy/stable release

diff --git a/libs/openscenegraph/DEPENDS b/libs/openscenegraph/DEPENDS
index c2cf4c3..7ef7183 100755
--- a/libs/openscenegraph/DEPENDS
+++ b/libs/openscenegraph/DEPENDS
@@ -13,6 +13,7 @@ depends  openthreads   &&
 depends  tiff          &&
 depends  unzip         &&
 depends  zlib          &&
+depends  -sub legacy ffmpeg &&
 
 optional_depends  cairo     '' '' 'for GTK+ plugins'  &&
 optional_depends  gtk+2     '' '' 'for GTK+ plugins'  &&
diff --git a/libs/openscenegraph/HISTORY b/libs/openscenegraph/HISTORY
index a664af9..68e343d 100644
--- a/libs/openscenegraph/HISTORY
+++ b/libs/openscenegraph/HISTORY
@@ -1,3 +1,6 @@
+2012-08-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: add dependency on legacy release of ffmpeg
+
 2012-01-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 3.0.1
 
diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY
index d2cf740..1df0e31 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,3 +1,7 @@
+2012-08-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * SUB_DEPENDS, PRE_SUB_DEPENDS: offer sub dependency on stable/legacy
+         release
+
 2012-06-24 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated stable to 0.11.1; SECURITY_PATCH++
 
diff --git a/video/ffmpeg/PRE_SUB_DEPENDS b/video/ffmpeg/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..c6f1988
--- /dev/null
+++ b/video/ffmpeg/PRE_SUB_DEPENDS
@@ -0,0 +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 
;;
+esac
+return 1
diff --git a/video/ffmpeg/SUB_DEPENDS b/video/ffmpeg/SUB_DEPENDS
new file mode 100755
index 0000000..84330fc
--- /dev/null
+++ b/video/ffmpeg/SUB_DEPENDS
@@ -0,0 +1,5 @@
+case ${THIS_SUB_DEPENDS} in
+"legacy")       FFMPEG_RELEASE="legacy" && echo "Forcing legacy release." ;;
+"stable")       FFMPEG_RELEASE="stable" && echo "Forcing stable release." ;;
+*)        echo "Unknown sub depends!!!" && return 1 ;;
+esac