Index: multimedia/x264-devel/Makefile
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/multimedia/x264-devel/Makefile,v
retrieving revision 1.25
diff -u -r1.25 Makefile
--- multimedia/x264-devel/Makefile	11 Aug 2010 19:11:55 -0000	1.25
+++ multimedia/x264-devel/Makefile	5 Jan 2011 14:34:19 -0000
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.25 2010/08/11 19:11:55 tsutsui Exp $
 
-SNAPSHOT_DATE=		20090920
+SNAPSHOT_DATE=		20100101
 
 DISTNAME=		x264-snapshot-${SNAPSHOT_DATE}-2245
 PKGNAME=		x264-devel-${SNAPSHOT_DATE}
Index: multimedia/x264-devel/distinfo
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/multimedia/x264-devel/distinfo,v
retrieving revision 1.21
diff -u -r1.21 distinfo
--- multimedia/x264-devel/distinfo	7 May 2010 09:34:43 -0000	1.21
+++ multimedia/x264-devel/distinfo	5 Jan 2011 14:41:12 -0000
@@ -1,10 +1,10 @@
 $NetBSD: distinfo,v 1.21 2010/05/07 09:34:43 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-ab) = 6db45e7995b7986d8b0bf95a777eff71527a189d
+SHA1 (x264-snapshot-20100101-2245.tar.bz2) = 7c3fbc0d1889db80ca034756371c2c1797e72b7f
+RMD160 (x264-snapshot-20100101-2245.tar.bz2) = b6fe01819a12aa7e06ae716207bea30bdc1a090c
+Size (x264-snapshot-20100101-2245.tar.bz2) = 387818 bytes
+SHA1 (patch-aa) = f827373a78f797229b5fa293fcabddb1c5970ca3
+SHA1 (patch-ab) = 7003a20e609ff03c461303a8aff23931232af463
 SHA1 (patch-ac) = b3c91319b287278dd98c822dd7e35e273a238f70
 SHA1 (patch-ak) = d8362f3beadcc5cc19684a12b3794d542f502f14
 SHA1 (patch-am) = 07418547d05fd6c6e1703725a4cc5f1ddc36dca1
Index: multimedia/x264-devel/patches/patch-aa
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/multimedia/x264-devel/patches/patch-aa,v
retrieving revision 1.10
diff -u -r1.10 patch-aa
--- multimedia/x264-devel/patches/patch-aa	7 May 2010 09:34:43 -0000	1.10
+++ multimedia/x264-devel/patches/patch-aa	5 Jan 2011 14:37:35 -0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.10 2010/05/07 09:34:43 drochner Exp $
+$NetBSD$
 
---- configure.orig	2009-09-20 20:45:09.000000000 +0000
-+++ configure
-@@ -117,7 +117,7 @@ for opt do
+--- configure.orig	2010-01-02 06:45:07.000000000 +0900
++++ configure	2011-01-05 23:36:29.000000000 +0900
+@@ -122,7 +122,7 @@
              LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}"
              ;;
          --enable-pthread)
@@ -11,7 +11,7 @@
              ;;
          --disable-pthread)
              pthread="no"
-@@ -137,7 +137,7 @@ for opt do
+@@ -142,7 +142,7 @@
              shared="yes"
              ;;
          --enable-visualize)
@@ -20,7 +20,7 @@
              CFLAGS="$CFLAGS -DVISUALIZE=1"
              vis="yes"
              ;;
-@@ -187,6 +187,10 @@ case $host_os in
+@@ -192,6 +192,10 @@
      SYS="FREEBSD"
      LDFLAGS="$LDFLAGS -lm"
      ;;
@@ -31,7 +31,7 @@
    kfreebsd*-gnu)
      SYS="FREEBSD"
      CFLAGS="$CFLAGS -DHAVE_MALLOC_H"
-@@ -250,7 +254,7 @@ case $host_cpu in
+@@ -255,7 +259,7 @@
        ASFLAGS="$ASFLAGS -f elf"
      fi
      ;;
@@ -40,21 +40,21 @@
      ARCH="X86_64"
      AS="yasm"
      if [ "$SYS" = MACOSX ];then
-@@ -264,11 +268,11 @@ case $host_cpu in
+@@ -271,11 +275,12 @@
      fi
      ;;
    powerpc|powerpc64)
 -    ARCH="PPC"
      if [ $SYS = MACOSX ]
      then
--      ALTIVECFLAGS="$ALTIVECFLAGS -faltivec -fastf -mcpu=G4"
 +      ARCH="POWERPC"
+       CFLAGS="$CFLAGS -faltivec -fastf -mcpu=G4"
      else
 +      ARCH="PPC"
-       ALTIVECFLAGS="$ALTIVECFLAGS -maltivec -mabi=altivec -DHAVE_ALTIVEC_H"
+       CFLAGS="$CFLAGS -maltivec -mabi=altivec -DHAVE_ALTIVEC_H"
      fi
      ;;
-@@ -354,7 +358,7 @@ grep -q BIGE conftest.o && CFLAGS="$CFLA
+@@ -365,7 +370,7 @@
  
  # autodetect options that weren't forced nor disabled
  
@@ -63,7 +63,7 @@
  if test "$pthread" = "auto" ; then
      pthread="no"
      case $SYS in
-@@ -387,7 +391,7 @@ if test "$pthread" = "auto" ; then
+@@ -398,7 +403,7 @@
      esac
  fi
  if test "$pthread" = "yes" ; then
@@ -72,7 +72,7 @@
      LDFLAGS="$LDFLAGS $libpthread"
  fi
  
-@@ -424,7 +428,8 @@ if [ "$avis_input" = "yes" ] ; then
+@@ -442,7 +447,8 @@
  fi
  
  if [ "$pic" = "yes" ] ; then
Index: multimedia/x264-devel/patches/patch-ab
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/multimedia/x264-devel/patches/patch-ab,v
retrieving revision 1.12
diff -u -r1.12 patch-ab
--- multimedia/x264-devel/patches/patch-ab	4 May 2010 18:18:57 -0000	1.12
+++ multimedia/x264-devel/patches/patch-ab	5 Jan 2011 14:41:06 -0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.12 2010/05/04 18:18:57 drochner Exp $
+$NetBSD$
 
---- Makefile.orig	2009-09-20 20:45:09.000000000 +0000
-+++ Makefile
-@@ -40,9 +40,9 @@ endif
+--- Makefile.orig	2010-01-02 06:45:07.000000000 +0900
++++ Makefile	2011-01-05 23:40:31.000000000 +0900
+@@ -61,9 +61,9 @@
  ifdef ARCH_X86
  ASFLAGS += -Icommon/x86/
  SRCS   += common/x86/mc-c.c common/x86/predict-c.c
@@ -14,16 +14,15 @@
  endif
  endif
  
-@@ -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)
--$(ALTIVECSRC:%.c=%.o): CFLAGS += $(ALTIVECFLAGS)
+@@ -72,6 +72,7 @@
+ SRCS += common/ppc/mc.c common/ppc/pixel.c common/ppc/dct.c \
+         common/ppc/quant.c common/ppc/deblock.c \
+         common/ppc/predict.c
 +$(ALTIVECSRC:%.c=%.lo): CFLAGS += $(ALTIVECFLAGS)
  endif
  
  # NEON optims
-@@ -62,44 +62,49 @@ ASMSRC += common/arm/cpu-a.S common/arm/
+@@ -81,44 +82,49 @@
            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
@@ -87,7 +86,7 @@
  
  %.o: %.S
  	$(AS) $(ASFLAGS) -o $@ $<
-@@ -156,21 +161,16 @@ distclean: clean
+@@ -176,21 +182,16 @@
  	rm -f config.mak config.h x264.pc
  	rm -rf test/