-don't use assembler code on NetBSD/i386<current -- the gas doesn't

 do SSSE3 instructions (noticed by OBATA Akio)
-cleanup: remove obsolete patch and bashism

4 files changed, 20 insertions, 27 deletions

diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile
index d6e5c70ef95..efd3ca71f8f 100644
--- a/multimedia/x264-devel/Makefile
+++ b/multimedia/x264-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2010/05/04 18:18:57 drochner Exp $
+# $NetBSD: Makefile,v 1.21 2010/05/06 17:02:12 drochner Exp $
 
 SNAPSHOT_DATE=		20090920
 
@@ -21,7 +21,9 @@ CFLAGS+=	-DHAVE_STDLIB_H
 .endif
 
 .if ${MACHINE_ARCH} == "i386"
-.  if ${OPSYS} == "Darwin"
+.  if ${OPSYS} == "Darwin" || \
+      (${OPSYS} == "NetBSD" && \
+       (!empty(OS_VERSION:M[1-5].*) && empty(OS_VERSION:M5.99.*)))
 CONFIGURE_ARGS+=	--disable-asm
 .  else
 BUILD_DEPENDS+=	yasm>=0.4.0:../../devel/yasm
diff --git a/multimedia/x264-devel/distinfo b/multimedia/x264-devel/distinfo
index 69bdbdb523d..654de5dacf5 100644
--- a/multimedia/x264-devel/distinfo
+++ b/multimedia/x264-devel/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.19 2010/05/04 18:18:57 drochner Exp $
+$NetBSD: distinfo,v 1.20 2010/05/06 17:02:12 drochner Exp $
 
 SHA1 (x264-snapshot-20090920-2245.tar.bz2) = de37c75bdcbfb4e16fba006afd932020b93d8a66
 RMD160 (x264-snapshot-20090920-2245.tar.bz2) = c0303b906f4de285eb4c9460882e6df4cf92f4a3
 Size (x264-snapshot-20090920-2245.tar.bz2) = 2736477 bytes
-SHA1 (patch-aa) = e77e346640cb0512f9ca5b678bf325f915a69da7
+SHA1 (patch-aa) = c9c93b1d1bbbfe1b61564cb3ab7df68216d1d9d2
 SHA1 (patch-ab) = 6db45e7995b7986d8b0bf95a777eff71527a189d
 SHA1 (patch-ac) = b3c91319b287278dd98c822dd7e35e273a238f70
 SHA1 (patch-ak) = d8362f3beadcc5cc19684a12b3794d542f502f14
diff --git a/multimedia/x264-devel/patches/patch-aa b/multimedia/x264-devel/patches/patch-aa
index 90f3b5f635b..b7ddf3ebfd1 100644
--- a/multimedia/x264-devel/patches/patch-aa
+++ b/multimedia/x264-devel/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.8 2010/05/04 18:18:57 drochner Exp $
+$NetBSD: patch-aa,v 1.9 2010/05/06 17:02:12 drochner Exp $
 
 --- configure.orig	2009-09-20 20:45:09.000000000 +0000
 +++ configure
@@ -31,6 +31,19 @@ $NetBSD: patch-aa,v 1.8 2010/05/04 18:18:57 drochner Exp $
    kfreebsd*-gnu)
      SYS="FREEBSD"
      CFLAGS="$CFLAGS -DHAVE_MALLOC_H"
+@@ -236,10 +240,10 @@ case $host_cpu in
+     ARCH="X86"
+     AS="yasm"
+     ASFLAGS="$ASFLAGS -O2"
+-    if [[ "$asm" == yes && "$CFLAGS" != *-march* ]]; then
++    if [ "$asm" = yes -a "$CFLAGS" != *-march* ]; then
+       CFLAGS="$CFLAGS -march=i686"
+     fi
+-    if [[ "$asm" == yes && "$CFLAGS" != *-mfpmath* ]]; then
++    if [ "$asm" = yes -a "$CFLAGS" != *-mfpmath* ]; then
+       CFLAGS="$CFLAGS -mfpmath=sse -msse"
+     fi
+     if [ "$SYS" = MACOSX ]; then
 @@ -250,7 +254,7 @@ case $host_cpu in
        ASFLAGS="$ASFLAGS -f elf"
      fi
diff --git a/multimedia/x264-devel/patches/patch-ao b/multimedia/x264-devel/patches/patch-ao
deleted file mode 100644
index 594b9f4f389..00000000000
--- a/multimedia/x264-devel/patches/patch-ao
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2009/06/03 09:08:31 drochner Exp $
-
---- common/ppc/pixel.c.orig	2009-03-26 22:45:08.000000000 +0100
-+++ common/ppc/pixel.c
-@@ -1905,7 +1905,7 @@ static uint64_t pixel_hadamard_ac_altive
-     vec_u16_t addabs67 = vec_add( VEC_ABSOLUTE(pix16_d6), VEC_ABSOLUTE(pix16_d7) );
- 
-     vec_u16_t sum4_v = vec_add(vec_add(addabs01, addabs23), vec_add(addabs45, addabs67));
--    vec_ste(vec_sums(vec_sum4s(sum4_v, zero_s32v), zero_s32v), 12, sum4_tab);
-+    vec_ste(vec_sums(vec_sum4s((vec_s16_t)sum4_v, zero_s32v), zero_s32v), 12, sum4_tab);
- 
-     vec_s16_t tmpi0 = vec_add(pix16_d0, pix16_d4);
-     vec_s16_t tmpi4 = vec_sub(pix16_d0, pix16_d4);
-@@ -1933,7 +1933,7 @@ static uint64_t pixel_hadamard_ac_altive
-                                   VEC_ABSOLUTE( vec_sub(pix16_d3, pix16_d7) ) );
- 
-     vec_u16_t sum8_v = vec_add( vec_add(addsum04, addsum15), vec_add(addsum26, addsum37) );
--    vec_ste(vec_sums( vec_sum4s(sum8_v, zero_s32v), zero_s32v), 12, sum8_tab);
-+    vec_ste(vec_sums(vec_sum4s((vec_s16_t)sum8_v, zero_s32v), zero_s32v), 12, sum8_tab);
- 
-     int sum8 = sum8_tab[3];
-