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

Perforce Review Daemon p4review at smee.org
Wed Mar 29 11:55:01 EST 2006


Change 76979 by arwed_von_merkatz at arwed-Otherland on 2006/03/29 17:51:39

	compile with gcc 4.x, fixed bugs #10772 and #10781

Affected files ...

... //sgl/grimoires/test/video/cinelerra/BUILD#4 integrate
... //sgl/grimoires/test/video/cinelerra/CONFLICTS#1 branch
... //sgl/grimoires/test/video/cinelerra/DEPENDS#4 integrate
... //sgl/grimoires/test/video/cinelerra/DETAILS#4 integrate
... //sgl/grimoires/test/video/cinelerra/HISTORY#5 integrate
... //sgl/grimoires/test/video/cinelerra/PRE_BUILD#1 branch
... //sgl/grimoires/test/video/cinelerra/gcc41.patch#1 branch
... //sgl/grimoires/test/video/cinelerra/jpeg-mmx-0.1.6-gcc41.patch#1 branch
... //sgl/grimoires/test/video/cinelerra/libdv-0.103-mmx.patch#1 branch

Differences ...

==== //sgl/grimoires/test/video/cinelerra/BUILD#4 (xtext) ====

@@ -1,5 +1,9 @@
-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
+unset CFLAGS    &&
+unset CXXFLAGS  &&
+unset LDFLAGS   &&
+# non-gnu configure
 ./configure  &&
 make
 

==== //sgl/grimoires/test/video/cinelerra/DEPENDS#4 (xtext) ====

@@ -1,8 +1,9 @@
-depends  gcc34            &&
+#depends  gcc34            &&
 depends  nasm             &&
 depends  yasm             &&
 depends  X11-LIBS         &&
-depends  quicktime4linux  &&
+# currently doesn't work using the shared libraries
+#depends  quicktime4linux  &&
 depends  tiff             &&
 depends  freetype2        &&
 depends  texinfo

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

@@ -3,12 +3,12 @@
           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:3a8ec2edb0c2925a77224984e837ea08419756c551fa35b7411b11c22b00c549cc085dcc0b9a3ce9d2a0bffd987aaaf13f71cdf1d6f17b1fc35d5b3d43656cbc
         WEB_SITE=http://heroinewarrior.com
          ENTERED=20020707
          UPDATED=20020813
       LICENSE[0]=GPL
-     GCC_VERSION=3.4
+        KEYWORDS="video"
            SHORT="Advanced compositing and editing for native Linux"
 cat << EOF
 Cinelerra is not intended for consumer use. Much better alternatives for ease

==== //sgl/grimoires/test/video/cinelerra/HISTORY#5 (text) ====

@@ -1,3 +1,20 @@
+2006-03-28 Arwed v. Merkatz <v.merkatz at gmx.net>
+	* DEPENDS: removed dependency on quicktime4linux as the spell uses
+	  the included one currently
+	* CONFLICTS: conflicts with libmpeg3 as it installs the same binaries
+	* PRE_BUILD: sedit configure so the included fftw doesn't try to
+	  build fortran wrappers, fixes part of bug #10772
+	* PRE_BUILD, gcc41.patch, jpeg-mmx-0.1.6-gcc41.patch,
+	  libdv-0.103-mmx.patch:
+	  patches to make it build with gcc > 3.4, fixes rest of bug #10772,
+	  patches courtesy of gentoo and fedora
+	* DEPENDS, DETAILS: don't use gcc 3.4 anymore
+	* BUILD: removed invoke_gcc
+	* DETAILS: fixed SOURCE_HASH, bug #10781
+
+2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
+	* DETAILS: (automated) Add KEYWORDS
+
 2005-09-13 George Sherwood <george at beernabeer.com>
 	* DETAILS: Updated to 2.0
 	* DEPENDS: added depends yasm



More information about the SM-Commit mailing list