Sat Aug 19 09:57:53 2017 UTC ()
Disable Pax MPROTECT for bin/ffmpeg2 on NetBSD/i386 (8.99.1)

* Bump PKGREVISION


(ryoon)
diff -r1.39 -r1.40 pkgsrc/multimedia/ffmpeg2/Makefile
cvs diff -r1.39 -r1.40 pkgsrc/multimedia/ffmpeg2/Makefile (switch to unified diff)

--- pkgsrc/multimedia/ffmpeg2/Makefile 2017/06/19 08:22:47 1.39
+++ pkgsrc/multimedia/ffmpeg2/Makefile 2017/08/19 09:57:52 1.40
@@ -1,56 +1,58 @@ @@ -1,56 +1,58 @@
1# $NetBSD: Makefile,v 1.39 2017/06/19 08:22:47 adam Exp $ 1# $NetBSD: Makefile,v 1.40 2017/08/19 09:57:52 ryoon Exp $
2 2
3PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg2/} 3PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg2/}
 4PKGREVISION= 1
4MAINTAINER= pkgsrc-users@NetBSD.org 5MAINTAINER= pkgsrc-users@NetBSD.org
5HOMEPAGE= http://ffmpeg.mplayerhq.hu/ 6HOMEPAGE= http://ffmpeg.mplayerhq.hu/
6COMMENT= Decoding, encoding and streaming software (v2.x) 7COMMENT= Decoding, encoding and streaming software (v2.x)
7 8
8CONFIGURE_ARGS+= --enable-avfilter 9CONFIGURE_ARGS+= --enable-avfilter
9#CONFIGURE_ARGS+= --enable-avfilter-lavf 10#CONFIGURE_ARGS+= --enable-avfilter-lavf
10CONFIGURE_ARGS+= --enable-postproc 11CONFIGURE_ARGS+= --enable-postproc
11CONFIGURE_ARGS+= --disable-ffplay 12CONFIGURE_ARGS+= --disable-ffplay
12 13
13INSTALLATION_DIRS= lib/ffmpeg2 share/doc/ffmpeg2 share/examples/ffmpeg2 14INSTALLATION_DIRS= lib/ffmpeg2 share/doc/ffmpeg2 share/examples/ffmpeg2
14 15
15CONF_FILES+= ${PREFIX}/share/examples/ffmpeg2/ffserver.conf \ 16CONF_FILES+= ${PREFIX}/share/examples/ffmpeg2/ffserver.conf \
16 ${PKG_SYSCONFDIR}/ffserver.conf 17 ${PKG_SYSCONFDIR}/ffserver.conf
17 18
18.include "../../mk/bsd.prefs.mk" 19.include "../../mk/bsd.prefs.mk"
19 20
20.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) 21.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
21CONFIGURE_ARGS+= --enable-cross-compile 22CONFIGURE_ARGS+= --enable-cross-compile
22CONFIGURE_ARGS+= --arch=${MACHINE_ARCH} 23CONFIGURE_ARGS+= --arch=${MACHINE_ARCH}
23CONFIGURE_ARGS+= --host-cc=${NATIVE_CC:Q} 24CONFIGURE_ARGS+= --host-cc=${NATIVE_CC:Q}
24CONFIGURE_ARGS+= --host-ld=${NATIVE_CC:Q} 25CONFIGURE_ARGS+= --host-ld=${NATIVE_CC:Q}
25CONFIGURE_ARGS+= --target-os=${LOWER_OPSYS} 26CONFIGURE_ARGS+= --target-os=${LOWER_OPSYS}
26.endif 27.endif
27 28
28PRINT_PLIST_AWK+= /html/ { $$0 = "$${PLIST.doc}" $$0 } 29PRINT_PLIST_AWK+= /html/ { $$0 = "$${PLIST.doc}" $$0 }
29PRINT_PLIST_AWK+= /opencl/ { $$0 = "$${PLIST.opencl}" $$0 } 30PRINT_PLIST_AWK+= /opencl/ { $$0 = "$${PLIST.opencl}" $$0 }
30 31
31TEST_TARGET= check 32TEST_TARGET= check
32 33
33post-install: 34post-install:
34 ${INSTALL_DATA} ${WRKSRC}/doc/*.txt \ 35 ${INSTALL_DATA} ${WRKSRC}/doc/*.txt \
35 ${DESTDIR}${PREFIX}/share/doc/ffmpeg2 36 ${DESTDIR}${PREFIX}/share/doc/ffmpeg2
36 ${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf \ 37 ${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf \
37 ${DESTDIR}${PREFIX}/share/examples/ffmpeg2 38 ${DESTDIR}${PREFIX}/share/examples/ffmpeg2
38 39
39.include "options.mk" 40.include "options.mk"
40 41
41.include "../../mk/compiler.mk" 42.include "../../mk/compiler.mk"
42 43
43# disable asm on i386 for non-gcc and gcc < 4.2 44# disable asm on i386 for non-gcc and gcc < 4.2
44.if ${MACHINE_ARCH} == "i386" 45.if ${MACHINE_ARCH} == "i386"
45. if !empty(MACHINE_PLATFORM:MDarwin-*-i386) \ 46. if !empty(MACHINE_PLATFORM:MDarwin-*-i386) \
46 || !empty(MACHINE_PLATFORM:MSunOS-*-i386) \ 47 || !empty(MACHINE_PLATFORM:MSunOS-*-i386) \
47 || !empty(CC_VERSION:Mgcc-[123]*) \ 48 || !empty(CC_VERSION:Mgcc-[123]*) \
48 || !empty(CC_VERSION:Mgcc-4.[01].*) \ 49 || !empty(CC_VERSION:Mgcc-4.[01].*) \
49 || empty(CC_VERSION:Mgcc*) 50 || empty(CC_VERSION:Mgcc*)
50CONFIGURE_ARGS+= --disable-asm 51CONFIGURE_ARGS+= --disable-asm
51. elif !empty(CC_VERSION:Mgcc-[456].*) 52. elif !empty(CC_VERSION:Mgcc-[456].*)
52CFLAGS+= -mstackrealign -mpreferred-stack-boundary=4 53CFLAGS+= -mstackrealign -mpreferred-stack-boundary=4
53. endif 54. endif
 55NOT_PAX_MPROTECT_SAFE+= bin/ffmpeg2
54.endif 56.endif
55 57
56.include "../../multimedia/ffmpeg2/Makefile.common" 58.include "../../multimedia/ffmpeg2/Makefile.common"