diff options
| author | ahoka <ahoka@pkgsrc.org> | 2008-09-08 00:16:35 +0000 |
|---|---|---|
| committer | ahoka <ahoka@pkgsrc.org> | 2008-09-08 00:16:35 +0000 |
| commit | 09865e1650ef14935a196850a800d142fef617d4 (patch) | |
| tree | 363490c3e05fdbe1f5695f470444203cc8379292 | |
| parent | 3c51f4618d5ca5a7750f5633e7a26b33eba0118f (diff) | |
| download | pkgsrc-09865e1650ef14935a196850a800d142fef617d4.tar.gz | |
Explicitly disable any mmx or sse code.
Fix endian detection.
| -rw-r--r-- | multimedia/ffmpeg/Makefile | 6 | ||||
| -rw-r--r-- | multimedia/ffmpeg/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/ffmpeg/patches/patch-configure | 22 |
3 files changed, 26 insertions, 6 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 2f0d63be7c5..c36a796607f 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2008/09/07 23:39:37 ahoka Exp $ +# $NetBSD: Makefile,v 1.38 2008/09/08 00:16:35 ahoka Exp $ DISTNAME= ffmpeg-${DISTVERSION} PKGNAME= ffmpeg-${DISTVERSION:S/-//g} @@ -54,7 +54,9 @@ CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} \ # Doesn't work without memalign and memalign looks buggy. .if !empty(MACHINE_ARCH:Mi386) -CONFIGURE_ARGS+= --disable-mmx +CONFIGURE_ARGS+= --disable-mmx \ + --disable-mmx2 \ + --disable-ssse3 .endif INSTALLATION_DIRS= lib share/examples/ffmpeg share/doc/ffmpeg diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo index eef1f89927d..13a23923ccc 100644 --- a/multimedia/ffmpeg/distinfo +++ b/multimedia/ffmpeg/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.16 2008/09/07 23:39:37 ahoka Exp $ +$NetBSD: distinfo,v 1.17 2008/09/08 00:16:35 ahoka Exp $ SHA1 (ffmpeg-2008-07-27.tar.bz2) = 103acde7a0f02aa1c32d5dab5bf187c94441c479 RMD160 (ffmpeg-2008-07-27.tar.bz2) = e69128fc034a3f8b0fd561f1e6ecc04dd118a977 Size (ffmpeg-2008-07-27.tar.bz2) = 2581976 bytes SHA1 (patch-bktr) = dddf7149810d227f531e5a198445fc0d1893bece -SHA1 (patch-configure) = c61628c17bfb31021ee56782177c7df5a91ca5aa +SHA1 (patch-configure) = 61d547264afd2ae99fc4837fce1bd830db36ab26 SHA1 (patch-r14477) = fb68f691fe68b6dc4ddd31c4c366d0dae11ab999 SHA1 (patch-v4l2) = ed35dbd2d08337239f051c74c414e01609fb6ef6 diff --git a/multimedia/ffmpeg/patches/patch-configure b/multimedia/ffmpeg/patches/patch-configure index aad8233a5df..37448b0e63f 100644 --- a/multimedia/ffmpeg/patches/patch-configure +++ b/multimedia/ffmpeg/patches/patch-configure @@ -1,4 +1,4 @@ -$NetBSD: patch-configure,v 1.1 2008/09/07 23:39:38 ahoka Exp $ +$NetBSD: patch-configure,v 1.2 2008/09/08 00:16:35 ahoka Exp $ --- configure.orig 2008-07-24 12:53:32.000000000 +0200 +++ configure @@ -11,7 +11,25 @@ $NetBSD: patch-configure,v 1.1 2008/09/07 23:39:38 ahoka Exp $ vfwcap_demuxer_deps="capCreateCaptureWindow" vfwcap_demuxer_extralibs="-lvfw32" x11_grab_device_demuxer_deps="x11grab XShmCreateImage" -@@ -1789,6 +1789,7 @@ EOF +@@ -1586,10 +1586,14 @@ enabled vis && add_cflags "-mcpu=ultrasp + + # --- + # big/little-endian test +-check_cc <<EOF || die "endian test failed" +-unsigned int endian = 'B' << 24 | 'I' << 16 | 'G' << 8 | 'E'; ++check_exec <<EOF || enable bigendian ++int main() ++{ ++ long one= 1; ++ return !(*((char *)(&one))); ++} + EOF +-od -A n -t x1 $TMPO | grep -q '42 *49 *47 *45' && enable bigendian ++ + + # --- + # check availability of some header files +@@ -1789,6 +1793,7 @@ EOF check_header linux/videodev.h check_header linux/videodev2.h |