Source Mage code commit list

[Arwed von Merkatz <scm AT sourcemage.org>]

GIT changes to master grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:

 video-libs/avifile/BUILD     |    2 ++
 video-libs/avifile/DEPENDS   |    5 -----
 video-libs/avifile/HISTORY   |    5 +++++
 video-libs/avifile/PRE_BUILD |    5 ++++-
 4 files changed, 11 insertions(+), 6 deletions(-)

New commits:
commit d152dad5cec09831eb611d48c8d06be01d0ecb2f
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

    avifile: removed non-working parts

diff --git a/video-libs/avifile/BUILD b/video-libs/avifile/BUILD
index 8ce3616..7c7240b 100755
--- a/video-libs/avifile/BUILD
+++ b/video-libs/avifile/BUILD
@@ -1,4 +1,6 @@
 # needed for xvid detection
 LDFLAGS="$LDFLAGS -lm"  &&
 disable_pic  &&
+# disable qt stuff, doesn't work with the gcc34/gcc4 combination
+OPTS="--without-qt $OPTS"  &&
 default_build
diff --git a/video-libs/avifile/DEPENDS b/video-libs/avifile/DEPENDS
index 1fc8d74..c740ed9 100755
--- a/video-libs/avifile/DEPENDS
+++ b/video-libs/avifile/DEPENDS
@@ -1,10 +1,5 @@
 depends  gcc34  &&
 
-optional_depends  qt-x11          \
-                  ""              \
-                  "--without-qt"  \
-                  "for aviplay"   &&
-
 optional_depends  win32codecs              \
                   ""                       \
                   ""                       \
diff --git a/video-libs/avifile/HISTORY b/video-libs/avifile/HISTORY
index 41229e3..1e7e10c 100644
--- a/video-libs/avifile/HISTORY
+++ b/video-libs/avifile/HISTORY
@@ -1,3 +1,8 @@
+2007-12-01 Arwed v. Merkatz <v.merkatz AT gmx.net>
+       * PRE_BUILD: remove player and samples from the build as they don't
+         compile/link anymore, fixes bug #14148
+       * DEPENDS, BUILD: remove qt-x11 support, doesn't link anymore
+
 2007-04-29 John Harding <johnh AT kuberaconsulting.com>
        * BUILD: added disable_pic at ruskie's suggestion
          when it wouldn't compile here. It worked.
diff --git a/video-libs/avifile/PRE_BUILD b/video-libs/avifile/PRE_BUILD
index ad15d9f..8643360 100755
--- a/video-libs/avifile/PRE_BUILD
+++ b/video-libs/avifile/PRE_BUILD
@@ -2,4 +2,7 @@ default_pre_build      &&
 cd  $SOURCE_DIRECTORY  &&
 # fix the pkgconfig file, avifile install header to include/avifile-0.7,
 # not include/avifile
-sedit  's:\(@includedir@/avifile\):\1-0.7:' avifile.pc.in
+sedit  's:\(@includedir@/avifile\):\1-0.7:' avifile.pc.in  &&
+# remove player and samples from the build, they both fail due to issues
+# with newer gcc versions
+sedit 's:player samples::'  Makefile.in