Wed Aug 14 17:54:07 2013 UTC ()
Apply patch from Onno van der Linden to try fixing PR 48116.


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

--- pkgsrc/multimedia/ffmpeg/Attic/Makefile 2013/08/02 18:24:18 1.112
+++ pkgsrc/multimedia/ffmpeg/Attic/Makefile 2013/08/14 17:54:06 1.113
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.112 2013/08/02 18:24:18 adam Exp $ 1# $NetBSD: Makefile,v 1.113 2013/08/14 17:54:06 wiz Exp $
2 2
3PKGNAME= ffmpeg-20130728.${DISTVERSION} 3PKGNAME= ffmpeg-20130728.${DISTVERSION}
4MAINTAINER= pkgsrc-users@NetBSD.org 4MAINTAINER= pkgsrc-users@NetBSD.org
5HOMEPAGE= http://ffmpeg.mplayerhq.hu/ 5HOMEPAGE= http://ffmpeg.mplayerhq.hu/
6COMMENT= Decoding, encoding and streaming software 6COMMENT= Decoding, encoding and streaming software
7 7
8CONFIGURE_ARGS+= --enable-avfilter 8CONFIGURE_ARGS+= --enable-avfilter
9#CONFIGURE_ARGS+= --enable-avfilter-lavf 9#CONFIGURE_ARGS+= --enable-avfilter-lavf
10CONFIGURE_ARGS+= --enable-postproc 10CONFIGURE_ARGS+= --enable-postproc
11 11
12INSTALLATION_DIRS= lib share/examples/ffmpeg share/doc/ffmpeg 12INSTALLATION_DIRS= lib share/examples/ffmpeg share/doc/ffmpeg
13 13
14CONF_FILES+= ${PREFIX}/share/examples/ffmpeg/ffserver.conf \ 14CONF_FILES+= ${PREFIX}/share/examples/ffmpeg/ffserver.conf \
@@ -30,29 +30,28 @@ post-install: @@ -30,29 +30,28 @@ post-install:
30 ${INSTALL_DATA} ${WRKSRC}/doc/*.txt \ 30 ${INSTALL_DATA} ${WRKSRC}/doc/*.txt \
31 ${DESTDIR}${PREFIX}/share/doc/ffmpeg 31 ${DESTDIR}${PREFIX}/share/doc/ffmpeg
32 ${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf \ 32 ${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf \
33 ${DESTDIR}${PREFIX}/share/examples/ffmpeg 33 ${DESTDIR}${PREFIX}/share/examples/ffmpeg
34 34
35.include "options.mk" 35.include "options.mk"
36 36
37.include "../../mk/compiler.mk" 37.include "../../mk/compiler.mk"
38 38
39# disable asm on i386 for non-gcc and gcc < 4.2 39# disable asm on i386 for non-gcc and gcc < 4.2
40# no alignment options needed for gcc >= 4.6 on i386 40# no alignment options needed for gcc >= 4.6 on i386
41.if ${MACHINE_ARCH} == "i386" 41.if ${MACHINE_ARCH} == "i386"
42. if !empty(MACHINE_PLATFORM:MDarwin-*-i386) \ 42. if !empty(MACHINE_PLATFORM:MDarwin-*-i386) \
43 || !empty(MACHINE_PLATFORM:MSunOS-*-i386) 43 || !empty(MACHINE_PLATFORM:MSunOS-*-i386) \
 44 || !empty(CC_VERSION:Mgcc-[123]*) \
 45 || !empty(CC_VERSION:Mgcc-4.[01]*) \
 46 || empty(CC_VERSION:Mgcc*)
44CONFIGURE_ARGS+= --disable-asm 47CONFIGURE_ARGS+= --disable-asm
45. elif !empty(CC_VERSION:Mgcc-4.[2345]*) 48. elif !empty(CC_VERSION:Mgcc-4.[2345]*)
46CFLAGS+= -mstackrealign -mpreferred-stack-boundary=4 49CFLAGS+= -mstackrealign -mpreferred-stack-boundary=4
47. elif !empty(CC_VERSION:Mgcc-[123]*) \ 
48 || !empty(CC_VERSION:Mgcc-4.[01]*) \ 
49 || empty(CC_VERSION:Mgcc*) 
50CONFIGURE_ARGS+= --disable-asm 
51. endif 50. endif
52.endif 51.endif
53 52
54.if !empty(PKGSRC_COMPILER:Mclang) 53.if !empty(PKGSRC_COMPILER:Mclang)
55CFLAGS+= -no-integrated-as 54CFLAGS+= -no-integrated-as
56.endif 55.endif
57 56
58.include "../../multimedia/ffmpeg/Makefile.common" 57.include "../../multimedia/ffmpeg/Makefile.common"