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	6 Jan 2011 13:35:57 -0000
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.25 2010/08/11 19:11:55 tsutsui Exp $
 
-SNAPSHOT_DATE=		20090920
+SNAPSHOT_DATE=		20100201
 
 DISTNAME=		x264-snapshot-${SNAPSHOT_DATE}-2245
 PKGNAME=		x264-devel-${SNAPSHOT_DATE}
@@ -41,9 +41,10 @@
 
 HAS_CONFIGURE=		yes
 CONFIG_SHELL=		${BASH}
-CONFIGURE_ARGS+=	--enable-pic	# uses libtool's -prefer-pic
+#CONFIGURE_ARGS+=	--enable-pic	# uses libtool's -prefer-pic
 CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
 CONFIGURE_ARGS+=	--disable-mp4-output	# needs GPAC, not in pkgsrc
+CONFIGURE_ARGS+=	--enable-shared
 MAKE_ENV+=		SH=${SH:Q}
 
 BUILD_TARGET=		default
Index: multimedia/x264-devel/PLIST
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/multimedia/x264-devel/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- multimedia/x264-devel/PLIST	10 Mar 2008 11:59:26 -0000	1.2
+++ multimedia/x264-devel/PLIST	6 Jan 2011 14:10:08 -0000
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2008/03/10 11:59:26 drochner Exp $
+@comment $NetBSD$
+bin/libx264.so.84
 bin/x264
 include/x264.h
 lib/libx264.la
Index: multimedia/x264-devel/buildlink3.mk
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/multimedia/x264-devel/buildlink3.mk,v
retrieving revision 1.9
diff -u -r1.9 buildlink3.mk
--- multimedia/x264-devel/buildlink3.mk	20 Mar 2009 19:25:06 -0000	1.9
+++ multimedia/x264-devel/buildlink3.mk	5 Jan 2011 16:14:40 -0000
@@ -12,8 +12,9 @@
 ###	  into the version number and/or pkg-config file?
 ###
 ###	  Prior specification: x264-devel>=20060127 # X264_BUILD 44
+###	  Prior specification: x264-devel>=20081217 # X264_BUILD 65
 ###
-BUILDLINK_API_DEPENDS.x264-devel+=	x264-devel>=20081217 # X264_BUILD 65
+BUILDLINK_API_DEPENDS.x264-devel+=	x264-devel>=20100201 # X264_BUILD 84
 BUILDLINK_PKGSRCDIR.x264-devel?=	../../multimedia/x264-devel
 pkgbase:= x264-devel
 .  include "../../mk/pkg-build-options.mk"
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	6 Jan 2011 14:15:38 -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-20100201-2245.tar.bz2) = da29c5cbc17cddbbcc0bc1e09c3ca4d56aa8ff5d
+RMD160 (x264-snapshot-20100201-2245.tar.bz2) = 26c6f2eddf102077f99c56f98f6da96fe0c8a61c
+Size (x264-snapshot-20100201-2245.tar.bz2) = 396135 bytes
+SHA1 (patch-aa) = 33f6a4400a0197dfdf562292dfcf5ff3565df4dd
+SHA1 (patch-ab) = 3c9d5fc6ec7f9b53f292084002d6a5e066b6f983
 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 16:21:40 -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-02-02 06:45:06.000000000 +0900
++++ configure	2011-01-06 01:19:57.000000000 +0900
+@@ -193,7 +193,7 @@
              LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}"
              ;;
          --enable-pthread)
@@ -11,27 +11,30 @@
              ;;
          --disable-pthread)
              pthread="no"
-@@ -137,7 +137,7 @@ for opt do
+@@ -213,7 +213,7 @@
              shared="yes"
              ;;
          --enable-visualize)
 -            LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -lX11"
 +            LDFLAGS="$LDFLAGS -lX11"
-             CFLAGS="$CFLAGS -DVISUALIZE=1"
+             define HAVE_VISUALIZE
              vis="yes"
              ;;
-@@ -187,6 +187,10 @@ case $host_os in
+@@ -263,7 +263,12 @@
      SYS="FREEBSD"
      LDFLAGS="$LDFLAGS -lm"
      ;;
+-  kfreebsd*-gnu)
++
 +  dragonfly*)
 +    SYS="DRAGONFLY"
 +    LDFLAGS="$LDFLAGS -lm"
 +    ;;
-   kfreebsd*-gnu)
++kfreebsd*-gnu)
      SYS="FREEBSD"
-     CFLAGS="$CFLAGS -DHAVE_MALLOC_H"
-@@ -250,7 +254,7 @@ case $host_cpu in
+     define HAVE_MALLOC_H
+     LDFLAGS="$LDFLAGS -lm"
+@@ -326,7 +331,7 @@
        ASFLAGS="$ASFLAGS -f elf"
      fi
      ;;
@@ -40,21 +43,21 @@
      ARCH="X86_64"
      AS="yasm"
      if [ "$SYS" = MACOSX ];then
-@@ -264,11 +268,11 @@ case $host_cpu in
+@@ -342,11 +347,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"
+       define HAVE_ALTIVEC_H
      fi
-     ;;
-@@ -354,7 +358,7 @@ grep -q BIGE conftest.o && CFLAGS="$CFLA
+@@ -454,7 +460,7 @@
  
  # autodetect options that weren't forced nor disabled
  
@@ -63,16 +66,7 @@
  if test "$pthread" = "auto" ; then
      pthread="no"
      case $SYS in
-@@ -387,7 +391,7 @@ if test "$pthread" = "auto" ; then
-     esac
- fi
- if test "$pthread" = "yes" ; then
--    CFLAGS="$CFLAGS -DHAVE_PTHREAD"
-+    CFLAGS="$CFLAGS -DHAVE_PTHREAD $PTHREAD_CFLAGS"
-     LDFLAGS="$LDFLAGS $libpthread"
- fi
- 
-@@ -424,7 +428,8 @@ if [ "$avis_input" = "yes" ] ; then
+@@ -589,7 +595,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	6 Jan 2011 14:15:35 -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-02-02 06:45:06.000000000 +0900
++++ Makefile	2011-01-06 23:15:20.000000000 +0900
+@@ -67,9 +67,9 @@
  ifdef ARCH_X86
  ASFLAGS += -Icommon/x86/
  SRCS   += common/x86/mc-c.c common/x86/predict-c.c
@@ -14,40 +14,26 @@
  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)
+@@ -78,6 +78,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/
-           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)
+@@ -107,31 +108,40 @@
  endif
  endif
  
- # VIS optims
- ifeq ($(ARCH),UltraSparc)
- ASMSRC += common/sparc/pixel.asm
--OBJASM  = $(ASMSRC:%.asm=%.o)
-+OBJASM  = $(ASMSRC:%.asm=%.lo)
- endif
- 
- ifneq ($(HAVE_GETOPT_LONG),1)
- SRCS += extras/getopt.c
- endif
- 
 -OBJS = $(SRCS:%.c=%.o)
 -OBJCLI = $(SRCCLI:%.c=%.o)
+-OBJSO = $(SRCSO:%.c=%.o)
 +OBJS = $(SRCS:%.c=%.lo)
 +OBJCLI = $(SRCCLI:%.c=%.lo)
++OBJSO = $(SRCS:%.c=%.so)
  DEP  = depend
++PICFLAGS = -fPIC
  
  .PHONY: all default fprofiled clean distclean install uninstall dox test testclean
  
@@ -56,30 +42,39 @@
 -libx264.a: .depend $(OBJS) $(OBJASM)
 -	$(AR) rc libx264.a $(OBJS) $(OBJASM)
 -	$(RANLIB) libx264.a
+-
+-$(SONAME): .depend $(OBJS) $(OBJASM) $(OBJSO)
+-	$(CC) -shared -o $@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS)
+-
+-x264$(EXE): $(OBJCLI) libx264.a
+-	$(CC) -o $@ $+ $(LDFLAGS) $(LDFLAGSCLI)
+-
+-checkasm: tools/checkasm.o libx264.a
+-	$(CC) -o $@ $+ $(LDFLAGS)
+-
+-%.o: %.asm
+-	$(AS) $(ASFLAGS) -o $@ $<
+-	-@ $(STRIP) -x $@ # delete local/anonymous symbols, so they don't show up in oprofile
 +%.lo: %.c
 +	${LIBTOOL} --mode=compile ${CC} -c ${CFLAGS} ${PICFLAGS} -o $@ $<
-+
++ 
 +libx264.la: .depend $(OBJS) $(OBJASM)
 +	${LIBTOOL} --mode=link \
 +	${CC} -o libx264.la -rpath ${PREFIX}/lib -version-info 0 \
 +	$(OBJS) $(OBJASM) ${LDFLAGS}
- 
- $(SONAME): .depend $(OBJS) $(OBJASM)
- 	$(CC) -shared -o $@ $(OBJS) $(OBJASM) $(SOFLAGS) $(LDFLAGS)
- 
--x264$(EXE): $(OBJCLI) libx264.a 
--	$(CC) -o $@ $+ $(LDFLAGS)
-+x264$(EXE): $(OBJCLI) libx264.la 
++
++%.so: %.c
++	${CC} -c ${CFLAGS} ${PICFLAGS} -o $@ $<
++
++$(SONAME): .depend $(OBJASM) $(OBJSO)
++	${AR} cr $@ $(OBJASM) $(OBJSO)
++
++x264$(EXE): $(OBJCLI) libx264.la
 +	${LIBTOOL} --mode=link $(CC) -o $@ $+ $(LDFLAGS)
- 
--checkasm: tools/checkasm.o libx264.a
--	$(CC) -o $@ $+ $(LDFLAGS)
-+checkasm: tools/checkasm.lo libx264.la
++
++checkasm: tools/checkasm.o libx264.la
 +	${LIBTOOL} --mode=link $(CC) -o $@ $+ $(LDFLAGS)
- 
--%.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 $@ $<
@@ -87,8 +82,8 @@
  
  %.o: %.S
  	$(AS) $(ASFLAGS) -o $@ $<
-@@ -156,21 +161,16 @@ distclean: clean
- 	rm -f config.mak config.h x264.pc
+@@ -189,21 +199,17 @@
+ 	rm -f config.mak config.h config.log x264.pc
  	rm -rf test/
  
 -install: x264$(EXE) $(SONAME)
@@ -97,7 +92,7 @@
  	install -d $(DESTDIR)$(libdir) $(DESTDIR)$(libdir)/pkgconfig
  	install -m 644 x264.h $(DESTDIR)$(includedir)
 -	install -m 644 libx264.a $(DESTDIR)$(libdir)
-+	${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libx264.la $(DESTDIR)$(libdir)
++	${LIBTOOL} --mode=install install -m 644 libx264.la $(DESTDIR)$(libdir)
  	install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
 -	install x264$(EXE) $(DESTDIR)$(bindir)
 -	$(RANLIB) $(DESTDIR)$(libdir)/libx264.a
@@ -109,6 +104,7 @@
 -	$(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir))
  endif
 -	$(if $(IMPLIBNAME), install -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir))
++	$(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(bindir))
  
  uninstall:
  	rm -f $(DESTDIR)$(includedir)/x264.h $(DESTDIR)$(libdir)/libx264.a