[pkgsrc/trunk]: pkgsrc/multimedia/x264-devel Use yasm on i386 as well. From M...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d25a612df6de
branches:  trunk
changeset: 537375:d25a612df6de
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Jan 07 13:33:27 2008 +0000

description:
Use yasm on i386 as well. From Matthias Drochner.

diffstat:

 multimedia/x264-devel/Makefile         |   6 ++----
 multimedia/x264-devel/distinfo         |   4 ++--
 multimedia/x264-devel/patches/patch-aa |  11 +++++++++--
 3 files changed, 13 insertions(+), 8 deletions(-)

diffs (57 lines):

diff -r 69321703c642 -r d25a612df6de multimedia/x264-devel/Makefile
--- a/multimedia/x264-devel/Makefile    Mon Jan 07 12:26:20 2008 +0000
+++ b/multimedia/x264-devel/Makefile    Mon Jan 07 13:33:27 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/01/04 18:41:54 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2008/01/07 13:33:27 joerg Exp $
 #
 
 SNAPSHOT_DATE=         20071218
@@ -17,9 +17,7 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${MACHINE_ARCH} == "i386"
-BUILD_DEPENDS+=        nasm>=0.98.34:../../devel/nasm
-.elif ${MACHINE_ARCH} == "x86_64"
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 BUILD_DEPENDS+=        yasm>=0.4.0:../../devel/yasm
 .endif
 
diff -r 69321703c642 -r d25a612df6de multimedia/x264-devel/distinfo
--- a/multimedia/x264-devel/distinfo    Mon Jan 07 12:26:20 2008 +0000
+++ b/multimedia/x264-devel/distinfo    Mon Jan 07 13:33:27 2008 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2008/01/04 18:41:54 joerg Exp $
+$NetBSD: distinfo,v 1.5 2008/01/07 13:33:28 joerg Exp $
 
 SHA1 (x264-snapshot-20071218-2245.tar.bz2) = b5bc182070e17a8470618bae776488514b67a96a
 RMD160 (x264-snapshot-20071218-2245.tar.bz2) = 753ab79398bf5bb92b41656ef48ab57dcc63f347
 Size (x264-snapshot-20071218-2245.tar.bz2) = 537622 bytes
-SHA1 (patch-aa) = 8c652d45621d2a3faed3d80a5eddb85fc1c96507
+SHA1 (patch-aa) = cce1ef8b7a332e9f9a4c18a8a4246b9382dc4bca
diff -r 69321703c642 -r d25a612df6de multimedia/x264-devel/patches/patch-aa
--- a/multimedia/x264-devel/patches/patch-aa    Mon Jan 07 12:26:20 2008 +0000
+++ b/multimedia/x264-devel/patches/patch-aa    Mon Jan 07 13:33:27 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2008/01/04 18:41:54 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2008/01/07 13:33:28 joerg Exp $
 
 --- configure.orig     2007-12-18 22:45:04.000000000 +0100
 +++ configure
@@ -13,7 +13,14 @@
    kfreebsd*-gnu)
      SYS="FREEBSD"
      CFLAGS="$CFLAGS -DHAVE_MALLOC_H"
-@@ -252,7 +256,7 @@ case $host_cpu in
+@@ -245,14 +249,12 @@ case $host_cpu in
+       ASFLAGS="$ASFLAGS -f macho -DPREFIX"
+     elif [ "$SYS" = CYGWIN -o "$SYS" = MINGW ]; then
+       ASFLAGS="$ASFLAGS -f win32 -DPREFIX"
+-    elif [ "$SYS" = NETBSD ]; then
+-      ASFLAGS="$ASFLAGS -f aoutb"
+     else
+       ASFLAGS="$ASFLAGS -f elf"
      fi
      as_check || AS="nasm"
      ;;