diff options
| author | richard <richard@pkgsrc.org> | 2014-08-30 11:21:19 +0000 |
|---|---|---|
| committer | richard <richard@pkgsrc.org> | 2014-08-30 11:21:19 +0000 |
| commit | eed3f6ba7c85022e608f8febee1374a3d4cf2292 (patch) | |
| tree | 159b4f8579bddee5ec3b02637709533ed08a2d56 /multimedia/ffmpeg2 | |
| parent | 96609cfe748a2c286238e53118e25a974c6dee78 (diff) | |
| download | pkgsrc-eed3f6ba7c85022e608f8febee1374a3d4cf2292.tar.gz | |
avoid SunOS regset.h definition for REG_SP causing assembler issues.
Bump PKGVERSION
Diffstat (limited to 'multimedia/ffmpeg2')
| -rw-r--r-- | multimedia/ffmpeg2/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/ffmpeg2/Makefile.common | 13 | ||||
| -rw-r--r-- | multimedia/ffmpeg2/distinfo | 3 |
3 files changed, 9 insertions, 10 deletions
diff --git a/multimedia/ffmpeg2/Makefile b/multimedia/ffmpeg2/Makefile index 28db0f3852b..d26226700c5 100644 --- a/multimedia/ffmpeg2/Makefile +++ b/multimedia/ffmpeg2/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.10 2014/08/11 23:09:45 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2014/08/30 11:21:19 richard Exp $ PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg2/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://ffmpeg.mplayerhq.hu/ COMMENT= Decoding, encoding and streaming software (v2.x) +PKGREVISION= 1 CONFIGURE_ARGS+= --enable-avfilter #CONFIGURE_ARGS+= --enable-avfilter-lavf diff --git a/multimedia/ffmpeg2/Makefile.common b/multimedia/ffmpeg2/Makefile.common index 57a31db2f27..bd0684c32fe 100644 --- a/multimedia/ffmpeg2/Makefile.common +++ b/multimedia/ffmpeg2/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.20 2014/08/19 18:18:44 adam Exp $ +# $NetBSD: Makefile.common,v 1.21 2014/08/30 11:21:19 richard Exp $ # used by multimedia/ffmpeg2/Makefile # used by multimedia/ffplay2/Makefile @@ -41,15 +41,12 @@ PLIST.opencl= yes .endif .if ${OPSYS} == "SunOS" -CONFIGURE_ARGS+= --disable-amd3dnow -CONFIGURE_ARGS+= --disable-amd3dnowext -CONFIGURE_ARGS+= --disable-mmx -CONFIGURE_ARGS+= --disable-sse -CONFIGURE_ARGS+= --disable-ssse3 -.else -CONFIGURE_ARGS+= --enable-runtime-cpudetect +USE_TOOLS+= bash:build +CONFIG_SHELL= ${TOOLS_PATH.bash} .endif +CONFIGURE_ARGS+= --enable-runtime-cpudetect + # No posix_memalign() in NetBSD 4.0 and earlier .if !empty(MACHINE_PLATFORM:MNetBSD-[1-4].*-*) CONFIGURE_ARGS+= --enable-memalign-hack diff --git a/multimedia/ffmpeg2/distinfo b/multimedia/ffmpeg2/distinfo index a65b6aab315..3764be81dd5 100644 --- a/multimedia/ffmpeg2/distinfo +++ b/multimedia/ffmpeg2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.18 2014/08/19 18:18:44 adam Exp $ +$NetBSD: distinfo,v 1.19 2014/08/30 11:21:19 richard Exp $ SHA1 (ffmpeg-2.3.3.tar.bz2) = 012afcbc57ecdf23f71b9901087cd5dbc8056756 RMD160 (ffmpeg-2.3.3.tar.bz2) = cee0f67250da8e5dd11e58321b0466dcdfd33073 @@ -6,4 +6,5 @@ Size (ffmpeg-2.3.3.tar.bz2) = 7448421 bytes SHA1 (patch-Makefile) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253 SHA1 (patch-configure) = 42be64b0456c4d09d24db2535e22e948034ebd3c SHA1 (patch-libavutil_common.h) = ebbd0c169f228af37ae2dd54b27d5dba11a34c5e +SHA1 (patch-libavutil_x86_asm.h) = 3fe732ec6da9f0920d3c6e3a5db9bed65b0a3e40 SHA1 (patch-libavutil_x86_cpu.c) = ece66a5b22130754c11c643dae48171d04d3246f |