summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2006-01-31 10:57:46 +0000
committerLuca Barbato <lu_zero@gentoo.org>2006-01-31 10:57:46 +0000
commit7cd3d1ffa9d0298d93b7df46c5e950a05dae3b68 (patch)
tree55ce918a65d4837eba3b0d7efb9f735899265043 /media-video/avifile
parentAdd a new upstream version, but still package masked (diff)
downloadgentoo-2-7cd3d1ffa9d0298d93b7df46c5e950a05dae3b68.tar.gz
gentoo-2-7cd3d1ffa9d0298d93b7df46c5e950a05dae3b68.tar.bz2
gentoo-2-7cd3d1ffa9d0298d93b7df46c5e950a05dae3b68.zip
avifile removal (die avifile die!)
Diffstat (limited to 'media-video/avifile')
-rw-r--r--media-video/avifile/ChangeLog557
-rw-r--r--media-video/avifile/Manifest37
-rw-r--r--media-video/avifile/avifile-0.7.38.20030710-r1.ebuild148
-rw-r--r--media-video/avifile/avifile-0.7.41.20041001-r1.ebuild162
-rw-r--r--media-video/avifile/avifile-0.7.41.20041001-r2.ebuild147
-rw-r--r--media-video/avifile/avifile-0.7.43.20050224-r1.ebuild164
-rw-r--r--media-video/avifile/avifile-0.7.43.20050224-r2.ebuild186
-rw-r--r--media-video/avifile/files/avifile-0.7.37.20030522-divx.patch391
-rw-r--r--media-video/avifile/files/avifile-0.7.38.20030710-2.6.patch65
-rw-r--r--media-video/avifile/files/avifile-0.7.38.20030710-amd64.patch12
-rw-r--r--media-video/avifile/files/avifile-0.7.38.20030710-sparc.patch22
-rw-r--r--media-video/avifile/files/avifile-0.7.41.20041001-gcc2.patch36
-rw-r--r--media-video/avifile/files/avifile-0.7.43.20050224-1.0.0.1.gcc4.patch149
-rw-r--r--media-video/avifile/files/avifile-0.7.43.20050224-fixlabels.patch18
-rw-r--r--media-video/avifile/files/avifile-0.7.43.20050224-pic.patch50
-rw-r--r--media-video/avifile/files/avifile-0.7.43.20050224-sdllibs.patch12
-rw-r--r--media-video/avifile/files/avifile-0.7.43.20050224-sysffmpeg.patch354
-rw-r--r--media-video/avifile/files/avifile-gcc34.patch172
-rw-r--r--media-video/avifile/files/avifile-mad.patch89
-rw-r--r--media-video/avifile/files/avifile-x86-gcc34.patch93
-rw-r--r--media-video/avifile/files/digest-avifile-0.7.38.20030710-r11
-rw-r--r--media-video/avifile/files/digest-avifile-0.7.41.20041001-r11
-rw-r--r--media-video/avifile/files/digest-avifile-0.7.41.20041001-r21
-rw-r--r--media-video/avifile/files/digest-avifile-0.7.43.20050224-r11
-rw-r--r--media-video/avifile/files/digest-avifile-0.7.43.20050224-r21
-rw-r--r--media-video/avifile/files/flvenc-patch20
-rw-r--r--media-video/avifile/files/throw.patch233
-rw-r--r--media-video/avifile/metadata.xml6
28 files changed, 0 insertions, 3128 deletions
diff --git a/media-video/avifile/ChangeLog b/media-video/avifile/ChangeLog
deleted file mode 100644
index 5462fd494696..000000000000
--- a/media-video/avifile/ChangeLog
+++ /dev/null
@@ -1,557 +0,0 @@
-# ChangeLog for media-video/avifile
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/ChangeLog,v 1.116 2005/12/13 16:40:19 spyderous Exp $
-
- 13 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
- avifile-0.7.43.20050224-r2.ebuild:
- Add modular X dependencies. Also add use_enable for xinerama, since it's in
- IUSE and there was no mention of its removal in the ChangeLog.
-
- 24 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
- avifile-0.7.38.20030710-r1.ebuild, avifile-0.7.41.20041001-r1.ebuild,
- avifile-0.7.41.20041001-r2.ebuild, avifile-0.7.43.20050224-r1.ebuild,
- avifile-0.7.43.20050224-r2.ebuild:
- Remove divx4linux dependency entirely.
-
- 22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
- avifile-0.7.38.20030710-r1.ebuild:
- Add divx4linux useflag
-
- 15 Sep 2005; Aron Griffis <agriffis@gentoo.org>
- avifile-0.7.43.20050224-r1.ebuild:
- Mark 0.7.43.20050224-r1 stable on alpha
-
- 10 Aug 2005; Markus Rothe <corsair@gentoo.org>
- avifile-0.7.43.20050224-r2.ebuild:
- added ~ppc64
-
- 25 Jul 2005; Caleb Tennis <caleb@gentoo.org>
- avifile-0.7.38.20030710-r1.ebuild, avifile-0.7.41.20041001-r1.ebuild,
- avifile-0.7.41.20041001-r2.ebuild, avifile-0.7.43.20050224-r1.ebuild,
- avifile-0.7.43.20050224-r2.ebuild:
- Change qt dep for bug #100235
-
- 15 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
- avifile-0.7.43.20050224-r1.ebuild:
- Stable on ia64, bug 98891.
-
- 13 Jul 2005; Diego Pettenò <flameeyes@gentoo.org>
- avifile-0.7.43.20050224-r1.ebuild:
- Stable on amd64, closes #93814.
-
- 13 Jul 2005; Diego Pettenò <flameeyes@gentoo.org>
- +files/avifile-0.7.43.20050224-pic.patch,
- avifile-0.7.43.20050224-r2.ebuild:
- Add pic patch for x86 as per bug #88582. Thanks to Kevin F. Quinn
- <kevquinn@gentoo.org> for the patch.
-
- 13 Jul 2005; Diego Pettenò <flameeyes@gentoo.org>
- avifile-0.7.43.20050224-r1.ebuild, avifile-0.7.43.20050224-r2.ebuild:
- Backport lib64 fixes in avifile-0.7.43.20050224-r1.
-
-*avifile-0.7.43.20050224-r2 (28 Jun 2005)
-
- 28 Jun 2005; Martin Schlemmer <azarah@gentoo.org>
- +avifile-0.7.43.20050224-r2.ebuild:
- Fix broken acinclude.m4 that have a broken SDL test that clobber
- '/usr/lib64' to '4'.
-
- 18 Jun 2005; Guy Martin <gmsoft@gentoo.org> files/avifile-mad.patch,
- avifile-0.7.43.20050224-r1.ebuild:
- Fixed and marked stable for hppa.
-
- 17 May 2005; Gustavo Zacarias <gustavoz@gentoo.org>
- avifile-0.7.43.20050224-r1.ebuild:
- Stable on sparc
-
- 25 Apr 2005; Martin Schlemmer <azarah@gentoo.org>
- +files/avifile-0.7.43.20050224-1.0.0.1.gcc4.patch,
- avifile-0.7.43.20050224-r1.ebuild:
- Fix building with gcc4. Patch from Debian.
-
- 25 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
- avifile-0.7.43.20050224-r1.ebuild:
- Added check so that qt and dmalloc can't be enabled at the same time as they
- make avifile not compile at all. Fixes #80874.
-
- 22 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
- +files/avifile-0.7.43.20050224-fixlabels.patch,
- avifile-0.7.43.20050224-r1.ebuild:
- Added patch to convert labels to local form, fixes #86320.
-
- 18 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
- +files/avifile-0.7.43.20050224-sdllibs.patch,
- avifile-0.7.43.20050224-r1.ebuild:
- Added win32codecs useflag (which allows to disable win32codecs support
- instead of harddepend it on x86 systems). Renamed oggvorbis flag into
- vorbis. Renamed dvd flag into a52 (it enables a52 support in avi files, not
- in dvds, anyway). Used mad useflag in use_enable libmad. Remove dependency
- on sed-4 (in system now). Added a patch to fix compilation of sdl support on
- amd64 (at least). Fixed disabling of sdl with useflag. Removed x86
- conditional on divx4linux as it's usemasked out of x86.
-
- 15 Apr 2005; Stephen P. Becker <geoman@gentoo.org>
- avifile-0.7.41.20041001-r1.ebuild:
- changed to -mips because of hard dep on madplay
-
-*avifile-0.7.43.20050224-r1 (26 Mar 2005)
-
- 26 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
- -files/avifile-0.7.41.20041001-sparc.patch,
- +files/avifile-0.7.43.20050224-sysffmpeg.patch,
- -avifile-0.7.32.20030219.ebuild, -avifile-0.7.37.20030522-r2.ebuild,
- -avifile-0.7.41.20041001.ebuild, -avifile-0.7.43.20050224.ebuild,
- +avifile-0.7.43.20050224-r1.ebuild:
- Now uses system ffmpeg and installs both static and shared libs. Removing
- old versions. Added to ~sparc.
-
-*avifile-0.7.43.20050224 (22 Mar 2005)
-
- 22 Mar 2005; Chris White <chriswhite@gentoo.org> +files/avifile-mad.patch,
- +avifile-0.7.43.20050224.ebuild:
- Changed the following:
-
- 1) changed SRC_URI since upstream extension is now .tar.bz2 instead of
- .tar.gz 2) added alsa dep virutal/alsa (helps to have alsa if you're going
- to use it) 3) removed useless audiofile and ffmpeg depends 4) made qt
- sed-ing look a little bit cleaner and more explanitory 5) removed throw and
- gcc2 patches as they no longer apply 6) changed sparc patch to a sed based
- patch 7) removed avifile.pc.in sed-ing as it no longer applies 8) made the
- AM_CFLAGS apply to x86 as it should have been (conflicts with sparc patch)
- 9) changed `use_enable`'s to $(use_enable)'s 10) rid of pointless dodir in
- src_install 10) added a fpm patch to fix FPM_* not being set for use in
- libmad plugin
-
- And that's all.
-
- 14 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org>
- avifile-0.7.41.20041001-r1.ebuild:
- made divx4linux dependency optional, controlled by the respective useflag.
- fixes #81787
-
- 31 Jan 2005; <lucky@gentoo.org> avifile-0.7.41.20041001-r2.ebuild:
- removed the pic functionality. fixes #80034
-
- 29 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org>
- avifile-0.7.41.20041001-r2.ebuild:
- avi? dependency now only possible on x86. thanks to KingTaco.
-
- 29 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org>
- avifile-0.7.41.20041001-r2.ebuild:
- excluded amd64 from optional dmalloc usage.
-
-*avifile-0.7.41.20041001-r2 (29 Jan 2005)
-
- 29 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org>
- +avifile-0.7.41.20041001-r2.ebuild:
- various cleanups which were suggested by Diego Pettenò
- <dgp85@users.sourceforge.net>, fixes bug #72182. thanks a lot, Diego.
-
- 20 Jan 2005; Marcus Hanwell <cryos@gentoo.org>
- avifile-0.7.41.20041001-r1.ebuild:
- Marking stable for amd64.
-
- 09 Dec 2004; Patrick Kursawe <phosphan@gentoo.org>
- avifile-0.7.41.20041001-r1.ebuild:
- Declaring stable for x86 - still broken (see bug #72182), but less broken than
- older versions.
-
-*avifile-0.7.41.20041001 (01 Dec 2004)
-
- 01 Dec 2004; Chris White <chriswhite@gentoo.org>
- avifile-0.7.41.20041001-r1.ebuild, +avifile-0.7.41.20041001.ebuild:
- Re-added 0.7.41.ebuild as it's the latest x86 stable.
-
-*avifile-0.7.32.20030219 (01 Dec 2004)
-
- 01 Dec 2004; Chris White <chriswhite@gentoo.org>
- +avifile-0.7.32.20030219.ebuild:
- Re-adding .32 to unbreak mjpegtools.. again.
-
-*avifile-0.7.37.20030522-r2 (01 Dec 2004)
-
- 01 Dec 2004; Chris White <chriswhite@gentoo.org>
- +avifile-0.7.37.20030522-r2.ebuild, avifile-0.7.41.20041001-r1.ebuild:
- Added avifile-0.7.37-20030522-r2.ebuild back to unbreak swftools and
- mjpegtools deps.
-
- 30 Nov 2004; Chris White <chriswhite@gentoo.org>
- -avifile-0.7.32.20030219.ebuild, -avifile-0.7.37.20030522-r2.ebuild,
- -avifile-0.7.38.20030710.ebuild, -avifile-0.7.41.20041001.ebuild:
- Ebuild cleanup.
-
- 26 Nov 2004; Patrick Kursawe <phosphan@gentoo.org>
- avifile-0.7.41.20041001-r1.ebuild:
- Fixing bug #70920 (fails to build on platforms that don't know
- no-omit-leaf-frame-pointer).
-
- 16 Nov 2004; Patrick Kursawe <phosphan@gentoo.org>
- avifile-0.7.41.20041001.ebuild:
- Adding compile bug fixes from -r1
-
-*avifile-0.7.41.20041001-r1 (12 Nov 2004)
-
- 12 Nov 2004; Patrick Kursawe <phosphan@gentoo.org>
- +files/avifile-0.7.41.20041001-gcc2.patch,
- +avifile-0.7.41.20041001-r1.ebuild:
- Fixing bug #67441 (configure script stripped -g from CFLAGS - even in the
- middle of a word), bug #68899 (hard-coded -lXrender in some Makefile, removing
- it if not using X), bug #70074 (doesn't compile with gcc 2.95) and
- bug #69511 (parts of the build did not use our CFLAGS)
-
- 23 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
- avifile-0.7.41.20041001.ebuild:
- Disabling maketest for now because of bug #66740.
-
- 22 Oct 2004; Patrick Kursawe <phosphan@gentoo.org>
- avifile-0.7.41.20041001.ebuild:
- Older versions seem to cause more trouble than .41 - declaring stable for x86.
-
- 07 Oct 2004; Patrick Kursawe <phosphan@gentoo.org> files/throw.patch:
- throw.patch finally works with latest glibc versions - closing bug #64893.
- Modifying postinst to only show the message if the file it refers to was
- actually built. (closing bug #56973)
-
- 06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
- avifile-0.7.41.20041001.ebuild:
- get_libdir fixes.
-
- 06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
- +files/avifile-0.7.41.20041001-sparc.patch,
- avifile-0.7.41.20041001.ebuild:
- Recreated sparc CFLAGS patch, but still -sparc. Readded to ~amd64.
- Closes bug #66422.
-
- 06 Oct 2004; Patrick Kursawe <phosphan@gentoo.org> files/throw.patch:
- Patch was broken (bug #64893)
-
- 06 Oct 2004; Patrick Kursawe <phosphan@gentoo.org> +files/throw.patch,
- avifile-0.7.41.20041001.ebuild:
- Fixing wrong attribute locations in source, see bug #64893
-
- 06 Oct 2004; Patrick Kursawe <phosphan@gentoo.org>
- avifile-0.7.41.20041001.ebuild:
- Filtering flag -momit-leaf-frame-pointer (bug #66445)
-
-*avifile-0.7.41.20041001 (05 Oct 2004)
-
- 05 Oct 2004; Patrick Kursawe <phosphan@gentoo.org>
- +avifile-0.7.41.20041001.ebuild:
- New version that works with xvid 1.x and does not unset compiler flags.
-
-*avifile-0.7.38.20030710-r1 (12 Jul 2004)
-
- 12 Jul 2004; Mike Frysinger <vapier@gentoo.org>
- +avifile-0.7.38.20030710-r1.ebuild:
- Make sure pkgconfig file spits out right include path #53183 by Luke Worth and
- clean up the ebuild in general.
-
- 29 May 2004; Travis Tilley <lv@gentoo.org> +files/avifile-x86-gcc34.patch,
- avifile-0.7.38.20030710.ebuild:
- added an additional gcc 3.4 fix for x86
-
- 03 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
- avifile-0.7.32.20030219.ebuild, avifile-0.7.37.20030522-r2.ebuild,
- avifile-0.7.38.20030710.ebuild:
- Changing mad dep to madplay.
-
- 28 Apr 2004; Travis Tilley <lv@gentoo.org> +files/avifile-gcc34.patch,
- avifile-0.7.38.20030710.ebuild:
- patched to compile using gcc 3.4
-
- 27 Apr 2004; Aron Griffis <agriffis@gentoo.org>
- avifile-0.7.37.20030522-r2.ebuild, avifile-0.7.38.20030710.ebuild:
- Add inherit eutils
-
- 29 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>;
- avifile-0.7.32.20030219.ebuild, avifile-0.7.37.20030522-r2.ebuild,
- avifile-0.7.38.20030710.ebuild:
- Change x11-base/xfree dependency to virtual/x11.
-
- 09 Mar 2004; <agriffis@gentoo.org> avifile-0.7.38.20030710.ebuild:
- stable on alpha and ia64
-
- 17 Feb 2004; Aron Griffis <agriffis@gentoo.org>
- avifile-0.7.37.20030522-r2.ebuild, avifile-0.7.38.20030710.ebuild:
- add alpha and ia64 keywords
-
- 28 Dec 2003; Martin Holzer <mholzer@gentoo.org>
- avifile-0.7.38.20030710.ebuild:
- adding patch
-
- 26 Dec 2003; Jason Wever <weeve@gentoo.org> avifile-0.7.38.20030710.ebuild:
- Added patch for sparc to fix bug #36040.
-
- 26 Dec 2003; <plasmaroo@gentoo.org> avifile-0.7.38.20030710.ebuild,
- files/avifile-0.7.38.20030710-2.6.patch:
- Added a patch which allows avifile to compile successfully on 2.6 series
- kernels - note; this patch requires compatible, patched 2.6.0 linux-headers.
-
- 14 Dec 2003; Martin Holzer <mholzer@gentoo.org> files/flvenc-patch:
- chaning patch. Closes #35802
-
- 12 Dec 2003; Daniel Ahlberg <aliz@gentoo.org> avifile-0.7.38.20030710.ebuild:
- Add amd64 keyword. Patch contributed by MATSUU Takuto <matsuu@gentoo.org> in #33655.
-
- 22 Oct 2003; Martin Holzer <mholzer@gentoo.org>
- avifile-0.7.37.20030522-r2.ebuild, avifile-0.7.38.20030710.ebuild:
- adding RESTRICT="nomirror"
-
- 16 Sep 2003; Max Kalika <max@gentoo.org> avifile-0.7.38.20030710.ebuild,
- metadata.xml:
- Bump to stable x86.
-
- 06 Sep 2003; Martin Holzer <mholzer@gentoo.org>
- avifile-0.7.38.20030710.ebuild:
- Fixing bug with gcc 2.95. Closes #27987
-
-*avifile-0.7.38.20030710 (17 Aug 2003)
-
- 17 Aug 2003; Martin Holzer <mholzer@gentoo.org>
- avifile-0.7.38.20030710.ebuild:
- Version bumped.
-
- 19 Jul 2003; Nick Hadaway <raker@gentoo.org>
- avifile-0.7.37.20030522-r2.ebuild:
- Fixed mad dep
-
-*avifile-0.7.37.20030522-r2 (17 Jul 2003)
-
- 17 Jul 2003; Nick Hadaway <raker@gentoo.org>
- avifile-0.7.27.20030522-r2.ebuild:
- Changed from media-sound/mad to media-libs/{libmad,libid3tag} and
- from $DEBUGBUILD to `use debug`
-
-*avifile-0.7.37.20030522-r1 (09 Jul 2003)
-
- 09 Jul 2003; Martin Holzer <mholzer@gentoo.org>
- avifile-0.7.37.20030522-r1.ebuild, files/avifile-0.7.37.20030522-divx.patch:
- Adding latest divx support. Closes #23795
-
- 12 Jun 2003; Seemant Kulleen <seemant@gentoo.org>
- avifile-0.7.32.20030219.ebuild, avifile-0.7.34.20030319.ebuild,
- avifile-0.7.37.20030522.ebuild:
- USE flag is truetype NOT freetype. Thanks to: Chris Hornbaker
- <chrishornbaker@earthlink.net> in bug #21802
-
- 10 Jun 2003; Alastair Tse <liquidx@gentoo.org>
- avifile-0.7.37.20030522.ebuild:
- Added fix for qt compile errors. Thanks to Daniel Steinberger
- <Daniel.Steinberger@gmx.de>. (#21804)
-
-*avifile-0.7.37.20030522 (22 May 2003)
-
- 22 May 2003; Martin Holzer <mholzer@gentoo.org>
- avifile-0.7.37.20030522.ebuild:
- Version bumped.
-
-*avifile-0.7.34.20030319 (22 Apr 2003)
-
- 22 Apr 2003; Martin Holzer <mholzer@gentoo.org>
- avifile-0.7.34.20030319.ebuild:
- Version bumped. Ebuild submitted by TGL <degrenier@easyconnect.fr> in #18709.
-
-*avifile-0.7.32.20030219 (20 Feb 2003)
-
- 17 Apr 2003; foser <foser@gentoo.org> * :
- Fixed xft dep to be virtual
-
- 20 Feb 2003; Nick Hadaway <raker@gentoo.org>
- avifile-0.7.32.20030219.ebuild,
- files/digest-avifile-0.7.32.20030219 :
- Version bump. Fixes for compatibility with the newest qt builds and
- many other bug fixes. This is possibly the last 0.7.x build
- according to the upstream author.
-
-*avifile-0.7.29.20030204 (04 Feb 2003)
-
- 18 Feb 2003; Nick Hadaway <raker@gentoo.org>
- avifile-0.7.29.20030204.ebuild :
- Changed the freetype USE flag to truetype. Thanks to Pascal Labit
- on bug #15888 for noticing this misnomer.
-
- 10 Feb 2003; Nick Hadaway <raker@gentoo.org>
- avifile-0.7.29.20030204.ebuild :
- Removed --enable-timing from DEBUGBUILD as it causes compile
- failures.
-
- 09 Feb 2003; Nick Hadaway <raker@gentoo.org>
- avifile-0.7.29.20030204.ebuild :
- Marked stable again. Forcing --enable-oss
-
- 07 Feb 2003; Seemant Kulleen <seemant@gentoo.org> *.ebuild :
-
- Cleaned out old, crusty ebuilds. More importantly, divx4linux and
- win32codecs are installed ONLY on the x86 arch, not any others. Added
- ~sparc KEYWORD. Closing bug #15276 by Alvaro Figueroa
- <fede2@fuerzag.ulatina.ac.cr>
-
- 05 Feb 2003; Nick Hadaway <raker@gentoo.org> avifile-0.7.29.20030204.ebuild :
- Added a pkg_postinst with a note about making aviplay suid root
- so certain video functions work properly.
- Marked stable.
-
- 04 Feb 2003; Nick Hadaway <raker@gentoo.org> avifile-0.7.2920030204,
- files/digest-avifile-0.7.29.20030204 :
- Added esd and alsa USE variables. No patches... so autoconf... just
- configure+options and go... I still need vidix support!
-
-*avifile-0.7.27.20030122-r1 (30 Jan 2003)
-
- 25 Mar 2003; Seemant Kulleen <seemant@gentoo.org>
- avifile-0.7.27.20030122-r1.ebuild:
- freetype USE to truetype USE, which ACTUALLY EXISTS, Sheesh
-
- 01 Feb 2003; Nick Hadaway <raker@gentoo.org>
- avifile-0.7.27.20030130-r1.ebuild :
- Added the missing download link for the patch. Added dependancies on
- alsa-lib, esound, and audiofile.
-
- 30 Jan 2003; Nick Hadaway <raker@gentoo.org>
- avifile-0.7.27.20030122-r1.ebuild,
- files/digest-avifile-0.7.27.200301220-r1 :
- cvs updated from 2003/01/30 which actually plays avi files! :)
- This is actually marked as 0.7.28 but since I am patching
- the 0.7.27 version i figured a rev bump was a better idea.
-
-*avifile-0.7.27.20030122 (23 jan 2003)
-
- 23 Jan 2003; Nick Hadaway <raker@gentoo.org> avifile-0.7.27.20030122.ebuild,
- files/digest-/avifile-0.7.27.20030122 :
- Version bump. Removed automake dependancy. This has a fix for avi
- movies over ~4200 seconds.
-
-*avifile-0.7.26.20030117 (23 Jan 2003)
-
- 23 Jan 2003; Nick Hadaway <raker@gentoo.org> avifile-0.7.26.20030117.ebuild,
- files/digest-avifile-0.7.26.20030117 :
- Version bump. Total ebuild reorganization fully supporting all
- available configure options. A couple of local variables added for
- explicit disabling or enabling of certain features. Unset CC and
- CXX during configure to avoid problems during the mad configuration.
- Reset for emake.
-
- 19 Jan 2003; Martin Schlemmer <azarah@gentoo.org> :
- Disable KDE support, as it is broken anyhow. Bug #13608.
-
-*avifile-0.7.25.20030114 (15 Jan 2003)
-
- 15 Jan 2003; Nick Hadaway <raker@gentoo.org> avifile-0.7.25.20030114.ebuild,
- files/digest-avifile-0.7.25.20030114 :
- Version bump. subtitles should be working now.
-
-*avifile-0.7.22.20021129 (13 Dec 2002)
-
- 13 Dec 2002; Brandon Low <lostlogic@gentoo.org> avifile-0.7.22.20021129.ebuild,
- Fix sandbox error
-
- 13 Dec 2002; Nick Hadaway <raker@gentoo.org> avifile-0.7.22.20021129.ebuild,
- files/digest-avifile-0.7.22.20021129 :
- Version bump. Added a sed fix so qt is detected properly. WM9 audio and
- video is now supported! Currently marked unstable.
-
-*avifile-0.7.15.20020816-r1 (13 Dec 2002)
-
- 13 Dec Martin Schlemmer <azarah@gentoo.org> avifile-0.7.15.20020816-r1.ebuild :
- Make sure we include freetype2 headers before freetype1 headers, else Xft2
- borks, bug #11941.
-
- 06 Dec 2002; Rodney Rees <manson@gentoo.org> :
- Changed sparc ~sparc keywords
-
-*avifile-0.7.15.20020816 (27 Aug 2002)
-
- 04 Nov 2002; Seemant Kulleen <seemant@gentoo.org>
- avifile-0.7.15.20020816.ebuild :
-
- small typo fix: ${S}->${D} to install the pixmaps. Thanks to:
- dareynol@ij.net (dareynol) in bug #10178
-
- Sep 2002; Maarten Thibaut <murphy@gentoo.org> avifile-0.7.15.20020816.ebuild :
- Added sparc/sparc64 keywords.
-
- 27 Aug 2002; Nick Hadaway <raker@gentoo.org> avifile-0.7.15.20020816.ebuild,
- files/digest-avifile-0.7.15.20020816 : Version bump. Currently masked for freeze.
-
-*avifile-0.7.14.20020802 (04 Aug 2002)
-
- 17 Aug 2002; Nick Hadaway <raker@gentoo.org> avifile-0.7.14.20020802.ebuild :
- Changed to econf. Removed redundant "use kde" section. Fixed
- invalid logic in the script. Added datadir=${D}/usr/share to make install.
-
- 14 Aug 2002; Martin Schlemmer <azarah@gentoo.org> avifile-0.7.14.20020802.ebuild :
- Elibtoolize this one.
-
- 04 Aug 2002; Nick Hadaway <raker@gentoo.org> avifile-0.7.14.20020802.ebuild,
- files/digest-avifile-0.7.14.2020802 : Version bump. Many bug fixes.
-
-*avifile-0.7.7.20020523 (25 Jun 2002)
-
- 25 Jun 2002; Martin Schlemmer <azarah@gentoo.org> : New version closing bug #3855.
-
-*avifile-0.7.4-20020426-r2 (26 May 2002)
-
- 26 May 2002; Martin Schlemmer <azarah@gentoo.org> : Remove the suffix added to
- all binaries.
-
-*avifile-0.7.4-20020426 (25 May 2002)
-
- 25 May 2002; Matthew Kennedy <mkennedy@gentoo.org> avifile-0.7.4-20020426-r1.ebuild
- files/digest-avifile-0.7.4-r1-20020426,
- files/avifile-0.7.4.20020426-gcc3.1-gentoo.patch : Fix avifile code to compile
- under gcc3.1. This will be an upstream patch also. I'm masking this until
- gcc-2.95.3 users verify that it works for them too.
-
-*avifile-0.7.4-20020426 (20 Apr 2002)
-
- 30 Apr 2002; Seemant Kulleen <seemant@gentoo.org> avifile-0.7.4-20020426.ebuild
- files/digest-avifile-0.7.4-20020426 : Version bump to newest snapshot.
- Upstream claims this is a bugfix release.
-
-*avifile-0.7.3.20020419-r1 (28 Apr 2002)
-
- 28 Apr 2002; Matthew Kennedy <mkennedy@gentoo.org> avifile-0.7.3.20020419-r1.ebuild,
- ChangeLog, files/digest-avifile-0.7.3.20020419-r1 : Should be --without-qt
- instead of --disable-qt (only users without qt installed will see this produce
- a fatal error).
-
-*avifile-0.7.3.20020419 (24 Apr 2002)
-
- 24 Apr 2002; Seemant Kulleen <seemant@gentoo.org> avifile-0.7.3.20020419.ebuild
- files/digest-avifile-0.7.3.20020419 : Version bump to newest snapshot.
- This should work with the latest divx4linux and now has ffmpeg compiled as default.
- And they have actually named this thing consistent with the 0.6 series!
-
-*avifile-0.6.0.20011220-r2 (13 Apr 2002)
-
- 13 Apr 2002; Seemant Kulleen <seemant@gentoo.org> : Trying to make avifile more
- friendly towards kde3 users. This closes bug #1713 -- so thanks to
- edwardam@interlix.com (Edward Muller) for discovering this. Also, many thanks
- to andee in #gentoo for being the tester, and woodchip for his insight.
-
- 13 Apr 2002; M.Schlemmer <azarah@gentoo.org> : After much thought, decided to
- remove the "avi" USE flag, as it enabling or disabling use of the win32 codecs
- is not valid. Also, avifile's main use *is* to do avi.
-
-*avifile-0.7.20020412 (12 Apr 2002)
-
- 12 Apr 2002; Seemant Kulleen <seemant@gentoo.org> avifile-0.7.20020412.ebuild:
- New release, and they keep changing the naming scheme -- aaarrgh
-
-*avifile-0.6.0.20011220-r1 (28 Mar 2002)
-
- 28 Mar 2002; Seemant Kulleen <seemant@gentoo.org> avifile-0.6.0-20011220-r1.ebuild :
- Many changes in here, involving USE dependent compilation of support for:
- oggvorbis, avi (win32codecs), sdl, mmx/3dnow/sse (x86 optimisation), kde
- (for kde sample somethings)
-
-*avifile-0.6.0.20011220 (17 Feb 2002)
-
-*avifile-0.53.5-r1 (1 Feb 2002)
-
- 1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
- Added initial ChangeLog which should be updated whenever the package is
- updated in any way. This changelog is targetted to users. This means that the
- comments should well explained and written in clean English. The details about
- writing correct changelogs are explained in the skel.ChangeLog file which you
- can find in the root directory of the portage repository.
diff --git a/media-video/avifile/Manifest b/media-video/avifile/Manifest
deleted file mode 100644
index 8ca4b7f72854..000000000000
--- a/media-video/avifile/Manifest
+++ /dev/null
@@ -1,37 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c59cb59e97b3ae3ee01f980ac6183b04 ChangeLog 21842
-MD5 8981c162145c43fd70699f83c3f94ae0 avifile-0.7.38.20030710-r1.ebuild 3980
-MD5 35a55f8388e88bfab099edd7bf8ccffb avifile-0.7.41.20041001-r1.ebuild 4568
-MD5 38ecc8f255e1a65a1759b55320f836d5 avifile-0.7.41.20041001-r2.ebuild 4537
-MD5 f4b7a72550bd92613f4e250a4fea99b9 avifile-0.7.43.20050224-r1.ebuild 4658
-MD5 b0ed2a53e9617d74fe179240bc23dc5e avifile-0.7.43.20050224-r2.ebuild 5201
-MD5 8390bf9de24635d667a5724c2cc0cbe9 files/avifile-0.7.37.20030522-divx.patch 11943
-MD5 7a55e6cb72df715c9b822505d5b4b8b0 files/avifile-0.7.38.20030710-2.6.patch 2038
-MD5 624ac61f6a4fb9ed9700a7496f2827cb files/avifile-0.7.38.20030710-amd64.patch 466
-MD5 769b5c63369a3c1bc5b74abe591731fd files/avifile-0.7.38.20030710-sparc.patch 998
-MD5 37a0170a523a26fd8a8c576c498b3641 files/avifile-0.7.41.20041001-gcc2.patch 1006
-MD5 d004578ed49e07cac372c21c044775fe files/avifile-0.7.43.20050224-1.0.0.1.gcc4.patch 5878
-MD5 7404620a2904bb27683df4a0ed2f412d files/avifile-0.7.43.20050224-fixlabels.patch 559
-MD5 db5a5ee4d4627cbfa05d775c118cbc53 files/avifile-0.7.43.20050224-pic.patch 1416
-MD5 6cab3d2acc1d30f101f100f9549613d8 files/avifile-0.7.43.20050224-sdllibs.patch 569
-MD5 6eb792de0d30abfb680655dcdec8b15c files/avifile-0.7.43.20050224-sysffmpeg.patch 14435
-MD5 69d7c84947a5ea083f25e43fdacc126e files/avifile-gcc34.patch 5795
-MD5 1c397a5be4ce93dd90fde2b9ab3aa937 files/avifile-mad.patch 1846
-MD5 f2e5938361909893d37d1ce0b80fdbfc files/avifile-x86-gcc34.patch 5247
-MD5 21e60c1838b04fa1990fe5538569ac4b files/digest-avifile-0.7.38.20030710-r1 71
-MD5 f19f862b147fa314ed83d4b78e661a5d files/digest-avifile-0.7.41.20041001-r1 71
-MD5 f19f862b147fa314ed83d4b78e661a5d files/digest-avifile-0.7.41.20041001-r2 71
-MD5 3eca07dd543790b26539e1c1755d4fde files/digest-avifile-0.7.43.20050224-r1 72
-MD5 3eca07dd543790b26539e1c1755d4fde files/digest-avifile-0.7.43.20050224-r2 72
-MD5 5c7a3ea4957036aa1da3db9880a3ed34 files/flvenc-patch 558
-MD5 c5840e80e1a70f6b5ce25679e53f2dcb files/throw.patch 7396
-MD5 3a58fac5e578938333e1e6afea64657c metadata.xml 217
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDwWbGV3J2n04EauwRAjTvAJ0ej2tJ2636oKbF76q4AyR1rW4p8QCfVvu+
-8BZBbiNfw0LDA6K5tnEiEQ0=
-=jSF/
------END PGP SIGNATURE-----
diff --git a/media-video/avifile/avifile-0.7.38.20030710-r1.ebuild b/media-video/avifile/avifile-0.7.38.20030710-r1.ebuild
deleted file mode 100644
index f168e6f6cf1a..000000000000
--- a/media-video/avifile/avifile-0.7.38.20030710-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.38.20030710-r1.ebuild,v 1.6 2005/10/24 09:22:43 flameeyes Exp $
-
-inherit eutils qt3
-
-MAJ_PV=${PV:0:3}
-MIN_PV=${PV:0:6}
-MY_P="${PN}-${MAJ_PV}-${MIN_PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Library for AVI-Files"
-HOMEPAGE="http://avifile.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0.7"
-KEYWORDS="x86 ~sparc alpha amd64 ia64"
-IUSE="3dnow X alsa avi debug dvd esd mmx oggvorbis qt sdl sse static truetype xv zlib"
-
-DEPEND=">=media-libs/jpeg-6b
- x86? ( >=media-libs/win32codecs-0.90 )
- >=media-video/ffmpeg-0.4
- >=media-libs/xvid-0.9.0
- >=media-sound/lame-3.90
- >=media-libs/audiofile-0.2.3
- >=sys-apps/sed-4
- >=media-sound/madplay-0.14.2b
- >=sys-devel/patch-2.5.9
- truetype? ( >=media-libs/freetype-2.1 )
- xv? ( virtual/x11 )
- sdl? ( >=media-libs/libsdl-1.2.2 )
- dvd? ( >=media-libs/a52dec-0.7 )
- zlib? ( >=sys-libs/zlib-1.1.3 )
- oggvorbis? ( >=media-libs/libvorbis-1.0 )
- X? ( virtual/x11 virtual/xft )
- qt? ( $(qt_min_version 3.1) )
- alsa? ( >=media-libs/alsa-lib-0.9.0_rc2 )
- esd? ( >=media-sound/esound-0.2.28 )"
-
-src_unpack() {
- unpack ${A}
- use qt || sed -i 's/qt[a-z]*//g' ${S}/samples/Makefile.am
-
- epatch ${FILESDIR}/flvenc-patch
- epatch ${FILESDIR}/${P}-2.6.patch
- use amd64 && epatch ${FILESDIR}/${P}-amd64.patch
- use sparc && epatch ${FILESDIR}/${P}-sparc.patch
- epatch ${FILESDIR}/avifile-gcc34.patch
- epatch ${FILESDIR}/avifile-x86-gcc34.patch
-
- # make sure pkgconfig file is correct #53183
- cd ${S}
- rm -f avifile.pc
- sed -i "/^includedir=/s:avifile$:avifile-${PV:0:3}:" avifile.pc.in
-}
-
-src_compile() {
- local myconf="--enable-oss"
- local kdepre=""
-
- if [ "$XINERAMA" = "NO" ]; then
- myconf="${myconf} --disable-xinerama"
- fi
-
- if [ "$DPMS" = "NO" ]; then
- myconf="${myconf} --disable-dpms"
- fi
-
- if [ "$V4L" = "NO" ]; then
- myconf="${myconf} --disable-v4l"
- fi
-
- if [ "$SUN" = "NO" ]; then
- myconf="${myconf} --disable-sunaudio"
- fi
-
- if [ "$SBLIVE" = "NO" ]; then
- myconf="${myconf} --disable-ac3passthrough"
- fi
-
- use debug \
- && myconf="${myconf} --enable-loader-out" \
- || myconf="${myconf} --enable-quiet"
-
- ( use mmx || use sse || use 3dnow ) && myconf="${myconf} --enable-x86opt"
-
- if [ "$MGA" = "NO" ]; then
- myconf="${myconf} --disable-mga"
- fi
-
- if [ "$DMALLOC" = "YES" ]; then
- myconf="${myconf} --with-dmallocth"
- fi
-
- use qt \
- && myconf="${myconf} --with-qt-prefix=${QTDIR}" \
- || myconf="${myconf} --without-qt"
-
- # Rather not use custom ones here .. build should set as high as
- # safe by itself.
- unset CFLAGS CXXFLAGS LDFLAGS CC CXX
-
- # Make sure we include freetype2 headers before freetype1 headers, else Xft2
- # borks, bug #11941.
- export C_INCLUDE_PATH="${C_INCLUDE_PATH}:/usr/include/freetype2"
- export CPLUS_INCLUDE_PATH="${CPLUS_INCLUDE_PATH}:/usr/include/freetype2"
-
- # Fix qt detection
- sed -i \
- -e "s:extern \"C\" void exit(int);:/* extern \"C\" void exit(int); */:" \
- configure
-
- econf \
- `use_enable static` \
- `use_enable truetype freetype2` \
- `use_enable xv` \
- `use_enable sdl` `use_enable sdl sdltest` \
- `use_enable dvd a52` `use_enable dvd ffmpeg-a52` \
- `use_enable zlib libz` \
- `use_enable oggvorbis vorbis` `use_enable oggvorbis oggtest` `use_enable oggvorbis vorbistest` \
- `use_with X x` `use_enable X xft` \
- --enable-samples \
- --disable-vidix \
- --with-fpic \
- --enable-lame-bin \
- ${myconf} \
- || die
- emake || die
-}
-
-src_install() {
- dodir /usr/lib /usr/bin
- use avi && dodir /usr/lib/win32
-
- make install DESTDIR=${D} || die
-
- dodoc README INSTALL
- cd doc
- dodoc CREDITS EXCEPTIONS TODO VIDEO-PERFORMANCE WARNINGS KNOWN_BUGS
-}
-
-pkg_postinst() {
- einfo "In order to use certain video modes, you must be root"
- einfo "chmod +s /usr/bin/aviplay to suid root"
- einfo "As this is considered a security risk on multiuser"
- einfo "systems, this is not done by default"
-}
diff --git a/media-video/avifile/avifile-0.7.41.20041001-r1.ebuild b/media-video/avifile/avifile-0.7.41.20041001-r1.ebuild
deleted file mode 100644
index 8e5f66bdacab..000000000000
--- a/media-video/avifile/avifile-0.7.41.20041001-r1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.41.20041001-r1.ebuild,v 1.11 2005/10/24 09:22:43 flameeyes Exp $
-
-inherit eutils flag-o-matic qt3
-
-MAJ_PV=${PV:0:3}
-MIN_PV=${PV:0:6}
-MY_P="${PN}-${MAJ_PV}-${MIN_PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Library for AVI-Files"
-HOMEPAGE="http://avifile.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0.7"
-
-#-sparc: 0.7.41 - dsputil_init_vis undefined - eradicator
-KEYWORDS="~alpha amd64 ~arm ~ia64 -mips -sparc x86"
-IUSE="3dnow X alsa avi debug dvd esd mmx oggvorbis qt sdl sse static truetype xv zlib"
-
-DEPEND=">=media-libs/jpeg-6b
- x86? ( >=media-libs/win32codecs-0.90 )
- >=media-video/ffmpeg-0.4
- =media-libs/xvid-1*
- >=media-sound/lame-3.90
- >=media-libs/audiofile-0.2.3
- >=sys-apps/sed-4
- >=media-sound/madplay-0.14.2b
- >=sys-devel/patch-2.5.9
- truetype? ( >=media-libs/freetype-2.1 )
- xv? ( virtual/x11 )
- sdl? ( >=media-libs/libsdl-1.2.2 )
- dvd? ( >=media-libs/a52dec-0.7 )
- zlib? ( >=sys-libs/zlib-1.1.3 )
- oggvorbis? ( >=media-libs/libvorbis-1.0 )
- X? ( virtual/x11 virtual/xft )
- qt? ( $(qt_min_version 3.1) )
- alsa? ( >=media-libs/alsa-lib-0.9.0_rc2 )
- esd? ( >=media-sound/esound-0.2.28 )"
-
-src_unpack() {
- unpack ${A}
- use qt || sed -i 's/qt[a-z]*//g' ${S}/samples/Makefile.am
-
- # make sure pkgconfig file is correct #53183
- cd ${S}
- epatch ${FILESDIR}/throw.patch
- epatch ${FILESDIR}/${PN}-${PV}-gcc2.patch
- use sparc && epatch ${FILESDIR}/${P}-sparc.patch
- rm -f avifile.pc
- sed -i "/^includedir=/s:avifile$:avifile-${PV:0:3}:" avifile.pc.in \
- || die "sed failed (avifile.pc.in)"
- sed -e "s:| sed s/-g//::" -i configure || die "sed failed (-g)"
- # Fix qt detection
- sed -i \
- -e "s:extern \"C\" void exit(int);:/* extern \"C\" void exit(int); */:" \
- configure || die "sed failed (qt detection)"
- # Fix hardcoded Xrender linking, bug #68899
- if ! use X; then
- sed -e 's/-lXrender//g' -i lib/video/Makefile.* \
- || die "sed failed (Xrender)"
- fi
- # adding CFLAGS by default which exists only for x86 is no good idea
- # but I can't get it through gcc 3.4.3 without omit-frame-pointer
- find . -name "Makefile.in" | while read file; do
- sed -e "s/^AM_CFLAGS = .*/AM_CFLAGS = -fomit-frame-pointer/" -i $file
- done
-}
-
-src_compile() {
- local myconf="--enable-oss --disable-xvid --enable-xvid4"
- local kdepre=""
-
- if [ "$XINERAMA" = "NO" ]; then
- myconf="${myconf} --disable-xinerama"
- fi
-
- if [ "$DPMS" = "NO" ]; then
- myconf="${myconf} --disable-dpms"
- fi
-
- if [ "$V4L" = "NO" ]; then
- myconf="${myconf} --disable-v4l"
- fi
-
- if [ "$SUN" = "NO" ]; then
- myconf="${myconf} --disable-sunaudio"
- fi
-
- if [ "$SBLIVE" = "NO" ]; then
- myconf="${myconf} --disable-ac3passthrough"
- fi
-
- use debug \
- && myconf="${myconf} --enable-loader-out" \
- || myconf="${myconf} --enable-quiet"
-
- ( use mmx || use sse || use 3dnow ) && myconf="${myconf} --enable-x86opt"
-
- if [ "$MGA" = "NO" ]; then
- myconf="${myconf} --disable-mga"
- fi
-
- if [ "$DMALLOC" = "YES" ]; then
- myconf="${myconf} --with-dmallocth"
- fi
-
- use qt \
- && myconf="${myconf} --with-qt-prefix=${QTDIR}" \
- || myconf="${myconf} --without-qt"
-
- # Make sure we include freetype2 headers before freetype1 headers, else Xft2
- # borks, bug #11941.
- export C_INCLUDE_PATH="${C_INCLUDE_PATH}:/usr/include/freetype2"
- export CPLUS_INCLUDE_PATH="${CPLUS_INCLUDE_PATH}:/usr/include/freetype2"
-
- filter-flags "-momit-leaf-frame-pointer"
-
- export FFMPEG_CFLAGS="${CFLAGS}"
-
- econf \
- `use_enable static` \
- `use_enable truetype freetype2` \
- `use_enable xv` \
- `use_enable sdl` `use_enable sdl sdltest` \
- `use_enable dvd a52` `use_enable dvd ffmpeg-a52` \
- `use_enable zlib libz` \
- `use_enable oggvorbis vorbis` `use_enable oggvorbis oggtest` `use_enable oggvorbis vorbistest` \
- `use_with X x` `use_enable X xft` \
- --enable-samples \
- --disable-vidix \
- --with-fpic \
- --enable-lame-bin \
- ${myconf} \
- || die
- emake || die
-}
-
-src_install() {
- use avi && dodir /usr/$(get_libdir)/win32
-
- make DESTDIR="${D}" install || die
-
- dodoc README INSTALL
- cd doc
- dodoc CREDITS EXCEPTIONS TODO VIDEO-PERFORMANCE WARNINGS KNOWN_BUGS
-}
-
-src_test() {
- ewarn "Testing disabled for this ebuild."
-}
-
-pkg_postinst() {
- if use qt; then # else no aviplay built
- einfo "In order to use certain video modes, you must be root"
- einfo "chmod +s /usr/bin/aviplay to suid root"
- einfo "As this is considered a security risk on multiuser"
- einfo "systems, this is not done by default"
- fi
-}
diff --git a/media-video/avifile/avifile-0.7.41.20041001-r2.ebuild b/media-video/avifile/avifile-0.7.41.20041001-r2.ebuild
deleted file mode 100644
index 9cff85672922..000000000000
--- a/media-video/avifile/avifile-0.7.41.20041001-r2.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.41.20041001-r2.ebuild,v 1.6 2005/10/24 09:22:43 flameeyes Exp $
-
-inherit eutils flag-o-matic qt3
-
-MAJ_PV=${PV:0:3}
-MIN_PV=${PV:0:6}
-MY_P="${PN}-${MAJ_PV}-${MIN_PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Library for AVI-Files"
-HOMEPAGE="http://avifile.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0.7"
-
-#-sparc: 0.7.41 - dsputil_init_vis undefined - eradicator
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips -sparc ~x86"
-IUSE="3dnow X alsa avi debug dmalloc dpms dvd encode esd mad matrox
-mmx oggvorbis oss qt sblive sdl sse static truetype v4l vidix xinerama xv xvid zlib"
-
-DEPEND="alsa? ( >=media-libs/alsa-lib-0.9.0_rc2 )
- avi? ( x86? ( >=media-libs/win32codecs-0.90 ) )
- dmalloc? ( !amd64? ( !arm? ( !mips? ( dev-libs/dmalloc ) ) ) )
- dvd? ( >=media-libs/a52dec-0.7 )
- encode? ( >=media-sound/lame-3.90 )
- esd? ( >=media-sound/esound-0.2.28 )
- mad? ( media-libs/libmad )
- oggvorbis? ( >=media-libs/libvorbis-1.0 )
- qt? ( $(qt_min_version 3.1) )
- sdl? ( >=media-libs/libsdl-1.2.2 )
- truetype? ( >=media-libs/freetype-2.1 )
- xv? ( virtual/x11 )
- xvid? ( =media-libs/xvid-1* )
- X? ( virtual/x11 virtual/xft )
- zlib? ( >=sys-libs/zlib-1.1.3 )
- >=media-libs/audiofile-0.2.3
- >=media-libs/jpeg-6b
- >=media-video/ffmpeg-0.4
- >=sys-apps/sed-4
- >=sys-devel/patch-2.5.9"
-
-src_unpack() {
- unpack ${A}
- use qt || sed -i 's/qt[a-z]*//g' ${S}/samples/Makefile.am
-
- # make sure pkgconfig file is correct #53183
- cd ${S}
- epatch ${FILESDIR}/throw.patch
- epatch ${FILESDIR}/${PN}-${PV}-gcc2.patch
- use sparc && epatch ${FILESDIR}/${P}-sparc.patch
- rm -f avifile.pc
- sed -i "/^includedir=/s:avifile$:avifile-${PV:0:3}:" avifile.pc.in \
- || die "sed failed (avifile.pc.in)"
- sed -e "s:| sed s/-g//::" -i configure || die "sed failed (-g)"
- # Fix qt detection
- sed -i \
- -e "s:extern \"C\" void exit(int);:/* extern \"C\" void exit(int); */:" \
- configure || die "sed failed (qt detection)"
- # Fix hardcoded Xrender linking, bug #68899
- if ! use X; then
- sed -e 's/-lXrender//g' -i lib/video/Makefile.* \
- || die "sed failed (Xrender)"
- fi
- # adding CFLAGS by default which exists only for x86 is no good idea
- # but I can't get it through gcc 3.4.3 without omit-frame-pointer
- find . -name "Makefile.in" | while read file; do
- sed -e "s/^AM_CFLAGS = .*/AM_CFLAGS = -fomit-frame-pointer/" -i $file
- done
-}
-
-src_compile() {
- local myconf=""
- local kdepre=""
-
- use sparc \
- && myconf="${myconf} --enable-sunaudio" \
- || myconf="${myconf} --disable-sunaudio"
-
- use debug \
- && myconf="${myconf} --enable-loader-out" \
- || myconf="${myconf} --enable-quiet"
-
- ( use mmx || use sse || use 3dnow ) && myconf="${myconf} --enable-x86opt"
-
- use encode \
- && myconf="${myconf} --disable-lame --enable-lamebin" \
- || myconf="${myconf} --enable-lame --disable-lamebin"
-
- # Make sure we include freetype2 headers before freetype1 headers, else Xft2
- # borks, bug #11941.
- export C_INCLUDE_PATH="${C_INCLUDE_PATH}:/usr/include/freetype2"
- export CPLUS_INCLUDE_PATH="${CPLUS_INCLUDE_PATH}:/usr/include/freetype2"
-
- filter-flags "-momit-leaf-frame-pointer"
-
- export FFMPEG_CFLAGS="${CFLAGS}"
-
- econf \
- `use_enable avi win32` \
- `use_with dmalloc dmallocth` \
- `use_enable dvd a52` `use_enable dvd ffmpeg-a52` \
- `use_enable dpms` \
- `use_enable mad` `use_enable libmad` \
- `use_enable matrox mga` \
- `use_enable oggvorbis vorbis` `use_enable oggvorbis oggtest` `use_enable oggvorbis vorbistest` \
- `use_enable oss` \
- `use_with qt` \
- `use_enable sblive ac3passthrough` \
- `use_enable sdl` `use_enable sdl sdltest` \
- `use_enable static` \
- `use_enable truetype freetype2` \
- `use_enable v4l` \
- `use_enable vidix` \
- `use_with X x` `use_enable X xft` \
- `use_enable xv` \
- `use_enable xvid xvid4` --disable-xvid \
- `use_enable zlib libz` \
- ${myconf} \
- || die
- emake || die
-}
-
-src_install() {
- use avi && dodir /usr/$(get_libdir)/win32
-
- make DESTDIR="${D}" install || die
-
- dodoc README INSTALL
- cd doc
- dodoc CREDITS EXCEPTIONS TODO VIDEO-PERFORMANCE WARNINGS KNOWN_BUGS
-}
-
-src_test() {
- ewarn "Testing disabled for this ebuild."
-}
-
-pkg_postinst() {
- if use qt; then # else no aviplay built
- einfo "In order to use certain video modes, you must be root"
- einfo "chmod +s /usr/bin/aviplay to suid root"
- einfo "As this is considered a security risk on multiuser"
- einfo "systems, this is not done by default"
- fi
-}
diff --git a/media-video/avifile/avifile-0.7.43.20050224-r1.ebuild b/media-video/avifile/avifile-0.7.43.20050224-r1.ebuild
deleted file mode 100644
index a4a12b735297..000000000000
--- a/media-video/avifile/avifile-0.7.43.20050224-r1.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.43.20050224-r1.ebuild,v 1.13 2005/10/24 09:22:43 flameeyes Exp $
-
-inherit eutils flag-o-matic qt3
-
-MAJ_PV=${PV:0:3}
-MIN_PV=${PV:0:6}
-MY_P="${PN}-${MAJ_PV}-${MIN_PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Library for AVI-Files"
-HOMEPAGE="http://avifile.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0.7"
-
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips sparc ~x86"
-IUSE="3dnow X alsa debug dmalloc dpms a52 encode esd mad matrox
-mmx vorbis oss qt sblive sdl sse truetype v4l vidix win32codecs xinerama xv xvid
-zlib"
-
-RDEPEND="alsa? ( >=media-libs/alsa-lib-0.9.0_rc2 )
- win32codecs? ( >=media-libs/win32codecs-0.90 )
- dmalloc? ( !amd64? ( !arm? ( !mips? ( dev-libs/dmalloc ) ) ) )
- a52? ( >=media-libs/a52dec-0.7 )
- encode? ( >=media-sound/lame-3.90 )
- esd? ( >=media-sound/esound-0.2.28 )
- mad? ( media-libs/libmad )
- vorbis? ( >=media-libs/libvorbis-1.0 )
- qt? ( $(qt_min_version 3.1) )
- sdl? ( >=media-libs/libsdl-1.2.2 )
- truetype? ( >=media-libs/freetype-2.1 )
- xv? ( virtual/x11 )
- xvid? ( =media-libs/xvid-1* )
- X? ( virtual/x11 virtual/xft )
- zlib? ( >=sys-libs/zlib-1.1.3 )
- >=media-video/ffmpeg-0.4.9_p20050226-r2
- >=media-libs/jpeg-6b"
-
-DEPEND="${RDEPEND}
- >=sys-devel/autoconf-2.59
- >=sys-devel/automake-1.4_p6
- sys-devel/libtool"
-# v4l needs linux headers
-# v4l? ( virtual/os-headers )
-
-pkg_setup() {
- if use qt && use dmalloc; then
- die "Sorry, qt and dmalloc can't be enabled at the same time."
- fi
-}
-
-src_unpack() {
- unpack ${A}
-
- cd ${S}
-
- epatch ${FILESDIR}/avifile-0.7.43.20050224-sysffmpeg.patch
- # removes sed-out of -L/usr/lib(64?) on sdl libs flags
- epatch ${FILESDIR}/avifile-0.7.43.20050224-sdllibs.patch
- # fixes bug #86320
- epatch ${FILESDIR}/${P}-fixlabels.patch
- # fix building with gcc4
- # http://debian-amd64.alioth.debian.org/gcc-3.4/patches/avifile_0.7.43.20050224-1.0.0.1.gcc4.patch
- epatch ${FILESDIR}/${P}-1.0.0.1.gcc4.patch
-
- if ! use qt ; then
- sed -i -e 's/qtvidcap\ qtrecompress//g' \
- ${S}/samples/Makefile.am || die "qt based sample test removal failed"
- fi
-
- # Fix hardcoded Xrender linking, bug #68899
- if ! use X; then
- sed -i -e 's/-lXrender//g' ${S}/lib/video/Makefile.* || die "sed failed (Xrender)"
- fi
-
- # Stop them from stripping out -g
- sed -i -e "s:| sed s/-g//::" ${S}/configure{,.ac} || die "sed failed (-g)"
-
- # Run autotools...
- cd ${S}
- [[ -f configure.ac ]] && rm -f configure.in
- # acinclude have a broken SDL test that clobber '/usr/lib64' to '4'
- rm -f acinclude.m4
-
- # Reconfigure autotools
- ACLOCAL_FLAGS="-I m4" ./autogen.sh --copy --force || die "autogen.sh failed"
-
- # fixes mad FPM detection
- epatch ${FILESDIR}/${PN}-mad.patch
-
- # make sure pkgconfig file is correct #53183
- rm -f avifile.pc
-}
-
-src_compile() {
- local myconf=""
- local kdepre=""
-
- use debug \
- && myconf="${myconf} --enable-loader-out" \
- || myconf="${myconf} --enable-quiet"
-
- ( use mmx || use sse || use 3dnow ) && myconf="${myconf} --enable-x86opt"
-
- use encode \
- && myconf="${myconf} --disable-lame --enable-lamebin" \
- || myconf="${myconf} --enable-lame --disable-lamebin"
-
- # Make sure we include freetype2 headers before freetype1 headers, else Xft2
- # borks, bug #11941.
- export C_INCLUDE_PATH="${C_INCLUDE_PATH}:/usr/include/freetype2"
- export CPLUS_INCLUDE_PATH="${CPLUS_INCLUDE_PATH}:/usr/include/freetype2"
-
- filter-flags "-momit-leaf-frame-pointer"
-
- export FFMPEG_CFLAGS="${CFLAGS}"
-
- econf \
- $(use_enable win32codecs win32) \
- $(use_with dmalloc dmallocth) \
- $(use_enable a52) $(use_enable a52 ffmpeg-a52) \
- $(use_enable dpms) \
- $(use_enable mad) $(use_enable mad libmad) \
- $(use_enable matrox mga) \
- $(use_enable vorbis) \
- $(use_enable oss) \
- $(use_with qt) \
- $(use_enable sblive ac3passthrough) \
- $(use_with sdl) \
- $(use_enable truetype freetype2) \
- $(use_enable v4l) \
- $(use_enable vidix) \
- $(use_with X x) $(use_enable X xft) \
- $(use_enable xv) \
- $(use_enable xvid xvid4) --disable-xvid \
- $(use_enable zlib libz) \
- ${myconf} \
- || die
- emake || die
-}
-
-src_install() {
- make DESTDIR="${D}" install || die
-
- dodoc README
- cd doc
- dodoc CREDITS EXCEPTIONS TODO VIDEO-PERFORMANCE WARNINGS KNOWN_BUGS
-}
-
-src_test() {
- ewarn "Testing disabled for this ebuild."
-}
-
-pkg_postinst() {
- if use qt; then # else no aviplay built
- einfo "In order to use certain video modes, you must be root"
- einfo "chmod +s /usr/bin/aviplay to suid root"
- einfo "As this is considered a security risk on multiuser"
- einfo "systems, this is not done by default"
- fi
-}
diff --git a/media-video/avifile/avifile-0.7.43.20050224-r2.ebuild b/media-video/avifile/avifile-0.7.43.20050224-r2.ebuild
deleted file mode 100644
index cdbca45b15ce..000000000000
--- a/media-video/avifile/avifile-0.7.43.20050224-r2.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.43.20050224-r2.ebuild,v 1.7 2005/12/13 16:40:19 spyderous Exp $
-
-inherit eutils flag-o-matic qt3
-
-MAJ_PV=${PV:0:3}
-MIN_PV=${PV:0:6}
-MY_P="${PN}-${MAJ_PV}-${MIN_PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Library for AVI-Files"
-HOMEPAGE="http://avifile.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0.7"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86"
-IUSE="3dnow X alsa debug dmalloc dpms a52 encode esd mad matrox
-mmx vorbis oss qt sblive sdl sse truetype v4l vidix win32codecs xinerama xv xvid
-zlib"
-
-RDEPEND="alsa? ( >=media-libs/alsa-lib-0.9.0_rc2 )
- win32codecs? ( >=media-libs/win32codecs-0.90 )
- dmalloc? ( !amd64? ( !arm? ( !mips? ( dev-libs/dmalloc ) ) ) )
- a52? ( >=media-libs/a52dec-0.7 )
- encode? ( >=media-sound/lame-3.90 )
- esd? ( >=media-sound/esound-0.2.28 )
- mad? ( media-libs/libmad )
- vorbis? ( >=media-libs/libvorbis-1.0 )
- qt? ( $(qt_min_version 3.1) )
- sdl? ( >=media-libs/libsdl-1.2.2 )
- truetype? ( >=media-libs/freetype-2.1 )
- xinerama? ( || ( x11-libs/libXinerama virtual/x11 ) )
- xv? ( || ( x11-libs/libXv virtual/x11 ) )
- xvid? ( =media-libs/xvid-1* )
- X? ( || ( ( x11-libs/libXi
- x11-libs/libXxf86dga
- x11-libs/libXxf86vm
- x11-libs/libXrender
- )
- virtual/x11
- )
- virtual/xft
- )
- zlib? ( >=sys-libs/zlib-1.1.3 )
- >=media-video/ffmpeg-0.4.9_p20050226-r2
- >=media-libs/jpeg-6b"
-
-DEPEND="${RDEPEND}
- xinerama? ( || ( x11-proto/xineramaproto virtual/x11 ) )
- xv? ( || ( x11-proto/videoproto virtual/x11 ) )
- X? ( || ( ( x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xf86dgaproto
- x11-proto/xf86vidmodeproto
- )
- virtual/x11
- )
- )
- >=sys-devel/autoconf-2.59
- >=sys-devel/automake-1.4_p6
- sys-devel/libtool"
-# v4l needs linux headers
-# v4l? ( virtual/os-headers )
-
-pkg_setup() {
- if use qt && use dmalloc; then
- die "Sorry, qt and dmalloc can't be enabled at the same time."
- fi
-}
-
-src_unpack() {
- unpack ${A}
-
- cd ${S}
-
- epatch ${FILESDIR}/avifile-0.7.43.20050224-sysffmpeg.patch
- # removes sed-out of -L/usr/lib(64?) on sdl libs flags
- epatch ${FILESDIR}/avifile-0.7.43.20050224-sdllibs.patch
- # fixes bug #86320
- epatch ${FILESDIR}/${P}-fixlabels.patch
- # fix building with gcc4
- # http://debian-amd64.alioth.debian.org/gcc-3.4/patches/avifile_0.7.43.20050224-1.0.0.1.gcc4.patch
- epatch ${FILESDIR}/${P}-1.0.0.1.gcc4.patch
- # Fix pic building (bug #88582)
- epatch ${FILESDIR}/${P}-pic.patch
-
- if ! use qt ; then
- sed -i -e 's/qtvidcap\ qtrecompress//g' \
- ${S}/samples/Makefile.am || die "qt based sample test removal failed"
- fi
-
- # Fix hardcoded Xrender linking, bug #68899
- if ! use X; then
- sed -i -e 's/-lXrender//g' ${S}/lib/video/Makefile.* || die "sed failed (Xrender)"
- fi
-
- # Stop them from stripping out -g
- sed -i -e "s:| sed s/-g//::" ${S}/configure{,.ac} || die "sed failed (-g)"
-
- # Run autotools...
- cd ${S}
- [[ -f configure.ac ]] && rm -f configure.in
- # acinclude have a broken SDL test that clobber '/usr/lib64' to '4'
- rm -f acinclude.m4
-
- # Reconfigure autotools
- ACLOCAL_FLAGS="-I m4" ./autogen.sh --copy --force || die "autogen.sh failed"
-
- # fixes mad FPM detection
- epatch ${FILESDIR}/${PN}-mad.patch
-
- # make sure pkgconfig file is correct #53183
- rm -f avifile.pc
-}
-
-src_compile() {
- local myconf=""
- local kdepre=""
-
- use debug \
- && myconf="${myconf} --enable-loader-out" \
- || myconf="${myconf} --enable-quiet"
-
- ( use mmx || use sse || use 3dnow ) && myconf="${myconf} --enable-x86opt"
-
- use encode \
- && myconf="${myconf} --disable-lame --enable-lamebin" \
- || myconf="${myconf} --enable-lame --disable-lamebin"
-
- # Make sure we include freetype2 headers before freetype1 headers, else Xft2
- # borks, bug #11941.
- export C_INCLUDE_PATH="${C_INCLUDE_PATH}:/usr/include/freetype2"
- export CPLUS_INCLUDE_PATH="${CPLUS_INCLUDE_PATH}:/usr/include/freetype2"
-
- filter-flags "-momit-leaf-frame-pointer"
-
- export FFMPEG_CFLAGS="${CFLAGS}"
-
- econf \
- $(use_enable win32codecs win32) \
- $(use_with dmalloc dmallocth) \
- $(use_enable a52) $(use_enable a52 ffmpeg-a52) \
- $(use_enable dpms) \
- $(use_enable mad) $(use_enable mad libmad) \
- $(use_enable matrox mga) \
- $(use_enable vorbis) \
- $(use_enable oss) \
- $(use_with qt) \
- $(use_enable sblive ac3passthrough) \
- $(use_with sdl) \
- $(use_enable truetype freetype2) \
- $(use_enable v4l) \
- $(use_enable vidix) \
- $(use_with X x) $(use_enable X xft) \
- $(use_enable xv) \
- $(use_enable xinerama) \
- $(use_enable xvid xvid4) --disable-xvid \
- $(use_enable zlib libz) \
- ${myconf} \
- || die
- emake || die
-}
-
-src_install() {
- make DESTDIR="${D}" install || die
-
- dodoc README
- cd doc
- dodoc CREDITS EXCEPTIONS TODO VIDEO-PERFORMANCE WARNINGS KNOWN_BUGS
-}
-
-src_test() {
- ewarn "Testing disabled for this ebuild."
-}
-
-pkg_postinst() {
- if use qt; then # else no aviplay built
- einfo "In order to use certain video modes, you must be root"
- einfo "chmod +s /usr/bin/aviplay to suid root"
- einfo "As this is considered a security risk on multiuser"
- einfo "systems, this is not done by default"
- fi
-}
diff --git a/media-video/avifile/files/avifile-0.7.37.20030522-divx.patch b/media-video/avifile/files/avifile-0.7.37.20030522-divx.patch
deleted file mode 100644
index 42de7c380750..000000000000
--- a/media-video/avifile/files/avifile-0.7.37.20030522-divx.patch
+++ /dev/null
@@ -1,391 +0,0 @@
-===================================================================
-RCS file: /cvsroot/avifile/avifile-0.6/plugins/libdivx4/divx4.cpp,v
-retrieving revision 1.86
-retrieving revision 1.87
-diff -u -r1.86 -r1.87
---- avifile/avifile-0.6/plugins/libdivx4/divx4.cpp 2003/05/20 14:41:44 1.86
-+++ avifile/avifile-0.6/plugins/libdivx4/divx4.cpp 2003/05/23 23:21:52 1.87
-@@ -32,7 +32,11 @@
- class DIVX_VideoDecoder: public IVideoDecoder, public IRtConfig
- {
- void* m_pDll;
-+#if DECORE_VERSION >= 20021112
-+ void* m_pHandle;
-+#else
- unsigned long m_ulHandle;
-+#endif
- int m_iLastPPMode;
- int m_iMaxAuto;
- int m_iLastBrightness;
-@@ -44,15 +48,28 @@
- bool m_bFlip;
- char m_cFormatBuf[128];
- avm::vector<AttributeInfo> m_YvAttrs;
-- int STDCALL (*m_pDecore)(unsigned long handle, // handle - the handle of the calling entity, must be unique
-- unsigned long dec_opt, // dec_opt - the option for docoding, see below
-+#if DECORE_VERSION >= 20021112
-+ typedef int STDCALL (*pDecoreFun)(void *handle, // handle - the handle of the calling entity, must be unique
-+ int dec_opt, // dec_opt - the option for docoding, see below
- void *param1, // param1 - the parameter 1 (it's actually meaning depends on dec_opt
- void *param2); // param2 - the parameter 2 (it's actually meaning depends on dec_opt
--
-+#else
-+ typedef int STDCALL (*pDecoreFun)(unsigned long handle, // handle - the handle of the calling entity, must be unique
-+ unsigned long dec_opt, // dec_opt - the option for docoding, see below
-+ void *param1, // param1 - the parameter 1 (it's actually meaning depends on dec_opt
-+ void *param2); // param2 - the parameter 2 (it's actually meaning depends on dec_opt
-+#endif
-+ pDecoreFun m_pDecore;
- public:
- DIVX_VideoDecoder(const CodecInfo& info, const BITMAPINFOHEADER& bh,
- int flip) :
-- IVideoDecoder(info, bh), m_pDll(0), m_ulHandle(0), m_iLastPPMode(0),
-+ IVideoDecoder(info, bh), m_pDll(0),
-+#if DECORE_VERSION < 20021112
-+ m_ulHandle(0),
-+#else
-+ m_pHandle(0),
-+#endif
-+ m_iLastPPMode(0),
- m_iLastBrightness(0), m_iLastContrast(0), m_iLastSaturation(0),
- m_bSetFlg(true), m_bFlip(flip)
- {
-@@ -74,9 +91,7 @@
- divx4_error_set("can't open %s", divxdecore);
- return -1;
- }
-- m_pDecore = (int STDCALL (*)(unsigned long, unsigned long,
-- void *, void *))
-- dlsym(m_pDll, "decore");
-+ m_pDecore = (pDecoreFun) dlsym(m_pDll, "decore");
- if (!m_pDecore)
- {
- divx4_error_set("can't resolve %s:decore", divxdecore);
-@@ -142,6 +157,31 @@
- }
- virtual int Start()
- {
-+#if DECORE_VERSION >= 20021112
-+ DEC_INIT init;
-+ memset(&init, 0, sizeof(init));
-+ switch(m_Info.fourcc)
-+ {
-+ case fccDIV3: init.codec_version = 311; break;
-+ case fccDIVX: init.codec_version = 412; break;
-+ default:
-+ case fccDX50: init.codec_version = 500; break;
-+ }
-+
-+ int result=m_pDecore((void*) &m_pHandle, DEC_OPT_INIT, &init, 0);
-+ if(result)
-+ {
-+ divx4_error_set("Error %d creating decoder instance", result);
-+ return -1;
-+ }
-+ assert(m_pHandle);
-+ result=m_pDecore(m_pHandle, DEC_OPT_SETOUT, &m_Dest, 0);
-+ if(result) // unacceptable color space
-+ {
-+ divx4_error_set("Error %d setting output", result);
-+ return -1;
-+ }
-+#else /* version < 20021112 */
- DEC_PARAM param;
-
- memset(&param, 0, sizeof(param));
-@@ -211,13 +251,19 @@
- case fccDX50: param.codec_version = 500; break;
- }
- param.build_number = 0;
--#endif
-+#endif /* 20020303 */
- m_ulHandle = (unsigned long) this;
- m_pDecore(m_ulHandle, DEC_OPT_INIT, &param, m_cFormatBuf);
-+#endif /* 20021112 */
- return 0;
- }
- virtual int Stop()
-- {
-+ {
-+#if DECORE_VERSION >= 20021112
-+ if (!m_pHandle)
-+ return -1;
-+ m_pDecore(m_pHandle, DEC_OPT_RELEASE, 0, 0);
-+#else /* 20021112 */
- if (!m_ulHandle)
- return -1;
- #if DECORE_VERSION > 20011009
-@@ -225,17 +271,22 @@
- // so release memory only with newer versions
- // and leave the memory leak with the older version
- m_pDecore(m_ulHandle, DEC_OPT_RELEASE, 0, 0);
--#else
-+#else /* 20011009 */
- #warning !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- #warning !USING OLD DIVX4 library - memory will be unreleased!
- #warning !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
--#endif
-+#endif /* 20011009 */
-+#endif /* 20021112 */
- PluginSetAttrInt(m_Info, divx4str_saturation, m_iLastSaturation);
- PluginSetAttrInt(m_Info, divx4str_contrast, m_iLastContrast);
- PluginSetAttrInt(m_Info, divx4str_brightness, m_iLastBrightness);
- PluginSetAttrInt(m_Info, divx4str_maxauto, m_iMaxAuto);
- PluginSetAttrInt(m_Info, divx4str_postprocessing, m_iLastPPMode);
-+#if DECORE_VERSION >= 20021112
-+ m_pHandle = 0;
-+#else
- m_ulHandle = 0;
-+#endif
- return 0;
- }
- virtual int DecodeFrame(CImage* pImage, const void* src, uint_t size,
-@@ -243,14 +294,21 @@
- CImage** pOut = 0)
- {
- DEC_FRAME param;
--
-- if (!size || !m_ulHandle)
-+
-+ if (!size ||
-+#if DECORE_VERSION >= 20021112
-+ !m_pHandle
-+#else
-+ !m_ulHandle
-+#endif
-+ )
- return 0;
- if (m_Dest.biHeight != pImage->GetFmt()->biHeight)
- {
- m_Dest = pImage->GetFmt();
- Restart();
- }
-+ memset(&param, 0, sizeof(param));
-
- // leave here for some time - until all users will use new headers
- param.bitstream = (void*) src;
-@@ -268,10 +326,20 @@
- param.stride = 0;
- param.render_flag = 0;
- }
--
- if (m_bSetFlg)
- {
- m_bSetFlg = false;
-+#if DECORE_VERSION >= 20021112
-+ int iSetOperation = DEC_ADJ_SET | DEC_ADJ_POSTPROCESSING;
-+ int iPP=m_iLastPPMode * 10;
-+ m_pDecore(m_pHandle, DEC_OPT_ADJUST, &iSetOperation, &iPP);
-+ iSetOperation = DEC_ADJ_SET | DEC_ADJ_BRIGHTNESS;
-+ m_pDecore(m_pHandle, DEC_OPT_ADJUST, &iSetOperation, &m_iLastBrightness);
-+ iSetOperation = DEC_ADJ_SET | DEC_ADJ_CONTRAST;
-+ m_pDecore(m_pHandle, DEC_OPT_ADJUST, &iSetOperation, &m_iLastContrast);
-+ iSetOperation = DEC_ADJ_SET | DEC_ADJ_SATURATION;
-+ m_pDecore(m_pHandle, DEC_OPT_ADJUST, &iSetOperation, &m_iLastSaturation);
-+#else /* version < 20021112 */
- DEC_SET set;
- set.postproc_level = m_iLastPPMode * 10;
- m_pDecore(m_ulHandle, DEC_OPT_SETPP, &set, 0);
-@@ -279,9 +347,13 @@
- m_pDecore(m_ulHandle, DEC_OPT_GAMMA, (void*)DEC_GAMMA_BRIGHTNESS, (void*)m_iLastBrightness);
- m_pDecore(m_ulHandle, DEC_OPT_GAMMA, (void*)DEC_GAMMA_CONTRAST, (void*)m_iLastContrast);
- m_pDecore(m_ulHandle, DEC_OPT_GAMMA, (void*)DEC_GAMMA_SATURATION, (void*)m_iLastSaturation);
--#endif
-+#endif /* DEC_OPT_GAMMA */
-+#endif /* 20021112 */
- }
-
-+#if DECORE_VERSION >= 20021112
-+ m_pDecore(m_pHandle, DEC_OPT_FRAME, &param, 0);
-+#else /* version < 20021112 */
- #ifdef USE_311_DECODER
- #if DECORE_VERSION < 20020303
- if(m_bCompat311)
-@@ -292,11 +364,12 @@
- m_pDecore(m_ulHandle, DEC_OPT_FRAME_311, &param, 0);
- }
- else
--#endif
--#endif
-+#endif /* 20020303 */
-+#endif /* USE_311_DECODER */
- {
- m_pDecore(m_ulHandle, DEC_OPT_FRAME, &param, 0);
- }
-+#endif
- pImage->SetQuality((float) m_iLastPPMode / DIVX4_MAX_QUALITY);
-
- return size;
-@@ -324,9 +397,13 @@
- default:
- return -1;
- }
-+#if DECORE_VERSION >= 20021112
-+ if(m_pHandle)
-+ m_pDecore(m_pHandle, DEC_OPT_SETOUT, &m_Dest, 0);
-+#else
- if (m_ulHandle)
- Restart();
--
-+#endif
- return 0;
- }
- virtual const avm::vector<AttributeInfo>& GetAttrs() const
-@@ -444,6 +521,7 @@
- (m_Info.fourcc == fccDIVX) ? "DivX4" : "DivX5" );
- m_obh.biCompression = m_Info.fourcc;
- m_obh.biHeight = labs(m_obh.biHeight);
-+#if ENCORE_VERSION < 5200
- switch (m_bh.biCompression)
- {
- // supports only bottom-up RGB for encoding
-@@ -460,29 +538,60 @@
- divx4_error_set("Unsupported input format");
- return -1;
- }
-+#else
-+ switch (m_bh.biCompression)
-+ {
-+ // supports only bottom-up RGB for encoding
-+ case 0:
-+ if (m_bh.biBitCount != 24) {
-+ divx4_error_set("Unsupported input bit depth");
-+ return -1;
-+ }
-+ break;
-+ case fccYUY2:
-+ case fccYV12:
-+ case fccI420:
-+ break;
-+ default:
-+ divx4_error_set("Unsupported input format");
-+ return -1;
-+ }
-+#endif
- return 0;
- }
- virtual int Start()
- {
-+#if ENCORE_MAJOR_VERSION < 5200
- ENC_PARAM param;
-+#else
-+ SETTINGS param;
-+#endif
- memset(&param, 0, sizeof(param));
-+#if ENCORE_MAJOR_VERSION < 5200
- param.x_dim=m_bh.biWidth;
- //param.y_dim=m_bh.biHeight;// labs(m_bh.biHeight);
- param.y_dim=labs(m_bh.biHeight);
- param.framerate=30;//frames/sec
--
-+#else
-+ param.input_clock = 1000000;
-+ param.input_frame_period = 33333;
-+#endif
- PluginGetAttrInt(m_Info, divx4str_bitrate, &param.bitrate);//bits/sec
-+#if ENCORE_MAJOR_VERSION < 5200
- PluginGetAttrInt(m_Info, divx4str_rc_period, &param.rc_period);
- PluginGetAttrInt(m_Info, divx4str_rc_reaction_period, &param.rc_reaction_period);
- PluginGetAttrInt(m_Info, divx4str_rc_reaction_ratio, &param.rc_reaction_ratio);
- PluginGetAttrInt(m_Info, divx4str_max_quantizer, &param.max_quantizer);//just guess
- PluginGetAttrInt(m_Info, divx4str_min_quantizer, &param.min_quantizer);
-+#endif
- PluginGetAttrInt(m_Info, divx4str_max_key_interval, &param.max_key_interval);
- PluginGetAttrInt(m_Info, divx4str_quality, &param.quality);
-
- int deinterlace = 0;
- int bidirect = 0;
- int obmc = 0;
-+#if ENCORE_MAJOR_VERSION < 5200
-+// to be done: all extended parameters of new encore
- #ifdef IF_SUPPORT_PRO
- // fast deinterlace
- PluginGetAttrInt(m_Info, divx4str_deinterlace, &deinterlace);
-@@ -490,16 +599,13 @@
- PluginGetAttrInt(m_Info, divx4str_bidirect, &bidirect);
- // flag to enable overlapped block motion compensation mode
- PluginGetAttrInt(m_Info, divx4str_obmc, &obmc);
--#endif
-+#endif /* IF_SUPPORT_PRO */
- param.deinterlace = deinterlace;
- #ifndef ENCORE_MAJOR_VERSION
- param.use_bidirect = bidirect;
--#if DECORE_VERSION > 2001009
- param.obmc = obmc;
--#endif
--#else
-+#else /* ENCORE_MAJOR_VERSION */
- memset(&param.extensions, 0, sizeof(param.extensions));
--
- #ifdef IF_SUPPORT_PRO
- param.extensions.use_bidirect = bidirect;
- param.extensions.obmc = obmc;
-@@ -532,11 +638,13 @@
- PluginGetAttrInt(m_Info, divx4str_spatial_level, &tmp);
- param.extensions.spatial_level = tmp / (double) 1000.0;
-
--#endif // ENCORE_MAJOR_VERSION >= 5010
-+#endif /* ENCORE_MAJOR_VERSION >= 5010 */
-+
-+#endif /* IF_SUPPORT_PRO */
-
--#endif // IF_SUPPORT_PRO
-+#endif /* ENCORE_MAJOR_VERSION */
-
--#endif // ENCORE_MAJOR_VERSION
-+#endif /* 5200 */
- if (param.quality == 1)
- {
- m_bRtMode=true;
-@@ -551,8 +659,17 @@
- else
- m_bRtMode=false;
- // param.flip=1;
-+#if ENCORE_MAJOR_VERSION < 5200
- m_pEncore(0, ENC_OPT_INIT, &param, 0);
- m_pHandle=param.handle;
-+#else
-+ int result=m_pEncore((void*)&m_pHandle, ENC_OPT_INIT, &param, &m_bh);
-+ if(result!=ENC_OK)
-+ {
-+ divx4_error_set("Error %d creating encoder", result);
-+ return -1;
-+ }
-+#endif
- return 0;
- }
- virtual int Stop()
-@@ -584,12 +701,16 @@
- //return -1;
- }
- ENC_FRAME param;
-+ memset(&param, 0, sizeof(param));
- ENC_RESULT result;
- param.bitstream = dest;
-+#if ENCORE_MAJOR_VERSION < 5200
- param.colorspace = m_iCSP;
-- param.image = (ci) ? ci->Data() : (void*) src->Data();
- param.mvs = 0;
-+#endif
-+ param.image = (ci) ? ci->Data() : (void*) src->Data();
- param.length = GetOutputSize();
-+#if ENCORE_MAJOR_VERSION < 5200
- if (m_bRtMode)
- {
- param.quant=m_iQuant;
-@@ -598,9 +719,15 @@
- m_pEncore(m_pHandle, ENC_OPT_ENCODE_VBR, &param, &result);
- }
- else
-+#endif
- m_pEncore(m_pHandle, ENC_OPT_ENCODE, &param, &result);
-+#if ENCORE_MAJOR_VERSION < 5200
- if (is_keyframe)
- *is_keyframe = result.is_key_frame ? 16 : 0;
-+#else
-+ if (is_keyframe)
-+ *is_keyframe = (result.cType == 'I') ? 16 : 0;
-+#endif
- if (size)
- *size = param.length;
- if (ci)
diff --git a/media-video/avifile/files/avifile-0.7.38.20030710-2.6.patch b/media-video/avifile/files/avifile-0.7.38.20030710-2.6.patch
deleted file mode 100644
index e89243275a37..000000000000
--- a/media-video/avifile/files/avifile-0.7.38.20030710-2.6.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -ur avifile-0.7-0.7.38/ffmpeg/libavformat/grab.c avifile-0.7-0.7.38.plasmaroo/ffmpeg/libavformat/grab.c
---- avifile-0.7-0.7.38/ffmpeg/libavformat/grab.c 2003-06-26 20:14:31.000000000 +0100
-+++ avifile-0.7-0.7.38.plasmaroo/ffmpeg/libavformat/grab.c 2003-12-26 21:41:48.000000000 +0000
-@@ -16,14 +16,24 @@
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-+
- #include "avformat.h"
-+
-+#if defined(__linux__)
-+ #include <linux/version.h>
-+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+ #include <sys/time.h>
-+ #endif
-+#else
-+ #include <sys/time.h>
-+#endif
-+#include <time.h>
-+
- #include <linux/videodev.h>
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/ioctl.h>
- #include <sys/mman.h>
--#include <sys/time.h>
--#include <time.h>
-
- typedef struct {
- int fd;
-diff -ur avifile-0.7-0.7.38/samples/qtvidcap/main.cpp avifile-0.7-0.7.38.plasmaroo/samples/qtvidcap/main.cpp
---- avifile-0.7-0.7.38/plugins/libwin32/loader/ldt_keeper.c 2002-08-08 10:05:51.000000000 +0100
-+++ avifile-0.7-0.7.38.plasmaroo/plugins/libwin32/loader/ldt_keeper.c 2004-01-02 16:17:06.000000000 +0000
-@@ -24,6 +24,10 @@
- #ifdef __linux__
- #include <asm/unistd.h>
- #include <asm/ldt.h>
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,47)
-+ #define modify_ldt_ldt_s user_desc
-+#endif
- /* prototype it here, so we won't depend on kernel headers */
- #ifdef __cplusplus
- extern "C" {
---- avifile-0.7-0.7.38/samples/qtvidcap/main.cpp 2003-06-08 18:26:04.000000000 +0100
-+++ avifile-0.7-0.7.38.plasmaroo/samples/qtvidcap/main.cpp 2003-12-26 19:21:20.000000000 +0000
-@@ -1,9 +1,6 @@
--
--#include "v4lwindow.h"
- #include "vidconf.h"
-
- #include <aviplay.h>
--#include "v4lxif.h"
- #include <avm_except.h>
- #include <avm_cpuinfo.h>
- #include <videoencoder.h>
-@@ -27,6 +24,8 @@
- #include <stdlib.h>
- #include <stdio.h>
-
-+#include "v4lwindow.h"
-+#include "v4lxif.h"
-
- unsigned int m_iMemory;
- const char* g_pcProgramName = "AviCap";
diff --git a/media-video/avifile/files/avifile-0.7.38.20030710-amd64.patch b/media-video/avifile/files/avifile-0.7.38.20030710-amd64.patch
deleted file mode 100644
index 15081799bc72..000000000000
--- a/media-video/avifile/files/avifile-0.7.38.20030710-amd64.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur avifile-0.7-0.7.38.orig/plugins/libmad/libmad/madconfig.h avifile-0.7-0.7.38/plugins/libmad/libmad/madconfig.h
---- avifile-0.7-0.7.38.orig/plugins/libmad/libmad/madconfig.h 2003-05-21 03:53:26.000000000 +0900
-+++ avifile-0.7-0.7.38/plugins/libmad/libmad/madconfig.h 2003-11-17 15:09:58.072518680 +0900
-@@ -13,6 +13,8 @@
- #define FPM_SPARC
- #elif ARCH_MIPS
- #define FPM_MIPS
-+#elif ARCH_X86_64
-+#define FPM_64BIT
- #endif
-
- #endif /* LIBMAD_MADCONFIG_H */
diff --git a/media-video/avifile/files/avifile-0.7.38.20030710-sparc.patch b/media-video/avifile/files/avifile-0.7.38.20030710-sparc.patch
deleted file mode 100644
index 00240de4dd1c..000000000000
--- a/media-video/avifile/files/avifile-0.7.38.20030710-sparc.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- avifile-0.7-0.7.38/ffmpeg/libavcodec/libpostproc/Makefile.am.orig 2003-12-26 17:34:26.000000000 -0500
-+++ avifile-0.7-0.7.38/ffmpeg/libavcodec/libpostproc/Makefile.am 2003-12-26 17:34:43.000000000 -0500
-@@ -10,7 +10,7 @@
- libpostproc_la_SOURCES = postprocess.c
-
- AM_CPPFLAGS = $(LTNOPIC) -DHAVE_AV_CONFIG_H $(FFMPEG_CFLAGS) -I$(srcdir)/..
--AM_CFLAGS = -O2 -fomit-frame-pointer -mno-omit-leaf-frame-pointer
-+AM_CFLAGS = -O2 -fomit-frame-pointer
-
-
- CLEANFILES = .depend *.a
---- avifile-0.7-0.7.38/ffmpeg/libavcodec/libpostproc/Makefile.in.orig 2003-12-26 17:34:31.000000000 -0500
-+++ avifile-0.7-0.7.38/ffmpeg/libavcodec/libpostproc/Makefile.in 2003-12-26 17:34:46.000000000 -0500
-@@ -138,7 +138,7 @@
- libpostproc_la_SOURCES = postprocess.c
-
- AM_CPPFLAGS = $(LTNOPIC) -DHAVE_AV_CONFIG_H $(FFMPEG_CFLAGS) -I$(srcdir)/..
--AM_CFLAGS = -O2 -fomit-frame-pointer -mno-omit-leaf-frame-pointer
-+AM_CFLAGS = -O2 -fomit-frame-pointer
-
- CLEANFILES = .depend *.a
- MAINTAINERCLEANFILES = Makefile.in
diff --git a/media-video/avifile/files/avifile-0.7.41.20041001-gcc2.patch b/media-video/avifile/files/avifile-0.7.41.20041001-gcc2.patch
deleted file mode 100644
index b8cbfa532e55..000000000000
--- a/media-video/avifile/files/avifile-0.7.41.20041001-gcc2.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- lib/subtitle/subread.c~ 2004-03-28 09:45:08 -0500
-+++ lib/subtitle/subread.c 2004-11-04 14:40:52 -0500
-@@ -101,11 +101,12 @@
- {
- int n = 0;
- char* b = trim_spaces(txt);
-- trim_http(b);
-+ char* t;
-+ trim_http(b);
-
- // skip color and font-style change - not supported right now
- // {c:$00ffff} {y:i}
-- char* t = strchr(b, '{');
-+ t = strchr(b, '{');
- if (t)
- {
- char u = toupper(t[1]);
---- ffmpeg/libavcodec/libpostproc/postprocess_template.c~ 2004-09-30 10:55:16 -0400
-+++ ffmpeg/libavcodec/libpostproc/postprocess_template.c 2004-11-04 14:20:43 -0500
-@@ -2731,6 +2731,7 @@
- if(dc_mask & eq_mask){
- int offset= -8*step;
- int64_t *temp_sums= sums;
-+ int xxx;
-
- asm volatile(
- "movq %2, %%mm0 \n\t" // QP,..., QP
-@@ -2870,7 +2871,7 @@
- );
-
- src+= step; // src points to begin of the 8x8 Block
-- int xxx = dc_mask & eq_mask;
-+ xxx = dc_mask & eq_mask;
- asm volatile(
- "movq %4, %%mm6 \n\t"
- "pcmpeqb %%mm5, %%mm5 \n\t"
diff --git a/media-video/avifile/files/avifile-0.7.43.20050224-1.0.0.1.gcc4.patch b/media-video/avifile/files/avifile-0.7.43.20050224-1.0.0.1.gcc4.patch
deleted file mode 100644
index a00595bccbf9..000000000000
--- a/media-video/avifile/files/avifile-0.7.43.20050224-1.0.0.1.gcc4.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-diff -urN avifile-0.7.43.20050224/ffmpeg/libavcodec/avcodec.h ./ffmpeg/libavcodec/avcodec.h
---- avifile-0.7.43.20050224/ffmpeg/libavcodec/avcodec.h 2005-02-24 12:31:10.000000000 +0100
-+++ avifile-0.7.43.20050224.gcc4/ffmpeg/libavcodec/avcodec.h 2005-03-18 09:29:44.849987503 +0100
-@@ -1813,6 +1813,14 @@
- #define FF_OPT_MAX_DEPTH 10
- } AVOption;
-
-+#ifdef HAVE_MMX
-+extern const struct AVOption avoptions_common[3 + 5];
-+#else
-+extern const struct AVOption avoptions_common[3];
-+#endif
-+extern const struct AVOption avoptions_workaround_bug[11];
-+
-+
- /**
- * Parse option(s) and sets fields in passed structure
- * @param strct structure where the parsed results will be written
-diff -urN avifile-0.7.43.20050224/ffmpeg/libavcodec/common.h ./ffmpeg/libavcodec/common.h
---- avifile-0.7.43.20050224/ffmpeg/libavcodec/common.h 2005-02-15 13:33:33.000000000 +0100
-+++ avifile-0.7.43.20050224.gcc4/ffmpeg/libavcodec/common.h 2005-03-18 09:34:02.595215479 +0100
-@@ -53,15 +53,6 @@
- { name, help, offsetof(AVCodecContext, field), FF_OPT_TYPE_RCOVERRIDE, .defval = 0, .defstr = NULL }
- #define AVOPTION_SUB(ptr) { .name = NULL, .help = (const char*)ptr }
- #define AVOPTION_END() AVOPTION_SUB(NULL)
--
--struct AVOption;
--#ifdef HAVE_MMX
--extern const struct AVOption avoptions_common[3 + 5];
--#else
--extern const struct AVOption avoptions_common[3];
--#endif
--extern const struct AVOption avoptions_workaround_bug[11];
--
- #endif /* HAVE_AV_CONFIG_H */
-
- /* Suppress restrict if it was not defined in config.h. */
-diff -urN avifile-0.7.43.20050224/ffmpeg/libavcodec/dsputil.h ./ffmpeg/libavcodec/dsputil.h
---- avifile-0.7.43.20050224/ffmpeg/libavcodec/dsputil.h 2005-02-15 13:33:34.000000000 +0100
-+++ avifile-0.7.43.20050224.gcc4/ffmpeg/libavcodec/dsputil.h 2005-03-18 09:24:45.732740888 +0100
-@@ -604,33 +604,6 @@
- return score;\
- }
-
--#ifndef HAVE_LRINTF
--/* XXX: add ISOC specific test to avoid specific BSD testing. */
--/* better than nothing implementation. */
--/* btw, rintf() is existing on fbsd too -- alex */
--static always_inline long int lrintf(float x)
--{
--#ifdef CONFIG_WIN32
--# ifdef ARCH_X86
-- int32_t i;
-- asm volatile(
-- "fistpl %0\n\t"
-- : "=m" (i) : "t" (x) : "st"
-- );
-- return i;
--# else
-- /* XXX: incorrect, but make it compile */
-- return (int)(x + (x < 0 ? -0.5 : 0.5));
--# endif
--#else
-- return (int)(rint(x));
--#endif
--}
--#else
--#ifndef _ISOC9X_SOURCE
--#define _ISOC9X_SOURCE
--#endif
- #include <math.h>
--#endif
-
- #endif
-diff -urN avifile-0.7.43.20050224/lib/aviplay/AudioQueue.h ./lib/aviplay/AudioQueue.h
---- avifile-0.7.43.20050224/lib/aviplay/AudioQueue.h 2004-08-25 18:29:06.000000000 +0200
-+++ avifile-0.7.43.20050224.gcc4/lib/aviplay/AudioQueue.h 2005-03-18 09:32:07.258488382 +0100
-@@ -16,10 +16,11 @@
- virtual int Mix(void* data, const void* src, uint_t n) const = 0;
- };
-
-+#define MAX_BUFFER_TIME 1.0;
-+
- class AudioQueue
- {
- public:
-- static const double MAX_BUFFER_TIME = 1.0;
- AudioQueue(WAVEFORMATEX& Iwf, WAVEFORMATEX& Owf);
- ~AudioQueue();
-
-diff -urN avifile-0.7.43.20050224/lib/aviplay/aviplay_impl.h ./lib/aviplay/aviplay_impl.h
---- avifile-0.7.43.20050224/lib/aviplay/aviplay_impl.h 2003-12-17 21:37:54.000000000 +0100
-+++ avifile-0.7.43.20050224.gcc4/lib/aviplay/aviplay_impl.h 2005-03-18 09:32:07.260487996 +0100
-@@ -136,8 +136,6 @@
- void createAudioRenderer();
- int restartVideoStreaming(const char* codec = 0);
-
-- static const float m_fDropLimit = -0.015;
--
- mutable int AviPlayer::propertyRead[LAST_PROPERTY]; // have we read at least once from Registry::
-
- avm::vector<IVideoRenderer*> m_VideoRenderers; // we could draw image to more places
-diff -urN avifile-0.7.43.20050224/lib/aviplay/aviplayth.cpp ./lib/aviplay/aviplayth.cpp
---- avifile-0.7.43.20050224/lib/aviplay/aviplayth.cpp 2004-10-25 12:27:42.000000000 +0200
-+++ avifile-0.7.43.20050224.gcc4/lib/aviplay/aviplayth.cpp 2005-03-18 09:32:07.261487803 +0100
-@@ -31,6 +31,7 @@
- // preffer video playing thread
- static const int PRIORITY_ADD_VIDEO = 0;
- static const int PRIORITY_ADD_AUDIO = 0;
-+static const float m_fDropLimit = -0.015;
-
- float AviPlayer::getVideoAsync()
- {
-diff -urN avifile-0.7.43.20050224/lib/aviread/ReadFile.cpp ./lib/aviread/ReadFile.cpp
---- avifile-0.7.43.20050224/lib/aviread/ReadFile.cpp 2004-03-10 18:00:09.000000000 +0100
-+++ avifile-0.7.43.20050224.gcc4/lib/aviread/ReadFile.cpp 2005-03-18 09:32:07.273485486 +0100
-@@ -125,7 +125,7 @@
- };
-
-
--avm::IReadFile* avm::CreateReadFile(const char* name, unsigned int flags)
-+IReadFile* CreateReadFile(const char* name, unsigned int flags)
- {
- ReadFile* r = new ReadFile(name, flags);
- return r;
-diff -urN avifile-0.7.43.20050224/samples/qtvidcap/kv4lsetup.cpp ./samples/qtvidcap/kv4lsetup.cpp
---- avifile-0.7.43.20050224/samples/qtvidcap/kv4lsetup.cpp 2004-11-04 14:43:49.000000000 +0100
-+++ avifile-0.7.43.20050224.gcc4/samples/qtvidcap/kv4lsetup.cpp 2005-03-18 09:32:07.283483556 +0100
-@@ -311,7 +311,7 @@
- fbuf.depth = set_bpp;
- fbuf.bytesperline = set_bpl;
- if (set_base != NULL)
-- fbuf.base = (void*)((unsigned int)set_base+(unsigned int)shift);
-+ fbuf.base = (void*)((unsigned long)set_base+(unsigned long)shift);
-
- /* XXX bttv confuses color depth and bits/pixel */
- #ifndef X_DISPLAY_MISSING
-diff -urN avifile-0.7.43.20050224/samples/qtvidcap/v4lxif.cpp ./samples/qtvidcap/v4lxif.cpp
---- avifile-0.7.43.20050224/samples/qtvidcap/v4lxif.cpp 2004-11-04 14:43:50.000000000 +0100
-+++ avifile-0.7.43.20050224.gcc4/samples/qtvidcap/v4lxif.cpp 2005-03-18 09:32:07.291482011 +0100
-@@ -1118,7 +1118,7 @@
- XF86DGAGetVideoLL(disp, DefaultScreen(disp), (int *)&base, &width, &bank, &ram );
- if (!base)
- avml(AVML_WARN,
-- "v4l1: can not allocate frame buffer base: 0x%x\n",(int)base);
-+ "v4l1: can not allocate frame buffer base: 0x%lx\n",(long)base);
- }
- }
- }
diff --git a/media-video/avifile/files/avifile-0.7.43.20050224-fixlabels.patch b/media-video/avifile/files/avifile-0.7.43.20050224-fixlabels.patch
deleted file mode 100644
index e841cb0c8b0d..000000000000
--- a/media-video/avifile/files/avifile-0.7.43.20050224-fixlabels.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ur a/lib/common/mmx.cpp avifile-0.7-0.7.43/lib/common/mmx.cpp
---- a/lib/common/mmx.cpp 2005-02-15 15:33:39.000000000 +0300
-+++ avifile-0.7-0.7.43/lib/common/mmx.cpp 2005-03-23 22:09:48.730535320 +0300
-@@ -122,12 +122,12 @@
- // x_accum-=x_min;
- "subl %6, %%edx \n\t"
- // if(x_accum<=0) {
-- "jnc x2 \n\t"
-+ "jnc 2f \n\t"
- // xaccum+=dst_w;
- "addl %7, %%edx \n\t"
- // src++;
- "addl $2, %%eax \n\t"
-- "x2: \n\t"
-+ "2: \n\t"
- "decl %8 \n\t"
- "jnz 1b \n\t"
- "popl %%ebx \n\t"
diff --git a/media-video/avifile/files/avifile-0.7.43.20050224-pic.patch b/media-video/avifile/files/avifile-0.7.43.20050224-pic.patch
deleted file mode 100644
index 8ce0d463070a..000000000000
--- a/media-video/avifile/files/avifile-0.7.43.20050224-pic.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- avifile-0.7-0.7.43/samples/qtvidcap/deinterlace-rgb.cpp.orig 2005-04-10 13:26:01.000000000 +0200
-+++ avifile-0.7-0.7.43/samples/qtvidcap/deinterlace-rgb.cpp 2005-04-10 13:26:38.000000000 +0200
-@@ -17,10 +17,10 @@
- memcpy(outp, inp, xdim);
- continue;
- }
-- int count=xdim/8;
- __asm__ __volatile__ (
-- "movl %2, %%esi\n\t"
-- "movl %3, %%edi\n\t"
-+ "movl %2, %%esi\n\t" // xdim
-+ "shr $3, %2\n\t"
-+ "movl %2, %%edi\n\t" // count = xdim/8
- "pxor %%mm3, %%mm3\n\t"
- "1:\n\t"
- "movq (%%ecx, %%esi), %%mm0\n\t"
-@@ -39,7 +39,7 @@
- "decl %%edi\n\t"
- "jnz 1b\n\t"
- :
-- : "c" (inp-xdim), "d" (outp), "r" (xdim), "r" (count)
-+ : "c" (inp-xdim), "d" (outp), "r" (xdim)
- : "esi", "edi"
- );
- }
---- avifile-0.7-0.7.43/samples/qtvidcap/qtrenderer.cpp.orig 2005-04-10 14:01:44.000000000 +0200
-+++ avifile-0.7-0.7.43/samples/qtvidcap/qtrenderer.cpp 2005-04-10 14:02:36.000000000 +0200
-@@ -160,10 +160,10 @@
- memcpy(outp, inp, xdim);
- continue;
- }
-- int count=xdim/8;
- __asm__ __volatile__ (
-- "movl %2, %%esi\n\t"
-- "movl %3, %%edi\n\t"
-+ "movl %2, %%esi\n\t" // xdim
-+ "shr $3,%2\n\t"
-+ "movl %2, %%edi\n\t" // count = xdim/8
- "pxor %%mm3, %%mm3\n\t"
- "1:\n\t"
- "movq (%%ecx, %%esi), %%mm0\n\t"
-@@ -182,7 +182,7 @@
- "decl %%edi\n\t"
- "jnz 1b\n\t"
- :
-- : "c" (inp-xdim), "d" (outp), "r" (xdim), "r" (count)
-+ : "c" (inp-xdim), "d" (outp), "r" (xdim)
- : "esi", "edi"
- );
- }
diff --git a/media-video/avifile/files/avifile-0.7.43.20050224-sdllibs.patch b/media-video/avifile/files/avifile-0.7.43.20050224-sdllibs.patch
deleted file mode 100644
index 56d2b4a107c3..000000000000
--- a/media-video/avifile/files/avifile-0.7.43.20050224-sdllibs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur avifile-0.7-0.7.43/m4/sdl.m4 avifile-0.7-0.7.43-fixed/m4/sdl.m4
---- avifile-0.7-0.7.43/m4/sdl.m4 2004-02-18 21:54:39.000000000 +0100
-+++ avifile-0.7-0.7.43-fixed/m4/sdl.m4 2005-04-18 01:04:22.831940176 +0200
-@@ -50,7 +50,7 @@
- no_sdl=yes
- else
- SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
-- SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs | sed -e 's!-L/usr/lib[[^/]]!!g'`
-+ SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
-
- sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
diff --git a/media-video/avifile/files/avifile-0.7.43.20050224-sysffmpeg.patch b/media-video/avifile/files/avifile-0.7.43.20050224-sysffmpeg.patch
deleted file mode 100644
index 10f9b5efe319..000000000000
--- a/media-video/avifile/files/avifile-0.7.43.20050224-sysffmpeg.patch
+++ /dev/null
@@ -1,354 +0,0 @@
-diff -Naurp avifile-0.7-0.7.43.orig/Makefile.am avifile-0.7-0.7.43/Makefile.am
---- avifile-0.7-0.7.43.orig/Makefile.am 2004-11-24 15:12:53.000000000 -0800
-+++ avifile-0.7-0.7.43/Makefile.am 2005-03-25 17:40:31.000000000 -0800
-@@ -1,4 +1,4 @@
--SUBDIRS = . admin m4 ffmpeg drivers lib plugins bin \
-+SUBDIRS = . admin m4 drivers lib plugins bin \
- doc include debian libavqt player samples
-
- EXTRA_DIST = INSTALL autogen.sh avifile.spec.in avifile.pc.in \
-diff -Naurp avifile-0.7-0.7.43.orig/Makefile.in avifile-0.7-0.7.43/Makefile.in
---- avifile-0.7-0.7.43.orig/Makefile.in 2005-02-24 06:26:41.000000000 -0800
-+++ avifile-0.7-0.7.43/Makefile.in 2005-03-25 17:40:40.000000000 -0800
-@@ -142,7 +142,7 @@ XVID_LIBS = @XVID_LIBS@
- Z_LIBS = @Z_LIBS@
- qt_version = @qt_version@
-
--SUBDIRS = . admin m4 ffmpeg drivers lib plugins bin doc include debian libavqt player samples
-+SUBDIRS = . admin m4 drivers lib plugins bin doc include debian libavqt player samples
-
-
- EXTRA_DIST = INSTALL autogen.sh avifile.spec.in avifile.pc.in $(pkgdoc_DATA) $(pkgconfig_DATA)
-diff -Naurp avifile-0.7-0.7.43.orig/configure.ac avifile-0.7-0.7.43/configure.ac
---- avifile-0.7-0.7.43.orig/configure.ac 2005-02-24 03:31:38.000000000 -0800
-+++ avifile-0.7-0.7.43/configure.ac 2005-03-25 17:59:48.000000000 -0800
-@@ -55,7 +55,7 @@ AC_PROG_CPP
- AC_PROG_INSTALL
- AC_PROG_LN_S
- AC_PROG_MAKE_SET
--AC_PROG_RANLIB
-+AC_PROG_LIBTOOL
- AC_PROG_AWK
-
- AC_CC_VERSION
-@@ -167,8 +167,8 @@ dnl
- dnl Libtool
- dnl
- dnl AC_LIBTOOL_DLOPEN
--AM_DISABLE_STATIC
--AM_PROG_LIBTOOL
-+dnl AM_DISABLE_STATIC
-+dnl AM_PROG_LIBTOOL
- dnl automatic updating of libtool configuration files
- dnl not needed with automake AC_SUBST(LIBTOOL_DEPS)
- dnl using rather hack for .lo creation AM_PROG_AS
-@@ -790,11 +790,6 @@ if test x$enable_xvid4 = xyes; then
- fi
-
-
--dnl =======================
--dnl Configure ffmpeg plugin
--dnl =======================
--AM_PATH_FFMPEG
--
- dnl use_nasm=
- dnl not needed right now
- dnl AC_CHECK_PROG(use_nasm, nasm, yes, no)
-diff -Naurp avifile-0.7-0.7.43.orig/configure.in avifile-0.7-0.7.43/configure.in
---- avifile-0.7-0.7.43.orig/configure.in 2005-02-24 03:31:38.000000000 -0800
-+++ avifile-0.7-0.7.43/configure.in 2005-03-25 17:59:48.000000000 -0800
-@@ -55,7 +55,7 @@ AC_PROG_CPP
- AC_PROG_INSTALL
- AC_PROG_LN_S
- AC_PROG_MAKE_SET
--AC_PROG_RANLIB
-+AC_PROG_LIBTOOL
- AC_PROG_AWK
-
- AC_CC_VERSION
-@@ -167,8 +167,8 @@ dnl
- dnl Libtool
- dnl
- dnl AC_LIBTOOL_DLOPEN
--AM_DISABLE_STATIC
--AM_PROG_LIBTOOL
-+dnl AM_DISABLE_STATIC
-+dnl AM_PROG_LIBTOOL
- dnl automatic updating of libtool configuration files
- dnl not needed with automake AC_SUBST(LIBTOOL_DEPS)
- dnl using rather hack for .lo creation AM_PROG_AS
-@@ -790,11 +790,6 @@ if test x$enable_xvid4 = xyes; then
- fi
-
-
--dnl =======================
--dnl Configure ffmpeg plugin
--dnl =======================
--AM_PATH_FFMPEG
--
- dnl use_nasm=
- dnl not needed right now
- dnl AC_CHECK_PROG(use_nasm, nasm, yes, no)
-diff -Naurp avifile-0.7-0.7.43.orig/lib/Makefile.am avifile-0.7-0.7.43/lib/Makefile.am
---- avifile-0.7-0.7.43.orig/lib/Makefile.am 2003-03-11 04:53:40.000000000 -0800
-+++ avifile-0.7-0.7.43/lib/Makefile.am 2005-03-25 16:49:58.000000000 -0800
-@@ -1,8 +1,7 @@
- DIST_SUBDIRS = aviplay aviread aviwrite common subtitle video
- noinst_HEADERS = Uncompressed.h
-
--COMMONCFLAGS = $(DIVX4_CFLAGS) $(XVID_CFLAGS) -DPLUGIN_PATH=\"$(pkglibdir)\" \
-- -I$(srcdir)/../ffmpeg/libavcodec -I$(srcdir)/../ffmpeg/libavformat
-+COMMONCFLAGS = $(DIVX4_CFLAGS) $(XVID_CFLAGS) -DPLUGIN_PATH=\"$(pkglibdir)\"
- if AMM_USE_FAST_BUILD
- AVISOURCES = libaviplay.cpp
- AVILIBADD =
-diff -Naurp avifile-0.7-0.7.43.orig/lib/Makefile.in avifile-0.7-0.7.43/lib/Makefile.in
---- avifile-0.7-0.7.43.orig/lib/Makefile.in 2005-02-24 06:26:48.000000000 -0800
-+++ avifile-0.7-0.7.43/lib/Makefile.in 2005-03-25 16:50:19.000000000 -0800
-@@ -145,7 +145,7 @@ qt_version = @qt_version@
- DIST_SUBDIRS = aviplay aviread aviwrite common subtitle video
- noinst_HEADERS = Uncompressed.h
-
--COMMONCFLAGS = $(DIVX4_CFLAGS) $(XVID_CFLAGS) -DPLUGIN_PATH=\"$(pkglibdir)\" -I$(srcdir)/../ffmpeg/libavcodec -I$(srcdir)/../ffmpeg/libavformat
-+COMMONCFLAGS = $(DIVX4_CFLAGS) $(XVID_CFLAGS) -DPLUGIN_PATH=\"$(pkglibdir)\"
-
- @AMM_USE_FAST_BUILD_TRUE@AVISOURCES = libaviplay.cpp
- @AMM_USE_FAST_BUILD_FALSE@AVISOURCES = codeckeeper.cpp Uncompressed.cpp
-diff -Naurp avifile-0.7-0.7.43.orig/lib/aviread/FFReadHandler.cpp avifile-0.7-0.7.43/lib/aviread/FFReadHandler.cpp
---- avifile-0.7-0.7.43.orig/lib/aviread/FFReadHandler.cpp 2004-10-25 02:52:51.000000000 -0700
-+++ avifile-0.7-0.7.43/lib/aviread/FFReadHandler.cpp 2005-03-25 17:17:41.000000000 -0800
-@@ -2,11 +2,11 @@
- #include "FFReadStream.h"
- #include "avm_output.h"
-
--#ifndef int64_t_C
--#define int64_t_C(c) (c ## LL)
--#define uint64_t_C(c) (c ## ULL)
-+#ifdef HAVE_AV_CONFIG_H
-+#undef HAVE_AV_CONFIG_H
- #endif
--#include "avformat.h"
-+
-+#include <ffmpeg/avformat.h>
-
- #include <stdio.h>
- #include <stdlib.h>
-diff -Naurp avifile-0.7-0.7.43.orig/lib/aviread/FFReadStream.cpp avifile-0.7-0.7.43/lib/aviread/FFReadStream.cpp
---- avifile-0.7-0.7.43.orig/lib/aviread/FFReadStream.cpp 2004-05-24 01:24:26.000000000 -0700
-+++ avifile-0.7-0.7.43/lib/aviread/FFReadStream.cpp 2005-03-25 17:17:21.000000000 -0800
-@@ -3,11 +3,11 @@
- #include "avm_fourcc.h"
- #include "avm_output.h"
-
--#ifndef int64_t_C
--#define int64_t_C(c) (c ## LL)
--#define uint64_t_C(c) (c ## ULL)
-+#ifdef HAVE_AV_CONFIG_H
-+#undef HAVE_AV_CONFIG_H
- #endif
--#include "avformat.h"
-+
-+#include <ffmpeg/avformat.h>
-
- #include <stdio.h>
- #include <stdlib.h>
-diff -Naurp avifile-0.7-0.7.43.orig/lib/aviread/Makefile.am avifile-0.7-0.7.43/lib/aviread/Makefile.am
---- avifile-0.7-0.7.43.orig/lib/aviread/Makefile.am 2003-03-11 03:17:37.000000000 -0800
-+++ avifile-0.7-0.7.43/lib/aviread/Makefile.am 2005-03-25 17:09:48.000000000 -0800
-@@ -43,21 +43,11 @@ libaviread_la_SOURCES = \
- StreamInfo.cpp
-
-
--if AMM_LINK_SHARED
--FF_LIB = \
-- ../../ffmpeg/libavformat/libaviplayavformat.la \
-- ../../ffmpeg/libavcodec/libaviplayavcodec.la
--else
--FF_LIB = \
-- ../../ffmpeg/libavformat/libavformat.la \
-- ../../ffmpeg/libavcodec/libavcodec.la
--endif
-+FF_LIB = -lavformat -lavcodec
-
- libaviread_la_LIBADD = $(FF_LIB)
-
- AM_CPPFLAGS = $(LTNOPIC) \
-- -I$(srcdir)/../common \
-- -I$(srcdir)/../../ffmpeg/libavformat \
-- -I$(srcdir)/../../ffmpeg/libavcodec
-+ -I$(srcdir)/../common
-
- MAINTAINERCLEANFILES = Makefile.in
-diff -Naurp avifile-0.7-0.7.43.orig/lib/aviread/Makefile.in avifile-0.7-0.7.43/lib/aviread/Makefile.in
---- avifile-0.7-0.7.43.orig/lib/aviread/Makefile.in 2005-02-24 06:26:49.000000000 -0800
-+++ avifile-0.7-0.7.43/lib/aviread/Makefile.in 2005-03-25 17:10:58.000000000 -0800
-@@ -148,12 +148,11 @@ noinst_HEADERS = AsfFileInputStream.h
-
- libaviread_la_SOURCES = AsfFileInputStream.cpp asffmt.cpp AsfNetworkInputStream.cpp AsfReadHandler.cpp AsfReadStream.cpp AsfRedirectInputStream.cpp AsfStreamSeekInfo.cpp asf_guids.cpp AsxReader.cpp AviReadHandler.cpp AviReadStream.cpp Cache.cpp FFReadHandler.cpp FFReadStream.cpp ReadFile.cpp ReadStream.cpp ReadStreamA.cpp ReadStreamV.cpp StreamInfo.cpp
-
--@AMM_LINK_SHARED_TRUE@FF_LIB = ../../ffmpeg/libavformat/libaviplayavformat.la ../../ffmpeg/libavcodec/libaviplayavcodec.la
--@AMM_LINK_SHARED_FALSE@FF_LIB = ../../ffmpeg/libavformat/libavformat.la ../../ffmpeg/libavcodec/libavcodec.la
-+FF_LIB = -lavformat -lavcodec
-
- libaviread_la_LIBADD = $(FF_LIB)
-
--AM_CPPFLAGS = $(LTNOPIC) -I$(srcdir)/../common -I$(srcdir)/../../ffmpeg/libavformat -I$(srcdir)/../../ffmpeg/libavcodec
-+AM_CPPFLAGS = $(LTNOPIC) -I$(srcdir)/../common
-
-
- MAINTAINERCLEANFILES = Makefile.in
-@@ -172,12 +171,7 @@ X_LIBS = @X_LIBS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
- libaviread_la_LDFLAGS =
--@AMM_LINK_SHARED_FALSE@libaviread_la_DEPENDENCIES = \
--@AMM_LINK_SHARED_FALSE@../../ffmpeg/libavformat/libavformat.la \
--@AMM_LINK_SHARED_FALSE@../../ffmpeg/libavcodec/libavcodec.la
--@AMM_LINK_SHARED_TRUE@libaviread_la_DEPENDENCIES = \
--@AMM_LINK_SHARED_TRUE@../../ffmpeg/libavformat/libaviplayavformat.la \
--@AMM_LINK_SHARED_TRUE@../../ffmpeg/libavcodec/libaviplayavcodec.la
-+libaviread_la_DEPENDENCIES = -lavformat -lavcodec
- libaviread_la_OBJECTS = AsfFileInputStream.lo asffmt.lo \
- AsfNetworkInputStream.lo AsfReadHandler.lo AsfReadStream.lo \
- AsfRedirectInputStream.lo AsfStreamSeekInfo.lo asf_guids.lo \
-diff -Naurp avifile-0.7-0.7.43.orig/plugins/Makefile.am avifile-0.7-0.7.43/plugins/Makefile.am
---- avifile-0.7-0.7.43.orig/plugins/Makefile.am 2004-02-09 07:06:56.000000000 -0800
-+++ avifile-0.7-0.7.43/plugins/Makefile.am 2005-03-25 17:07:57.000000000 -0800
-@@ -20,7 +20,7 @@ SUBDIRS = \
-
- AM_CPPFLAGS = -Ilibac3pass -Ilibwin32 -Ilibwin32/audiodec \
- -Ilibwin32/videocodec -Ilibwin32/loader \
-- -Ilibwin32/loader/dshow -I../ffmpeg/libavcodec \
-+ -Ilibwin32/loader/dshow \
- -DWIN32_PATH=\"$(WIN32_PATH)\" -D__WINE__ -DUNICODE \
- -Ddbg_printf=__vprintf -DTRACE=__vprintf \
- -Wmissing-prototypes -Wimplicit-function-declaration \
-diff -Naurp avifile-0.7-0.7.43.orig/plugins/Makefile.in avifile-0.7-0.7.43/plugins/Makefile.in
---- avifile-0.7-0.7.43.orig/plugins/Makefile.in 2005-02-24 06:26:52.000000000 -0800
-+++ avifile-0.7-0.7.43/plugins/Makefile.in 2005-03-25 17:12:02.000000000 -0800
-@@ -152,7 +152,7 @@ SUBDIRS = libac3pass libaudiodec lib
- #noinst_LTLIBRARIES = libplugins.la
- #libplugins_la_SOURCES = libplugins.cpp plugins.c
-
--AM_CPPFLAGS = -Ilibac3pass -Ilibwin32 -Ilibwin32/audiodec -Ilibwin32/videocodec -Ilibwin32/loader -Ilibwin32/loader/dshow -I../ffmpeg/libavcodec -DWIN32_PATH=\"$(WIN32_PATH)\" -D__WINE__ -DUNICODE -Ddbg_printf=__vprintf -DTRACE=__vprintf -Wmissing-prototypes -Wimplicit-function-declaration -DAVIFILE
-+AM_CPPFLAGS = -Ilibac3pass -Ilibwin32 -Ilibwin32/audiodec -Ilibwin32/videocodec -Ilibwin32/loader -Ilibwin32/loader/dshow -DWIN32_PATH=\"$(WIN32_PATH)\" -D__WINE__ -DUNICODE -Ddbg_printf=__vprintf -DTRACE=__vprintf -Wmissing-prototypes -Wimplicit-function-declaration -DAVIFILE
-
-
- MAINTAINERCLEANFILES = Makefile.in
-diff -Naurp avifile-0.7-0.7.43.orig/plugins/libffmpeg/FFAudioDecoder.h avifile-0.7-0.7.43/plugins/libffmpeg/FFAudioDecoder.h
---- avifile-0.7-0.7.43.orig/plugins/libffmpeg/FFAudioDecoder.h 2003-05-12 03:34:11.000000000 -0700
-+++ avifile-0.7-0.7.43/plugins/libffmpeg/FFAudioDecoder.h 2005-03-25 17:19:13.000000000 -0800
-@@ -2,7 +2,12 @@
- #define AVIFILE_FFAUDIODECODER_H
-
- #include "audiodecoder.h"
--#include "avcodec.h"
-+
-+#ifdef HAVE_AV_CONFIG_H
-+#undef HAVE_AV_CONFIG_H
-+#endif
-+
-+#include <ffmpeg/avcodec.h>
-
- AVM_BEGIN_NAMESPACE;
-
-diff -Naurp avifile-0.7-0.7.43.orig/plugins/libffmpeg/FFVideoDecoder.h avifile-0.7-0.7.43/plugins/libffmpeg/FFVideoDecoder.h
---- avifile-0.7-0.7.43.orig/plugins/libffmpeg/FFVideoDecoder.h 2003-11-21 06:09:42.000000000 -0800
-+++ avifile-0.7-0.7.43/plugins/libffmpeg/FFVideoDecoder.h 2005-03-25 17:17:15.000000000 -0800
-@@ -3,11 +3,11 @@
-
- #include "videodecoder.h"
-
--#ifndef int64_t_C
--#define int64_t_C(c) (c ## LL)
--#define uint64_t_C(c) (c ## ULL)
-+#ifdef HAVE_AV_CONFIG_H
-+#undef HAVE_AV_CONFIG_H
- #endif
--#include "avformat.h"
-+
-+#include <ffmpeg/avformat.h>
-
- AVM_BEGIN_NAMESPACE;
-
-diff -Naurp avifile-0.7-0.7.43.orig/plugins/libffmpeg/FFVideoEncoder.h avifile-0.7-0.7.43/plugins/libffmpeg/FFVideoEncoder.h
---- avifile-0.7-0.7.43.orig/plugins/libffmpeg/FFVideoEncoder.h 2003-06-06 02:06:26.000000000 -0700
-+++ avifile-0.7-0.7.43/plugins/libffmpeg/FFVideoEncoder.h 2005-03-25 17:13:31.000000000 -0800
-@@ -2,7 +2,12 @@
- #define AVIFILE_FFVIDEOENCODER_H
-
- #include "videoencoder.h"
--#include "avcodec.h"
-+
-+#ifdef HAVE_AV_CONFIG_H
-+#undef HAVE_AV_CONFIG_H
-+#endif
-+
-+#include <ffmpeg/avcodec.h>
-
- #include <stdlib.h>
-
-diff -Naurp avifile-0.7-0.7.43.orig/plugins/libffmpeg/Makefile.am avifile-0.7-0.7.43/plugins/libffmpeg/Makefile.am
---- avifile-0.7-0.7.43.orig/plugins/libffmpeg/Makefile.am 2003-05-26 01:49:35.000000000 -0700
-+++ avifile-0.7-0.7.43/plugins/libffmpeg/Makefile.am 2005-03-25 17:11:45.000000000 -0800
-@@ -11,16 +11,13 @@ ffmpeg_la_SOURCES = \
- FFVideoDecoder.cpp \
- FFVideoEncoder.cpp
-
--ffmpeg_la_LIBADD = $(LINK_AVIPLAY)
--#ffmpeg_la_LIBADD = ../../ffmpeg/libavcodec/libavcodec.a
-+ffmpeg_la_LIBADD = -lavformat -lavcodec
-+#ffmpeg_la_LIBADD = $(LINK_AVIPLAY)
- ffmpeg_la_LDFLAGS = -module -avoid-version
-
- #KPROF_LIBS = -L/var/tmp/kprof/lib -lkprof
- #INSTRUMENT = -finstrument-functions
--AM_CPPFLAGS = $(LTNOPIC) $(INSTRUMENT) \
-- -I$(srcdir)/../../ffmpeg/libavcodec \
-- -I$(srcdir)/../../ffmpeg/libavformat \
-- -I$(srcdir)/../../ffmpeg
-+AM_CPPFLAGS = $(LTNOPIC) $(INSTRUMENT)
- AM_CXXFLAGS = $(CXXRTTIEXCEPT)
-
- TEST_LIBS = ../../lib/libaviplay.la $(pkglib_LTLIBRARIES) $(SDL_LIBS) $(MPATROL_LIBS) $(EFENCE_LIBS) $(KPROF_LIBS)
-diff -Naurp avifile-0.7-0.7.43.orig/plugins/libffmpeg/Makefile.in avifile-0.7-0.7.43/plugins/libffmpeg/Makefile.in
---- avifile-0.7-0.7.43.orig/plugins/libffmpeg/Makefile.in 2005-02-24 06:26:53.000000000 -0800
-+++ avifile-0.7-0.7.43/plugins/libffmpeg/Makefile.in 2005-03-25 17:11:38.000000000 -0800
-@@ -149,14 +149,13 @@ pkglib_LTLIBRARIES = ffmpeg.la
- noinst_HEADERS = FFAudioDecoder.h FFVideoDecoder.h FFVideoEncoder.h fillplugins.h
- ffmpeg_la_SOURCES = libffmpeg.cpp FFAudioDecoder.cpp FFVideoDecoder.cpp FFVideoEncoder.cpp
-
--
--ffmpeg_la_LIBADD = $(LINK_AVIPLAY)
--#ffmpeg_la_LIBADD = ../../ffmpeg/libavcodec/libavcodec.a
-+ffmpeg_la_LIBADD = -lavformat -lavcodec
-+#ffmpeg_la_LIBADD = $(LINK_AVIPLAY)
- ffmpeg_la_LDFLAGS = -module -avoid-version
-
- #KPROF_LIBS = -L/var/tmp/kprof/lib -lkprof
- #INSTRUMENT = -finstrument-functions
--AM_CPPFLAGS = $(LTNOPIC) $(INSTRUMENT) -I$(srcdir)/../../ffmpeg/libavcodec -I$(srcdir)/../../ffmpeg/libavformat -I$(srcdir)/../../ffmpeg
-+AM_CPPFLAGS = $(LTNOPIC) $(INSTRUMENT)
-
- AM_CXXFLAGS = $(CXXRTTIEXCEPT)
-
-diff -Naurp avifile-0.7-0.7.43.orig/plugins/libffmpeg/fillplugins.h avifile-0.7-0.7.43/plugins/libffmpeg/fillplugins.h
---- avifile-0.7-0.7.43.orig/plugins/libffmpeg/fillplugins.h 2004-05-14 03:56:52.000000000 -0700
-+++ avifile-0.7-0.7.43/plugins/libffmpeg/fillplugins.h 2005-03-25 17:18:29.000000000 -0800
-@@ -4,12 +4,11 @@
- #include "infotypes.h"
- #include "avm_fourcc.h"
-
--//#include "avcodec.h"
--#ifndef int64_t_C
--#define int64_t_C(c) (c ## LL)
--#define uint64_t_C(c) (c ## ULL)
-+#ifdef HAVE_AV_CONFIG_H
-+#undef HAVE_AV_CONFIG_H
- #endif
--#include "avformat.h"
-+
-+#include <ffmpeg/avformat.h>
-
- #include <string.h>
- #include <stdlib.h>
diff --git a/media-video/avifile/files/avifile-gcc34.patch b/media-video/avifile/files/avifile-gcc34.patch
deleted file mode 100644
index 349676b33ee4..000000000000
--- a/media-video/avifile/files/avifile-gcc34.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-diff -urd avifile-0.7-0.7.38.old/include/aviplay.h avifile-0.7-0.7.38/include/aviplay.h
---- avifile-0.7-0.7.38.old/include/aviplay.h 2003-05-24 18:51:30.000000000 -0400
-+++ avifile-0.7-0.7.38/include/aviplay.h 2004-04-28 14:08:02.520535288 -0400
-@@ -12,8 +12,8 @@
- #include "image.h"
- #include "avm_args.h"
-
--typedef void (*KILLHANDLER)(int, void* p = 0);
--typedef int (*AUDIOFUNC)(void* srcdata, unsigned int size, void* p = 0);
-+typedef void (*KILLHANDLER)(int, void* p);
-+typedef int (*AUDIOFUNC)(void* srcdata, unsigned int size, void* p);
-
- AVM_BEGIN_NAMESPACE;
-
-diff -urd avifile-0.7-0.7.38.old/include/avm_map.h avifile-0.7-0.7.38/include/avm_map.h
---- avifile-0.7-0.7.38.old/include/avm_map.h 2003-03-26 20:01:22.000000000 -0500
-+++ avifile-0.7-0.7.38/include/avm_map.h 2004-04-28 14:08:29.592419736 -0400
-@@ -198,7 +198,8 @@
- {
- // cast to the needed type - used to prevent internal compiler error
- // for old egcc
-- avm_map<Key, Value, Compare, Equal>::_Tnode* node = (avm_map<Key, Value, Compare, Equal>::_Tnode*) n;
-+ //avm_map<Key, Value, Compare, Equal>::_Tnode* node = (avm_map<Key, Value, Compare, Equal>::_Tnode*) n;
-+ _Tnode* node = (_Tnode*) n;
-
- if(node->entry)
- {
-diff -urd avifile-0.7-0.7.38.old/include/avm_stl.h avifile-0.7-0.7.38/include/avm_stl.h
---- avifile-0.7-0.7.38.old/include/avm_stl.h 2003-06-08 11:57:05.000000000 -0400
-+++ avifile-0.7-0.7.38/include/avm_stl.h 2004-04-28 14:08:24.074258624 -0400
-@@ -74,6 +74,10 @@
- m_Type = new Type[m_uiCapacity];
- }
- ~qring() { delete[] m_Type; }
-+ qring<Type>(const qring<Type>& t) : m_Type(0)
-+ {
-+ operator=(t);
-+ }
- qring<Type>& operator=(const qring<Type>& t)
- {
- if (this != &t)
-@@ -149,7 +153,6 @@
-
- // disabled for now
- qring<Type>() {}
-- qring<Type>(const qring<Type>& t) {}
-
- uint_t bpos() const { return (m_uiPos > 0) ? m_uiPos - 1 : m_uiCapacity - 1; }
- uint_t fpos() const { return (m_uiSize > m_uiPos) ? m_uiPos + m_uiCapacity - m_uiSize: m_uiPos - m_uiSize; }
-@@ -167,9 +170,21 @@
- static const uint_t invalid=(uint_t)(~0);
- typedef Type* iterator;
- typedef const Type* const_iterator;
-- vector<Type>(int prealloc = 0);
-+ vector<Type>()
-+ :m_Type(0), m_uiCapacity(0), m_uiSize(0)
-+ {
-+ }
-+
-+ vector<Type>(int prealloc)
-+ :m_Type(0), m_uiCapacity(prealloc), m_uiSize(prealloc)
-+ {
-+ if (m_uiCapacity > 0 )
-+ m_Type = new Type[m_uiCapacity];
-+ //printf("vector %p (%d)\n", this, m_uiSize);
-+ }
-+
- // we will not count references - we have to program with this in mind!
-- vector<Type>(const vector<Type>& t) :m_Type(0), m_uiCapacity(0), m_uiSize(0)
-+ vector<Type>(const vector<Type>& t) :m_Type(0)
- {
- operator=(t);
- }
-@@ -272,15 +287,6 @@
- };
-
- template <class Type>
--vector<Type>::vector<Type>(int prealloc)
-- :m_Type(0), m_uiCapacity(prealloc), m_uiSize(prealloc)
--{
-- if (m_uiCapacity > 0 )
-- m_Type = new Type[m_uiCapacity];
-- //printf("vector %p (%d)\n", this, m_uiSize);
--}
--
--template <class Type>
- void vector<Type>::remove(const Type& t)
- {
- int d = 0;
-diff -urd avifile-0.7-0.7.38.old/lib/aviread/AsfNetworkInputStream.cpp avifile-0.7-0.7.38/lib/aviread/AsfNetworkInputStream.cpp
---- avifile-0.7-0.7.38.old/lib/aviread/AsfNetworkInputStream.cpp 2003-05-27 11:26:31.000000000 -0400
-+++ avifile-0.7-0.7.38/lib/aviread/AsfNetworkInputStream.cpp 2004-04-28 14:08:13.148919528 -0400
-@@ -793,22 +793,24 @@
- return -1;
- }
-
--int AsfNetworkInputStream::write(const void* buffer, uint_t size)
-+int AsfNetworkInputStream::write(const void* b, uint_t size)
- {
-+ const char* buffer = (const char*) b;
- int wsize = size;
- while (wsize > 0)
- {
- int i = ::write(m_iSocket, buffer, wsize);
- if (i <= 0)
- return i;
-- (const char*)buffer += i;
-+ buffer += i;
- wsize -= i;
- }
- return size;
- }
-
--int AsfNetworkInputStream::dwrite(const void* buffer, uint_t size)
-+int AsfNetworkInputStream::dwrite(const void* b, uint_t size)
- {
-+ const char* buffer = (const char*) b;
- if (m_lfd < 0)
- {
- if (m_lfd == -12345)
-@@ -843,7 +845,7 @@
- int i = ::write(m_lfd, buffer, size);
- if (i < 0)
- return i;
-- (const char*)buffer += i;
-+ buffer += i;
- size -= i;
- }
- fsync(m_lfd);
-Only in avifile-0.7-0.7.38/lib/aviread: AsfNetworkInputStream.cpp.orig
-diff -urd avifile-0.7-0.7.38.old/lib/common/image.cpp avifile-0.7-0.7.38/lib/common/image.cpp
---- avifile-0.7-0.7.38.old/lib/common/image.cpp 2003-05-24 19:00:58.000000000 -0400
-+++ avifile-0.7-0.7.38/lib/common/image.cpp 2004-04-28 14:09:07.337681584 -0400
-@@ -954,7 +954,7 @@
- fillMembers();
- if (!copy)
- {
-- (const uint8_t*) m_pPlane[0] = data;
-+ m_pPlane[0] = (uint8_t*) data;
- }
- else
- {
-diff -urd avifile-0.7-0.7.38.old/plugins/libvorbis/libvorbis.cpp avifile-0.7-0.7.38/plugins/libvorbis/libvorbis.cpp
---- avifile-0.7-0.7.38.old/plugins/libvorbis/libvorbis.cpp 2003-05-20 10:33:13.000000000 -0400
-+++ avifile-0.7-0.7.38/plugins/libvorbis/libvorbis.cpp 2004-04-28 14:08:38.700035168 -0400
-@@ -96,7 +96,7 @@
- op.packet = NULL;
- op.b_o_s = 1; /* beginning of stream for first packet */
- op.bytes = hdrsizes[0];
-- (const void*) op.packet = vorbishdr;
-+ op.packet = (unsigned char*) vorbishdr;
- vorbishdr += op.bytes;
- if (vorbis_synthesis_headerin(&vi, &vc, &op) < 0)
- {
-@@ -106,7 +106,7 @@
-
- op.b_o_s = 0;
- op.bytes = hdrsizes[1];
-- (const void*) op.packet = vorbishdr;
-+ op.packet = (unsigned char*) vorbishdr;
- vorbishdr += op.bytes;
- if (vorbis_synthesis_headerin(&vi, &vc, &op) < 0)
- {
-@@ -115,7 +115,7 @@
- }
-
- op.bytes = hdrsizes[2];
-- (const void*) op.packet = vorbishdr;
-+ op.packet = (unsigned char*) vorbishdr;
- vorbishdr += op.bytes;
- if (vorbis_synthesis_headerin(&vi, &vc, &op) < 0)
- {
diff --git a/media-video/avifile/files/avifile-mad.patch b/media-video/avifile/files/avifile-mad.patch
deleted file mode 100644
index 25e80a6a05d4..000000000000
--- a/media-video/avifile/files/avifile-mad.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -uNr avifile-0.7-0.7.43.orig/configure avifile-0.7-0.7.43/configure
---- avifile-0.7-0.7.43.orig/configure 2005-06-18 09:23:56.000000000 +0200
-+++ avifile-0.7-0.7.43/configure 2005-06-18 09:26:34.000000000 +0200
-@@ -19998,7 +19998,7 @@
- case "$target" in
- i?86*)
- test x$ac_cv_c_compiler_gnu = xyes && DEFAULT_FLAGS="-mcpu=$DEFAULT_FLAGS -march=$DEFAULT_FLAGS -ffast-math -fomit-frame-pointer"
--
-+MAD_FLAGS="-DFPM_INTEL"
- cat >>confdefs.h <<\_ACEOF
- #define ARCH_X86 1
- _ACEOF
-@@ -20010,29 +20010,37 @@
-
- ;;
- ia64*)
--
-+MAD_FLAGS="-DFPM_64BIT"
- cat >>confdefs.h <<\_ACEOF
- #define ARCH_IA64 1
- _ACEOF
-
- ;;
- x86_64*)
--
-+MAD_FLAGS="-DFPM_64BIT"
- cat >>confdefs.h <<\_ACEOF
- #define ARCH_X86_64 1
- _ACEOF
-
- ;;
- alpha*)
--
-+MAD_FLAGS="-DFPM_DEFAULT"
- cat >>confdefs.h <<\_ACEOF
- #define ARCH_ALPHA 1
- _ACEOF
-
- enable_alphaopt=yes
- ;;
-- arm*)
-+ hppa*)
-+MAD_FLAGS="-DFPM_DEFAULT"
-+cat >>confdefs.h <<\_ACEOF
-+#define ARCH_HPPA 1
-+_ACEOF
-
-+ enable_hppaopt=yes
-+ ;;
-+ arm*)
-+MAD_FLAGS="-DFPM_ARM"
- cat >>confdefs.h <<\_ACEOF
- #define ARCH_ARM 1
- _ACEOF
-@@ -20040,14 +20048,14 @@
- enable_armopt=yes
- ;;
- sparc*)
--
-+MAD_FLAGS="-DFPM_SPARC"
- cat >>confdefs.h <<\_ACEOF
- #define ARCH_SPARC 1
- _ACEOF
-
- ;;
- mips*)
--
-+MAD_FLAGS="-DFPM_MIPS"
- cat >>confdefs.h <<\_ACEOF
- #define ARCH_MIPS 1
- _ACEOF
-@@ -20055,7 +20063,7 @@
- enable_mipsopt=yes
- ;;
- ppc*|powerpc*)
--
-+MAD_FLAGS="-DFPM_PPC"
- cat >>confdefs.h <<\_ACEOF
- #define ARCH_POWERPC 1
- _ACEOF
-@@ -20065,7 +20073,7 @@
- esac
-
-
--DEFAULT_DEFINES="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $PTHREAD_CFLAGS"
-+DEFAULT_DEFINES="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $PTHREAD_CFLAGS $MAD_FLAGS"
-
- echo "$as_me:$LINENO: checking if you need GNU extensions" >&5
- echo $ECHO_N "checking if you need GNU extensions... $ECHO_C" >&6
diff --git a/media-video/avifile/files/avifile-x86-gcc34.patch b/media-video/avifile/files/avifile-x86-gcc34.patch
deleted file mode 100644
index 7554654e0415..000000000000
--- a/media-video/avifile/files/avifile-x86-gcc34.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff -ur avifile-0.7-0.7.38.orig/ffmpeg/libavcodec/i386/dsputil_mmx.c avifile-0.7-0.7.38/ffmpeg/libavcodec/i386/dsputil_mmx.c
---- avifile-0.7-0.7.38.orig/ffmpeg/libavcodec/i386/dsputil_mmx.c 2003-06-23 18:52:34.000000000 +0000
-+++ avifile-0.7-0.7.38/ffmpeg/libavcodec/i386/dsputil_mmx.c 2004-05-19 18:23:59.051278648 +0000
-@@ -29,8 +29,8 @@
- static const uint64_t mm_wone __attribute__ ((aligned(8))) = 0x0001000100010001ULL;
- static const uint64_t mm_wtwo __attribute__ ((aligned(8))) = 0x0002000200020002ULL;
-
--static const uint64_t ff_pw_20 __attribute__ ((aligned(8))) = 0x0014001400140014ULL;
--static const uint64_t ff_pw_3 __attribute__ ((aligned(8))) = 0x0003000300030003ULL;
-+static const uint64_t ff_pw_20 __attribute__ ((aligned(8))) __attribute__((used)) = 0x0014001400140014ULL;
-+static const uint64_t ff_pw_3 __attribute__ ((aligned(8))) __attribute__((used)) = 0x0003000300030003ULL;
- static const uint64_t ff_pw_16 __attribute__ ((aligned(8))) = 0x0010001000100010ULL;
- static const uint64_t ff_pw_15 __attribute__ ((aligned(8))) = 0x000F000F000F000FULL;
-
-diff -ur avifile-0.7-0.7.38.orig/ffmpeg/libavcodec/i386/motion_est_mmx.c avifile-0.7-0.7.38/ffmpeg/libavcodec/i386/motion_est_mmx.c
---- avifile-0.7-0.7.38.orig/ffmpeg/libavcodec/i386/motion_est_mmx.c 2003-03-03 17:07:35.000000000 +0000
-+++ avifile-0.7-0.7.38/ffmpeg/libavcodec/i386/motion_est_mmx.c 2004-05-19 16:59:44.019760248 +0000
-@@ -26,7 +26,7 @@
- 0x0002000200020002,
- };
-
--static __attribute__ ((aligned(8))) uint64_t bone= 0x0101010101010101LL;
-+static __attribute__((aligned(8))) __attribute__((used)) uint64_t bone= 0x0101010101010101LL;
-
- static inline void sad8_mmx(uint8_t *blk1, uint8_t *blk2, int stride, int h)
- {
-diff -ur avifile-0.7-0.7.38.orig/ffmpeg/libavcodec/i386/simple_idct_mmx.c avifile-0.7-0.7.38/ffmpeg/libavcodec/i386/simple_idct_mmx.c
---- avifile-0.7-0.7.38.orig/ffmpeg/libavcodec/i386/simple_idct_mmx.c 2003-02-14 13:58:00.000000000 +0000
-+++ avifile-0.7-0.7.38/ffmpeg/libavcodec/i386/simple_idct_mmx.c 2004-05-19 18:30:02.730990928 +0000
-@@ -45,8 +45,8 @@
- #define ROW_SHIFT 11
- #define COL_SHIFT 20 // 6
-
--static const uint64_t __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000ULL;
--static const uint64_t __attribute__((aligned(8))) d40000= 0x0000000000040000ULL;
-+static const uint64_t __attribute__((aligned(8))) __attribute__((used)) wm1010= 0xFFFF0000FFFF0000ULL;
-+static const uint64_t __attribute__((aligned(8))) __attribute__((used)) d40000= 0x0000000000040000ULL;
- static int16_t __attribute__((aligned(8))) temp[64];
- static int16_t __attribute__((aligned(8))) coeffs[]= {
- 1<<(ROW_SHIFT-1), 0, 1<<(ROW_SHIFT-1), 0,
-diff -ur avifile-0.7-0.7.38.orig/ffmpeg/libavcodec/liba52/resample_mmx.c avifile-0.7-0.7.38/ffmpeg/libavcodec/liba52/resample_mmx.c
---- avifile-0.7-0.7.38.orig/ffmpeg/libavcodec/liba52/resample_mmx.c 2003-04-16 20:03:07.000000000 +0000
-+++ avifile-0.7-0.7.38/ffmpeg/libavcodec/liba52/resample_mmx.c 2004-05-19 18:14:08.958986312 +0000
-@@ -7,10 +7,10 @@
- and it would mean (C / MMX2 / MMX / 3DNOW) versions
- */
-
--static uint64_t __attribute__((aligned(8))) magicF2W= 0x43c0000043c00000LL;
--static uint64_t __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000LL;
--static uint64_t __attribute__((aligned(8))) wm0101= 0x0000FFFF0000FFFFLL;
--static uint64_t __attribute__((aligned(8))) wm1100= 0xFFFFFFFF00000000LL;
-+static uint64_t __attribute__((aligned(8))) __attribute__((used)) magicF2W= 0x43c0000043c00000LL;
-+static uint64_t __attribute__((aligned(8))) __attribute__((used)) wm1010= 0xFFFF0000FFFF0000LL;
-+static uint64_t __attribute__((aligned(8))) __attribute__((used)) wm0101= 0x0000FFFF0000FFFFLL;
-+static uint64_t __attribute__((aligned(8))) __attribute__((used)) wm1100= 0xFFFFFFFF00000000LL;
-
- static int a52_resample_MONO_to_5_MMX(float * _f, int16_t * s16){
- int32_t * f = (int32_t *) _f;
-diff -ur avifile-0.7-0.7.38.orig/plugins/libmp3lame_audioenc/lame3.70/quantize-pvt.c avifile-0.7-0.7.38/plugins/libmp3lame_audioenc/lame3.70/quantize-pvt.c
---- avifile-0.7-0.7.38.orig/plugins/libmp3lame_audioenc/lame3.70/quantize-pvt.c 2001-03-27 17:04:29.000000000 +0000
-+++ avifile-0.7-0.7.38/plugins/libmp3lame_audioenc/lame3.70/quantize-pvt.c 2004-05-19 16:44:04.707557408 +0000
-@@ -1007,18 +1007,18 @@
- "dec %4\n\t"
-
- "movl %5, %%eax\n\t"
-- "movl 4+%5, %%ebx\n\t"
-+ "movl 4+%5, %%edx\n\t"
- "fxch %%st(1)\n\t"
- "fadd" F8type " (%2,%%eax," F8size ")\n\t"
- "fxch %%st(3)\n\t"
-- "fadd" F8type " (%2,%%ebx," F8size ")\n\t"
-+ "fadd" F8type " (%2,%%edx," F8size ")\n\t"
-
- "movl 8+%5, %%eax\n\t"
-- "movl 12+%5, %%ebx\n\t"
-+ "movl 12+%5, %%edx\n\t"
- "fxch %%st(2)\n\t"
- "fadd" F8type " (%2,%%eax," F8size ")\n\t"
- "fxch %%st(1)\n\t"
-- "fadd" F8type " (%2,%%ebx," F8size ")\n\t"
-+ "fadd" F8type " (%2,%%edx," F8size ")\n\t"
-
- "fxch %%st(3)\n\t"
- "fistpl -16(%3)\n\t"
-@@ -1030,7 +1030,7 @@
- "jnz loop1\n\n"
- : /* no outputs */
- : "t" (istep), "r" (xr), "r" (adj43asm), "r" (ix), "r" (576 / 4), "m" (rx)
-- : "%eax", "%ebx", "memory", "cc"
-+ : "%eax", "%edx", "memory", "cc"
- );
- }
- #elif defined (USE_MSC_ASM)
diff --git a/media-video/avifile/files/digest-avifile-0.7.38.20030710-r1 b/media-video/avifile/files/digest-avifile-0.7.38.20030710-r1
deleted file mode 100644
index e51b0d7555f8..000000000000
--- a/media-video/avifile/files/digest-avifile-0.7.38.20030710-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 db90c4bc0a8a8182b1ec084feca86bbb avifile-0.7-0.7.38.tar.gz 2888580
diff --git a/media-video/avifile/files/digest-avifile-0.7.41.20041001-r1 b/media-video/avifile/files/digest-avifile-0.7.41.20041001-r1
deleted file mode 100644
index 019a69ee1a1c..000000000000
--- a/media-video/avifile/files/digest-avifile-0.7.41.20041001-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a08911965d81a02ded95ddb95f63e1cf avifile-0.7-0.7.41.tar.gz 3498203
diff --git a/media-video/avifile/files/digest-avifile-0.7.41.20041001-r2 b/media-video/avifile/files/digest-avifile-0.7.41.20041001-r2
deleted file mode 100644
index 019a69ee1a1c..000000000000
--- a/media-video/avifile/files/digest-avifile-0.7.41.20041001-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a08911965d81a02ded95ddb95f63e1cf avifile-0.7-0.7.41.tar.gz 3498203
diff --git a/media-video/avifile/files/digest-avifile-0.7.43.20050224-r1 b/media-video/avifile/files/digest-avifile-0.7.43.20050224-r1
deleted file mode 100644
index b11df39b38be..000000000000
--- a/media-video/avifile/files/digest-avifile-0.7.43.20050224-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 821adfba2606773764aa29fcf14eb51f avifile-0.7-0.7.43.tar.bz2 2980827
diff --git a/media-video/avifile/files/digest-avifile-0.7.43.20050224-r2 b/media-video/avifile/files/digest-avifile-0.7.43.20050224-r2
deleted file mode 100644
index b11df39b38be..000000000000
--- a/media-video/avifile/files/digest-avifile-0.7.43.20050224-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 821adfba2606773764aa29fcf14eb51f avifile-0.7-0.7.43.tar.bz2 2980827
diff --git a/media-video/avifile/files/flvenc-patch b/media-video/avifile/files/flvenc-patch
deleted file mode 100644
index b71dffcc3dd4..000000000000
--- a/media-video/avifile/files/flvenc-patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- flvenc.c.org 2003-09-06 17:56:37.000000000 +0000
-+++ avifile-0.7-0.7.38/ffmpeg/libavformat/flvenc.c 2003-09-06 17:51:55.000000000 +0000
-@@ -224,13 +224,15 @@
-
- static int flv_write_trailer(AVFormatContext *s)
- {
-+ int64_t file_size ;
-+ int flags = 0;
- ByteIOContext *pb = &s->pb;
- FLVContext *flv = s->priv_data;
-
- Dump(flv,pb,1);
-
-- int64_t file_size = url_ftell(pb);
-- int flags = 0;
-+ file_size = url_ftell(pb);
-+
- flags |= flv->hasAudio ? 4 : 0;
- flags |= flv->hasVideo ? 1 : 0;
- url_fseek(pb, 4, SEEK_SET);
diff --git a/media-video/avifile/files/throw.patch b/media-video/avifile/files/throw.patch
deleted file mode 100644
index cec741b95f15..000000000000
--- a/media-video/avifile/files/throw.patch
+++ /dev/null
@@ -1,233 +0,0 @@
-diff -ru avifile-0.7-0.7.41/include/avm_cpuinfo.h avifile-0.7-0.7.41.new/include/avm_cpuinfo.h
---- avifile-0.7-0.7.41/include/avm_cpuinfo.h 2003-05-25 00:44:03.000000000 +0200
-+++ avifile-0.7-0.7.41.new/include/avm_cpuinfo.h 2004-10-06 11:43:22.935747117 +0200
-@@ -47,7 +47,7 @@
- extern "C" {
- #endif /* __cplusplus */
-
--static inline int avm_is_mmx_state() __THROW
-+ __NTH(static inline int avm_is_mmx_state())
- {
- #ifdef ARCH_X86
- if (freq.HaveMMX())
-@@ -66,7 +66,7 @@
- * Returns duration of time interval between two timestamps, received
- * with longcount().
- */
--static inline float to_float(int64_t tend, int64_t tbegin) __THROW
-+ __NTH(static inline float to_float(int64_t tend, int64_t tbegin))
- {
- return float((tend - tbegin) / (double)freq / 1000.);
- }
-diff -ru avifile-0.7-0.7.41/include/utils.h avifile-0.7-0.7.41.new/include/utils.h
---- avifile-0.7-0.7.41/include/utils.h 2002-09-24 09:19:22.000000000 +0200
-+++ avifile-0.7-0.7.41.new/include/utils.h 2004-10-06 11:43:22.936746979 +0200
-@@ -38,7 +38,7 @@
- * function to retrieve/store data in machine independent format
- * - right now dump implementation - as we could check functionality
- */
--static inline uint16_t avm_get_le16(const void* p) __THROW {
-+ __NTH(static inline uint16_t avm_get_le16(const void* p) ) {
- #ifdef WORDS_BIGENDIAN
- const uint8_t* c = (const uint8_t*) p;
- return c[0] | c[1] << 8;
-@@ -47,7 +47,7 @@
- #endif
- }
-
--static inline uint8_t* avm_set_le16(void* p, uint16_t v) __THROW {
-+ __NTH(static inline uint8_t* avm_set_le16(void* p, uint16_t v) ) {
- uint8_t* b = (uint8_t*) p;
- #ifdef WORDS_BIGENDIAN
- b[0] = v & 0xff;
-@@ -58,7 +58,7 @@
- return b;
- }
-
--static inline uint32_t avm_get_le32(const void* p) __THROW {
-+ __NTH(static inline uint32_t avm_get_le32(const void* p) ) {
- #ifdef WORDS_BIGENDIAN
- const uint8_t* c = (const uint8_t*) p;
- return c[0] | c[1] << 8 | c[2] << 16 | c[3] << 24;
-@@ -67,7 +67,7 @@
- #endif
- }
-
--static inline uint8_t* avm_set_le32(void* p, uint32_t v) __THROW {
-+ __NTH(static inline uint8_t* avm_set_le32(void* p, uint32_t v) ) {
- uint8_t* b = (uint8_t*) p;
- #ifdef WORDS_BIGENDIAN
- b[0] = v & 0xff;
-@@ -80,7 +80,7 @@
- return b;
- }
-
--static inline uint64_t avm_get_le64(const void* p) __THROW {
-+ __NTH(static inline uint64_t avm_get_le64(const void* p) ) {
- #ifdef WORDS_BIGENDIAN
- const uint8_t* c = (const uint8_t*) p;
- return avm_get_le32(c) | (((uint64_t)avm_get_le32(c + 4)) << 32);
-@@ -89,7 +89,7 @@
- #endif
- }
-
--static inline uint16_t avm_get_be16(const void* p) __THROW {
-+ __NTH(static inline uint16_t avm_get_be16(const void* p) ) {
- #ifdef WORDS_BIGENDIAN
- return *(const uint16_t*)p;
- #else
-@@ -98,14 +98,14 @@
- #endif
- }
-
--static inline uint8_t* avm_set_be16(void* p, uint16_t v) __THROW {
-+ __NTH(static inline uint8_t* avm_set_be16(void* p, uint16_t v) ) {
- uint8_t* b = (uint8_t*) p;
- b[0] = (v >> 8) & 0xff;
- b[1] = v & 0xff;
- return b;
- }
-
--static inline uint32_t avm_get_be32(const void* p) __THROW {
-+ __NTH(static inline uint32_t avm_get_be32(const void* p) ) {
- #ifdef WORDS_BIGENDIAN
- return *(const uint32_t*)p;
- #else
-@@ -114,7 +114,7 @@
- #endif
- }
-
--static inline uint8_t* avm_set_be32(void* p, uint32_t v) __THROW {
-+ __NTH(static inline uint8_t* avm_set_be32(void* p, uint32_t v) ) {
- uint8_t* b = (uint8_t*) p;
- b[0] = (v >> 24) & 0xff;
- b[1] = (v >> 16) & 0xff;
-@@ -123,7 +123,7 @@
- return b;
- }
-
--static inline uint64_t avm_get_be64(const void* p) __THROW {
-+ __NTH(static inline uint64_t avm_get_be64(const void* p) ) {
- #ifdef WORDS_BIGENDIAN
- return *(const uint64_t*)p;
- #else
-@@ -132,15 +132,15 @@
- #endif
- }
-
--static inline int avm_img_is_rgb(fourcc_t fmt) __THROW
-+ __NTH(static inline int avm_img_is_rgb(fourcc_t fmt))
- {
- return ((fmt & 0xffffff00) == IMG_FMT_RGB);
- }
--static inline int avm_img_is_bgr(fourcc_t fmt) __THROW
-+ __NTH(static inline int avm_img_is_bgr(fourcc_t fmt))
- {
- return ((fmt & 0xffffff00) == IMG_FMT_BGR);
- }
--static inline int avm_img_get_depth(fourcc_t fmt) __THROW
-+ __NTH(static inline int avm_img_get_depth(fourcc_t fmt))
- {
- return fmt & 0xff;
- }
-diff -ru avifile-0.7-0.7.41/lib/common/fcc_type.c avifile-0.7-0.7.41.new/lib/common/fcc_type.c
---- avifile-0.7-0.7.41/lib/common/fcc_type.c 2002-11-01 12:46:58.000000000 +0100
-+++ avifile-0.7-0.7.41.new/lib/common/fcc_type.c 2004-10-06 11:44:05.740822469 +0200
-@@ -4,7 +4,7 @@
-
- //#include <stdio.h>
-
--const char* avm_fcc_name(fourcc_t fcc) __THROW
-+ __NTH(const char* avm_fcc_name(fourcc_t fcc))
- {
- switch (fcc)
- {
-@@ -106,7 +106,7 @@
- { 0, "Unknown" }
- };
-
--const char *avm_img_format_name(fourcc_t fmt) __THROW
-+ __NTH(const char *avm_img_format_name(fourcc_t fmt))
- {
- const struct dts* t = data;
-
-diff -ru avifile-0.7-0.7.41/lib/common/utils.c avifile-0.7-0.7.41.new/lib/common/utils.c
---- avifile-0.7-0.7.41/lib/common/utils.c 2002-07-04 20:59:31.000000000 +0200
-+++ avifile-0.7-0.7.41.new/lib/common/utils.c 2004-10-06 11:45:10.652837913 +0200
-@@ -10,7 +10,7 @@
- uint_t (*localcount)(void);
- int64_t (*longcount)(void);
-
--WAVEFORMATEX* avm_get_leWAVEFORMATEX(WAVEFORMATEX* wf) __THROW
-+ __NTH(WAVEFORMATEX* avm_get_leWAVEFORMATEX(WAVEFORMATEX* wf))
- {
- wf->wFormatTag = avm_get_le16(&wf->wFormatTag);
- wf->nChannels = avm_get_le16(&wf->nChannels);
-@@ -22,7 +22,7 @@
- return wf;
- }
-
--BITMAPINFOHEADER* avm_get_leBITMAPINFOHEADER(BITMAPINFOHEADER* bi) __THROW
-+ __NTH(BITMAPINFOHEADER* avm_get_leBITMAPINFOHEADER(BITMAPINFOHEADER* bi))
- {
- bi->biSize = avm_get_le32(&bi->biSize);
- bi->biWidth = avm_get_le32(&bi->biWidth);
-@@ -44,7 +44,7 @@
- * (Note: on solaris, usleep is not thread-safe)
- */
- #ifndef WIN32
--int avm_usleep(unsigned long delay) __THROW
-+ __NTH(int avm_usleep(unsigned long delay))
- {
- #if HAVE_NANOSLEEP
- struct timespec tsp;
-@@ -62,7 +62,7 @@
- * Solaris (maybe other operating systems, too) does not have avm_setenv(),
- * and avm_unsetenv() in libc, provide our own implementation.
- */
--int avm_setenv(const char *name, const char *value, int overwrite) __THROW
-+ __NTH(int avm_setenv(const char *name, const char *value, int overwrite))
- {
- #if HAVE_SETENV
- return setenv(name, value, overwrite);
-@@ -80,7 +80,7 @@
- #endif
- }
-
--void avm_unsetenv(const char *name) __THROW
-+ __NTH(void avm_unsetenv(const char *name) )
- {
- #if HAVE_UNSETENV
- unsetenv(name);
-diff -ru avifile-0.7-0.7.41/lib/common/wave_type.c avifile-0.7-0.7.41.new/lib/common/wave_type.c
---- avifile-0.7-0.7.41/lib/common/wave_type.c 2002-11-29 14:09:46.000000000 +0100
-+++ avifile-0.7-0.7.41.new/lib/common/wave_type.c 2004-10-06 11:45:44.497153438 +0200
-@@ -3,7 +3,7 @@
- #include <string.h>
- #include <stdio.h>
-
--const char* avm_wave_format_name(short fmt) __THROW
-+ __NTH(const char* avm_wave_format_name(short fmt) )
- {
- switch ((unsigned short)fmt)
- {
-@@ -46,7 +46,7 @@
- }
- }
-
--char* avm_wave_format(char* buf, uint_t s, const WAVEFORMATEX* wf) __THROW
-+ __NTH(char* avm_wave_format(char* buf, uint_t s, const WAVEFORMATEX* wf))
- {
- if (buf)
- {
---- avifile-0.7-0.7.41/include/avm_default.h 2004-03-10 10:58:24.000000000 +0100
-+++ avifile-0.7-0.7.41/include/avm_default.h.new 2004-10-07 09:26:27.571849713 +0200
-@@ -76,4 +76,8 @@
- #define __THROW
- #endif
-
-+#ifndef __NTH
-+#define __NTH(func) func
-+#endif
-+
- #endif /* AVIFILE_DEFAULT_H */
diff --git a/media-video/avifile/metadata.xml b/media-video/avifile/metadata.xml
deleted file mode 100644
index e8272125fda3..000000000000
--- a/media-video/avifile/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>video</herd>
-<maintainer><email>mholzer@gentoo.org</email></maintainer>
-</pkgmetadata>