diff options
| author | drochner <drochner> | 2009-08-10 20:37:15 +0000 |
|---|---|---|
| committer | drochner <drochner> | 2009-08-10 20:37:15 +0000 |
| commit | 520d49212d4b54f5133ca32da9a5d30ff8ed5824 (patch) | |
| tree | de9a393aee2782557ea0b1ff7378db0dcb8a1bf2 /multimedia/ffmpeg | |
| parent | bc5d86e17e11136aa70216bb18be11d5fdb2666f (diff) | |
| download | pkgsrc-520d49212d4b54f5133ca32da9a5d30ff8ed5824.tar.gz | |
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 (limited to 'multimedia/ffmpeg')
| -rw-r--r-- | multimedia/ffmpeg/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/ffmpeg/distinfo | 3 | ||||
| -rw-r--r-- | multimedia/ffmpeg/patches/patch-aa | 20 |
3 files changed, 25 insertions, 2 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 3178c922fcf..da6c5df1e90 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -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 HOMEPAGE= http://ffmpeg.mplayerhq.hu/ diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo index ade5592d288..e43d795c5f9 100644 --- a/multimedia/ffmpeg/distinfo +++ b/multimedia/ffmpeg/distinfo @@ -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 --git a/multimedia/ffmpeg/patches/patch-aa b/multimedia/ffmpeg/patches/patch-aa new file mode 100644 index 00000000000..e523a9bc2ed --- /dev/null +++ b/multimedia/ffmpeg/patches/patch-aa @@ -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 + ; + } |