Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] PERFORCE change 76985 by Arwed von Merkatz for review

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Perforce Review Daemon <p4review AT smee.org>
  • To: "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT gmail.com>, "Arwed von Merkatz" <v.merkatz AT gmx.net>, "Benoit Papillault" <benoit.papillault AT sourcemage.org>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "David Michael Leo Brown Jr." <dmlb2000 AT gmail.com>, "David Kowis" <dkowis+smgl-p4 AT shlrm.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Eric Sandall" <eric AT sandall.us>, "Jason Flatt" <jflatt AT sourcemage.org>, "Jeremy Blosser" <jblosser AT sourcemage.org>, "Ladislav Hagara" <ladislav.hagara AT unob.cz>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Pol Vinogradov" <vin.public AT gmail.com>, "Robin Cook" <rcook AT wyrms.net>, "vladimir_marek" <vlmarek AT volny.cz>
  • Subject: [SM-Commit] PERFORCE change 76985 by Arwed von Merkatz for review
  • Date: Wed, 29 Mar 2006 18:05:01 +0100 (BST)

Change 76985 by arwed_von_merkatz@arwed-Otherland on 2006/03/29 18:00:47

relevant fixes to stable-rc/stable cinelerra

Affected files ...

... //sgl/grimoires/stable-rc/0.4/video/cinelerra/BUILD#2 edit
... //sgl/grimoires/stable-rc/0.4/video/cinelerra/CONFLICTS#1 add
... //sgl/grimoires/stable-rc/0.4/video/cinelerra/DEPENDS#2 edit
... //sgl/grimoires/stable-rc/0.4/video/cinelerra/DETAILS#2 edit
... //sgl/grimoires/stable-rc/0.4/video/cinelerra/HISTORY#2 edit
... //sgl/grimoires/stable/0.3/video/cinelerra/BUILD#2 edit
... //sgl/grimoires/stable/0.3/video/cinelerra/CONFLICTS#1 add
... //sgl/grimoires/stable/0.3/video/cinelerra/DEPENDS#2 edit
... //sgl/grimoires/stable/0.3/video/cinelerra/DETAILS#2 edit
... //sgl/grimoires/stable/0.3/video/cinelerra/HISTORY#2 edit

Differences ...

==== //sgl/grimoires/stable-rc/0.4/video/cinelerra/BUILD#2 (xtext) ====

@@ -1,5 +1,14 @@
invoke_gcc
#patch -p1 < $SCRIPT_DIRECTORY/cinelerra-2.0-shared.patch &&
+# random options generate random crashes, the only ones that work reliably
for
+# me are the defaults cinelerra build uses
+# fixes part of bug #10772
+unset CFLAGS &&
+unset CXXFLAGS &&
+unset LDFLAGS &&
+# disable fortran detection for fftw, fixes part of bug #10772
+sedit 's:CFLAGS=-fPIC ./configure:\0 --disable-fortran:' configure &&
+# non-gnu configure
./configure &&
make


==== //sgl/grimoires/stable-rc/0.4/video/cinelerra/DEPENDS#2 (xtext) ====

@@ -2,7 +2,7 @@
depends nasm &&
depends yasm &&
depends X11-LIBS &&
-depends quicktime4linux &&
+#depends quicktime4linux &&
depends tiff &&
depends freetype2 &&
depends texinfo

==== //sgl/grimoires/stable-rc/0.4/video/cinelerra/DETAILS#2 (xtext) ====

@@ -3,7 +3,8 @@
SOURCE=$SPELL-$VERSION-src.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=${SOURCEFORGE_URL}/heroines/$SOURCE
- SOURCE_HASH=sha1:f40f1f2f325e48c06995cad16e8a7652e1647132
+
SOURCE_HASH=sha512:3a8ec2edb0c2925a77224984e837ea08419756c551fa35b7411b11c2
+2b00c549cc085dcc0b9a3ce9d2a0bffd987aaaf13f71cdf1d6f17b1fc35d5b3d43656cbc
WEB_SITE=http://heroinewarrior.com
ENTERED=20020707
UPDATED=20020813

==== //sgl/grimoires/stable-rc/0.4/video/cinelerra/HISTORY#2 (text) ====

@@ -1,3 +1,12 @@
+2006-03-29 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: removed dependency on quicktime4linux as the spell uses
+ the included one currently
+ * DETAILS: fixed SOURCE_HASH, bug #10781
+ * CONFLICTS: conflicts with libmpeg3 as it installs the same binaries
+ * BUILD: sedit configure so the included fftw doesn't try to
+ build fortran wrappers, fixes part of bug #10772, unset CFLAGS,
+ CXXFLAGS and LDFLAGS, fixes the rest of bug #10772
+
2005-09-13 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to 2.0
* DEPENDS: added depends yasm

==== //sgl/grimoires/stable/0.3/video/cinelerra/BUILD#2 (xtext) ====

@@ -1,5 +1,14 @@
invoke_gcc
#patch -p1 < $SCRIPT_DIRECTORY/cinelerra-2.0-shared.patch &&
+# random options generate random crashes, the only ones that work reliably
for
+# me are the defaults cinelerra build uses
+# fixes part of bug #10772
+unset CFLAGS &&
+unset CXXFLAGS &&
+unset LDFLAGS &&
+# disable fortran detection for fftw, fixes part of bug #10772
+sedit 's:CFLAGS=-fPIC ./configure:\0 --disable-fortran:' configure &&
+# non-gnu configure
./configure &&
make


==== //sgl/grimoires/stable/0.3/video/cinelerra/DEPENDS#2 (xtext) ====

@@ -2,7 +2,7 @@
depends nasm &&
depends yasm &&
depends X11-LIBS &&
-depends quicktime4linux &&
+#depends quicktime4linux &&
depends tiff &&
depends freetype2 &&
depends texinfo

==== //sgl/grimoires/stable/0.3/video/cinelerra/DETAILS#2 (xtext) ====

@@ -3,7 +3,8 @@
SOURCE=$SPELL-$VERSION-src.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=${SOURCEFORGE_URL}/heroines/$SOURCE
- SOURCE_HASH=sha1:f40f1f2f325e48c06995cad16e8a7652e1647132
+
SOURCE_HASH=sha512:3a8ec2edb0c2925a77224984e837ea08419756c551fa35b7411b11c2
+2b00c549cc085dcc0b9a3ce9d2a0bffd987aaaf13f71cdf1d6f17b1fc35d5b3d43656cbc
WEB_SITE=http://heroinewarrior.com
ENTERED=20020707
UPDATED=20020813

==== //sgl/grimoires/stable/0.3/video/cinelerra/HISTORY#2 (text) ====

@@ -1,3 +1,12 @@
+2006-03-29 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: removed dependency on quicktime4linux as the spell uses
+ the included one currently
+ * DETAILS: fixed SOURCE_HASH, bug #10781
+ * CONFLICTS: conflicts with libmpeg3 as it installs the same binaries
+ * BUILD: sedit configure so the included fftw doesn't try to
+ build fortran wrappers, fixes part of bug #10772, unset CFLAGS,
+ CXXFLAGS and LDFLAGS, fixes the rest of bug #10772
+
2005-09-13 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to 2.0
* DEPENDS: added depends yasm



  • [SM-Commit] PERFORCE change 76985 by Arwed von Merkatz for review, Perforce Review Daemon, 03/29/2006

Archive powered by MHonArc 2.6.24.

Top of Page