[SM-Commit] GIT changes to master grimoire by Bor Kraljič (ae7f4ea40b57cde4d8f3d53ab2b6c450f05099d2)

Bor Kraljič scm at sourcemage.org
Fri Sep 23 07:44:33 EDT 2011


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

 video/mlt/DETAILS      |   17 +++++++++++------
 video/mlt/HISTORY      |    5 +++++
 video/mlt/PREPARE      |    3 ++-
 video/openshot/DETAILS |    6 +++---
 video/openshot/HISTORY |    3 +++
 5 files changed, 24 insertions(+), 10 deletions(-)

New commits:
commit ae7f4ea40b57cde4d8f3d53ab2b6c450f05099d2
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    mlt: use prepare_select_branch

commit 73ed4b167cd692ae2471c151b38c71bd29be980d
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    openshot: updated spell to 1.4.0 (modified SOURCE_URL)

commit 1965223d50857bd5239792f5df6f589cf7d74997
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    mlt: updated spell to 0.7.4

diff --git a/video/mlt/DETAILS b/video/mlt/DETAILS
index 6fbf312..a628778 100755
--- a/video/mlt/DETAILS
+++ b/video/mlt/DETAILS
@@ -1,17 +1,22 @@
            SPELL=mlt
-if [[ $MLT_GIT == y  ]];then
+if [[ $MLT_BRANCH == scm ]];then
+  if [[ "$MLT_AUTOUPDATE" == "y" ]]; then
+         VERSION=-$(date +%Y%m%d)
+  else
          VERSION=git
+  fi
       SOURCE_IGNORE=volatile
-          SOURCE=$SPELL-$VERSION.tar.bz2
-   SOURCE_URL[0]=git://mltframework.org/mlt.git:mlt
+          SOURCE=$SPELL-git.tar.bz2
+   SOURCE_URL[0]=git://mltframework.org/mlt.git:mlt-git
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
   FORCE_DOWNLOAD=on
 else
-         VERSION=0.6.2
-     SOURCE_HASH=sha512:f336595c47f5b48b629cd98f7dbdf6d94a5d21b16c0b1b6a6c04a38252461c2958d69ac5c80185a23e65c3c63b5bc9ab084ede5b24f28c9b73af764e9d686f47
+         VERSION=0.7.4
+     SOURCE_HASH=sha512:3723c6c9956e1cc4b48c2201e5ea76a35b7347c06d4cae1ebaa85b47042d93e12582da0b601ed044d095c80514678c89d31d501e8fd5c225df0ec5f04b865c57
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=$SOURCEFORGE_URL/mlt/$SOURCE
-fi
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+fi
       LICENSE[0]=GPL
         WEB_SITE=http://mlt.sourceforge.net/
          ENTERED=20030514
diff --git a/video/mlt/HISTORY b/video/mlt/HISTORY
index c76038b..e83b63a 100644
--- a/video/mlt/HISTORY
+++ b/video/mlt/HISTORY
@@ -1,3 +1,8 @@
+2011-09-23 Bor Kraljič <pyrobor at ver.si>
+	* PREPARE: use prepare_select_branch
+	* DETAILS: updated spell to 0.7.4
+	  minor fixes for use of prepare_select_branch
+
 2011-07-30 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DEPENDS: changed dependency on g++ to dependency on gcc with
 	  sub-depends on CXX (scripted)
diff --git a/video/mlt/PREPARE b/video/mlt/PREPARE
index 6b18127..98d27e4 100755
--- a/video/mlt/PREPARE
+++ b/video/mlt/PREPARE
@@ -1 +1,2 @@
-config_query        MLT_GIT 'build GIT version' n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/video/openshot/DETAILS b/video/openshot/DETAILS
index c423c7c..61a288e 100755
--- a/video/openshot/DETAILS
+++ b/video/openshot/DETAILS
@@ -1,9 +1,9 @@
            SPELL=openshot
-         VERSION=1.3.1
-     SOURCE_HASH=sha512:a1d5544b76521813c54a511b9ca44797f835016fd4d3c1e7f9137d8558c9d7bda4aad50893f6fda86a339d09b5e4fdca06c084049d8acc8478fc9d4645b0c425
+         VERSION=1.4.0
+     SOURCE_HASH=sha512:be81f3baf31ea2d09920ae3eb54c76602ff1acb30a077593f020b3d4e34cfc29690c46a9a84c72be0e1bc167379dfa9f95630f053f5bb7edff871999303a046f
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=http://launchpad.net/openshot/1.3/$VERSION/+download/$SOURCE
+   SOURCE_URL[0]=http://launchpad.net/openshot/${VERSION:0:3}/$VERSION/+download/$SOURCE
         WEB_SITE=http://www.openshotvideo.com/
       LICENSE[0]=GPL
          ENTERED=20110224
diff --git a/video/openshot/HISTORY b/video/openshot/HISTORY
index c355086..f460b8c 100644
--- a/video/openshot/HISTORY
+++ b/video/openshot/HISTORY
@@ -1,3 +1,6 @@
+2011-09-23 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 1.4.0 (modified SOURCE_URL)
+
 2011-09-22 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 1.3.1
 	* FINAL,PRE_BUILD: update mime database in FINAL not during build


More information about the SM-Commit mailing list