CVS commit: pkgsrc/multimedia

["Robert Swindells" <rjs%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rjs
Date:           Tue Jul 31 19:13:10 UTC 2018

Modified Files:
        pkgsrc/multimedia/ffmpeg3: Makefile.common
        pkgsrc/multimedia/ffmpeg4: Makefile.common
        pkgsrc/multimedia/x265: Makefile

Log Message:
Only need nasm when building for x86.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/multimedia/ffmpeg3/Makefile.common
cvs rdiff -u -r1.3 -r1.4 pkgsrc/multimedia/ffmpeg4/Makefile.common
cvs rdiff -u -r1.22 -r1.23 pkgsrc/multimedia/x265/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.common
diff -u pkgsrc/multimedia/ffmpeg3/Makefile.common:1.30 pkgsrc/multimedia/ffmpeg3/Makefile.common:1.31
--- pkgsrc/multimedia/ffmpeg3/Makefile.common:1.30      Thu Jul 19 06:47:43 2018
+++ pkgsrc/multimedia/ffmpeg3/Makefile.common   Tue Jul 31 19:13:10 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.30 2018/07/19 06:47:43 adam Exp $
+# $NetBSD: Makefile.common,v 1.31 2018/07/31 19:13:10 rjs Exp $
 # used by multimedia/ffmpeg3/Makefile
 # used by multimedia/ffplay3/Makefile
 
@@ -69,7 +69,9 @@ SUBST_SED.sunwspro+=  -e "s/-std=c99/-xc9
 SUBST_SED.sunwspro+=   -e "s/-Wl,-rpath-link,/-L /g"
 .endif
 
+.if ${MACHINE_ARCH} == x86_64 || ${MACHINE_ARCH} == i386
 BUILD_DEPENDS+=        nasm>=2.13:../../devel/nasm
+.endif
 
 REPLACE_PERL+= doc/texi2pod.pl
 REPLACE_SH+=   configure ffbuild/version.sh

Index: pkgsrc/multimedia/ffmpeg4/Makefile.common
diff -u pkgsrc/multimedia/ffmpeg4/Makefile.common:1.3 pkgsrc/multimedia/ffmpeg4/Makefile.common:1.4
--- pkgsrc/multimedia/ffmpeg4/Makefile.common:1.3       Thu Jul 19 06:46:55 2018
+++ pkgsrc/multimedia/ffmpeg4/Makefile.common   Tue Jul 31 19:13:10 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2018/07/19 06:46:55 adam Exp $
+# $NetBSD: Makefile.common,v 1.4 2018/07/31 19:13:10 rjs Exp $
 # used by multimedia/ffmpeg4/Makefile
 # used by multimedia/ffplay4/Makefile
 
@@ -69,7 +69,9 @@ SUBST_SED.sunwspro+=  -e "s/-std=c99/-xc9
 SUBST_SED.sunwspro+=   -e "s/-Wl,-rpath-link,/-L /g"
 .endif
 
+.if ${MACHINE_ARCH} == x86_64 || ${MACHINE_ARCH} == i386
 BUILD_DEPENDS+=        nasm>=2.13:../../devel/nasm
+.endif
 
 REPLACE_PERL+= doc/texi2pod.pl
 REPLACE_SH+=   configure ffbuild/version.sh

Index: pkgsrc/multimedia/x265/Makefile
diff -u pkgsrc/multimedia/x265/Makefile:1.22 pkgsrc/multimedia/x265/Makefile:1.23
--- pkgsrc/multimedia/x265/Makefile:1.22        Mon May 21 20:03:56 2018
+++ pkgsrc/multimedia/x265/Makefile     Tue Jul 31 19:13:10 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2018/05/21 20:03:56 adam Exp $
+# $NetBSD: Makefile,v 1.23 2018/07/31 19:13:10 rjs Exp $
 
 DISTNAME=      x265_2.8
 PKGNAME=       ${DISTNAME:S/_/-/}
@@ -12,7 +12,9 @@ COMMENT=      High Efficiency Video Coding (H
 LICENSE=       gnu-gpl-v2
 
 WRKSRC=                ${WRKDIR}/${DISTNAME}/source
+.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386"
 BUILD_DEPENDS+=        nasm>=2.13.0:../../devel/nasm
+.endif
 
 CMAKE_ARGS+=   -DENABLE_PIC=ON