summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2005-05-05 04:45:47 +0000
committerDonnie Berkholz <dberkholz@gentoo.org>2005-05-05 04:45:47 +0000
commitcf903ed224d687faa2e45fd557b953639038a83c (patch)
tree68f830c0a15d41b914363207e8dd2dc815512b02 /media-video/ffmpeg
parentVarious bug fixes... (diff)
downloadhistorical-cf903ed224d687faa2e45fd557b953639038a83c.tar.gz
historical-cf903ed224d687faa2e45fd557b953639038a83c.tar.bz2
historical-cf903ed224d687faa2e45fd557b953639038a83c.zip
Re-add missing patch.
Package-Manager: portage-2.0.51.20-r5
Diffstat (limited to 'media-video/ffmpeg')
-rw-r--r--media-video/ffmpeg/ChangeLog6
-rw-r--r--media-video/ffmpeg/Manifest9
-rw-r--r--media-video/ffmpeg/files/0.4.8-gcc3.4-magicF2W.patch18
3 files changed, 28 insertions, 5 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 911ce18a6398..95b8b594df23 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/ffmpeg
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.75 2005/05/04 01:13:37 j4rg0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.76 2005/05/05 04:45:47 spyderous Exp $
+
+ 05 May 2005; Donnie Berkholz <spyderous@gentoo.org>;
+ +files/0.4.8-gcc3.4-magicF2W.patch:
+ Re-add missing patch.
*ffmpeg-0.4.9_pre1-r1 (04 May 2005)
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index a89de8b66426..1e3d67ab890a 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,16 +1,17 @@
-MD5 b5fe59f15edd297717cd96a00bd49486 ChangeLog 12160
+MD5 80fc73e3e31b113dce5a3e20ab825d9b ChangeLog 12281
MD5 68e2b1e11184721e20a5b5d24ff9ba15 ffmpeg-0.4.9_p20050226-r5.ebuild 4460
MD5 d363b93324e315e8230dacdec1b650f9 ffmpeg-0.4.9_pre1-r1.ebuild 4050
MD5 c57ec7ef531e1088a91de5d6d9ba1dfa ffmpeg-0.4.8.ebuild 2430
MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
MD5 912d6d17440a836812ac0fd4cd93d23b ffmpeg-0.4.9_p20050226-r3.ebuild 4383
-MD5 b4ecc62e882107f766cf621bfc6c7e20 files/ffmpeg-osx.patch 5940
MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226-r5 73
-MD5 20274823abfde904ae73478349585dd0 files/ffmpeg-0.4.9_p20050226-gcc4.patch 2319
-MD5 0a76b7a4442aea90d56ac85508b2eff5 files/digest-ffmpeg-0.4.8 65
MD5 e592f1aa79ce0d709ac4980404956e87 files/ffmpeg-a52.patch 1111
+MD5 b4ecc62e882107f766cf621bfc6c7e20 files/ffmpeg-osx.patch 5940
+MD5 0a76b7a4442aea90d56ac85508b2eff5 files/digest-ffmpeg-0.4.8 65
MD5 1a8c0be3a5a5ba1d929b7773265943b7 files/ffmpeg-missing_links.patch 1199
MD5 e16a2db90cc2c151bdba748297e137dd files/digest-ffmpeg-0.4.9_pre1-r1 70
+MD5 003b0062185efcb0ea5a6115fa8a646a files/0.4.8-gcc3.4-magicF2W.patch 994
MD5 f0c54c934c78216a2bd0b157028a6f84 files/gentoo-ffmpeg001.patch 752
MD5 b1cd277309faaaa03e3dafb3b89b2a09 files/ffmpeg-libdir-pic.patch 6027
MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226-r3 73
+MD5 20274823abfde904ae73478349585dd0 files/ffmpeg-0.4.9_p20050226-gcc4.patch 2319
diff --git a/media-video/ffmpeg/files/0.4.8-gcc3.4-magicF2W.patch b/media-video/ffmpeg/files/0.4.8-gcc3.4-magicF2W.patch
new file mode 100644
index 000000000000..d227610656c5
--- /dev/null
+++ b/media-video/ffmpeg/files/0.4.8-gcc3.4-magicF2W.patch
@@ -0,0 +1,18 @@
+--- libavcodec/liba52/resample_mmx.c 2004/05/01 14:38:45 1.1
++++ libavcodec/liba52/resample_mmx.c 2004/05/01 14:58:39
+@@ -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__((used)) __attribute__((aligned(8))) magicF2W= 0x43c0000043c00000LL;
++static uint64_t __attribute__((used)) __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000LL;
++static uint64_t __attribute__((used)) __attribute__((aligned(8))) wm0101= 0x0000FFFF0000FFFFLL;
++static uint64_t __attribute__((used)) __attribute__((aligned(8))) wm1100= 0xFFFFFFFF00000000LL;
+
+ static int a52_resample_MONO_to_5_MMX(float * _f, int16_t * s16){
+ int32_t * f = (int32_t *) _f;
+