Thu Jun 23 17:22:24 2016 UTC ()
Use stackrealign on newer GCC as well
Bump PKGREVISION

PR pkg/51122


(maya)
diff -r1.7 -r1.8 pkgsrc/multimedia/ffmpeg1/Makefile
cvs diff -r1.7 -r1.8 pkgsrc/multimedia/ffmpeg1/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg1/Attic/Makefile 2016/04/09 20:07:23 1.7
+++ pkgsrc/multimedia/ffmpeg1/Attic/Makefile 2016/06/23 17:22:24 1.8
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.7 2016/04/09 20:07:23 alnsn Exp $ 1# $NetBSD: Makefile,v 1.8 2016/06/23 17:22:24 maya Exp $
2 2
3PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg1/} 3PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg1/}
4PKGREVISION= 2 4PKGREVISION= 3
5MAINTAINER= pkgsrc-users@NetBSD.org 5MAINTAINER= pkgsrc-users@NetBSD.org
6HOMEPAGE= http://ffmpeg.mplayerhq.hu/ 6HOMEPAGE= http://ffmpeg.mplayerhq.hu/
7COMMENT= Decoding, encoding and streaming software (v1.x) 7COMMENT= Decoding, encoding and streaming software (v1.x)
8 8
9CONFIGURE_ARGS+= --enable-avfilter 9CONFIGURE_ARGS+= --enable-avfilter
10#CONFIGURE_ARGS+= --enable-avfilter-lavf 10#CONFIGURE_ARGS+= --enable-avfilter-lavf
11CONFIGURE_ARGS+= --enable-postproc 11CONFIGURE_ARGS+= --enable-postproc
12CONFIGURE_ARGS+= --host-cflags=${CFLAGS:Q} 12CONFIGURE_ARGS+= --host-cflags=${CFLAGS:Q}
13CONFIGURE_ARGS+= --host-ldflags=${LDFLAGS:Q} 13CONFIGURE_ARGS+= --host-ldflags=${LDFLAGS:Q}
14 14
15INSTALLATION_DIRS= lib share/examples/ffmpeg1 share/doc/ffmpeg1 15INSTALLATION_DIRS= lib share/examples/ffmpeg1 share/doc/ffmpeg1
16 16
17CONF_FILES+= ${PREFIX}/share/examples/ffmpeg1/ffserver.conf \ 17CONF_FILES+= ${PREFIX}/share/examples/ffmpeg1/ffserver.conf \
@@ -40,19 +40,19 @@ post-install: @@ -40,19 +40,19 @@ post-install:
40 40
41.include "options.mk" 41.include "options.mk"
42 42
43.include "../../mk/compiler.mk" 43.include "../../mk/compiler.mk"
44 44
45# disable asm on i386 for non-gcc and gcc < 4.2 45# disable asm on i386 for non-gcc and gcc < 4.2
46.if ${MACHINE_ARCH} == "i386" 46.if ${MACHINE_ARCH} == "i386"
47. if !empty(MACHINE_PLATFORM:MDarwin-*-i386) \ 47. if !empty(MACHINE_PLATFORM:MDarwin-*-i386) \
48 || !empty(MACHINE_PLATFORM:MSunOS-*-i386) \ 48 || !empty(MACHINE_PLATFORM:MSunOS-*-i386) \
49 || !empty(CC_VERSION:Mgcc-[123]*) \ 49 || !empty(CC_VERSION:Mgcc-[123]*) \
50 || !empty(CC_VERSION:Mgcc-4.[01].*) \ 50 || !empty(CC_VERSION:Mgcc-4.[01].*) \
51 || empty(CC_VERSION:Mgcc*) 51 || empty(CC_VERSION:Mgcc*)
52CONFIGURE_ARGS+= --disable-asm 52CONFIGURE_ARGS+= --disable-asm
53. elif !empty(CC_VERSION:Mgcc-4.*) 53. elif !empty(CC_VERSION:Mgcc-[456].*)
54CFLAGS+= -mstackrealign -mpreferred-stack-boundary=4 54CFLAGS+= -mstackrealign -mpreferred-stack-boundary=4
55. endif 55. endif
56.endif 56.endif
57 57
58.include "../../multimedia/ffmpeg1/Makefile.common" 58.include "../../multimedia/ffmpeg1/Makefile.common"