CVS commit: pkgsrc/multimedia

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Oct  9 07:48:07 UTC 2021

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

Log Message:
ffmpeg: Simplify testing for i386.


To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 pkgsrc/multimedia/ffmpeg2/Makefile
cvs rdiff -u -r1.72 -r1.73 pkgsrc/multimedia/ffmpeg3/Makefile
cvs rdiff -u -r1.55 -r1.56 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/ffmpeg2/Makefile
diff -u pkgsrc/multimedia/ffmpeg2/Makefile:1.75 pkgsrc/multimedia/ffmpeg2/Makefile:1.76
--- pkgsrc/multimedia/ffmpeg2/Makefile:1.75     Wed Sep 29 19:01:02 2021
+++ pkgsrc/multimedia/ffmpeg2/Makefile  Sat Oct  9 07:48:06 2021
@@ -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"

Index: pkgsrc/multimedia/ffmpeg3/Makefile
diff -u pkgsrc/multimedia/ffmpeg3/Makefile:1.72 pkgsrc/multimedia/ffmpeg3/Makefile:1.73
--- pkgsrc/multimedia/ffmpeg3/Makefile:1.72     Wed Sep 29 19:01:02 2021
+++ pkgsrc/multimedia/ffmpeg3/Makefile  Sat Oct  9 07:48:07 2021
@@ -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

Index: pkgsrc/multimedia/ffmpeg4/Makefile
diff -u pkgsrc/multimedia/ffmpeg4/Makefile:1.55 pkgsrc/multimedia/ffmpeg4/Makefile:1.56
--- pkgsrc/multimedia/ffmpeg4/Makefile:1.55     Wed Sep 29 19:01:02 2021
+++ pkgsrc/multimedia/ffmpeg4/Makefile  Sat Oct  9 07:48:07 2021
@@ -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