diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2003-10-02 15:57:01 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2003-10-02 15:57:01 +0000 |
| commit | fbd1ea1837f296a55f70abc8cc353cdda204a6f8 (patch) | |
| tree | 81fff68dfbab4216b1d9fe3e9609e693ca5c6978 /media-libs/quicktime4linux | |
| parent | Added a patch which fixes a missing <cassert> include; Closes Bug #29654 (diff) | |
| download | gentoo-2-fbd1ea1837f296a55f70abc8cc353cdda204a6f8.tar.gz gentoo-2-fbd1ea1837f296a55f70abc8cc353cdda204a6f8.tar.bz2 gentoo-2-fbd1ea1837f296a55f70abc8cc353cdda204a6f8.zip | |
gcc2 patch
Diffstat (limited to 'media-libs/quicktime4linux')
| -rw-r--r-- | media-libs/quicktime4linux/ChangeLog | 5 | ||||
| -rw-r--r-- | media-libs/quicktime4linux/files/2.0.0-gcc2.patch | 41 | ||||
| -rw-r--r-- | media-libs/quicktime4linux/quicktime4linux-2.0.0-r1.ebuild | 5 |
3 files changed, 47 insertions, 4 deletions
diff --git a/media-libs/quicktime4linux/ChangeLog b/media-libs/quicktime4linux/ChangeLog index 4f4a64ce1b0a..bc07fecf4395 100644 --- a/media-libs/quicktime4linux/ChangeLog +++ b/media-libs/quicktime4linux/ChangeLog @@ -1,11 +1,12 @@ # ChangeLog for media-libs/quicktime4linux # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/quicktime4linux/ChangeLog,v 1.17 2003/10/02 08:43:15 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/quicktime4linux/ChangeLog,v 1.18 2003/10/02 15:57:01 vapier Exp $ *quicktime4linux-2.0.0-r1 (02 Oct 2003) 02 Oct 2003; Mike Frysinger <vapier@gentoo.org> : - Use external libraries for the most part #25574. + Use external libraries for the most part #25574. Also add + a gcc2 patch so the thing will compile ;). *quicktime4linux-2.0.0 (02 Sep 2003) diff --git a/media-libs/quicktime4linux/files/2.0.0-gcc2.patch b/media-libs/quicktime4linux/files/2.0.0-gcc2.patch new file mode 100644 index 000000000000..05d80ef9dfbf --- /dev/null +++ b/media-libs/quicktime4linux/files/2.0.0-gcc2.patch @@ -0,0 +1,41 @@ +--- Makefile.orig 2003-10-02 11:51:41.419727480 -0400 ++++ Makefile 2003-10-02 11:52:30.588252728 -0400 +@@ -182 +181,0 @@ +- -mno-ieee-fp \ +--- avi_ix.c.orig 2003-10-02 11:51:45.278140912 -0400 ++++ avi_ix.c 2003-10-02 11:52:48.774488000 -0400 +@@ -97,6 +97,7 @@ + + + /* Update super index */ ++{ + quicktime_riff_t *riff = file->riff[0]; + quicktime_hdrl_t *hdrl = &riff->hdrl; + quicktime_strl_t *strl = hdrl->strl[track]; +@@ -104,6 +105,7 @@ + + quicktime_update_indx(file, indx, ix); + } ++} + + void quicktime_read_ix(quicktime_t *file, + quicktime_ix_t *ix) +--- libdv.c.orig 2003-10-02 11:51:49.356520904 -0400 ++++ libdv.c 2003-10-02 11:53:12.945813400 -0400 +@@ -298,6 +298,7 @@ + int norm) + { + int i, j; ++ int samples; + + if(!dv->encoder) + { +@@ -310,7 +311,7 @@ + + + // Get sample count from a libdv function +- int samples = dv_calculate_samples(dv->encoder, rate, dv->audio_frames); ++ samples = dv_calculate_samples(dv->encoder, rate, dv->audio_frames); + dv->audio_frames++; + + if(!dv->temp_audio[0]) diff --git a/media-libs/quicktime4linux/quicktime4linux-2.0.0-r1.ebuild b/media-libs/quicktime4linux/quicktime4linux-2.0.0-r1.ebuild index 467bbf5a0a62..c8ff468ae29b 100644 --- a/media-libs/quicktime4linux/quicktime4linux-2.0.0-r1.ebuild +++ b/media-libs/quicktime4linux/quicktime4linux-2.0.0-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/quicktime4linux/quicktime4linux-2.0.0-r1.ebuild,v 1.1 2003/10/02 08:43:15 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/quicktime4linux/quicktime4linux-2.0.0-r1.ebuild,v 1.2 2003/10/02 15:57:01 vapier Exp $ -inherit flag-o-matic +inherit flag-o-matic gcc DESCRIPTION="quicktime library for linux" HOMEPAGE="http://heroinewarrior.com/quicktime.php3" @@ -31,6 +31,7 @@ src_unpack() { lame-3.93.1 libdv-0.99 libogg-1.0 libvorbis-1.0 ln -s /usr/include jpeg epatch ${FILESDIR}/${PV}-external-libs.patch + [ `gcc-major-version` -eq 2 ] && epatch ${FILESDIR}/${PV}-gcc2.patch } src_compile() { |