diff options
| author | ahze <ahze@FreeBSD.org> | 2008-04-10 13:32:02 +0000 |
|---|---|---|
| committer | ahze <ahze@FreeBSD.org> | 2008-04-10 13:32:02 +0000 |
| commit | 5fe5c93c7fcc9f4410af0862accffdc35439864e (patch) | |
| tree | cd8d3ee1299ff2be142bc97a7add85ca7c053f2c /multimedia | |
| parent | befbaf4a3edccfb85e6268c768ce1d701f30832e (diff) | |
| download | FreeBSD-ports-5fe5c93c7fcc9f4410af0862accffdc35439864e.zip FreeBSD-ports-5fe5c93c7fcc9f4410af0862accffdc35439864e.tar.gz | |
Fix build on i386 by switching to yasm instead of nasm
Reported by: Andrei V. Lavreniyuk <andy.lavr@reactor-xg.kiev.ua>
miwi
Boris Samorodov <bsam@ipt.ru>
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/x264-devel/Makefile | 7 | ||||
| -rw-r--r-- | multimedia/x264/Makefile | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile index 8bcb93b..91bc10c 100644 --- a/multimedia/x264-devel/Makefile +++ b/multimedia/x264-devel/Makefile @@ -15,6 +15,8 @@ DISTNAME= ${PORTNAME}-snapshot-${PORTVERSION:S/0.0.//}-2245 MAINTAINER= multimedia@FreeBSD.org COMMENT?= Multimedia library and tool for encoding H.264/AVC video streams +BUILD_DEPENDS= yasm>=0.6.0:${PORTSDIR}/devel/yasm + WANT_GNOME= yes USE_BZIP2= yes EXTRACT_AFTER_ARGS?= | ${TAR} -xf - --exclude .svn @@ -47,14 +49,9 @@ OPTIONS+= GPAC "Enable MPEG-4 Output" On \ .endif .if ${ARCH}=="i386" -BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm MAKE_ENV+= ARCH_X86="1" .endif -.if ${ARCH}=="amd64" || ${ARCH}=="sparc64" -BUILD_DEPENDS+= yasm>=0.6.0:${PORTSDIR}/devel/yasm -.endif - MAKE_ENV+= ARCH=${ARCH} .if defined(WITH_DEBUG) diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile index 8bcb93b..91bc10c 100644 --- a/multimedia/x264/Makefile +++ b/multimedia/x264/Makefile @@ -15,6 +15,8 @@ DISTNAME= ${PORTNAME}-snapshot-${PORTVERSION:S/0.0.//}-2245 MAINTAINER= multimedia@FreeBSD.org COMMENT?= Multimedia library and tool for encoding H.264/AVC video streams +BUILD_DEPENDS= yasm>=0.6.0:${PORTSDIR}/devel/yasm + WANT_GNOME= yes USE_BZIP2= yes EXTRACT_AFTER_ARGS?= | ${TAR} -xf - --exclude .svn @@ -47,14 +49,9 @@ OPTIONS+= GPAC "Enable MPEG-4 Output" On \ .endif .if ${ARCH}=="i386" -BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm MAKE_ENV+= ARCH_X86="1" .endif -.if ${ARCH}=="amd64" || ${ARCH}=="sparc64" -BUILD_DEPENDS+= yasm>=0.6.0:${PORTSDIR}/devel/yasm -.endif - MAKE_ENV+= ARCH=${ARCH} .if defined(WITH_DEBUG) |
