diff options
| author | rjs <rjs@pkgsrc.org> | 2018-07-31 19:13:10 +0000 |
|---|---|---|
| committer | rjs <rjs@pkgsrc.org> | 2018-07-31 19:13:10 +0000 |
| commit | 5dbd98a24207e0759a308dfd43504d1dc84a2d20 (patch) | |
| tree | 7c878cd99784b73497429f6348703f68cf2eea9d | |
| parent | f53ee4a1caa6b5877ea54f1362992fb6e3912eb5 (diff) | |
| download | pkgsrc-5dbd98a24207e0759a308dfd43504d1dc84a2d20.tar.gz | |
Only need nasm when building for x86.
| -rw-r--r-- | multimedia/ffmpeg3/Makefile.common | 4 | ||||
| -rw-r--r-- | multimedia/ffmpeg4/Makefile.common | 4 | ||||
| -rw-r--r-- | multimedia/x265/Makefile | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/multimedia/ffmpeg3/Makefile.common b/multimedia/ffmpeg3/Makefile.common index 4c4107aba15..681ec80b644 100644 --- a/multimedia/ffmpeg3/Makefile.common +++ b/multimedia/ffmpeg3/Makefile.common @@ -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/-xc99=all/" 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 diff --git a/multimedia/ffmpeg4/Makefile.common b/multimedia/ffmpeg4/Makefile.common index b3b39025a51..ea28c0245db 100644 --- a/multimedia/ffmpeg4/Makefile.common +++ b/multimedia/ffmpeg4/Makefile.common @@ -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/-xc99=all/" 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 diff --git a/multimedia/x265/Makefile b/multimedia/x265/Makefile index 4b50a5f754d..0bf07b6070d 100644 --- a/multimedia/x265/Makefile +++ b/multimedia/x265/Makefile @@ -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 (HEVC) 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 |