[pkgsrc/trunk]: pkgsrc/multimedia/ffmpeg Disable use of SSE2 accelerations if...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1d1eccd86e8a
branches:  trunk
changeset: 397366:1d1eccd86e8a
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Mon Aug 10 20:37:15 2009 +0000

description:
Disable use of SSE2 accelerations if compiled with gcc<4.2, this causes
crashes. (means this snapshot is just too new for NetBSD's toolchain)

diffstat:

 multimedia/ffmpeg/Makefile         |   4 +++-
 multimedia/ffmpeg/distinfo         |   3 ++-
 multimedia/ffmpeg/patches/patch-aa |  20 ++++++++++++++++++++
 3 files changed, 25 insertions(+), 2 deletions(-)

diffs (48 lines):

diff -r 8cb260f2a7ec -r 1d1eccd86e8a multimedia/ffmpeg/Makefile
--- a/multimedia/ffmpeg/Makefile        Mon Aug 10 20:01:37 2009 +0000
+++ b/multimedia/ffmpeg/Makefile        Mon Aug 10 20:37:15 2009 +0000
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.50 2009/06/12 16:25:34 ahoka Exp $
+# $NetBSD: Makefile,v 1.51 2009/08/10 20:37:15 drochner Exp $
+
+PKGREVISION=   1
 
 MAINTAINER=    ahoka%NetBSD.org@localhost
 HOMEPAGE=      http://ffmpeg.mplayerhq.hu/
diff -r 8cb260f2a7ec -r 1d1eccd86e8a multimedia/ffmpeg/distinfo
--- a/multimedia/ffmpeg/distinfo        Mon Aug 10 20:01:37 2009 +0000
+++ b/multimedia/ffmpeg/distinfo        Mon Aug 10 20:37:15 2009 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.25 2009/06/14 11:27:00 ahoka Exp $
+$NetBSD: distinfo,v 1.26 2009/08/10 20:37:15 drochner Exp $
 
 SHA1 (ffmpeg-20090611.tar.bz2) = 04e67497f70c64b7a26534d4b67e3a46cdb4b219
 RMD160 (ffmpeg-20090611.tar.bz2) = 447a72cd1a416f926100c61299d9012535909d9a
 Size (ffmpeg-20090611.tar.bz2) = 2799194 bytes
+SHA1 (patch-aa) = e40f61850fe5c85bdd4b659802601dfacfe73ad1
 SHA1 (patch-bktr) = dadd96835ffbf3a95a5de75647a72edb53171b6f
 SHA1 (patch-configure) = c4f5cbe0cecac291547a9fd652f3e6c3c92fde2c
diff -r 8cb260f2a7ec -r 1d1eccd86e8a multimedia/ffmpeg/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/ffmpeg/patches/patch-aa        Mon Aug 10 20:37:15 2009 +0000
@@ -0,0 +1,20 @@
+$NetBSD: patch-aa,v 1.9 2009/08/10 20:37:15 drochner Exp $
+
+--- libavcodec/x86/cpuid.c.orig        2009-08-10 22:17:29.000000000 +0200
++++ libavcodec/x86/cpuid.c
+@@ -80,6 +80,7 @@ int mm_support(void)
+             rval |= FF_MM_MMX2
+ #if HAVE_SSE
+                   | FF_MM_SSE;
++#if !defined(__GNUC__) || (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
+         if (std_caps & (1<<26))
+             rval |= FF_MM_SSE2;
+         if (ecx & 1)
+@@ -90,6 +91,7 @@ int mm_support(void)
+             rval |= FF_MM_SSE4;
+         if (ecx & 0x00100000 )
+             rval |= FF_MM_SSE42;
++#endif /* gcc >= 4.2 */
+ #endif
+                   ;
+     }