From 4c59908aa7b6cd86d90ee51558f8f73f2fc45f64 Mon Sep 17 00:00:00 2001 From: nia Date: Thu, 14 Jan 2021 09:38:51 +0000 Subject: [PATCH] Do not mark ffmpeg MPROTECT-unsafe on i386 It's no longer necessary due to the configure script patches and disabling assembly. Bump PKGREVISION. --- multimedia/ffmpeg3/Makefile | 5 ++--- multimedia/ffmpeg4/Makefile | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/multimedia/ffmpeg3/Makefile b/multimedia/ffmpeg3/Makefile index 6e914996809d..1c6449816f4c 100644 --- a/multimedia/ffmpeg3/Makefile +++ b/multimedia/ffmpeg3/Makefile @@ -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 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 diff --git a/multimedia/ffmpeg4/Makefile b/multimedia/ffmpeg4/Makefile index cdad3d93de2b..adc55a95b4bb 100644 --- a/multimedia/ffmpeg4/Makefile +++ b/multimedia/ffmpeg4/Makefile @@ -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 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