Source Mage code commit list

[Bor Kraljič <scm AT sourcemage.org>]

GIT changes to master grimoire by Bor Kraljič <pyrobor AT ver.si>:

 video/mlt/HISTORY         |    4 ++++
 video/mlt/INSTALL         |    7 ++++---
 video/mlt/PRE_SUB_DEPENDS |    5 +++++
 video/mlt/SUB_DEPENDS     |    6 ++++++
 video/openshot/DEPENDS    |    2 +-
 video/openshot/HISTORY    |    3 +++
 6 files changed, 23 insertions(+), 4 deletions(-)

New commits:
commit 1c60d638c63022bb64078abdad5eb60d996ed077
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

    mlt: fixed INSTALL to also work with other versions of python (not only 
2.7*)

commit 250aef1decff72435b4425ce045a514b811964c5
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

    openshot: request mlt with python bindings

commit 89091c45d7ffbcfacad378b13759a86b155b3a01
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

    mlt: added, now we can request python bindings

diff --git a/video/mlt/HISTORY b/video/mlt/HISTORY
index e405178..85694fc 100644
--- a/video/mlt/HISTORY
+++ b/video/mlt/HISTORY
@@ -1,3 +1,7 @@
+2011-02-27 Bor Kraljič <pyrobor AT ver.si>
+       * INSTALL: fixed to also work with other versions of python (not only 
2.7*)
+       * SUB_DEPENDS,PRE_SUB_DEPENDS: added, now we can request python 
bindings
+
 2011-02-24 Ladislav Hagara <hgr AT vabo.cz>
        * DEPENDS, INSTALL: python bindings installed optionally
 
diff --git a/video/mlt/INSTALL b/video/mlt/INSTALL
index bdc4f31..1e686db 100755
--- a/video/mlt/INSTALL
+++ b/video/mlt/INSTALL
@@ -2,8 +2,9 @@ default_install &&
 
 if is_depends_enabled $SPELL python; then
   message "${MESSAGE_COLOR}Installing python bindings...${DEFAULT_COLOR}" &&
+  PYTHON_VER=$(installed_version python) &&
   cd src/swig/python &&
-  install -vm 755 mlt.py $INSTALL_ROOT/usr/lib/python2.7/ &&
-  install -vm 755 _mlt.so $INSTALL_ROO/usr/lib/python2.7/ &&
-  install -vm 755 mlt_wrap.o $INSTALL_ROOT/usr/lib/python2.7/
+  install -vm 755 mlt.py $INSTALL_ROOT/usr/lib/python${PYTHON_VER:0:3}/ &&
+  install -vm 755 _mlt.so $INSTALL_ROO/usr/lib/python${PYTHON_VER:0:3}/ &&
+  install -vm 755 mlt_wrap.o $INSTALL_ROOT/usr/lib/python${PYTHON_VER:0:3}/
 fi
diff --git a/video/mlt/PRE_SUB_DEPENDS b/video/mlt/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..b250742
--- /dev/null
+++ b/video/mlt/PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+  PYTHON) is_depends_enabled $SPELL python;;
+       *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL 
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+          return 1;;
+esac
diff --git a/video/mlt/SUB_DEPENDS b/video/mlt/SUB_DEPENDS
new file mode 100755
index 0000000..85c4a38
--- /dev/null
+++ b/video/mlt/SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+  PYTHON) message "Python bindings requested, forcing python dependency" &&
+          depends python '--swig-languages=python';;
+       *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL 
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+          return 1;;
+esac
diff --git a/video/openshot/DEPENDS b/video/openshot/DEPENDS
index 052ba1b..ddaa3ef 100755
--- a/video/openshot/DEPENDS
+++ b/video/openshot/DEPENDS
@@ -1,5 +1,5 @@
 depends python &&
 depends pygtk2 &&
 depends pygoocanvas &&
-depends mlt &&
+depends -sub PYTHON mlt &&
 depends httplib2
diff --git a/video/openshot/HISTORY b/video/openshot/HISTORY
index e5cb2f6..7107bf7 100644
--- a/video/openshot/HISTORY
+++ b/video/openshot/HISTORY
@@ -1,2 +1,5 @@
+2011-02-27 Bor Kraljič <pyrobor AT ver.si>
+       * DEPENDS: request mlt with python bindings
+
 2011-02-24 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS, DEPENDS, BUILD, INSTALL: spell created, version 1.3.0