Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] SVK Change 9135 to grimoire.svk

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: root <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] SVK Change 9135 to grimoire.svk
  • Date: Fri, 2 Jun 2006 02:51:57 -0500

Group: defaults
Subject: r9135 - in test: . video/mlt

Author: arwed
Date: Thu May 25 10:28:11 2006
New Revision: 9135

Removed:
test/video/mlt/PRE_BUILD
test/video/mlt/buildsystem.patch
Modified:
test/ (props changed)
test/video/mlt/DEPENDS
test/video/mlt/DETAILS
test/video/mlt/HISTORY

Log:
r9143@Otherland: arwed | 1970-01-01 01:00:00 +0200
SOURCE_URL and build fixes, bug #12075


Modified: test/video/mlt/DEPENDS
==============================================================================
--- test/video/mlt/DEPENDS (original)
+++ test/video/mlt/DEPENDS Thu May 25 10:28:11 2006
@@ -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"

Modified: test/video/mlt/DETAILS
==============================================================================
--- test/video/mlt/DETAILS (original)
+++ test/video/mlt/DETAILS Thu May 25 10:28:11 2006
@@ -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

Modified: test/video/mlt/HISTORY
==============================================================================
--- test/video/mlt/HISTORY (original)
+++ test/video/mlt/HISTORY Thu May 25 10:28:11 2006
@@ -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


Deleted: test/video/mlt/PRE_BUILD
==============================================================================
--- test/video/mlt/PRE_BUILD Thu May 25 10:28:11 2006
+++ (empty file)
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p0 < $SCRIPT_DIRECTORY/buildsystem.patch

Deleted: test/video/mlt/buildsystem.patch
==============================================================================
--- test/video/mlt/buildsystem.patch Thu May 25 10:28:11 2006
+++ (empty file)
@@ -1,50 +0,0 @@
---- configure.orig 2004-08-01 01:43:57.889284992 -0500
-+++ configure 2004-08-01 01:45:17.876125144 -0500
-@@ -48,8 +48,7 @@
- echo "LARGE_FILE=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
-
- [ "$cpu" != "" ] &&
-- echo "TARGETARCH=-march=$cpu" &&
-- echo "TARGETCPU=-mcpu=$cpu"
-+ echo "TARGETARCH=-march=$cpu"
-
- [ "`uname`" = "Linux" ] &&
- echo "LIBDL=-ldl"
-@@ -72,7 +71,7 @@
-
- function build_pkgconfig
- {
-- for i in framework valerie miracle
-+ for i in framework valerie
- do
- echo "prefix=$prefix" >mlt-$i.pc
- echo "exec_prefix=$prefix" >>mlt-$i.pc
-@@ -90,7 +89,7 @@
-
- # Define build directory for scripts called
- export build_dir=`dirname $0`
--export prefix=/usr/local
-+export prefix=/usr
- export help=0
- export version=0.1.1
- export debug=true
-@@ -115,7 +114,7 @@
- [ $help = 1 ] && show_help || build_config
-
- # Iterate through each of the components
--for i in framework modules inigo valerie miracle humperdink
-+for i in framework modules inigo valerie
- do
- if [ -x src/$i/configure ]
- then
---- src/modules/kino/Makefile~ 2005-04-15 16:28:26.000000000 +0200
-+++ src/modules/kino/Makefile 2005-04-27 18:11:27.000000000 +0200
-@@ -6,7 +6,7 @@
- OBJS=factory.o producer_kino.o
- CPPOBJS=kino_wrapper.o avi.o error.o filehandler.o riff.o
- CFLAGS+=-I../../
--LDFLAGS+=-lmlt -lstdc++
-+LDFLAGS+=-L../../framework -lmlt -lstdc++
- CXXFLAGS+=$(CFLAGS) -Wno-deprecated
-
- ifdef HAVE_LIBQUICKTIME



  • [SM-Commit] SVK Change 9135 to grimoire.svk, root, 06/02/2006

Archive powered by MHonArc 2.6.24.

Top of Page