Update to 20081218 snapshot. There is no NEWS file or list of changes;

please see the repository for more information.  I'm doing this update
our version is over a year old and some software is starting to require
a newer version.

17 files changed, 316 insertions, 134 deletions

diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile
index a8504ebe62c..469ae09381b 100644
--- a/multimedia/x264-devel/Makefile
+++ b/multimedia/x264-devel/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2008/11/18 22:08:32 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2008/12/18 16:19:07 bjs Exp $
 
-SNAPSHOT_DATE=		20071218
+SNAPSHOT_DATE=		20081217
 
 DISTNAME=		x264-snapshot-${SNAPSHOT_DATE}-2245
 PKGNAME=		x264-devel-${SNAPSHOT_DATE}
-PKGREVISION=		2
 CATEGORIES=		multimedia
 MASTER_SITES=		ftp://ftp.videolan.org/pub/videolan/x264/snapshots/
 EXTRACT_SUFX=		.tar.bz2
@@ -17,6 +16,11 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../mk/bsd.prefs.mk"
 
+.if exists(/usr/include/stdlib.h) && ${OPSYS} != Linux # XXX should be fine
+CFLAGS+=	-DHAVE_STDLIB_H
+.endif
+
+
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 BUILD_DEPENDS+=	yasm>=0.4.0:../../devel/yasm
 .endif
@@ -25,18 +29,31 @@ USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 
 HAS_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--enable-pic	# uses libtool's -prefer-pic
 CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
-.if ${INSTALL_UNSTRIPPED:Uno:M[Yy][Ee][Ss]}
-CONFIGURE_ARGS+=	--enable-debug
-.endif
+CONFIGURE_ARGS+=	--disable-mp4-output	# needs GPAC, not in pkgsrc
 MAKE_ENV+=		SH=${SH:Q}
 
 BUILD_TARGET=		default
+BUILDLINK_TRANSFORM+=	rm:-O4	# XXX does this mean anything to any compiler?
+REPLACE_SH=		strip_fopt.sh
+
+.include "../../mk/dlopen.buildlink3.mk"
+
+CHECK_BUILTIN.pthread:=	yes
+.include "../../mk/pthread.builtin.mk"
+CHECK_BUILTIN.pthread:=	no
+
+.if !empty(USE_BUILTIN.pthread:M[Yy][Ee][Ss])
+X264_BUILD_THREADS_SUPPORT=	yes
+.else
+X264_BUILD_THREADS_SUPPORT=	${DLOPEN_REQUIRE_PTHREADS}
+.endif
+
+.include "options.mk"
 
 post-extract:
-	${SED} -e 's,@SH@,${SH},' ${FILESDIR}/strip_fopt.sh \
-	  >${WRKSRC}/strip_fopt.sh
+	${CP} ${FILESDIR}/strip_fopt.sh ${WRKSRC}/ && \
 	${CHMOD} +x ${WRKSRC}/strip_fopt.sh
 
-.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/x264-devel/buildlink3.mk b/multimedia/x264-devel/buildlink3.mk
index 61f3970a1ec..95e14abc3a3 100644
--- a/multimedia/x264-devel/buildlink3.mk
+++ b/multimedia/x264-devel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2008/03/10 11:59:26 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2008/12/18 16:19:07 bjs Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 X264_DEVEL_BUILDLINK3_MK:=	${X264_DEVEL_BUILDLINK3_MK}+
@@ -12,8 +12,22 @@ BUILDLINK_PACKAGES+=	x264-devel
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}x264-devel
 
 .if !empty(X264_DEVEL_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.x264-devel+=	x264-devel>=20060127
+###
+### NOTE: When changing BUILDLINK_A[BP]I_DEPENDS.x264-devel, please record
+###	  the value of X264_BUILD in x264.h along with the appropriate
+###	  dependency specification.  Perhaps we should incorporate this
+###	  into the version number and/or pkg-config file?
+###
+###	  Prior specification: x264-devel>=20060127 # X264_BUILD 44
+###
+BUILDLINK_API_DEPENDS.x264-devel+=	x264-devel>=20081212 # X264_BUILD 65
 BUILDLINK_PKGSRCDIR.x264-devel?=	../../multimedia/x264-devel
+pkgbase:= x264-devel
+.  include "../../mk/pkg-build-options.mk"
 .endif	# X264_DEVEL_BUILDLINK3_MK
 
+.if !empty(PKG_BUILD_OPTIONS.x264-devel:Mthreads)
+.  include "../../mk/pthread.buildlink3.mk"
+.endif
+
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/x264-devel/distinfo b/multimedia/x264-devel/distinfo
index 7e4bd9541bf..fe9b582b769 100644
--- a/multimedia/x264-devel/distinfo
+++ b/multimedia/x264-devel/distinfo
@@ -1,15 +1,18 @@
-$NetBSD: distinfo,v 1.14 2008/07/30 21:46:04 ahoka Exp $
+$NetBSD: distinfo,v 1.15 2008/12/18 16:19:07 bjs 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) = 78152d98fd8df5719dfc556286dec466c53299ba
-SHA1 (patch-ab) = 1c38310140b0497dbc257758564dac9264abad54
-SHA1 (patch-ac) = c6b1201d8dad1e681a3bf6df6d03da6688328471
-SHA1 (patch-ad) = 5a4327e917daa0a62363960f8e59ffd8331ec0c1
-SHA1 (patch-ae) = 2f1ffc0e59f9dbccf5887d3a7f92f0f4864c2411
-SHA1 (patch-af) = 2c2777b64a4db19b8eedbefc4beb1262f3a42463
-SHA1 (patch-ag) = 1c5652d41bfa3f37cb529c91784ecb40a9731c9d
-SHA1 (patch-ah) = f2476d6210481d2f35631b2d8f07f52ebc813467
-SHA1 (patch-ai) = e9c4a887a36d3a48e92c50c289a51d7bef83fd68
-SHA1 (patch-aj) = d39c117bec412d2809ce02ec4a53c36b94a46ab4
+SHA1 (x264-snapshot-20081217-2245.tar.bz2) = 81f51f72f8ba78e478f829d5cfe41fb6afe846b0
+RMD160 (x264-snapshot-20081217-2245.tar.bz2) = 20b8504c62189ed654a066d81433a91c0e0a97e3
+Size (x264-snapshot-20081217-2245.tar.bz2) = 2336751 bytes
+SHA1 (patch-aa) = 0ff1c2c0942a08dc1d0e35923490ca039cd16d12
+SHA1 (patch-ab) = bdba36c3a2d7a7baaf26f75e6c4ac7a0d15cb3aa
+SHA1 (patch-ac) = a8259f4b21daa19a11547a6af470bbb2376e7049
+SHA1 (patch-ad) = f43841b2a10a999647b83faa6e845724b0e93847
+SHA1 (patch-ae) = bd9b4eb54e0d6f465eea9976d4337bc6650fd5aa
+SHA1 (patch-af) = b006c53478e03ffc7e799ff293878438c8682fd3
+SHA1 (patch-ag) = c616a8c0cae024d223aec4adb6564fb2a302d36e
+SHA1 (patch-ah) = f6f4c384cb84b517b771e720e8f789e2070d6a4f
+SHA1 (patch-ai) = 5c796c6591f6c3614be769e0276a2c4f77479bae
+SHA1 (patch-aj) = 06eeceeb04aefef3a433a2e5934b60a32fd9c116
+SHA1 (patch-ak) = d8362f3beadcc5cc19684a12b3794d542f502f14
+SHA1 (patch-al) = f2c5d0e8b38870e48105239b61999a06b8dbf5ce
+SHA1 (patch-am) = 07418547d05fd6c6e1703725a4cc5f1ddc36dca1
diff --git a/multimedia/x264-devel/files/strip_fopt.sh b/multimedia/x264-devel/files/strip_fopt.sh
index 870a5d861db..3c9a3f16068 100755
--- a/multimedia/x264-devel/files/strip_fopt.sh
+++ b/multimedia/x264-devel/files/strip_fopt.sh
@@ -1,6 +1,6 @@
-#!@SH@
+#!/bin/sh
 #
-# $NetBSD: strip_fopt.sh,v 1.1 2008/03/18 15:05:04 tron Exp $
+# $NetBSD: strip_fopt.sh,v 1.2 2008/12/18 16:19:07 bjs Exp $
 #
 # libtool assumes that the compiler can handle the -fPIC flag and the
 # -fno-common. This isn't always true, for example yasm can't handle it.
diff --git a/multimedia/x264-devel/patches/patch-aa b/multimedia/x264-devel/patches/patch-aa
index 4161dcfe73a..e5978470aa5 100644
--- a/multimedia/x264-devel/patches/patch-aa
+++ b/multimedia/x264-devel/patches/patch-aa
@@ -1,8 +1,26 @@
-$NetBSD: patch-aa,v 1.5 2008/04/09 18:33:37 tron Exp $
+$NetBSD: patch-aa,v 1.6 2008/12/18 16:19:07 bjs Exp $
 
---- configure.orig	2007-12-18 21:45:04.000000000 +0000
-+++ configure	2008-04-09 19:10:28.000000000 +0100
-@@ -193,6 +193,10 @@
+--- configure.orig	2008-12-12 16:45:07.000000000 -0500
++++ configure
+@@ -130,7 +130,7 @@ for opt do
+             LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}"
+             ;;
+         --enable-pthread)
+-            pthread="auto" # can't skip detection, since it differs by OS
++            pthread="yes"
+             ;;
+         --disable-pthread)
+             pthread="no"
+@@ -150,7 +150,7 @@ for opt do
+             shared="yes"
+             ;;
+         --enable-visualize)
+-            LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -lX11"
++            LDFLAGS="$LDFLAGS -lX11"
+             CFLAGS="$CFLAGS -DVISUALIZE=1"
+             vis="yes"
+             ;;
+@@ -192,6 +192,10 @@ case $host_os in
      SYS="FREEBSD"
      LDFLAGS="$LDFLAGS -lm"
      ;;
@@ -13,23 +31,16 @@ $NetBSD: patch-aa,v 1.5 2008/04/09 18:33:37 tron Exp $
    kfreebsd*-gnu)
      SYS="FREEBSD"
      CFLAGS="$CFLAGS -DHAVE_MALLOC_H"
-@@ -245,14 +249,12 @@
-       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
+@@ -247,7 +251,7 @@ case $host_cpu in
        ASFLAGS="$ASFLAGS -f elf"
      fi
-     as_check || AS="nasm"
      ;;
 -  x86_64)
 +  x86_64|amd64)
      ARCH="X86_64"
-     AS="yasm"
      if [ "$SYS" = MACOSX ];then
-@@ -264,11 +266,11 @@
+       ASFLAGS="-f macho64 -m amd64 -DPIC -DPREFIX"
+@@ -258,11 +262,11 @@ case $host_cpu in
      fi
      ;;
    powerpc|powerpc64)
@@ -43,3 +54,31 @@ $NetBSD: patch-aa,v 1.5 2008/04/09 18:33:37 tron Exp $
        ALTIVECFLAGS="$ALTIVECFLAGS -maltivec -mabi=altivec"
      fi
      ;;
+@@ -322,7 +326,7 @@ grep -q BIGE conftest.o && CFLAGS="$CFLA
+ 
+ # autodetect options that weren't forced nor disabled
+ 
+-libpthread=""
++libpthread="$PTHREAD_LDFLAGS $PTHREAD_LIBS"
+ if test "$pthread" = "auto" ; then
+     pthread="no"
+     case $SYS in
+@@ -348,7 +352,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
+ 
+@@ -378,7 +382,8 @@ if [ "$avis_input" = "yes" ] ; then
+ fi
+ 
+ if [ "$pic" = "yes" ] ; then
+-    CFLAGS="$CFLAGS -fPIC"
++    CFLAGS="$CFLAGS"
++    PICFLAG="-prefer-pic"
+     ASFLAGS="$ASFLAGS -DPIC"
+     # resolve textrels in the x86 asm
+     cc_check stdio.h -Wl,-Bsymbolic && LDFLAGS="$LDFLAGS -Wl,-Bsymbolic"
diff --git a/multimedia/x264-devel/patches/patch-ab b/multimedia/x264-devel/patches/patch-ab
index d34bb509eb1..baa59484c24 100644
--- a/multimedia/x264-devel/patches/patch-ab
+++ b/multimedia/x264-devel/patches/patch-ab
@@ -1,26 +1,20 @@
-$NetBSD: patch-ab,v 1.8 2008/07/10 13:40:40 joerg Exp $
+$NetBSD: patch-ab,v 1.9 2008/12/18 16:19:07 bjs Exp $
 
---- Makefile.orig	2008-07-10 15:34:13.000000000 +0200
+--- Makefile.orig	2008-12-12 16:45:07.000000000 -0500
 +++ Makefile
-@@ -26,7 +26,7 @@ ASMSRC  = common/i386/dct-a.asm common/i
-           common/i386/mc-a2.asm common/i386/predict-a.asm \
-           common/i386/pixel-sse2.asm common/i386/quant-a.asm \
-           common/i386/deblock-a.asm
+@@ -40,9 +40,9 @@ endif
+ ifdef ARCH_X86
+ ASFLAGS += -Icommon/x86/
+ SRCS   += common/x86/mc-c.c common/x86/predict-c.c
 -OBJASM  = $(ASMSRC:%.asm=%.o)
 +OBJASM  = $(ASMSRC:%.asm=%.lo)
- ASFLAGS += -Icommon/i386/
+ $(OBJASM): common/x86/x86inc.asm common/x86/x86util.asm
+-checkasm: tools/checkasm-a.o
++checkasm: tools/checkasm-a.lo
  endif
  endif
-@@ -40,7 +40,7 @@ ASMSRC  = common/amd64/dct-a.asm common/
-           common/amd64/mc-a2.asm common/amd64/predict-a.asm \
-           common/amd64/pixel-sse2.asm common/amd64/quant-a.asm \
-           common/amd64/deblock-a.asm
--OBJASM  = $(ASMSRC:%.asm=%.o)
-+OBJASM  = $(ASMSRC:%.asm=%.lo)
- ASFLAGS += -Icommon/amd64
- endif
- endif
-@@ -51,20 +51,20 @@ ALTIVECSRC += common/ppc/mc.c common/ppc
+ 
+@@ -52,44 +52,49 @@ ALTIVECSRC += common/ppc/mc.c common/ppc
                common/ppc/quant.c common/ppc/deblock.c \
                common/ppc/predict.c
  SRCS += $(ALTIVECSRC)
@@ -40,11 +34,12 @@ $NetBSD: patch-ab,v 1.8 2008/07/10 13:40:40 joerg Exp $
  endif
  
 -OBJS = $(SRCS:%.c=%.o)
+-OBJCLI = $(SRCCLI:%.c=%.o)
 +OBJS = $(SRCS:%.c=%.lo)
- OBJCLI = $(SRCCLI:%.c=%.o)
++OBJCLI = $(SRCCLI:%.c=%.lo)
  DEP  = depend
  
-@@ -73,15 +73,17 @@ all: default
+ .PHONY: all default fprofiled clean distclean install uninstall dox test testclean
  
  default: $(DEP) x264$(EXE)
  
@@ -52,55 +47,59 @@ $NetBSD: patch-ab,v 1.8 2008/07/10 13:40:40 joerg Exp $
 -	ar rc libx264.a $(OBJS) $(OBJASM)
 -	ranlib libx264.a
 +%.lo: %.c
-+	${LIBTOOL} --mode=compile ${CC} -c ${CFLAGS} -o $@ $<
++	${LIBTOOL} --mode=compile ${CC} -c ${CFLAGS} ${PICFLAGS} -o $@ $<
 +
 +libx264.la: .depend $(OBJS) $(OBJASM)
-+	${LIBTOOL} --mode=link ${CC} -o libx264.la $(OBJS) $(OBJASM) ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} -rpath ${PREFIX}/lib -version-info 0
++	${LIBTOOL} --mode=link \
++	${CC} -o libx264.la -rpath ${PREFIX}/lib -version-info 0 \
++	$(OBJS) $(OBJASM) ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
  
  $(SONAME): .depend $(OBJS) $(OBJASM)
- 	$(CC) -shared -o $@ $(OBJS) $(OBJASM) -Wl,-soname,$(SONAME) $(LDFLAGS)
+ 	$(CC) -shared -o $@ $(OBJS) $(OBJASM) $(SOFLAGS) $(LDFLAGS)
  
 -x264$(EXE): $(OBJCLI) libx264.a 
 -	$(CC) -o $@ $+ $(LDFLAGS)
 +x264$(EXE): $(OBJCLI) libx264.la 
 +	${LIBTOOL} --mode=link $(CC) -o $@ $+ $(LDFLAGS)
  
- libx264gtk.a: muxers.o libx264.a
- 	$(MAKE) -C gtk
-@@ -89,10 +91,10 @@ libx264gtk.a: muxers.o libx264.a
- checkasm: tools/checkasm.o libx264.a
- 	$(CC) -o $@ $+ $(LDFLAGS)
+-checkasm: tools/checkasm.o libx264.a
+-	$(CC) -o $@ $+ $(LDFLAGS)
++checkasm: tools/checkasm.lo libx264.la
++	${LIBTOOL} --mode=link $(CC) -o $@ $+ $(LDFLAGS)
  
--common/amd64/*.o: common/amd64/amd64inc.asm
--common/i386/*.o: common/i386/i386inc.asm
 -%.o: %.asm
 -	$(AS) $(ASFLAGS) -o $@ $<
-+common/amd64/*.lo: common/amd64/amd64inc.asm
-+common/i386/*.lo: common/i386/i386inc.asm
 +%.lo: %.asm
-+	${LIBTOOL} --mode=compile --tag=ASM ./strip_fopt.sh $(AS) $(ASFLAGS) -o $@ $<
++	${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 $@
++	-@ strip -x $(@:.lo=.o)
  
-@@ -150,15 +152,14 @@ distclean: clean
- 	$(MAKE) -C gtk distclean
+ .depend: config.mak
+ 	rm -f .depend
+@@ -144,21 +149,16 @@ distclean: clean
+ 	rm -f config.mak config.h x264.pc
+ 	rm -rf test/
  
- install: x264 $(SONAME)
--	install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir)
--	install -d $(DESTDIR)$(libdir) $(DESTDIR)$(libdir)/pkgconfig
-+	install -d $(DESTDIR)$(bindir)
-+	install -d $(DESTDIR)$(includedir)
-+	install -d $(DESTDIR)$(libdir)
-+	install -d $(DESTDIR)$(libdir)/pkgconfig
+-install: x264$(EXE) $(SONAME)
++install: x264$(EXE) libx264.la
+ 	install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir)
+ 	install -d $(DESTDIR)$(libdir) $(DESTDIR)$(libdir)/pkgconfig
  	install -m 644 x264.h $(DESTDIR)$(includedir)
 -	install -m 644 libx264.a $(DESTDIR)$(libdir)
-+	${LIBTOOL} --mode=install install -m 644 libx264.la $(DESTDIR)$(libdir)
++	${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libx264.la $(DESTDIR)$(libdir)
  	install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
--	install x264 $(DESTDIR)$(bindir)
+-	install x264$(EXE) $(DESTDIR)$(bindir)
 -	ranlib $(DESTDIR)$(libdir)/libx264.a
--	$(if $(SONAME), ln -sf $(SONAME) $(DESTDIR)$(libdir)/libx264.so)
++	${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} x264$(EXE) $(DESTDIR)$(bindir)
+ ifeq ($(SYS),MINGW)
+ 	$(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(bindir))
+-else
+-	$(if $(SONAME), ln -sf $(SONAME) $(DESTDIR)$(libdir)/libx264.$(SOSUFFIX))
 -	$(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir))
-+	${LIBTOOL} --mode=install install x264 $(DESTDIR)$(bindir)
+ endif
+-	$(if $(IMPLIBNAME), install -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir))
  
- install-gtk: libx264gtk.a
- 	$(MAKE) -C gtk install
+ uninstall:
+ 	rm -f $(DESTDIR)$(includedir)/x264.h $(DESTDIR)$(libdir)/libx264.a
diff --git a/multimedia/x264-devel/patches/patch-ac b/multimedia/x264-devel/patches/patch-ac
index 3a581d122e7..723527649e8 100644
--- a/multimedia/x264-devel/patches/patch-ac
+++ b/multimedia/x264-devel/patches/patch-ac
@@ -1,13 +1,77 @@
-$NetBSD: patch-ac,v 1.3 2008/07/10 15:11:53 joerg Exp $
+$NetBSD: patch-ac,v 1.4 2008/12/18 16:19:07 bjs Exp $
 
---- common/osdep.h.orig	2008-07-10 15:44:08.000000000 +0200
-+++ common/osdep.h
-@@ -44,7 +44,7 @@
- #define X264_VERSION "" // no configure script for msvc
+--- common/cpu.c.orig	2008-11-15 16:45:06.000000000 -0500
++++ common/cpu.c
+@@ -32,6 +32,10 @@
+ #include <sys/types.h>
+ #include <sys/sysctl.h>
  #endif
++#if defined(SYS_OPENBSD) || defined(SYS_NETBSD)
++#include <sys/param.h>
++#include <sys/sysctl.h>
++#endif
  
--#ifdef SYS_OPENBSD
-+#if defined(SYS_OPENBSD) || defined(SYS_SunOS)
- #define isfinite finite
+ #include "common.h"
+ #include "cpu.h"
+@@ -185,17 +189,28 @@ uint32_t x264_cpu_detect( void )
+ 
+ #elif defined( ARCH_PPC )
+ 
+-#ifdef SYS_MACOSX
++#if defined(SYS_MACOSX) || defined(SYS_OPENBSD) || defined(SYS_NETBSD)
+ #include <sys/sysctl.h>
++#if defined(SYS_OPENBSD) || defined(SYS_NETBSD)
++#include <machine/cpu.h>
++#endif
+ uint32_t x264_cpu_detect( void )
+ {
+     /* Thank you VLC */
+     uint32_t cpu = 0;
+-    int      selectors[2] = { CTL_HW, HW_VECTORUNIT };
+-    int      has_altivec = 0;
++    int      selectors[2];
++    int      has_altivec = 0, error;
+     size_t   length = sizeof( has_altivec );
+-    int      error = sysctl( selectors, 2, &has_altivec, &length, NULL, 0 );
+ 
++#if defined(SYS_OPENBSD) || defined(SYS_NETBSD)
++    selectors[0] = CTL_MACHDEP;
++    selectors[1] = CPU_ALTIVEC;
++#else
++    selectors[0] = CTL_HW;
++    selectors[1] = HW_VECTORUNIT;
++#endif
++
++    error = sysctl( selectors, 2, &has_altivec, &length, NULL, 0 );
+     if( error == 0 && has_altivec != 0 )
+     {
+         cpu |= X264_CPU_ALTIVEC;
+@@ -285,7 +300,7 @@ int x264_cpu_num_processors( void )
+     get_system_info( &info );
+     return info.cpu_count;
+ 
+-#elif defined(SYS_MACOSX) || defined(SYS_FREEBSD)
++#elif defined(SYS_MACOSX) || defined(SYS_FREEBSD)
+     int numberOfCPUs;
+     size_t length = sizeof( numberOfCPUs );
+     if( sysctlbyname("hw.ncpu", &numberOfCPUs, &length, NULL, 0) )
+@@ -294,6 +309,19 @@ int x264_cpu_num_processors( void )
+     }
+     return numberOfCPUs;
+ 
++#elif defined(SYS_OPENBSD) || defined(SYS_NETBSD)
++    int mib[2], numberOfCPUs;
++    size_t length = sizeof( numberOfCPUs );
++
++    mib[0] = CTL_HW;
++    mib[1] = HW_NCPU;
++
++    if( sysctl(mib, 2, &numberOfCPUs, &length, NULL, 0) )
++    {
++        numberOfCPUs = 1;
++    }
++    return numberOfCPUs;
++
+ #else
+     return 1;
  #endif
- #if defined(_MSC_VER) || defined(SYS_SunOS) || defined(SYS_MACOSX)
diff --git a/multimedia/x264-devel/patches/patch-ad b/multimedia/x264-devel/patches/patch-ad
index c7a0b704f53..ecf5e076d6c 100644
--- a/multimedia/x264-devel/patches/patch-ad
+++ b/multimedia/x264-devel/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.1 2008/07/30 21:03:17 ahoka Exp $
+$NetBSD: patch-ad,v 1.2 2008/12/18 16:19:07 bjs Exp $
 
---- common/ppc/dct.c.orig	2007-12-18 22:45:03.000000000 +0100
-+++ common/ppc/dct.c
-@@ -22,7 +22,7 @@
-  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
-  *****************************************************************************/
- 
--#ifdef SYS_LINUX
-+#if defined(SYS_LINUX) || defined(__NetBSD__)
- #include <altivec.h>
+--- common/osdep.h.orig	2008-12-12 16:45:07.000000000 -0500
++++ common/osdep.h
+@@ -51,7 +51,7 @@
+ #define X264_VERSION "" // no configure script for msvc
  #endif
  
+-#if defined(SYS_OPENBSD) || defined(SYS_SunOS)
++#if defined(SYS_SunOS)
+ #define isfinite finite
+ #endif
+ #if defined(_MSC_VER) || defined(SYS_SunOS) || defined(SYS_MACOSX)
diff --git a/multimedia/x264-devel/patches/patch-ae b/multimedia/x264-devel/patches/patch-ae
index 8718794fb28..bb264aaf619 100644
--- a/multimedia/x264-devel/patches/patch-ae
+++ b/multimedia/x264-devel/patches/patch-ae
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.1 2008/07/30 21:03:17 ahoka Exp $
+$NetBSD: patch-ae,v 1.2 2008/12/18 16:19:07 bjs Exp $
 
---- common/ppc/deblock.c.orig	2007-12-18 22:45:03.000000000 +0100
+--- common/ppc/deblock.c.orig	2008-12-12 16:45:07.000000000 -0500
 +++ common/ppc/deblock.c
-@@ -21,7 +21,7 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+@@ -18,7 +18,7 @@
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  *****************************************************************************/
  
 -#if defined SYS_LINUX
-+#if defined(SYS_LINUX) || defined(__NetBSD__)
++#if defined(SYS_LINUX) || defined(SYS_NETBSD) || defined(SYS_OPENBSD)
  #include <altivec.h>
  #endif
  
diff --git a/multimedia/x264-devel/patches/patch-af b/multimedia/x264-devel/patches/patch-af
index 1c25c6132a6..f11f538b3e4 100644
--- a/multimedia/x264-devel/patches/patch-af
+++ b/multimedia/x264-devel/patches/patch-af
@@ -1,13 +1,13 @@
-$NetBSD: patch-af,v 1.1 2008/07/30 21:03:17 ahoka Exp $
+$NetBSD: patch-af,v 1.2 2008/12/18 16:19:07 bjs Exp $
 
---- common/ppc/mc.c.orig	2007-12-18 22:45:03.000000000 +0100
+--- common/ppc/mc.c.orig	2008-12-12 16:45:07.000000000 -0500
 +++ common/ppc/mc.c
 @@ -27,7 +27,7 @@
  #include <stdint.h>
  #include <stdarg.h>
  
 -#ifdef SYS_LINUX
-+#if defined(SYS_LINUX) || defined(__NetBSD__)
++#if defined(SYS_LINUX) || defined(SYS_NETBSD) || defined(SYS_OPENBSD)
  #include <altivec.h>
  #endif
  
diff --git a/multimedia/x264-devel/patches/patch-ag b/multimedia/x264-devel/patches/patch-ag
index d886c1e2026..063d91f4667 100644
--- a/multimedia/x264-devel/patches/patch-ag
+++ b/multimedia/x264-devel/patches/patch-ag
@@ -1,13 +1,13 @@
-$NetBSD: patch-ag,v 1.1 2008/07/30 21:03:17 ahoka Exp $
+$NetBSD: patch-ag,v 1.2 2008/12/18 16:19:08 bjs Exp $
 
---- common/ppc/pixel.c.orig	2007-12-18 22:45:03.000000000 +0100
+--- common/ppc/pixel.c.orig	2008-12-12 16:45:07.000000000 -0500
 +++ common/ppc/pixel.c
-@@ -22,7 +22,7 @@
-  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+@@ -21,7 +21,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
   *****************************************************************************/
  
 -#ifdef SYS_LINUX
-+#if defined(SYS_LINUX) || defined(__NetBSD__)
++#if defined(SYS_LINUX) || defined(SYS_NETBSD) || defined(SYS_OPENBSD)
  #include <altivec.h>
  #endif
  
diff --git a/multimedia/x264-devel/patches/patch-ah b/multimedia/x264-devel/patches/patch-ah
index aa4a2929118..acf6c620ffc 100644
--- a/multimedia/x264-devel/patches/patch-ah
+++ b/multimedia/x264-devel/patches/patch-ah
@@ -1,13 +1,13 @@
-$NetBSD: patch-ah,v 1.1 2008/07/30 21:03:17 ahoka Exp $
+$NetBSD: patch-ah,v 1.2 2008/12/18 16:19:08 bjs Exp $
 
---- common/ppc/predict.c.orig	2007-12-18 22:45:03.000000000 +0100
+--- common/ppc/predict.c.orig	2008-12-12 16:45:07.000000000 -0500
 +++ common/ppc/predict.c
-@@ -20,7 +20,7 @@
-  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+@@ -18,7 +18,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
   *****************************************************************************/
  
 -#ifdef SYS_LINUX
-+#if defined(SYS_LINUX) || defined(__NetBSD__)
++#if defined(SYS_LINUX) || defined(SYS_NETBSD) || defined(SYS_OPENBSD)
  #include <altivec.h>
  #endif
  
diff --git a/multimedia/x264-devel/patches/patch-ai b/multimedia/x264-devel/patches/patch-ai
index 640b9935c4c..4c53ba9a3f5 100644
--- a/multimedia/x264-devel/patches/patch-ai
+++ b/multimedia/x264-devel/patches/patch-ai
@@ -1,13 +1,13 @@
-$NetBSD: patch-ai,v 1.1 2008/07/30 21:03:17 ahoka Exp $
+$NetBSD: patch-ai,v 1.2 2008/12/18 16:19:08 bjs Exp $
 
---- common/ppc/quant.c.orig	2007-12-18 22:45:03.000000000 +0100
+--- common/ppc/quant.c.orig	2008-12-12 16:45:07.000000000 -0500
 +++ common/ppc/quant.c
 @@ -18,7 +18,7 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  *****************************************************************************/
  
 -#if defined SYS_LINUX
-+#if defined(SYS_LINUX) || defined(__NetBSD__)
++#if defined(SYS_LINUX) || defined(SYS_NETBSD) || defined(SYS_OPENBSD)
  #include <altivec.h>
  #endif
  
diff --git a/multimedia/x264-devel/patches/patch-aj b/multimedia/x264-devel/patches/patch-aj
index 6381307bb8f..d67475ed6ce 100644
--- a/multimedia/x264-devel/patches/patch-aj
+++ b/multimedia/x264-devel/patches/patch-aj
@@ -1,13 +1,13 @@
-$NetBSD: patch-aj,v 1.1 2008/07/30 21:46:04 ahoka Exp $
+$NetBSD: patch-aj,v 1.2 2008/12/18 16:19:08 bjs Exp $
 
---- common/cpu.c.orig	2007-12-18 22:45:03.000000000 +0100
+--- common/cpu.c.orig	2008-12-13 06:09:00.000000000 -0500
 +++ common/cpu.c
-@@ -154,7 +154,7 @@ uint32_t x264_cpu_detect( void )
+@@ -226,7 +226,7 @@ uint32_t x264_cpu_detect( void )
      return cpu;
  }
  
 -#elif defined( SYS_LINUX )
-+#elif defined(SYS_LINUX) || defined(__NetBSD__)
++#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-ak b/multimedia/x264-devel/patches/patch-ak
new file mode 100644
index 00000000000..bdcd6b0fd58
--- /dev/null
+++ b/multimedia/x264-devel/patches/patch-ak
@@ -0,0 +1,14 @@
+$NetBSD: patch-ak,v 1.1 2008/12/18 16:19:08 bjs Exp $
+
+--- common/display-x11.c.orig	2008-12-12 16:45:07.000000000 -0500
++++ common/display-x11.c
+@@ -22,6 +22,9 @@
+ #include <X11/Xutil.h>
+ #include <stdio.h>
+ #include <string.h>
++#ifdef HAVE_STDLIB_H
++#include <stdlib.h>
++#endif
+ 
+ #include "display.h"
+ 
diff --git a/multimedia/x264-devel/patches/patch-al b/multimedia/x264-devel/patches/patch-al
new file mode 100644
index 00000000000..576e98bcfbf
--- /dev/null
+++ b/multimedia/x264-devel/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 2008/12/18 16:19:08 bjs Exp $
+
+--- common/ppc/dct.c.orig	2008-12-12 16:45:07.000000000 -0500
++++ common/ppc/dct.c
+@@ -21,7 +21,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
+  *****************************************************************************/
+ 
+-#ifdef SYS_LINUX
++#if defined(SYS_LINUX) || defined(SYS_NETBSD) || defined(SYS_OPENBSD)
+ #include <altivec.h>
+ #endif
+ 
diff --git a/multimedia/x264-devel/patches/patch-am b/multimedia/x264-devel/patches/patch-am
new file mode 100644
index 00000000000..c1c708cb896
--- /dev/null
+++ b/multimedia/x264-devel/patches/patch-am
@@ -0,0 +1,19 @@
+$NetBSD: patch-am,v 1.1 2008/12/18 16:19:08 bjs Exp $
+
+--- common/x86/mc-a.asm.orig	2008-12-12 16:45:07.000000000 -0500
++++ common/x86/mc-a.asm
+@@ -512,12 +512,12 @@ AVG_CACHELINE_CHECK  8, 32, mmxext
+ AVG_CACHELINE_CHECK 12, 32, mmxext
+ AVG_CACHELINE_CHECK 16, 32, mmxext
+ AVG_CACHELINE_CHECK 20, 32, mmxext
+-AVG_CACHELINE_CHECK 16, 64, mmxext
+-AVG_CACHELINE_CHECK 20, 64, mmxext
+ %endif
+ 
+ AVG_CACHELINE_CHECK  8, 64, mmxext
+ AVG_CACHELINE_CHECK 12, 64, mmxext
++AVG_CACHELINE_CHECK 16, 64, mmxext
++AVG_CACHELINE_CHECK 20, 64, mmxext
+ AVG_CACHELINE_CHECK 16, 64, sse2
+ AVG_CACHELINE_CHECK 20, 64, sse2
+