Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (96ee11d9217ef5996268d1cd4c90f57db743ce3f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (96ee11d9217ef5996268d1cd4c90f57db743ce3f)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (96ee11d9217ef5996268d1cd4c90f57db743ce3f)
  • Date: Sat, 30 May 2009 09:24:23 -0500
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

kde4-apps/kdenlive4/DEPENDS | 3 ++-
kde4-apps/kdenlive4/DETAILS | 4 ++--
kde4-apps/kdenlive4/HISTORY | 5 +++++
kde4-apps/kdenlive4/TRIGGERS | 1 +
video/mlt++/BUILD | 1 +
video/mlt++/DEPENDS | 4 ----
video/mlt++/DETAILS | 30 +++++-------------------------
video/mlt++/DOWNLOAD | 1 +
video/mlt++/HISTORY | 36 ++++--------------------------------
video/mlt++/INSTALL | 1 +
video/mlt++/PREPARE | 1 -
video/mlt++/PRE_BUILD | 1 +
video/mlt++/TRIGGERS | 2 +-
video/mlt/CONFLICTS | 1 +
video/mlt/DEPENDS | 7 ++++---
video/mlt/DETAILS | 10 +++++-----
video/mlt/HISTORY | 9 +++++++++
video/mlt/PREPARE | 2 +-
video/mlt/PRE_BUILD | 4 ++++
19 files changed, 48 insertions(+), 75 deletions(-)

New commits:
commit 96ee11d9217ef5996268d1cd4c90f57db743ce3f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

deprecate video/mlt++ [replaced by mlt]

commit e77922c5f2bb57f519027f2056bb66084d133531
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

mlt: => 0.4.0

commit 466a1f96ad9d5868476ebadf414ad302d09f4dd6
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kdenlive4: => 0.7.4

diff --git a/kde4-apps/kdenlive4/DEPENDS b/kde4-apps/kdenlive4/DEPENDS
index 54a97cd..dc4e2d5 100755
--- a/kde4-apps/kdenlive4/DEPENDS
+++ b/kde4-apps/kdenlive4/DEPENDS
@@ -6,4 +6,5 @@ if [[ $KDN_SVN == y ]]; then
fi &&
#depends mlt -sub FFMPEG &&
depends LIBAVCODEC &&
-depends mlt++
+depends mlt &&
+depends shared-mime-info
diff --git a/kde4-apps/kdenlive4/DETAILS b/kde4-apps/kdenlive4/DETAILS
index aff89e7..fe3363b 100755
--- a/kde4-apps/kdenlive4/DETAILS
+++ b/kde4-apps/kdenlive4/DETAILS
@@ -12,8 +12,8 @@ if [[ $KDN_SVN == y ]]; then
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-svn
FORCE_DOWNLOAD=on
else
- VERSION=0.7.3
-
SOURCE_HASH=sha512:47a1ae106919841dea556d1387a6b56821e02f2b781d7ea8a3f80ca2c0296fce5471d82ff31bc66b8da0d399032674184a7464473d7e50af0382420fa4982564
+ VERSION=0.7.4
+
SOURCE_HASH=sha512:ea881ccec552f3a20e1193a7973fe0db7a17d0202215fa096bc3445de60bda6d1467abb0b80ecc3998eb24e12242d19831efb0498cf975aaab4594a8b345d955
SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELLX/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-${VERSION}
diff --git a/kde4-apps/kdenlive4/HISTORY b/kde4-apps/kdenlive4/HISTORY
index 78eb440..690b1d4 100755
--- a/kde4-apps/kdenlive4/HISTORY
+++ b/kde4-apps/kdenlive4/HISTORY
@@ -1,3 +1,8 @@
+2009-05-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.7.4
+ * DEPENDS: mlt++ -> mlt; add shared-mime-info
+ * TRIGGERS: added
+
2009-04-15 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.7.3

diff --git a/kde4-apps/kdenlive4/TRIGGERS b/kde4-apps/kdenlive4/TRIGGERS
new file mode 100755
index 0000000..592e038
--- /dev/null
+++ b/kde4-apps/kdenlive4/TRIGGERS
@@ -0,0 +1 @@
+on_cast mlt check_self
diff --git a/video/mlt++/BUILD b/video/mlt++/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/video/mlt++/BUILD
@@ -0,0 +1 @@
+true
diff --git a/video/mlt++/DEPENDS b/video/mlt++/DEPENDS
index 3887025..0223f49 100755
--- a/video/mlt++/DEPENDS
+++ b/video/mlt++/DEPENDS
@@ -1,5 +1 @@
-if [[ $MLT_SVN == y ]];then
-depends subversion
-fi &&
-depends g++ &&
depends mlt
diff --git a/video/mlt++/DETAILS b/video/mlt++/DETAILS
index f7e9fe9..90f47cf 100755
--- a/video/mlt++/DETAILS
+++ b/video/mlt++/DETAILS
@@ -1,28 +1,8 @@
SPELL=mlt++
-if [[ $MLT_SVN == y ]];then
- VERSION=svn
- SOURCE_IGNORE=volatile
- SOURCE=$SPELL-$VERSION.tar.bz2
-
SOURCE_URL[0]=svn_http://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt++:mlt++
- FORCE_DOWNLOAD=on
-else
- VERSION=0.3.8
-
SOURCE_HASH=sha512:2c2bd3da1e72da733ef0bedc61dba59a0632b393f1ee0f217b6cbe2d2c5e9348a6af8b974f7bd5cbd4aebf3008a7ded1ee1f8ee0b8e38c9ca0ceaadcd7d1b8a6
- SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_URL[0]=$SOURCEFORGE_URL/mlt/$SOURCE
-fi
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- LICENSE[0]=GPL
- WEB_SITE=http://mlt.sourceforge.net/
- ENTERED=20030514
- KEYWORDS="video"
- SHORT="multimedia framework, for television broadcasting."
+ VERSION=0
+ PATCHLEVEL=9999
+ SHORT="deprecated"
cat << EOF
-MLT is an open source multimedia framework, designed and developed
-for television broadcasting.
-
-It provides a toolkit for broadcasters, video editors, media players,
-transcoders, web streamers and many more types of applications. The
-functionality of the system is provided via an assortment of ready to
-use tools, xml authoring components, and an extendible plug-in based API.
+deprecated spell [replaced by mlt]
EOF
+
diff --git a/video/mlt++/DOWNLOAD b/video/mlt++/DOWNLOAD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/video/mlt++/DOWNLOAD
@@ -0,0 +1 @@
+true
diff --git a/video/mlt++/HISTORY b/video/mlt++/HISTORY
index 36ecde6..efd0e15 100644
--- a/video/mlt++/HISTORY
+++ b/video/mlt++/HISTORY
@@ -1,32 +1,4 @@
-2009-04-15 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.3.8
-
-2009-02-03 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.3.6
-
-2009-01-25 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.3.4
-
-2008-11-11 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.3.2
-
-2008-10-05 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: add FORCE_DOWNLOAD=on for svn version
-
-2008-08-06 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.3.0
-
-2008-06-28 Treeve Jelbert <treeve AT sourcemage.org>
- * DEPENDS: extra []
-
-2008-05-17 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS, DEPENDS, PREPARE: add svn support
-
-2007-08-12 Treeve Jelbert <treeve AT sourcemage.org>
- * TRIGGERS: added
- * DETAILS: PATCHLEVEL=1
-
-2006-06-17 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: copy mlt to mlt++
- version 0.2.2
- * DEPENDS: add g++, mlt
+2009-05-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0
+ PATCHLEVEL=9999
+ spell deprecated [replaced by mlt]
diff --git a/video/mlt++/INSTALL b/video/mlt++/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/video/mlt++/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/video/mlt++/PREPARE b/video/mlt++/PREPARE
deleted file mode 100755
index c72b032..0000000
--- a/video/mlt++/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query MLT_SVN 'build SVN version' n
diff --git a/video/mlt++/PRE_BUILD b/video/mlt++/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/video/mlt++/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/video/mlt++/TRIGGERS b/video/mlt++/TRIGGERS
index 592e038..25061de 100755
--- a/video/mlt++/TRIGGERS
+++ b/video/mlt++/TRIGGERS
@@ -1 +1 @@
-on_cast mlt check_self
+on_cast mlt++ dispel_self
diff --git a/video/mlt/CONFLICTS b/video/mlt/CONFLICTS
new file mode 100644
index 0000000..49acd7e
--- /dev/null
+++ b/video/mlt/CONFLICTS
@@ -0,0 +1 @@
+conflicts mlt++
diff --git a/video/mlt/DEPENDS b/video/mlt/DEPENDS
index 1c535ac..ce16215 100755
--- a/video/mlt/DEPENDS
+++ b/video/mlt/DEPENDS
@@ -1,6 +1,7 @@
-if [[ $VERSION == svn ]] ;then
-depends subversion
-fi
+if [[ $VERSION == git ]] ;then
+depends git
+fi &&
+depends g++ &&
optional_depends LIBAVCODEC \
"--avformat-shared --avformat-ldextra" \
"--disable-avformat" \
diff --git a/video/mlt/DETAILS b/video/mlt/DETAILS
index c62051c..bcc6f5e 100755
--- a/video/mlt/DETAILS
+++ b/video/mlt/DETAILS
@@ -1,13 +1,13 @@
SPELL=mlt
-if [[ $MLT_SVN == y ]];then
- VERSION=svn
+if [[ $MLT_GIT == y ]];then
+ VERSION=git
SOURCE_IGNORE=volatile
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_URL[0]=svn_http://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt:mlt
+ SOURCE_URL[0]=git://mltframework.org/mlt.git:mlt
FORCE_DOWNLOAD=on
else
- VERSION=0.3.8
-
SOURCE_HASH=sha512:4a79057ce0e701e52c9ac83d77ccb230ce222db994a1b3f0bd471a2a0f01bde72a8f621f708ecf2b08eceb174439e6131df91f2182f4bf664d4148085306ee19
+ VERSION=0.4.0
+
SOURCE_HASH=sha512:fe777310fc3383b9cb93b4459f15d31c8bbe4ececf5b65d5b9e682f989ab8659e3cac724a6bb60ad791614a2f192da010ff704b2c41a4427a075fb5f509785c3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=$SOURCEFORGE_URL/mlt/$SOURCE
fi
diff --git a/video/mlt/HISTORY b/video/mlt/HISTORY
index 620de62..0a2e8ac 100644
--- a/video/mlt/HISTORY
+++ b/video/mlt/HISTORY
@@ -1,3 +1,12 @@
+2009-05-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.4.0
+ svn -> git, new repo
+ * CONFLICTS: added, mlt++ in now included
+ * DEPENDS: add g++, svn -> git
+ * PREPARE: change query
+ now uses git for repository
+ * PRE_BUILD: added, fix bad compiler flag in 0.4.0
+
2009-04-15 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.3.8

diff --git a/video/mlt/PREPARE b/video/mlt/PREPARE
index c72b032..6b18127 100755
--- a/video/mlt/PREPARE
+++ b/video/mlt/PREPARE
@@ -1 +1 @@
-config_query MLT_SVN 'build SVN version' n
+config_query MLT_GIT 'build GIT version' n
diff --git a/video/mlt/PRE_BUILD b/video/mlt/PRE_BUILD
new file mode 100755
index 0000000..45ca408
--- /dev/null
+++ b/video/mlt/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+# fix bad compiler flag - 0.4.0
+sed -i 's/-dPIC/-DPIC/' src/mlt++/configure


  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (96ee11d9217ef5996268d1cd4c90f57db743ce3f), Treeve Jelbert, 05/30/2009

Archive powered by MHonArc 2.6.24.

Top of Page