pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/multimedia Only need nasm when building for x86.
details: https://anonhg.NetBSD.org/pkgsrc/rev/3a8370d8156f
branches: trunk
changeset: 383467:3a8370d8156f
user: rjs <rjs%pkgsrc.org@localhost>
date: Tue Jul 31 19:13:10 2018 +0000
description:
Only need nasm when building for x86.
diffstat:
multimedia/ffmpeg3/Makefile.common | 4 +++-
multimedia/ffmpeg4/Makefile.common | 4 +++-
multimedia/x265/Makefile | 4 +++-
3 files changed, 9 insertions(+), 3 deletions(-)
diffs (57 lines):
diff -r 21a4818f4df4 -r 3a8370d8156f multimedia/ffmpeg3/Makefile.common
--- a/multimedia/ffmpeg3/Makefile.common Tue Jul 31 16:44:37 2018 +0000
+++ b/multimedia/ffmpeg3/Makefile.common Tue Jul 31 19:13:10 2018 +0000
@@ -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/-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 -r 21a4818f4df4 -r 3a8370d8156f multimedia/ffmpeg4/Makefile.common
--- a/multimedia/ffmpeg4/Makefile.common Tue Jul 31 16:44:37 2018 +0000
+++ b/multimedia/ffmpeg4/Makefile.common Tue Jul 31 19:13:10 2018 +0000
@@ -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/-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 -r 21a4818f4df4 -r 3a8370d8156f multimedia/x265/Makefile
--- a/multimedia/x265/Makefile Tue Jul 31 16:44:37 2018 +0000
+++ b/multimedia/x265/Makefile Tue Jul 31 19:13:10 2018 +0000
@@ -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 @@
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
Home |
Main Index |
Thread Index |
Old Index