sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] PERFORCE change 79791 by Arwed von Merkatz for review

From: Perforce Review Daemon <p4review AT smee.org>
To: "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT sourcemage.org>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Ethan Grammatikidis" <eekee AT eekee.is-a-geek.org>, "Gareth Clay" <gareth AT caffeinefuelled.co.uk>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Robin Cook" <rcook AT wyrms.net>, "Seth Woolley" <seth AT swoolley.homeip.net>, "Unet" <unet AT sourcemage.org>, "vladimir_marek" <vlmarek AT volny.cz>
Subject: [SM-Commit] PERFORCE change 79791 by Arwed von Merkatz for review
Date: Thu, 25 May 2006 10:40:01 +0100 (BST)

Change 79791 by arwed_von_merkatz@arwed-Otherland on 2006/05/25 10:37:40

SOURCE_URL and build fixes, bug #12075

Affected files ...

... //sgl/grimoires/test/video/mlt/DEPENDS#2 integrate
... //sgl/grimoires/test/video/mlt/DETAILS#4 integrate
... //sgl/grimoires/test/video/mlt/HISTORY#6 integrate
... //sgl/grimoires/test/video/mlt/PRE_BUILD#2 delete
... //sgl/grimoires/test/video/mlt/buildsystem.patch#2 delete

Differences ...

==== //sgl/grimoires/test/video/mlt/DEPENDS#2 (xtext) ====

@@ -48,4 +48,9 @@
optional_depends xine-lib \
"--enable-xine" \
"--disable-xine" \
- "Enable Xine Module"
+ "Enable Xine Module" &&
+
+optional_depends qt-x11 \
+ "--enable-qimage --qimage-includedir=/usr/include/qt" \
+ "--disable-qimage" \
+ "Enable qimage module"

==== //sgl/grimoires/test/video/mlt/DETAILS#4 (xtext) ====

@@ -1,8 +1,8 @@
SPELL=mlt
VERSION=$(date +%Y%m%d)
- SOURCE=$SPELL.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
-
SOURCE_URL[0]=cvs://:pserver:anonymous AT cvs.sourceforge.net:/cvsroot/mlt:mlt
+ SOURCE=$SPELL-cvs.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
+
SOURCE_URL[0]=cvs://:pserver:anonymous AT mlt.cvs.sourceforge.net:/cvsroot/mlt:mlt
SOURCE_IGNORE=volatile
LICENSE[0]=GPL
FORCE_DOWNLOAD=on

==== //sgl/grimoires/test/video/mlt/HISTORY#6 (text) ====

@@ -1,3 +1,9 @@
+2006-05-25 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: fixed SOURCE_URL, bug #12075, changes SOURCE and
+ SOURCE_DIRECTORY to force a new checkout
+ * DEPENDS: added optional_depends on qt-x11
+ * PRE_BUILD, buildsystem.patch: removed
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

[SM-Commit] PERFORCE change 79791 by Arwed von Merkatz for review, Perforce Review Daemon, 05/25/2006