diff options
| author | Arwed von Merkatz | 2007-12-01 10:26:32 +0100 |
|---|---|---|
| committer | Arwed von Merkatz | 2007-12-01 10:26:58 +0100 |
| commit | d152dad5cec09831eb611d48c8d06be01d0ecb2f (patch) | |
| tree | ccd11d885a55ef29c8f56468e35f15e1ef861c45 | |
| parent | 0b1a8243711e77e7d1ddb7b8b798c7717826c3fc (diff) | |
avifile: removed non-working parts
| -rwxr-xr-x | video-libs/avifile/BUILD | 2 | ||||
| -rwxr-xr-x | video-libs/avifile/DEPENDS | 5 | ||||
| -rw-r--r-- | video-libs/avifile/HISTORY | 5 | ||||
| -rwxr-xr-x | video-libs/avifile/PRE_BUILD | 5 |
4 files changed, 11 insertions, 6 deletions
diff --git a/video-libs/avifile/BUILD b/video-libs/avifile/BUILD index 8ce36162f2..7c7240b45c 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 1fc8d7424f..c740ed9ccd 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 41229e30b5..1e7e10cf7a 100644 --- a/video-libs/avifile/HISTORY +++ b/video-libs/avifile/HISTORY @@ -1,3 +1,8 @@ +2007-12-01 Arwed v. Merkatz <v.merkatz@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@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 ad15d9f567..864336088c 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 |