diff options
| -rw-r--r-- | multimedia/mpeg4ip/Makefile | 15 | ||||
| -rw-r--r-- | multimedia/mpeg4ip/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/mpeg4ip/patches/patch-ab | 16 |
3 files changed, 30 insertions, 5 deletions
diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile index dd7134273ef..7ea6acfde77 100644 --- a/multimedia/mpeg4ip/Makefile +++ b/multimedia/mpeg4ip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2010/09/27 05:03:25 obache Exp $ +# $NetBSD: Makefile,v 1.17 2010/09/27 09:09:28 obache Exp $ DISTNAME= mpeg4ip-1.5.0.1 CATEGORIES= multimedia @@ -27,5 +27,18 @@ PLIST_VARS+= mpeg4ipSDL PLIST.mpeg4ipSDL= yes .endif +.if ${MACHINE_ARCH} == "i386" +PKG_OPTIONS_VAR= PKG_OPTIONS.mpeg4ip +PKG_SUPPORTED_OPTIONS= mmx +.include "../../mk/bsd.options.mk" + +. if !empty(PKG_OPTIONS:Mmmx) +CONFIGURE_ARGS+= --enable-mmx +BUILD_DEPENDS+= nasm>=0.97.19:../../devel/nasm +. else +CONFIGURE_ARGS+= --disable-mmx +. endif +.endif + .include "../../devel/SDL/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/mpeg4ip/distinfo b/multimedia/mpeg4ip/distinfo index ecc542a7aab..224543d5de9 100644 --- a/multimedia/mpeg4ip/distinfo +++ b/multimedia/mpeg4ip/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.13 2010/01/01 18:23:48 joerg Exp $ +$NetBSD: distinfo,v 1.14 2010/09/27 09:09:29 obache Exp $ SHA1 (mpeg4ip-1.5.0.1.tar.gz) = 1271de695ed65284d9c39aa91bf26c5494603fd3 RMD160 (mpeg4ip-1.5.0.1.tar.gz) = fee5c21c17a470e6de349e07d233a1eb46b2064a Size (mpeg4ip-1.5.0.1.tar.gz) = 4826180 bytes SHA1 (patch-aa) = 5f494117fae307f4adc503fd880a762d82d771ff -SHA1 (patch-ab) = 93875dfe86b50c399113915fbac523becae3e2aa +SHA1 (patch-ab) = aaa7b2a542a91986f2b60fa348af928476d44f18 SHA1 (patch-ac) = 9e4683fdbbfa3b85941243547773814ea50125a9 SHA1 (patch-ad) = e5dd062d7f17230bf27ffde0fc2db72d8357fd56 SHA1 (patch-ae) = 0418c4fa0fd966b3d5303d4f95a300d94fc48111 diff --git a/multimedia/mpeg4ip/patches/patch-ab b/multimedia/mpeg4ip/patches/patch-ab index 1fafcd9d7cc..622c9442863 100644 --- a/multimedia/mpeg4ip/patches/patch-ab +++ b/multimedia/mpeg4ip/patches/patch-ab @@ -1,6 +1,9 @@ -$NetBSD: patch-ab,v 1.1.1.1 2006/04/12 21:39:38 wiz Exp $ +$NetBSD: patch-ab,v 1.2 2010/09/27 09:09:29 obache Exp $ ---- configure.orig 2005-11-11 00:26:00.000000000 +0000 +* XXX +* replace obsoleted `-r' option for nasm with `-v'. + +--- configure.orig 2006-06-08 19:17:51.000000000 +0000 +++ configure @@ -1570,7 +1570,7 @@ echo "$as_me: error: Please run bootstra { (exit 1); exit 1; }; } @@ -11,3 +14,12 @@ $NetBSD: patch-ab,v 1.1.1.1 2006/04/12 21:39:38 wiz Exp $ touch config.h ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do +@@ -28881,7 +28881,7 @@ fi + if test x$USENASM = xtrue; then + echo "$as_me:$LINENO: checking nasm version..." >&5 + echo $ECHO_N "checking nasm version...... $ECHO_C" >&6 +- BILLSNASM_arg=`nasm -r | tr '.' ' '` ++ BILLSNASM_arg=`nasm -v | tr '.' ' '` + BILLSNASM_ret=`util/testnasm.sh $BILLSNASM_arg` + if test x$BILLSNASM_ret = x"yes"; then + USENASM=true |