[pkgsrc/trunk]: pkgsrc/multimedia/ffmpeg gcc 2.95 does not handle some of the...

[kristerw <kristerw%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/74a710efd486
branches:  trunk
changeset: 478155:74a710efd486
user:      kristerw <kristerw%pkgsrc.org@localhost>
date:      Sun Jul 18 17:40:25 2004 +0000

description:
gcc 2.95 does not handle some of the asm statements.  Fall back to
the C version when using gcc 2.

diffstat:

 multimedia/ffmpeg/distinfo         |   3 ++-
 multimedia/ffmpeg/patches/patch-af |  28 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletions(-)

diffs (46 lines):

diff -r ea69ded5bbf3 -r 74a710efd486 multimedia/ffmpeg/distinfo
--- a/multimedia/ffmpeg/distinfo        Sun Jul 18 17:07:10 2004 +0000
+++ b/multimedia/ffmpeg/distinfo        Sun Jul 18 17:40:25 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2004/05/25 21:49:26 wiz Exp $
+$NetBSD: distinfo,v 1.3 2004/07/18 17:40:25 kristerw Exp $
 
 SHA1 (ffmpeg-0.4.8.tar.gz) = 629a0f8f4daa3da1dedd8ba58bfdec4c47581bb4
 Size (ffmpeg-0.4.8.tar.gz) = 1352874 bytes
@@ -7,3 +7,4 @@
 SHA1 (patch-ac) = 6f137ca14131e00c2db89cbe44657f32f3513e98
 SHA1 (patch-ad) = 38ce2de4fd721ed0832669ffb9e30f4a909e10b2
 SHA1 (patch-ae) = 101684310347c26205ff07acfbb62af16e5f633b
+SHA1 (patch-af) = 6992668cf23c6030acc9db6a318a68d6114ed5f2
diff -r ea69ded5bbf3 -r 74a710efd486 multimedia/ffmpeg/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/ffmpeg/patches/patch-af        Sun Jul 18 17:40:25 2004 +0000
@@ -0,0 +1,28 @@
+$NetBSD: patch-af,v 1.3 2004/07/18 17:40:25 kristerw Exp $
+
+--- libavcodec/libpostproc/postprocess_template.c.orig Sun Jul 18 18:13:02 2004
++++ libavcodec/libpostproc/postprocess_template.c      Sun Jul 18 19:25:47 2004
+@@ -2614,12 +2614,12 @@
+ static inline void RENAME(blockCopy)(uint8_t dst[], int dstStride, uint8_t src[], int srcStride,
+       int levelFix, int64_t *packedOffsetAndScale)
+ {
+-#ifndef HAVE_MMX
++#if !defined(HAVE_MMX) || (__GNUC__ < 3)
+       int i;
+ #endif
+       if(levelFix)
+       {
+-#ifdef HAVE_MMX
++#ifdef defined(HAVE_MMX) && (__GNUC__ >= 3)
+                                       asm volatile(
+                                               "movq (%%eax), %%mm2    \n\t" // packedYOffset
+                                               "movq 8(%%eax), %%mm3   \n\t" // packedYScale
+@@ -2702,7 +2702,7 @@
+       }
+       else
+       {
+-#ifdef HAVE_MMX
++#if defined(HAVE_MMX) && (__GNUC__ >= 3)
+                                       asm volatile(
+                                               "leal (%0,%2), %%eax    \n\t"
+                                               "leal (%1,%3), %%edx    \n\t"