old

(Portage version: 2.1.6.2/cvs/Linux 2.6.27.7 i686)

6 files changed, 0 insertions, 304 deletions

diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index f54eb904f12f..fd5d92d40310 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,13 +1,7 @@
-AUX CVE-2008-3162.patch 2936 RMD160 5a4c226d5d43d106cced92b9e80c5cbc9b9fc8e2 SHA1 dcc242a09deba9a2e960621244e42b72dfd9c661 SHA256 1a07075fcfb6c763912cd295a34532a629f3cf1d3fef60fed1c6418c80abda7d
-AUX ffmpeg-0.4.9_p20070330-asmpic.patch 2111 RMD160 3172d33b3f98933de028a279a55ceea488ab635a SHA1 1a60ea4599324bb29be2de818ee126804203b060 SHA256 a0799a9fda4312c468ec812af67e3a69f7e9f298f877734ce061dfaa4e5b1ce9
 AUX ffmpeg-0.4.9_p20081014-sparc-gcc43.patch 503 RMD160 3b7b0deb5c8ceac2b8ec39c45d761c6f6f9158f3 SHA1 f538896e44e15bb07fd500d0bf0360c96bc6a9da SHA256 4f7675477d51ddce885a7a1bb647a30663e0294db0f6936fa37d162f2d4a94b0
-AUX ffmpeg-arm-pld.patch 491 RMD160 a0b9b1d582ff070c3c124d59ffc41fde0d9cb8fc SHA1 e9f4950e49776f48b28aae1836de4b9290c71afd SHA256 ea361d224c9ad2a961a268b04653f628b8db4d0e5ce45766518bea6c907656a2
-AUX ffmpeg-libdir-2007.patch 313 RMD160 88b86d34eaf976db25db70449b0d4a3238a16a32 SHA1 43486a328913beec5ae1f38eb6fd987b2d756995 SHA256 08df45ff041269c1226eda787e9a30373ed7b5a469e06b6b30bd6a81e781f863
 AUX ffmpeg-shared-gcc4.1.patch 1667 RMD160 cf0318bcb812ad701e8cd55f10f59ca71933cf6c SHA1 0fd4d860efd8a0240fa66443429d8404d28a27dd SHA256 0bd67ed0cc1ea47c36756f5a66e504af4de85ce072c4b92083fb44065b5a3671
-DIST ffmpeg-0.4.9-p20070616.tar.bz2 2275972 RMD160 73d0334b85f0859bbfc40a4d9c27fb987b36ca25 SHA1 6c649cf5b4c803bf7aec2f70adbd9d0992360e71 SHA256 bb15d2aee946ac6113928386f7385b15ffa4d9640e60830bd9868079bfb2da88
 DIST ffmpeg-0.4.9-p20081014.tar.bz2 2676641 RMD160 6b7e556292425dabcf1f6e94c01d493a3d353835 SHA1 016fdd2798ce442dddfe4551e04a2324b0587428 SHA256 a039ac78b31e24b1a1a06daa927bdf24fc3cc7b73adbb7a5d936a0c828b84018
 DIST ffmpeg-0.4.9-p20081219.tar.bz2 2669507 RMD160 0de7935340bfd477d6be9407285bcc066e8b6347 SHA1 b1af74fbed65c4060b8882bd1ea3e029263cd811 SHA256 626184a86ad8159b1702c93e80714e87aec5b17163e7a5360d6b976ecc4453fc
-EBUILD ffmpeg-0.4.9_p20070616-r3.ebuild 5570 RMD160 405fe31ab57681ae126317c4cb4bd6dc3ff47e0d SHA1 0e8f8844e761d85266affbd348fe1a0fc5692392 SHA256 10990230c1a51b8b088c6a8628703563af382f84369ec43dd7dc514e1347b5ca
 EBUILD ffmpeg-0.4.9_p20081014.ebuild 6344 RMD160 913d3831b0964bf5a3491d81524003d338cde01e SHA1 808abc3b8327df36652ba0394906201da22a1e29 SHA256 53c4d4c97d508a5ec5e4c1a580ad510bc2e55f613efc5b83b3798898299a40ba
 EBUILD ffmpeg-0.4.9_p20081219.ebuild 6082 RMD160 4268ea444574c8cafc38aad097767ff0760a6141 SHA1 5331dc52ae6116dd1bcf63f6f6fb2717d53c8711 SHA256 ae26866f48ae223d6e85f150f44b703ffc95c8695adf0bf3aa2041a5a1468d57
 EBUILD ffmpeg-9999.ebuild 5974 RMD160 f6bc36d94525aea1beec1ffe82c417be9e387f13 SHA1 606722ed6b43fc71a94d148097dbd6ea486a597b SHA256 9daeb655fe046b4aeccf18d65752483e9f30c226189cd13b7e5b655c15b43aa6
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20070616-r3.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20070616-r3.ebuild
deleted file mode 100644
index 6bd26660c726..000000000000
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20070616-r3.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20070616-r3.ebuild,v 1.10 2008/12/21 17:11:17 ssuominen Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video.
-Includes libavcodec. SVN revision 9330"
-HOMEPAGE="http://ffmpeg.org/"
-MY_P=${P/_/-}
-S=${WORKDIR}/ffmpeg
-
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="arm ia64"
-IUSE="aac altivec amr debug doc ieee1394 a52 encode imlib mmx ogg vorbis oss
-	test theora threads truetype v4l x264 xvid network zlib sdl X"
-
-RDEPEND="imlib? ( >=media-libs/imlib2-1.4.0 )
-	truetype? ( >=media-libs/freetype-2 )
-	sdl? ( >=media-libs/libsdl-1.2.10 )
-	encode? ( media-sound/lame
-		vorbis? ( media-libs/libvorbis )
-		theora? ( media-libs/libtheora ) )
-	ogg? ( media-libs/libogg )
-	aac? ( media-libs/faad2 media-libs/faac )
-	a52? ( >=media-libs/a52dec-0.7.4-r4 )
-	xvid? ( >=media-libs/xvid-1.1.0 )
-	zlib? ( sys-libs/zlib )
-	ieee1394? ( =media-libs/libdc1394-1*
-				sys-libs/libraw1394 )
-	x264? ( media-libs/x264 )
-	X? ( x11-libs/libX11 x11-libs/libXext )
-	amr? ( media-libs/amrnb media-libs/amrwb )"
-
-DEPEND="${RDEPEND}
-	doc? ( app-text/texi2html )
-	test? ( net-misc/wget )"
-# Make sure the mmx USE flag is unmasked
-# Remove this once default-linux/amd64/2006.1 is deprecated
-DEPEND="${DEPEND} amd64? ( >=sys-apps/portage-2.1.2 )"
-
-src_unpack() {
-	unpack ${A} || die
-	cd "${S}"
-
-	#Append -DBROKEN_RELOCATIONS to build for bug 179872.
-	#Pretty please fix me if you can.
-	append-flags "-DBROKEN_RELOCATIONS"
-
-	#Append -fomit-frame-pointer to avoid some common issues
-	use debug || append-flags "-fomit-frame-pointer"
-
-	# for some reason it tries to #include <X11/Xlib.h>, but doesn't use it
-	sed -i s:\#define\ HAVE_X11:\#define\ HAVE_LINUX: ffplay.c
-
-	# .pc files contain wrong libdir path
-	epatch "${FILESDIR}"/${PN}-libdir-2007.patch
-	sed -i -e "s:GENTOOLIBDIR:$(get_libdir):" configure
-
-	# Make it use pic always since we don't need textrels
-	sed -i -e "s:LIBOBJFLAGS=\"\":LIBOBJFLAGS=\'\$\(PIC\)\':" configure
-
-	# To make sure the ffserver test will work
-	sed -i -e "s:-e debug=off::" tests/server-regression.sh
-
-	epatch "${FILESDIR}"/${PN}-arm-pld.patch
-	epatch "${FILESDIR}/${PN}-shared-gcc4.1.patch"
-	# disable non pic safe asm, bug #172877, bug #172845 and dupes
-	# epatch "${FILESDIR}/${PN}-0.4.9_p20070330-asmpic.patch"
-
-	# Security fix, bug #231831
-	epatch "${FILESDIR}/CVE-2008-3162.patch"
-}
-
-src_compile() {
-	replace-flags -O0 -O2
-	#x86, what a wonderful arch....
-	replace-flags -O1 -O2
-	local myconf="${EXTRA_ECONF}"
-
-	#disable mmx accelerated code if not requested, or if PIC is required
-	# as the provided asm decidedly is not PIC.
-	if ( gcc-specs-pie || ! use mmx ) ; then
-		myconf="${myconf} --disable-mmx"
-	fi
-
-	# enabled by default
-	use altivec || myconf="${myconf} --disable-altivec"
-	use debug || myconf="${myconf} --disable-debug"
-	use oss || myconf="${myconf} --disable-audio-oss"
-	use v4l || myconf="${myconf} --disable-v4l --disable-v4l2"
-	use ieee1394 || myconf="${myconf} --disable-dv1394"
-	use network || myconf="${myconf} --disable-network"
-	use zlib || myconf="${myconf} --disable-zlib"
-	use sdl || myconf="${myconf} --disable-ffplay"
-
-	myconf="${myconf} --disable-opts"
-
-	# disabled by default
-	if use encode
-	then
-		myconf="${myconf} --enable-libmp3lame"
-		use vorbis && myconf="${myconf} --enable-libvorbis --enable-libogg"
-		use theora && myconf="${myconf} --enable-libtheora --enable-libogg"
-	fi
-	use a52 && myconf="${myconf} --enable-liba52"
-	use ieee1394 && myconf="${myconf} --enable-dc1394"
-	use threads && myconf="${myconf} --enable-pthreads"
-	use xvid && myconf="${myconf} --enable-libxvid"
-	use X && myconf="${myconf} --enable-x11grab"
-	use ogg && myconf="${myconf} --enable-libogg"
-	use x264 && myconf="${myconf} --enable-libx264"
-	use aac && myconf="${myconf} --enable-libfaad --enable-libfaac"
-	use amr && myconf="${myconf} --enable-libamr-nb --enable-libamr-wb"
-
-	myconf="${myconf} --enable-gpl --enable-pp --disable-strip"
-
-	tc-is-cross-compiler && myconf="${myconf} --cross-compile --arch=$(tc-arch-kernel)"
-
-	# Specific workarounds for too-few-registers arch...
-	if [[ $(tc-arch) == "x86" ]]; then
-		filter-flags -fforce-addr -momit-leaf-frame-pointer
-		append-flags -fomit-frame-pointer
-		is-flag -O? || append-flags -O2
-		if (use debug); then
-			# no need to warn about debug if not using debug flag
-			ewarn ""
-			ewarn "Debug information will be almost useless as the frame pointer is omitted."
-			ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
-			ewarn "difficult to fix. Please have that in mind."
-			ewarn ""
-		fi
-	fi
-
-	cd "${S}"
-	./configure \
-		--prefix=/usr \
-		--libdir=/usr/$(get_libdir) \
-		--shlibdir=/usr/$(get_libdir) \
-		--mandir=/usr/share/man \
-		--enable-static --enable-shared \
-		"--cc=$(tc-getCC)" \
-		${myconf} || die "configure failed"
-
-	emake -j1 depend || die "depend failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	emake -j1 LDCONFIG=true DESTDIR="${D}" install || die "Install Failed"
-
-	use doc && emake -j1 documentation
-	dodoc Changelog README INSTALL
-	dodoc doc/*
-}
-
-# Never die for now...
-src_test() {
-	cd "${S}"/tests
-	for t in "codectest libavtest test-server" ; do
-		make ${t} || ewarn "Some tests in ${t} failed"
-	done
-}
-
-pkg_postinst() {
-	ewarn "This version is maintained by ${KEYWORDS} teams,"
-	ewarn "please don't contact media-video about this"
-	ewarn "version."
-}
diff --git a/media-video/ffmpeg/files/CVE-2008-3162.patch b/media-video/ffmpeg/files/CVE-2008-3162.patch
deleted file mode 100644
index 032a3e7016b3..000000000000
--- a/media-video/ffmpeg/files/CVE-2008-3162.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-CVE-2008-3162:
-Stack-based buffer overflow in the str_read_packet function in libavformat/psxstr.c
-in FFmpeg before r13993 allows remote attackers to cause a denial of service 
-(application crash) or execute arbitrary code via a crafted STR file that interleaves
-audio and video sectors.
-
-Patch from
-http://svn.mplayerhq.hu/ffmpeg?view=rev&revision=13993
-
-Index: ffmpeg/libavformat/psxstr.c
-===================================================================
---- ffmpeg.orig/libavformat/psxstr.c
-+++ ffmpeg/libavformat/psxstr.c
-@@ -276,12 +276,23 @@ static int str_read_packet(AVFormatConte
-                 int current_sector = AV_RL16(&sector[0x1C]);
-                 int sector_count   = AV_RL16(&sector[0x1E]);
-                 int frame_size = AV_RL32(&sector[0x24]);
--                int bytes_to_copy;
-+
-+                if(!(   frame_size>=0
-+                     && current_sector < sector_count
-+                     && sector_count*VIDEO_DATA_CHUNK_SIZE >=frame_size)){
-+                    av_log(s, AV_LOG_ERROR, "Invalid parameters %d %d %d\n", current_sector, sector_count, frame_size);
-+                    return AVERROR_INVALIDDATA;
-+                }
-+
- //        printf("%d %d %d\n",current_sector,sector_count,frame_size);
-                 /* if this is the first sector of the frame, allocate a pkt */
-                 pkt = &str->tmp_pkt;
--                if (current_sector == 0) {
--                    if (av_new_packet(pkt, frame_size))
-+
-+                if(pkt->size != sector_count*VIDEO_DATA_CHUNK_SIZE){
-+                    if(pkt->data)
-+                        av_log(s, AV_LOG_ERROR, "missmatching sector_count\n");
-+                    av_free_packet(pkt);
-+                    if (av_new_packet(pkt, sector_count*VIDEO_DATA_CHUNK_SIZE))
-                         return AVERROR_IO;
- 
-                     pkt->pos= url_ftell(pb) - RAW_CD_SECTOR_SIZE;
-@@ -295,15 +306,15 @@ static int str_read_packet(AVFormatConte
-                        str->pts += (90000 / 15);
-                 }
- 
--                /* load all the constituent chunks in the video packet */
--                bytes_to_copy = frame_size - current_sector*VIDEO_DATA_CHUNK_SIZE;
--                if (bytes_to_copy>0) {
--                    if (bytes_to_copy>VIDEO_DATA_CHUNK_SIZE) bytes_to_copy=VIDEO_DATA_CHUNK_SIZE;
--                    memcpy(pkt->data + current_sector*VIDEO_DATA_CHUNK_SIZE,
--                        sector + VIDEO_DATA_HEADER_SIZE, bytes_to_copy);
--                }
-+                memcpy(pkt->data + current_sector*VIDEO_DATA_CHUNK_SIZE,
-+                       sector + VIDEO_DATA_HEADER_SIZE,
-+                       VIDEO_DATA_CHUNK_SIZE);
-+
-                 if (current_sector == sector_count-1) {
-+                    pkt->size= frame_size;
-                     *ret_pkt = *pkt;
-+                    pkt->data= NULL;
-+                    pkt->size= -1;
-                     return 0;
-                 }
- 
diff --git a/media-video/ffmpeg/files/ffmpeg-0.4.9_p20070330-asmpic.patch b/media-video/ffmpeg/files/ffmpeg-0.4.9_p20070330-asmpic.patch
deleted file mode 100644
index 0cf16c3e5cca..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-0.4.9_p20070330-asmpic.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: ffmpeg/libavcodec/cabac.h
-===================================================================
---- ffmpeg.orig/libavcodec/cabac.h
-+++ ffmpeg/libavcodec/cabac.h
-@@ -376,7 +376,7 @@ static int av_always_inline get_cabac_in
- #define BYTE        "16"
- #define BYTEEND     "20"
- #endif
--#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE)
-+#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE) && !(defined(PIC) && defined(__GNUC__))
-     int bit;
- 
- #ifndef BRANCHLESS_CABAC_DECODER
-@@ -680,7 +680,7 @@ static av_always_inline int get_cabac_by
- 
- //FIXME the x86 code from this file should be moved into i386/h264 or cabac something.c/h (note ill kill you if you move my code away from under my fingers before iam finished with it!)
- //FIXME use some macros to avoid duplicatin get_cabac (cant be done yet as that would make optimization work hard)
--#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE)
-+#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE) && !(defined(PIC) && defined(__GNUC__))
- static int decode_significance_x86(CABACContext *c, int max_coeff, uint8_t *significant_coeff_ctx_base, int *index){
-     void *end= significant_coeff_ctx_base + max_coeff - 1;
-     int minusstart= -(int)significant_coeff_ctx_base;
-Index: ffmpeg/libavcodec/h264.c
-===================================================================
---- ffmpeg.orig/libavcodec/h264.c
-+++ ffmpeg/libavcodec/h264.c
-@@ -6111,7 +6111,7 @@ static int decode_cabac_residual( H264Co
-             index[coeff_count++] = last;\
-         }
-         const uint8_t *sig_off = significant_coeff_flag_offset_8x8[MB_FIELD];
--#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE)
-+#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE) && !(defined(PIC) && defined(__GNUC__))
-         coeff_count= decode_significance_8x8_x86(CC, significant_coeff_ctx_base, index, sig_off);
-     } else {
-         coeff_count= decode_significance_x86(CC, max_coeff, significant_coeff_ctx_base, index);
diff --git a/media-video/ffmpeg/files/ffmpeg-arm-pld.patch b/media-video/ffmpeg/files/ffmpeg-arm-pld.patch
deleted file mode 100644
index 5b8a2ce9cf87..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-arm-pld.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-fix from upstream svn
---- ffmpeg/libavcodec/armv4l/dsputil_arm_s.S	(revision 12568)
-+++ ffmpeg/libavcodec/armv4l/dsputil_arm_s.S	(revision 12569)
-@@ -19,6 +19,13 @@
- @ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- @
- 
-+#include "config.h"
-+
-+#ifndef HAVE_PLD
-+.macro pld reg
-+.endm
-+#endif
-+
- .macro  ADJ_ALIGN_QUADWORD_D shift, Rd0, Rd1, Rd2, Rd3, Rn0, Rn1, Rn2, Rn3, Rn4
-         mov \Rd0, \Rn0, lsr #(\shift * 8)
-         mov \Rd1, \Rn1, lsr #(\shift * 8)
diff --git a/media-video/ffmpeg/files/ffmpeg-libdir-2007.patch b/media-video/ffmpeg/files/ffmpeg-libdir-2007.patch
deleted file mode 100644
index ca3f202b4029..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-libdir-2007.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ffmpeg/configure.orig	2007-01-29 15:24:05.000000000 +0100
-+++ ffmpeg/configure	2007-01-29 15:37:23.000000000 +0100
-@@ -2166,7 +2166,7 @@
- cat <<EOF >$name.pc
- prefix=$PREFIX
- exec_prefix=\${prefix}
--libdir=\${exec_prefix}/lib
-+libdir=\${exec_prefix}/GENTOOLIBDIR
- includedir=\${prefix}/include
- 
- Name: $name