Tue Dec 2 19:40:43 2008 UTC ()
Disable SIMD on AMD64 too.


(ahoka)
diff -r1.44 -r1.45 pkgsrc/multimedia/ffmpeg/Makefile
cvs diff -r1.44 -r1.45 pkgsrc/multimedia/ffmpeg/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg/Attic/Makefile 2008/09/15 21:24:00 1.44
+++ pkgsrc/multimedia/ffmpeg/Attic/Makefile 2008/12/02 19:40:43 1.45
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.44 2008/09/15 21:24:00 sborrill Exp $ 1# $NetBSD: Makefile,v 1.45 2008/12/02 19:40:43 ahoka Exp $
2 2
3DISTNAME= ffmpeg-${DISTVERSION} 3DISTNAME= ffmpeg-${DISTVERSION}
4PKGNAME= ffmpeg-${DISTVERSION:S/-//g} 4PKGNAME= ffmpeg-${DISTVERSION:S/-//g}
5PKGREVISION= 4 5PKGREVISION= 5
6CATEGORIES= multimedia 6CATEGORIES= multimedia
7MASTER_SITES= ${MASTER_SITE_FREEBSD} 7MASTER_SITES= ${MASTER_SITE_FREEBSD}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= ahoka@NetBSD.org 10MAINTAINER= ahoka@NetBSD.org
11HOMEPAGE= http://ffmpeg.mplayerhq.hu/ 11HOMEPAGE= http://ffmpeg.mplayerhq.hu/
12COMMENT= MPEG decoding, encoding and streaming software 12COMMENT= MPEG decoding, encoding and streaming software
13 13
14DISTVERSION= 2008-07-27 14DISTVERSION= 2008-07-27
15PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
16 16
17HAS_CONFIGURE= YES 17HAS_CONFIGURE= YES
18USE_LIBTOOL= YES 18USE_LIBTOOL= YES
@@ -44,28 +44,28 @@ CONFIGURE_ARGS+= --mandir=${PREFIX}/${PK @@ -44,28 +44,28 @@ CONFIGURE_ARGS+= --mandir=${PREFIX}/${PK
44 --prefix=${PREFIX:Q} \ 44 --prefix=${PREFIX:Q} \
45 --disable-debug \ 45 --disable-debug \
46 --disable-vhook \ 46 --disable-vhook \
47 --enable-avfilter \ 47 --enable-avfilter \
48 --enable-gpl \ 48 --enable-gpl \
49 --enable-postproc \ 49 --enable-postproc \
50 --enable-pthreads \ 50 --enable-pthreads \
51 --enable-shared \ 51 --enable-shared \
52 --enable-swscale \ 52 --enable-swscale \
53 --enable-libvorbis \ 53 --enable-libvorbis \
54 --enable-libmp3lame \ 54 --enable-libmp3lame \
55 --disable-stripping 55 --disable-stripping
56 56
57# Doesn't work without memalign and memalign looks buggy. 57# causes complaining about being miscompiled
58.if !empty(MACHINE_ARCH:Mi386) 58.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
59CONFIGURE_ARGS+= --disable-mmx \ 59CONFIGURE_ARGS+= --disable-mmx \
60 --disable-mmx2 \ 60 --disable-mmx2 \
61 --disable-ssse3 61 --disable-ssse3
62.endif 62.endif
63 63
64INSTALLATION_DIRS= lib share/examples/ffmpeg share/doc/ffmpeg 64INSTALLATION_DIRS= lib share/examples/ffmpeg share/doc/ffmpeg
65 65
66.include "options.mk" 66.include "options.mk"
67 67
68post-install: 68post-install:
69 ${INSTALL_DATA} ${WRKSRC}/libavcodec/apiexample.c \ 69 ${INSTALL_DATA} ${WRKSRC}/libavcodec/apiexample.c \
70 ${DESTDIR}${PREFIX}/share/doc/ffmpeg 70 ${DESTDIR}${PREFIX}/share/doc/ffmpeg
71 ${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/doc/TODO \ 71 ${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/doc/TODO \