CVS commit: pkgsrc/multimedia

["John Klos" <jklos%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jklos
Date:           Fri Jun 26 03:11:40 UTC 2020

Modified Files:
        pkgsrc/multimedia/ffmpeg3: Makefile
        pkgsrc/multimedia/ffmpeg4: Makefile

Log Message:
Fix "Cannot write-enable text segment: Permission denied" issues for
i386 and aarch64.


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 pkgsrc/multimedia/ffmpeg3/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/multimedia/ffmpeg4/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/ffmpeg3/Makefile
diff -u pkgsrc/multimedia/ffmpeg3/Makefile:1.54 pkgsrc/multimedia/ffmpeg3/Makefile:1.55
--- pkgsrc/multimedia/ffmpeg3/Makefile:1.54     Fri Jun  5 12:49:12 2020
+++ pkgsrc/multimedia/ffmpeg3/Makefile  Fri Jun 26 03:11:40 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2020/06/05 12:49:12 jperkin Exp $
+# $NetBSD: Makefile,v 1.55 2020/06/26 03:11:40 jklos Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffmpeg3/}
 PKGREVISION=   8
@@ -53,6 +53,11 @@ CONFIGURE_ARGS+=     --disable-asm
 .  elif !empty(CC_VERSION:Mgcc-[456].*)
 CFLAGS+=               -mstackrealign -mpreferred-stack-boundary=4
 .  endif
+NOT_PAX_MPROTECT_SAFE+=        bin/ffmpeg4
+.endif
+
+.if ${MACHINE_ARCH} == "aarch64"
+NOT_PAX_MPROTECT_SAFE+= bin/ffmpeg4
 .endif
 
 # configure script uses uname -m to detect arch, as opposed to uname -p in

Index: pkgsrc/multimedia/ffmpeg4/Makefile
diff -u pkgsrc/multimedia/ffmpeg4/Makefile:1.31 pkgsrc/multimedia/ffmpeg4/Makefile:1.32
--- pkgsrc/multimedia/ffmpeg4/Makefile:1.31     Tue Jun 16 16:54:45 2020
+++ pkgsrc/multimedia/ffmpeg4/Makefile  Fri Jun 26 03:11:40 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2020/06/16 16:54:45 adam Exp $
+# $NetBSD: Makefile,v 1.32 2020/06/26 03:11:40 jklos Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffmpeg4/}
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -47,6 +47,11 @@ CONFIGURE_ARGS+=     --disable-asm
 .  elif !empty(CC_VERSION:Mgcc-[456].*)
 CFLAGS+=               -mstackrealign -mpreferred-stack-boundary=4
 .  endif
+NOT_PAX_MPROTECT_SAFE+=        bin/ffmpeg4
+.endif
+
+.if ${MACHINE_ARCH} == "aarch64"
+NOT_PAX_MPROTECT_SAFE+= bin/ffmpeg4
 .endif
 
 # configure script uses uname -m to detect arch, as opposed to uname -p in