Sun Jun 30 12:16:18 2013 UTC ()
Apply a version of the asm fixes for gcc from ffmpeg/Makefile here as well.
Noted by John D. Baker in PR 47132.


(wiz)
diff -r1.11 -r1.12 pkgsrc/multimedia/ffmpeg010/Makefile
cvs diff -r1.11 -r1.12 pkgsrc/multimedia/ffmpeg010/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg010/Attic/Makefile 2013/04/14 00:59:50 1.11
+++ pkgsrc/multimedia/ffmpeg010/Attic/Makefile 2013/06/30 12:16:18 1.12
@@ -1,42 +1,55 @@ @@ -1,42 +1,55 @@
1# $NetBSD: Makefile,v 1.11 2013/04/14 00:59:50 cheusov Exp $ 1# $NetBSD: Makefile,v 1.12 2013/06/30 12:16:18 wiz Exp $
2 2
3PKGNAME= ffmpeg010-20130410.${DISTVERSION} 3PKGNAME= ffmpeg010-20130410.${DISTVERSION}
4PKGREVISION= 1 4PKGREVISION= 1
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
12CONFIGURE_ARGS+= --incdir=${PREFIX}/include/ffmpeg010 12CONFIGURE_ARGS+= --incdir=${PREFIX}/include/ffmpeg010
13CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/ffmpeg010 13CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/ffmpeg010
14CONFIGURE_ARGS+= --shlibdir=${PREFIX}/lib/ffmpeg010 14CONFIGURE_ARGS+= --shlibdir=${PREFIX}/lib/ffmpeg010
15CONFIGURE_ARGS+= --datadir=${PREFIX}/share/ffmpeg010 15CONFIGURE_ARGS+= --datadir=${PREFIX}/share/ffmpeg010
16#CONFIGURE_ARGS+= --build-suffix=010 16#CONFIGURE_ARGS+= --build-suffix=010
17CONFIGURE_ARGS+= --progs-suffix=010 17CONFIGURE_ARGS+= --progs-suffix=010
18 18
19LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ffmpeg010 19LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ffmpeg010
20 20
21INSTALLATION_DIRS= lib share/examples/ffmpeg010 share/doc/ffmpeg010 21INSTALLATION_DIRS= lib share/examples/ffmpeg010 share/doc/ffmpeg010
22 22
23CONF_FILES+= ${PREFIX}/share/examples/ffmpeg010/ffserver.conf \ 23CONF_FILES+= ${PREFIX}/share/examples/ffmpeg010/ffserver.conf \
24 ${PKG_SYSCONFDIR}/ffserver.conf 24 ${PKG_SYSCONFDIR}/ffserver.conf
25 25
26.include "../../mk/bsd.prefs.mk" 26.include "../../mk/bsd.prefs.mk"
27 27
28.if ${OPSYS} == "Darwin" 28.include "../../mk/compiler.mk"
 29
 30# disable asm on i386 for non-gcc and gcc < 4.2
 31# no alignment options needed for gcc >= 4.6 on i386
 32
 33.if ${MACHINE_ARCH} == "i386"
 34.if !empty(MACHINE_PLATFORM:MDarwin-*-i386)
29CONFIGURE_ARGS+= --disable-asm 35CONFIGURE_ARGS+= --disable-asm
 36.elif !empty(CC_VERSION:Mgcc-4.[2345]*)
 37CFLAGS+=-mstackrealign -mpreferred-stack-boundary=4
 38.elif !empty(CC_VERSION:Mgcc-[123]*) \
 39 || !empty(CC_VERSION:Mgcc-4.[01]*) \
 40 || empty(CC_VERSION:Mgcc*)
 41CONFIGURE_ARGS+= --disable-asm
 42.endif
30.endif 43.endif
31 44
32# "error: can't find a register in class 'GENERAL_REGS' while reloading 'asm'" 45# "error: can't find a register in class 'GENERAL_REGS' while reloading 'asm'"
33CFLAGS.SunOS+= -DBROKEN_RELOCATIONS=1 46CFLAGS.SunOS+= -DBROKEN_RELOCATIONS=1
34 47
35TEST_TARGET= check 48TEST_TARGET= check
36 49
37post-install: 50post-install:
38 ${INSTALL_DATA} ${WRKSRC}/doc/*.txt \ 51 ${INSTALL_DATA} ${WRKSRC}/doc/*.txt \
39 ${DESTDIR}${PREFIX}/share/doc/ffmpeg010 52 ${DESTDIR}${PREFIX}/share/doc/ffmpeg010
40 ${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf \ 53 ${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf \
41 ${DESTDIR}${PREFIX}/share/examples/ffmpeg010 54 ${DESTDIR}${PREFIX}/share/examples/ffmpeg010
42 55