Sat Jun 29 14:53:39 2013 UTC ()
Do not make assumptions about Darwin's or Solaris' gcc behaving like others.


(wiz)
diff -r1.110 -r1.111 pkgsrc/multimedia/ffmpeg/Makefile
cvs diff -r1.110 -r1.111 pkgsrc/multimedia/ffmpeg/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg/Attic/Makefile 2013/06/29 13:34:23 1.110
+++ pkgsrc/multimedia/ffmpeg/Attic/Makefile 2013/06/29 14:53:39 1.111
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.110 2013/06/29 13:34:23 wiz Exp $ 1# $NetBSD: Makefile,v 1.111 2013/06/29 14:53:39 wiz Exp $
2 2
3PKGNAME= ffmpeg-20130510.${DISTVERSION} 3PKGNAME= ffmpeg-20130510.${DISTVERSION}
4PKGREVISION= 2 4PKGREVISION= 2
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 7COMMENT= Decoding, encoding and streaming software
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
12 12
13INSTALLATION_DIRS= lib share/examples/ffmpeg share/doc/ffmpeg 13INSTALLATION_DIRS= lib share/examples/ffmpeg share/doc/ffmpeg
14 14
@@ -31,27 +31,30 @@ post-install: @@ -31,27 +31,30 @@ post-install:
31 ${INSTALL_DATA} ${WRKSRC}/doc/*.txt \ 31 ${INSTALL_DATA} ${WRKSRC}/doc/*.txt \
32 ${DESTDIR}${PREFIX}/share/doc/ffmpeg 32 ${DESTDIR}${PREFIX}/share/doc/ffmpeg
33 ${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf \ 33 ${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf \
34 ${DESTDIR}${PREFIX}/share/examples/ffmpeg 34 ${DESTDIR}${PREFIX}/share/examples/ffmpeg
35 35
36.include "options.mk" 36.include "options.mk"
37 37
38.include "../../mk/compiler.mk" 38.include "../../mk/compiler.mk"
39 39
40# disable asm on i386 for non-gcc and gcc < 4.2 40# disable asm on i386 for non-gcc and gcc < 4.2
41# no alignment options needed for gcc >= 4.6 on i386 41# no alignment options needed for gcc >= 4.6 on i386
42 42
43.if ${MACHINE_ARCH} == "i386" 43.if ${MACHINE_ARCH} == "i386"
44.if !empty(CC_VERSION:Mgcc-4.[2345]*) 44.if !empty(MACHINE_PLATFORM:MDarwin-*-i386) \
 45 || !empty(MACHINE_PLATFORM:MSunOS-*-i386)
 46CONFIGURE_ARGS+= --disable-asm
 47.elif !empty(CC_VERSION:Mgcc-4.[2345]*)
45CFLAGS+=-mstackrealign -mpreferred-stack-boundary=4 48CFLAGS+=-mstackrealign -mpreferred-stack-boundary=4
46.elif !empty(CC_VERSION:Mgcc-[123]*) \ 49.elif !empty(CC_VERSION:Mgcc-[123]*) \
47 || !empty(CC_VERSION:Mgcc-4.[01]*) \ 50 || !empty(CC_VERSION:Mgcc-4.[01]*) \
48 || empty(CC_VERSION:Mgcc*) 51 || empty(CC_VERSION:Mgcc*)
49CONFIGURE_ARGS+= --disable-asm 52CONFIGURE_ARGS+= --disable-asm
50.endif 53.endif
51.endif 54.endif
52 55
53.if !empty(PKGSRC_COMPILER:Mclang) 56.if !empty(PKGSRC_COMPILER:Mclang)
54CFLAGS+= -no-integrated-as 57CFLAGS+= -no-integrated-as
55.endif 58.endif
56 59
57.include "../../multimedia/ffmpeg/Makefile.common" 60.include "../../multimedia/ffmpeg/Makefile.common"