diff options
| author | adam <adam@pkgsrc.org> | 2013-08-02 18:24:18 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2013-08-02 18:24:18 +0000 |
| commit | 4874ccfc060cc5b7739042b8b2411a137b26c129 (patch) | |
| tree | 985cd8fafc490209082efa972b99888116ab6836 /multimedia/ffmpeg/Makefile | |
| parent | 86df3f1135f3dbc61be996d3478b38e759f4de72 (diff) | |
| download | pkgsrc-4874ccfc060cc5b7739042b8b2411a137b26c129.tar.gz | |
1.2.2 was released on 2013-07-28. It is the latest stable FFmpeg release from the 1.2 release branch, which was cut from master on 2013-03-07. Amongst lots of other changes, it includes all changes from ffmpeg-mt, libav master of 2013-03-07, libav 9 as of 2013-03-07.
Diffstat (limited to 'multimedia/ffmpeg/Makefile')
| -rw-r--r-- | multimedia/ffmpeg/Makefile | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index e89038222d1..6a76ceadc60 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.111 2013/06/29 14:53:39 wiz Exp $ +# $NetBSD: Makefile,v 1.112 2013/08/02 18:24:18 adam Exp $ -PKGNAME= ffmpeg-20130510.${DISTVERSION} -PKGREVISION= 2 +PKGNAME= ffmpeg-20130728.${DISTVERSION} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://ffmpeg.mplayerhq.hu/ COMMENT= Decoding, encoding and streaming software @@ -19,8 +18,8 @@ CONF_FILES+= ${PREFIX}/share/examples/ffmpeg/ffserver.conf \ .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) CONFIGURE_ARGS+= --enable-cross-compile -CONFIGURE_ARGS+= --target-os=${LOWER_OPSYS:Q} -CONFIGURE_ARGS+= --arch=${MACHINE_ARCH:Q} +CONFIGURE_ARGS+= --target-os=${LOWER_OPSYS} +CONFIGURE_ARGS+= --arch=${MACHINE_ARCH} CONFIGURE_ARGS+= --host-cc=${NATIVE_CC:Q} CONFIGURE_ARGS+= --host-ld=${NATIVE_CC:Q} .endif @@ -39,18 +38,17 @@ post-install: # disable asm on i386 for non-gcc and gcc < 4.2 # no alignment options needed for gcc >= 4.6 on i386 - .if ${MACHINE_ARCH} == "i386" -.if !empty(MACHINE_PLATFORM:MDarwin-*-i386) \ - || !empty(MACHINE_PLATFORM:MSunOS-*-i386) -CONFIGURE_ARGS+= --disable-asm -.elif !empty(CC_VERSION:Mgcc-4.[2345]*) -CFLAGS+=-mstackrealign -mpreferred-stack-boundary=4 -.elif !empty(CC_VERSION:Mgcc-[123]*) \ - || !empty(CC_VERSION:Mgcc-4.[01]*) \ - || empty(CC_VERSION:Mgcc*) +. if !empty(MACHINE_PLATFORM:MDarwin-*-i386) \ + || !empty(MACHINE_PLATFORM:MSunOS-*-i386) CONFIGURE_ARGS+= --disable-asm -.endif +. elif !empty(CC_VERSION:Mgcc-4.[2345]*) +CFLAGS+= -mstackrealign -mpreferred-stack-boundary=4 +. elif !empty(CC_VERSION:Mgcc-[123]*) \ + || !empty(CC_VERSION:Mgcc-4.[01]*) \ + || empty(CC_VERSION:Mgcc*) +CONFIGURE_ARGS+= --disable-asm +. endif .endif .if !empty(PKGSRC_COMPILER:Mclang) |