From 5b8e77b7d37edb885f9849dd35e698195c5524cc Mon Sep 17 00:00:00 2001
From: nia <nia@pkgsrc.org>
Date: Sat, 9 Oct 2021 07:48:06 +0000
Subject: [PATCH] ffmpeg: Simplify testing for i386.

---
 multimedia/ffmpeg2/Makefile | 15 ++-------------
 multimedia/ffmpeg3/Makefile | 13 ++-----------
 multimedia/ffmpeg4/Makefile | 13 ++-----------
 3 files changed, 6 insertions(+), 35 deletions(-)

diff --git a/multimedia/ffmpeg2/Makefile b/multimedia/ffmpeg2/Makefile
index 9e3cee7ffdb5..de155413215d 100644
--- a/multimedia/ffmpeg2/Makefile
+++ b/multimedia/ffmpeg2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2021/09/29 19:01:02 adam Exp $
+# $NetBSD: Makefile,v 1.76 2021/10/09 07:48:06 nia Exp $
 
 PKGNAME=	${DISTNAME:S/ffmpeg/ffmpeg2/}
 PKGREVISION=	12
@@ -43,20 +43,9 @@ post-install:
 
 .include "options.mk"
 
-.include "../../mk/compiler.mk"
-
-# disable asm on i386 for non-gcc and gcc < 4.2
+# disable asm on i386 to avoid text relocations
 .if ${MACHINE_ARCH} == "i386"
-.  if !empty(MACHINE_PLATFORM:MDarwin-*-i386) \
-   || !empty(MACHINE_PLATFORM:MSunOS-*-i386) \
-   || !empty(CC_VERSION:Mgcc-[123]*) \
-   || !empty(CC_VERSION:Mgcc-4.[01].*) \
-   || empty(CC_VERSION:Mgcc*)
 CONFIGURE_ARGS+=	--disable-asm
-.  elif !empty(CC_VERSION:Mgcc-[456].*)
-CFLAGS+=		-mstackrealign -mpreferred-stack-boundary=4
-.  endif
-NOT_PAX_MPROTECT_SAFE+=	bin/ffmpeg2
 .endif
 
 .include "../../multimedia/ffmpeg2/Makefile.common"
diff --git a/multimedia/ffmpeg3/Makefile b/multimedia/ffmpeg3/Makefile
index 722d40102f28..9787a3897a55 100644
--- a/multimedia/ffmpeg3/Makefile
+++ b/multimedia/ffmpeg3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2021/09/29 19:01:02 adam Exp $
+# $NetBSD: Makefile,v 1.73 2021/10/09 07:48:07 nia Exp $
 
 PKGNAME=	${DISTNAME:S/ffmpeg/ffmpeg3/}
 PKGREVISION=	14
@@ -41,18 +41,9 @@ post-install:
 
 .include "../../mk/compiler.mk"
 
-# disable asm on i386 for non-gcc and gcc < 4.2, or to avoid text relocations
+# disable asm on i386 to avoid text relocations
 .if ${MACHINE_ARCH} == "i386"
-.  if !empty(MACHINE_PLATFORM:MDarwin-*-i386) \
-   || !empty(MACHINE_PLATFORM:MSunOS-*-i386) \
-   || !empty(MACHINE_PLATFORM:MNetBSD-*-i386) \
-   || !empty(CC_VERSION:Mgcc-[123]*) \
-   || !empty(CC_VERSION:Mgcc-4.[01].*) \
-   || empty(CC_VERSION:Mgcc*)
 CONFIGURE_ARGS+=	--disable-asm
-.  elif !empty(CC_VERSION:Mgcc-[456].*)
-CFLAGS+=		-mstackrealign -mpreferred-stack-boundary=4
-.  endif
 .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 a6a7d84b5e32..5fea235e0047 100644
--- a/multimedia/ffmpeg4/Makefile
+++ b/multimedia/ffmpeg4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2021/09/29 19:01:02 adam Exp $
+# $NetBSD: Makefile,v 1.56 2021/10/09 07:48:07 nia Exp $
 
 PKGNAME=	${DISTNAME:S/ffmpeg/ffmpeg4/}
 PKGREVISION=	9
@@ -36,18 +36,9 @@ post-install:
 
 .include "../../mk/compiler.mk"
 
-# disable asm on i386 for non-gcc and gcc < 4.2
+# disable asm on i386 to avoid text relocations
 .if ${MACHINE_ARCH} == "i386"
-.  if !empty(MACHINE_PLATFORM:MDarwin-*-i386) \
-   || !empty(MACHINE_PLATFORM:MSunOS-*-i386) \
-   || !empty(MACHINE_PLATFORM:MNetBSD-*-i386) \
-   || !empty(CC_VERSION:Mgcc-[123]*) \
-   || !empty(CC_VERSION:Mgcc-4.[01].*) \
-   || empty(CC_VERSION:Mgcc*)
 CONFIGURE_ARGS+=	--disable-asm
-.  elif !empty(CC_VERSION:Mgcc-[456].*)
-CFLAGS+=		-mstackrealign -mpreferred-stack-boundary=4
-.  endif
 .endif
 
 # configure script uses uname -m to detect arch, as opposed to uname -p in