Sat Jan 16 19:48:22 2021 UTC ()
Pullup ticket #6400 - requested by nia
multimedia/ffmpeg3: build fix

Revisions pulled up:
- multimedia/ffmpeg3/Makefile                                   1.63

---
   Module Name:	pkgsrc
   Committed By:	nia
   Date:		Wed Jan 13 09:38:02 UTC 2021

   Modified Files:
   	pkgsrc/multimedia/ffmpeg3: Makefile

   Log Message:
   ffmpeg3: Fix executable name in NOT_PAX_MPROTECT...


(bsiegert)
diff -r1.61 -r1.61.2.1 pkgsrc/multimedia/ffmpeg3/Makefile
cvs diff -r1.61 -r1.61.2.1 pkgsrc/multimedia/ffmpeg3/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg3/Makefile 2020/11/05 09:08:44 1.61
+++ pkgsrc/multimedia/ffmpeg3/Makefile 2021/01/16 19:48:22 1.61.2.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.61 2020/11/05 09:08:44 ryoon Exp $ 1# $NetBSD: Makefile,v 1.61.2.1 2021/01/16 19:48:22 bsiegert Exp $
2 2
3PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg3/} 3PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg3/}
4PKGREVISION= 4 4PKGREVISION= 4
5MAINTAINER= pkgsrc-users@NetBSD.org 5MAINTAINER= pkgsrc-users@NetBSD.org
6HOMEPAGE= https://ffmpeg.org/ 6HOMEPAGE= https://ffmpeg.org/
7COMMENT= Decoding, encoding and streaming software (v3.x) 7COMMENT= Decoding, encoding and streaming software (v3.x)
8 8
9CONFIGURE_ARGS+= --enable-avfilter 9CONFIGURE_ARGS+= --enable-avfilter
10CONFIGURE_ARGS+= --enable-avresample 10CONFIGURE_ARGS+= --enable-avresample
11CONFIGURE_ARGS+= --enable-postproc 11CONFIGURE_ARGS+= --enable-postproc
12CONFIGURE_ARGS+= --enable-rpath 12CONFIGURE_ARGS+= --enable-rpath
13CONFIGURE_ARGS+= --disable-ffplay 13CONFIGURE_ARGS+= --disable-ffplay
14 14
@@ -43,21 +43,21 @@ post-install: @@ -43,21 +43,21 @@ post-install:
43 43
44# disable asm on i386 for non-gcc and gcc < 4.2, or to avoid text relocations 44# disable asm on i386 for non-gcc and gcc < 4.2, or to avoid text relocations
45.if ${MACHINE_ARCH} == "i386" 45.if ${MACHINE_ARCH} == "i386"
46. if !empty(MACHINE_PLATFORM:MDarwin-*-i386) \ 46. if !empty(MACHINE_PLATFORM:MDarwin-*-i386) \
47 || !empty(MACHINE_PLATFORM:MSunOS-*-i386) \ 47 || !empty(MACHINE_PLATFORM:MSunOS-*-i386) \
48 || !empty(MACHINE_PLATFORM:MNetBSD-*-i386) \ 48 || !empty(MACHINE_PLATFORM:MNetBSD-*-i386) \
49 || !empty(CC_VERSION:Mgcc-[123]*) \ 49 || !empty(CC_VERSION:Mgcc-[123]*) \
50 || !empty(CC_VERSION:Mgcc-4.[01].*) \ 50 || !empty(CC_VERSION:Mgcc-4.[01].*) \
51 || empty(CC_VERSION:Mgcc*) 51 || empty(CC_VERSION:Mgcc*)
52CONFIGURE_ARGS+= --disable-asm 52CONFIGURE_ARGS+= --disable-asm
53. elif !empty(CC_VERSION:Mgcc-[456].*) 53. elif !empty(CC_VERSION:Mgcc-[456].*)
54CFLAGS+= -mstackrealign -mpreferred-stack-boundary=4 54CFLAGS+= -mstackrealign -mpreferred-stack-boundary=4
55. endif 55. endif
56NOT_PAX_MPROTECT_SAFE+= bin/ffmpeg4 56NOT_PAX_MPROTECT_SAFE+= bin/ffmpeg3
57.endif 57.endif
58 58
59# configure script uses uname -m to detect arch, as opposed to uname -p in 59# configure script uses uname -m to detect arch, as opposed to uname -p in
60# GNU/configure. Unable to detect NetBSD/macppc hosts correctly. 60# GNU/configure. Unable to detect NetBSD/macppc hosts correctly.
61CONFIGURE_ARGS+= --arch=${MACHINE_ARCH} 61CONFIGURE_ARGS+= --arch=${MACHINE_ARCH}
62 62
63.include "../../multimedia/ffmpeg3/Makefile.common" 63.include "../../multimedia/ffmpeg3/Makefile.common"