CVS commit: pkgsrc/multimedia

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Jan 14 09:38:51 UTC 2021

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

Log Message:
Do not mark ffmpeg MPROTECT-unsafe on i386

It's no longer necessary due to the configure script patches and
disabling assembly.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 pkgsrc/multimedia/ffmpeg3/Makefile
cvs rdiff -u -r1.41 -r1.42 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.63 pkgsrc/multimedia/ffmpeg3/Makefile:1.64
--- pkgsrc/multimedia/ffmpeg3/Makefile:1.63     Wed Jan 13 09:38:02 2021
+++ pkgsrc/multimedia/ffmpeg3/Makefile  Thu Jan 14 09:38:51 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.63 2021/01/13 09:38:02 nia Exp $
+# $NetBSD: Makefile,v 1.64 2021/01/14 09:38:51 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffmpeg3/}
-PKGREVISION=   5
+PKGREVISION=   6
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://ffmpeg.org/
 COMMENT=       Decoding, encoding and streaming software (v3.x)
@@ -53,7 +53,6 @@ CONFIGURE_ARGS+=      --disable-asm
 .  elif !empty(CC_VERSION:Mgcc-[456].*)
 CFLAGS+=               -mstackrealign -mpreferred-stack-boundary=4
 .  endif
-NOT_PAX_MPROTECT_SAFE+=        bin/ffmpeg3
 .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.41 pkgsrc/multimedia/ffmpeg4/Makefile:1.42
--- pkgsrc/multimedia/ffmpeg4/Makefile:1.41     Fri Jan  1 09:52:36 2021
+++ pkgsrc/multimedia/ffmpeg4/Makefile  Thu Jan 14 09:38:51 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2021/01/01 09:52:36 ryoon Exp $
+# $NetBSD: Makefile,v 1.42 2021/01/14 09:38:51 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffmpeg4/}
-PKGREVISION=   6
+PKGREVISION=   7
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://ffmpeg.org/
 COMMENT=       Decoding, encoding and streaming software (v4.x)
@@ -48,7 +48,6 @@ CONFIGURE_ARGS+=      --disable-asm
 .  elif !empty(CC_VERSION:Mgcc-[456].*)
 CFLAGS+=               -mstackrealign -mpreferred-stack-boundary=4
 .  endif
-NOT_PAX_MPROTECT_SAFE+=        bin/ffmpeg4
 .endif
 
 # configure script uses uname -m to detect arch, as opposed to uname -p in