update to the 20090920 snapshot

The snapshot date is chosen for some reason:
-vlc-1.0.6 (which I'll commit soon) needs an API change which
 was introduced on 20090813
-pkgsrc's ffmpeg can't deal with an API change which was done 20090921
 (and is not easily updated)

6 files changed, 54 insertions, 41 deletions

diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile
index 494ec29ed3c..d6e5c70ef95 100644
--- a/multimedia/x264-devel/Makefile
+++ b/multimedia/x264-devel/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2009/05/25 20:56:38 drochner Exp $
+# $NetBSD: Makefile,v 1.20 2010/05/04 18:18:57 drochner Exp $
 
-SNAPSHOT_DATE=		20090326
+SNAPSHOT_DATE=		20090920
 
 DISTNAME=		x264-snapshot-${SNAPSHOT_DATE}-2245
 PKGNAME=		x264-devel-${SNAPSHOT_DATE}
diff --git a/multimedia/x264-devel/distinfo b/multimedia/x264-devel/distinfo
index 8468f72ffb2..69bdbdb523d 100644
--- a/multimedia/x264-devel/distinfo
+++ b/multimedia/x264-devel/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.18 2009/06/03 09:08:31 drochner Exp $
+$NetBSD: distinfo,v 1.19 2010/05/04 18:18:57 drochner Exp $
 
-SHA1 (x264-snapshot-20090326-2245.tar.bz2) = 4d28a02db4586986162368c18e607ca3b10b3453
-RMD160 (x264-snapshot-20090326-2245.tar.bz2) = fc6581a33970f012c660489eb2ae48f8ac9c151d
-Size (x264-snapshot-20090326-2245.tar.bz2) = 2466701 bytes
-SHA1 (patch-aa) = b2222f1f9fa66ba46d1512dfca76d9ac4c14eea4
-SHA1 (patch-ab) = ba276318f8e12626bdddbc978c00609d42921965
-SHA1 (patch-ac) = 0659b7f6ad1195c59c6298bc270b15990b1a8204
+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-ab) = 6db45e7995b7986d8b0bf95a777eff71527a189d
+SHA1 (patch-ac) = b3c91319b287278dd98c822dd7e35e273a238f70
 SHA1 (patch-ak) = d8362f3beadcc5cc19684a12b3794d542f502f14
 SHA1 (patch-am) = 07418547d05fd6c6e1703725a4cc5f1ddc36dca1
 SHA1 (patch-an) = 69e2a8f6167fd2410c69e4df3e3a071c8c0c835f
-SHA1 (patch-ao) = 27866ab362625c090d40fbea423c24852cdd3598
+SHA1 (patch-ba) = a80323251ccb1434e4154e9736462ddf39e04c1d
diff --git a/multimedia/x264-devel/patches/patch-aa b/multimedia/x264-devel/patches/patch-aa
index c0e49d1d62b..90f3b5f635b 100644
--- a/multimedia/x264-devel/patches/patch-aa
+++ b/multimedia/x264-devel/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.7 2009/05/25 20:56:38 drochner Exp $
+$NetBSD: patch-aa,v 1.8 2010/05/04 18:18:57 drochner Exp $
 
---- configure.orig	2009-03-26 22:45:08.000000000 +0100
+--- configure.orig	2009-09-20 20:45:09.000000000 +0000
 +++ configure
 @@ -117,7 +117,7 @@ for opt do
              LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}"
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.7 2009/05/25 20:56:38 drochner Exp $
              CFLAGS="$CFLAGS -DVISUALIZE=1"
              vis="yes"
              ;;
-@@ -188,6 +188,10 @@ case $host_os in
+@@ -187,6 +187,10 @@ case $host_os in
      SYS="FREEBSD"
      LDFLAGS="$LDFLAGS -lm"
      ;;
@@ -31,7 +31,7 @@ $NetBSD: patch-aa,v 1.7 2009/05/25 20:56:38 drochner Exp $
    kfreebsd*-gnu)
      SYS="FREEBSD"
      CFLAGS="$CFLAGS -DHAVE_MALLOC_H"
-@@ -244,7 +248,7 @@ case $host_cpu in
+@@ -250,7 +254,7 @@ case $host_cpu in
        ASFLAGS="$ASFLAGS -f elf"
      fi
      ;;
@@ -40,7 +40,7 @@ $NetBSD: patch-aa,v 1.7 2009/05/25 20:56:38 drochner Exp $
      ARCH="X86_64"
      AS="yasm"
      if [ "$SYS" = MACOSX ];then
-@@ -258,11 +262,11 @@ case $host_cpu in
+@@ -264,11 +268,11 @@ case $host_cpu in
      fi
      ;;
    powerpc|powerpc64)
@@ -54,7 +54,7 @@ $NetBSD: patch-aa,v 1.7 2009/05/25 20:56:38 drochner Exp $
        ALTIVECFLAGS="$ALTIVECFLAGS -maltivec -mabi=altivec -DHAVE_ALTIVEC_H"
      fi
      ;;
-@@ -322,7 +326,7 @@ grep -q BIGE conftest.o && CFLAGS="$CFLA
+@@ -354,7 +358,7 @@ grep -q BIGE conftest.o && CFLAGS="$CFLA
  
  # autodetect options that weren't forced nor disabled
  
@@ -63,7 +63,7 @@ $NetBSD: patch-aa,v 1.7 2009/05/25 20:56:38 drochner Exp $
  if test "$pthread" = "auto" ; then
      pthread="no"
      case $SYS in
-@@ -355,7 +359,7 @@ if test "$pthread" = "auto" ; then
+@@ -387,7 +391,7 @@ if test "$pthread" = "auto" ; then
      esac
  fi
  if test "$pthread" = "yes" ; then
@@ -72,7 +72,7 @@ $NetBSD: patch-aa,v 1.7 2009/05/25 20:56:38 drochner Exp $
      LDFLAGS="$LDFLAGS $libpthread"
  fi
  
-@@ -392,7 +396,8 @@ if [ "$avis_input" = "yes" ] ; then
+@@ -424,7 +428,8 @@ if [ "$avis_input" = "yes" ] ; then
  fi
  
  if [ "$pic" = "yes" ] ; then
diff --git a/multimedia/x264-devel/patches/patch-ab b/multimedia/x264-devel/patches/patch-ab
index a3d72590235..d426225fe22 100644
--- a/multimedia/x264-devel/patches/patch-ab
+++ b/multimedia/x264-devel/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.11 2009/05/25 20:56:38 drochner Exp $
+$NetBSD: patch-ab,v 1.12 2010/05/04 18:18:57 drochner Exp $
 
---- Makefile.orig	2009-03-26 22:45:08.000000000 +0100
+--- Makefile.orig	2009-09-20 20:45:09.000000000 +0000
 +++ Makefile
 @@ -40,9 +40,9 @@ endif
  ifdef ARCH_X86
@@ -14,7 +14,7 @@ $NetBSD: patch-ab,v 1.11 2009/05/25 20:56:38 drochner Exp $
  endif
  endif
  
-@@ -52,44 +52,49 @@ ALTIVECSRC += common/ppc/mc.c common/ppc
+@@ -52,7 +52,7 @@ ALTIVECSRC += common/ppc/mc.c common/ppc
                common/ppc/quant.c common/ppc/deblock.c \
                common/ppc/predict.c
  SRCS += $(ALTIVECSRC)
@@ -22,6 +22,16 @@ $NetBSD: patch-ab,v 1.11 2009/05/25 20:56:38 drochner Exp $
 +$(ALTIVECSRC:%.c=%.lo): CFLAGS += $(ALTIVECFLAGS)
  endif
  
+ # NEON optims
+@@ -62,44 +62,49 @@ ASMSRC += common/arm/cpu-a.S common/arm/
+           common/arm/dct-a.S common/arm/quant-a.S common/arm/deblock-a.S \
+           common/arm/predict-a.S
+ SRCS   += common/arm/mc-c.c common/arm/predict-c.c
+-OBJASM  = $(ASMSRC:%.S=%.o)
++OBJASM  = $(ASMSRC:%.S=%.lo)
+ endif
+ endif
+ 
  # VIS optims
  ifeq ($(ARCH),UltraSparc)
  ASMSRC += common/sparc/pixel.asm
@@ -59,7 +69,7 @@ $NetBSD: patch-ab,v 1.11 2009/05/25 20:56:38 drochner Exp $
  
 -x264$(EXE): $(OBJCLI) libx264.a 
 -	$(CC) -o $@ $+ $(LDFLAGS)
-+x264$(EXE): $(OBJCLI) libx264.la
++x264$(EXE): $(OBJCLI) libx264.la 
 +	${LIBTOOL} --mode=link $(CC) -o $@ $+ $(LDFLAGS)
  
 -checkasm: tools/checkasm.o libx264.a
@@ -69,16 +79,15 @@ $NetBSD: patch-ab,v 1.11 2009/05/25 20:56:38 drochner Exp $
  
 -%.o: %.asm
 -	$(AS) $(ASFLAGS) -o $@ $<
+-	-@ $(STRIP) -x $@ # delete local/anonymous symbols, so they don't show up in oprofile
 +%.lo: %.asm
 +	${LIBTOOL} --mode=compile --tag=CC \
 +		./strip_fopt.sh $(AS) $(ASFLAGS) -o $@ $<
- # delete local/anonymous symbols, so they don't show up in oprofile
--	-@ $(STRIP) -x $@
-+	-@ $(STRIP) -x $(@:.lo=.o)
++	-@ $(STRIP) -x $(@:.lo=.o) # delete local/anonymous symbols, so they don't show up in oprofile
  
- .depend: config.mak
- 	rm -f .depend
-@@ -143,21 +148,16 @@ distclean: clean
+ %.o: %.S
+ 	$(AS) $(ASFLAGS) -o $@ $<
+@@ -156,21 +161,16 @@ distclean: clean
  	rm -f config.mak config.h x264.pc
  	rm -rf test/
  
diff --git a/multimedia/x264-devel/patches/patch-ac b/multimedia/x264-devel/patches/patch-ac
index fb89a28129f..b8d0f4685a2 100644
--- a/multimedia/x264-devel/patches/patch-ac
+++ b/multimedia/x264-devel/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.5 2009/05/25 20:56:38 drochner Exp $
+$NetBSD: patch-ac,v 1.6 2010/05/04 18:18:57 drochner Exp $
 
---- common/cpu.c.orig	2009-04-05 21:01:48.000000000 +0200
+--- common/cpu.c.orig	2010-04-22 20:45:07.000000000 +0000
 +++ common/cpu.c
-@@ -33,7 +33,7 @@
+@@ -36,7 +36,7 @@
  #include <sys/types.h>
  #include <sys/sysctl.h>
  #endif
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.5 2009/05/25 20:56:38 drochner Exp $
  #include <sys/param.h>
  #include <sys/sysctl.h>
  #include <machine/cpu.h>
-@@ -200,13 +200,13 @@ uint32_t x264_cpu_detect( void )
+@@ -226,13 +226,13 @@ uint32_t x264_cpu_detect( void )
  
  #elif defined( ARCH_PPC )
  
@@ -27,12 +27,3 @@ $NetBSD: patch-ac,v 1.5 2009/05/25 20:56:38 drochner Exp $
      int      selectors[2] = { CTL_MACHDEP, CPU_ALTIVEC };
  #else
      int      selectors[2] = { CTL_HW, HW_VECTORUNIT };
-@@ -223,7 +223,7 @@ uint32_t x264_cpu_detect( void )
-     return cpu;
- }
- 
--#elif defined( SYS_LINUX )
-+#elif defined(SYS_LINUX) || defined(SYS_NETBSD)
- #include <signal.h>
- #include <setjmp.h>
- static sigjmp_buf jmpbuf;
diff --git a/multimedia/x264-devel/patches/patch-ba b/multimedia/x264-devel/patches/patch-ba
new file mode 100644
index 00000000000..085164d13b8
--- /dev/null
+++ b/multimedia/x264-devel/patches/patch-ba
@@ -0,0 +1,13 @@
+$NetBSD: patch-ba,v 1.1 2010/05/04 18:18:57 drochner Exp $
+
+--- encoder/analyse.c.orig	2009-09-20 20:45:09.000000000 +0000
++++ encoder/analyse.c
+@@ -252,7 +252,7 @@ int x264_analyse_init_costs( x264_t *h, 
+     for( i = 0; i <= 2*4*2048; i++ )
+     {
+         h->cost_mv[lambda][-i] =
+-        h->cost_mv[lambda][i]  = lambda * (log2f(i+1)*2 + 0.718f + !!i) + .5f;
++        h->cost_mv[lambda][i]  = lambda * (logf(i+1)*2.88539f + 0.718f + !!i) + .5f;
+     }
+     x264_pthread_mutex_lock( &cost_ref_mutex );
+     for( i = 0; i < 3; i++ )