Changes 20151227:

* ppc: Add detection of AltiVec support for FreeBSD
* Don't assume 16-byte stack alignment by default on x86-32
* Fix a few static analyzer performance hints
* Revise the row VBV algorithm
* Fix high bit depth lookahead cost compensation algorithm
* Correctly update the intra row predictor in B-frames
* Change the predictors update algorithm

5 files changed, 62 insertions, 74 deletions

diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile
index 7a3e94bc3ed..ad87ea5a222 100644
--- a/multimedia/x264-devel/Makefile
+++ b/multimedia/x264-devel/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.54 2015/07/18 11:08:21 adam Exp $
+# $NetBSD: Makefile,v 1.55 2015/12/28 11:37:03 adam Exp $
 
-SNAPSHOT_DATE=	20150717
+SNAPSHOT_DATE=	20151227
 
 DISTNAME=	x264-snapshot-${SNAPSHOT_DATE}-2245
 PKGNAME=	x264-devel-${SNAPSHOT_DATE}
@@ -83,6 +83,12 @@ X264_BUILD_THREADS_SUPPORT=	yes
 X264_BUILD_THREADS_SUPPORT=	${DLOPEN_REQUIRE_PTHREADS}
 .endif
 
+SUBST_CLASSES+=		netbsd
+SUBST_STAGE.netbsd=	pre-configure
+SUBST_MESSAGE.netbsd=	Adding support for NetBSD.
+SUBST_FILES.netbsd=	common/cpu.c
+SUBST_SED.netbsd=	-e 's,SYS_OPENBSD,SYS_OPENBSD || SYS_NETBSD,'
+
 .include "options.mk"
 
 post-extract:
diff --git a/multimedia/x264-devel/distinfo b/multimedia/x264-devel/distinfo
index ca5f7533803..3f3e0bbfb51 100644
--- a/multimedia/x264-devel/distinfo
+++ b/multimedia/x264-devel/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.38 2015/11/03 23:54:33 agc Exp $
+$NetBSD: distinfo,v 1.39 2015/12/28 11:37:03 adam Exp $
 
-SHA1 (x264-snapshot-20150717-2245.tar.bz2) = 491bfd031e4e4708173bacf4646098f22126c604
-RMD160 (x264-snapshot-20150717-2245.tar.bz2) = 3d5eb71c3dcf2bddcff53e3da355459b1a053a6c
-SHA512 (x264-snapshot-20150717-2245.tar.bz2) = bef87294fd21b1cfad2e04ec64e30b5859433c8c3c71f95ae075d01b33e0cf8fc981eeb6d7b48ac4d4789a1abfe5faa743d978f09b4e54c32d0a1f8ebcf09cbd
-Size (x264-snapshot-20150717-2245.tar.bz2) = 673063 bytes
-SHA1 (patch-aa) = cfb5c8f90548aa2ee2cdfadc34010033f2288258
-SHA1 (patch-ab) = c85db90485a397262bc4b0fea0d17075182ab3e3
-SHA1 (patch-ac) = e81a4c74cca30a0d3191817ada915fc956362509
+SHA1 (x264-snapshot-20151227-2245.tar.bz2) = 51f86923adcc3d929037e786a64df4fa0b0f8c95
+RMD160 (x264-snapshot-20151227-2245.tar.bz2) = 30c4b8da5bf38fe3263d0c4656ce2db32ccd5bd3
+SHA512 (x264-snapshot-20151227-2245.tar.bz2) = bbfbcddcfc83bed0565d1724e855671211f809a03424529ca5560e618dfd7ccd0123cf4321d03b07b183cb3df4304c337fab1673747cdf3726cdb3246b3d95fa
+Size (x264-snapshot-20151227-2245.tar.bz2) = 725710 bytes
+SHA1 (patch-aa) = 0ae14acfebf0bd19f1d1811b3cc201c8cb3a3dc4
+SHA1 (patch-ab) = ddc71a4ee27693d5e80527efb26326c4ed9546bd
 SHA1 (patch-ba) = a8f12131e23953704361fb499b568f8f233c6be6
diff --git a/multimedia/x264-devel/patches/patch-aa b/multimedia/x264-devel/patches/patch-aa
index e576e472001..0a513ead7ed 100644
--- a/multimedia/x264-devel/patches/patch-aa
+++ b/multimedia/x264-devel/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.20 2015/01/21 18:15:17 adam Exp $
+$NetBSD: patch-aa,v 1.21 2015/12/28 11:37:03 adam Exp $
 
 Add support for DragonFly.
 Use 'amd64' as a synonym for 'x86_64'.
 Avoid endian test failure for -flto.
 Do not force compiler optimisations.
 
---- configure.orig	2014-11-28 21:45:04.000000000 +0000
+--- configure.orig	2015-10-24 20:45:04.000000000 +0000
 +++ configure
-@@ -516,6 +516,10 @@ case $host_os in
+@@ -578,6 +578,10 @@ case $host_os in
          SYS="FREEBSD"
          libm="-lm"
          ;;
@@ -18,19 +18,19 @@ Do not force compiler optimisations.
      kfreebsd*-gnu)
          SYS="FREEBSD"
          define HAVE_MALLOC_H
-@@ -639,7 +643,7 @@ case $host_cpu in
-             ASFLAGS="$ASFLAGS -f elf"
+@@ -689,7 +693,7 @@ case $host_cpu in
+             ASFLAGS="$ASFLAGS -f elf32"
          fi
          ;;
 -    x86_64)
 +    x86_64|amd64)
          ARCH="X86_64"
-         AS="yasm"
+         AS="${AS-yasm}"
          AS_EXT=".asm"
-@@ -662,14 +666,15 @@ case $host_cpu in
+@@ -713,14 +717,15 @@ case $host_cpu in
          fi
          ;;
-     powerpc|powerpc64)
+     powerpc*)
 -        ARCH="PPC"
          if [ $asm = auto ] ; then
              define HAVE_ALTIVEC
@@ -44,16 +44,16 @@ Do not force compiler optimisations.
                  CFLAGS="$CFLAGS -maltivec -mabi=altivec"
                  define HAVE_ALTIVEC_H
              fi
-@@ -817,7 +822,7 @@ ASFLAGS="$ASFLAGS -DSTACK_ALIGNMENT=$sta
- # skip endianness check for Intel Compiler and MSVS, as all supported platforms are little. each have flags that will cause the check to fail as well
+@@ -902,7 +907,7 @@ ASFLAGS="$ASFLAGS -DSTACK_ALIGNMENT=$sta
+ CPU_ENDIAN="little-endian"
  if [ $compiler = GNU ]; then
      echo "int i[2] = {0x42494745,0}; double f[2] = {0x1.0656e6469616ep+102,0};" > conftest.c
 -    $CC $CFLAGS conftest.c -c -o conftest.o 2>/dev/null || die "endian test failed"
 +    $CC $CPPFLAGS conftest.c -c -o conftest.o 2>/dev/null || die "endian test failed"
      if (${cross_prefix}strings -a conftest.o | grep -q BIGE) && (${cross_prefix}strings -a conftest.o | grep -q FPendian) ; then
          define WORDS_BIGENDIAN
-     elif !(${cross_prefix}strings -a conftest.o | grep -q EGIB && ${cross_prefix}strings -a conftest.o | grep -q naidnePF) ; then
-@@ -830,7 +835,7 @@ fi
+         CPU_ENDIAN="big-endian"
+@@ -927,7 +932,7 @@ fi
  # pthread-win32 is lgpl, prevent its use if --disable-gpl is specified and targeting windows
  [ "$SYS" = "WINDOWS" -a "$gpl" = "no" -a "$thread" = "auto" ] && thread="win32"
  
@@ -62,12 +62,11 @@ Do not force compiler optimisations.
  if [ "$thread" = "auto" ]; then
      thread="no"
      case $SYS in
-@@ -1044,10 +1049,11 @@ fi
+@@ -1141,10 +1146,10 @@ fi
  cc_check "stdint.h" "" "uint32_t test_vec __attribute__ ((vector_size (16))) = {0,1,2,3};" && define HAVE_VECTOREXT
  
  if [ "$pic" = "yes" ] ; then
--    CFLAGS="$CFLAGS -fPIC"
-+    CFLAGS="$CFLAGS"
+-    [ "$SYS" != WINDOWS -a "$SYS" != CYGWIN ] && CFLAGS="$CFLAGS -fPIC"
 +    PICFLAG="-prefer-pic"
      ASFLAGS="$ASFLAGS -DPIC"
      # resolve textrels in the x86 asm
@@ -76,7 +75,7 @@ Do not force compiler optimisations.
      [ $SYS = SunOS -a "$ARCH" = "X86" ] && SOFLAGS="$SOFLAGS -mimpure-text"
  fi
  
-@@ -1061,8 +1067,6 @@ fi
+@@ -1158,8 +1163,6 @@ fi
  
  if [ "$debug" = "yes" ]; then
      CFLAGS="-O1 -g $CFLAGS"
@@ -85,7 +84,7 @@ Do not force compiler optimisations.
  fi
  
  if cc_check '' -fno-tree-vectorize ; then
-@@ -1154,7 +1158,7 @@ else # gcc/icc
+@@ -1288,7 +1291,7 @@ else # gcc/icc
      DEPMM="$DEPMM -g0"
      AR="$AR rc "
      LD="$CC -o "
diff --git a/multimedia/x264-devel/patches/patch-ab b/multimedia/x264-devel/patches/patch-ab
index fcdd01eada7..92e6b619322 100644
--- a/multimedia/x264-devel/patches/patch-ab
+++ b/multimedia/x264-devel/patches/patch-ab
@@ -1,7 +1,16 @@
-$NetBSD: patch-ab,v 1.22 2015/07/18 11:08:22 adam Exp $
+$NetBSD: patch-ab,v 1.23 2015/12/28 11:37:03 adam Exp $
 
---- Makefile.orig	2015-07-17 20:45:05.000000000 +0000
+--- Makefile.orig	2015-10-24 20:45:04.000000000 +0000
 +++ Makefile
+@@ -34,7 +34,7 @@ OBJS =
+ OBJSO =
+ OBJCLI =
+ 
+-OBJCHK = tools/checkasm.o
++OBJCHK = tools/checkasm.lo
+ 
+ OBJEXAMPLE = example.o
+ 
 @@ -99,9 +99,9 @@ endif
  
  ifdef ARCH_X86
@@ -14,16 +23,29 @@ $NetBSD: patch-ab,v 1.22 2015/07/18 11:08:22 adam Exp $
  endif
  endif
  
-@@ -121,7 +121,7 @@ ASMSRC += common/arm/cpu-a.S common/arm/
+@@ -121,8 +121,8 @@ 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
+           common/arm/predict-a.S common/arm/bitstream-a.S
  SRCS   += common/arm/mc-c.c common/arm/predict-c.c
 -OBJASM  = $(ASMSRC:%.S=%.o)
+-OBJCHK += tools/checkasm-arm.o
++OBJASM  = $(ASMSRC:%.S=%.lo)
++OBJCHK += tools/checkasm-arm.lo
+ endif
+ endif
+ 
+@@ -140,8 +140,8 @@ ASMSRC += common/aarch64/bitstream-a.S \
+ SRCS   += common/aarch64/asm-offsets.c \
+           common/aarch64/mc-c.c        \
+           common/aarch64/predict-c.c
+-OBJASM  = $(ASMSRC:%.S=%.o)
+-OBJCHK += tools/checkasm-aarch64.o
 +OBJASM  = $(ASMSRC:%.S=%.lo)
++OBJCHK += tools/checkasm-aarch64.lo
  endif
  endif
  
-@@ -162,20 +162,23 @@ GENERATED += common/oclobj.h
+@@ -173,20 +173,23 @@ GENERATED += common/oclobj.h
  SRCS += common/opencl.c encoder/slicetype-cl.c
  endif
  
@@ -36,7 +58,7 @@ $NetBSD: patch-ab,v 1.22 2015/07/18 11:08:22 adam Exp $
  .PHONY: all default fprofiled clean distclean install install-* uninstall cli lib-* etags
  
 +%.lo: %.c
-+	${LIBTOOL} --mode=compile ${CC} -c ${CFLAGS} ${PICFLAGS} -o $@ $<
++	${LIBTOOL} --mode=compile ${CC} -c ${CFLAGS} ${PICFLAG} -o $@ $<
 +
  cli: x264$(EXE)
 -lib-static: $(LIBX264)
@@ -54,7 +76,7 @@ $NetBSD: patch-ab,v 1.22 2015/07/18 11:08:22 adam Exp $
  
  $(SONAME): $(GENERATED) .depend $(OBJS) $(OBJASM) $(OBJSO)
  	$(LD)$@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS)
-@@ -187,20 +190,19 @@ checkasm: checkasm$(EXE)
+@@ -198,20 +201,19 @@ checkasm: checkasm$(EXE)
  example: example$(EXE)
  endif
  
@@ -81,7 +103,7 @@ $NetBSD: patch-ab,v 1.22 2015/07/18 11:08:22 adam Exp $
  
  %.o: %.S
  	$(AS) $(ASFLAGS) -o $@ $<
-@@ -270,8 +272,7 @@ distclean: clean
+@@ -281,8 +283,7 @@ distclean: clean
  	rm -f config.mak x264_config.h config.h config.log x264.pc x264.def conftest*
  
  install-cli: cli
@@ -91,7 +113,7 @@ $NetBSD: patch-ab,v 1.22 2015/07/18 11:08:22 adam Exp $
  
  install-lib-dev:
  	$(INSTALL) -d $(DESTDIR)$(includedir)
-@@ -282,8 +283,7 @@ install-lib-dev:
+@@ -293,8 +294,7 @@ install-lib-dev:
  	$(INSTALL) -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
  
  install-lib-static: lib-static install-lib-dev
diff --git a/multimedia/x264-devel/patches/patch-ac b/multimedia/x264-devel/patches/patch-ac
deleted file mode 100644
index df18ec15f10..00000000000
--- a/multimedia/x264-devel/patches/patch-ac
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-ac,v 1.10 2014/03/04 13:59:11 adam Exp $
-
---- common/cpu.c.orig	2014-03-03 21:45:04.000000000 +0000
-+++ common/cpu.c
-@@ -39,7 +39,7 @@
- #include <sys/types.h>
- #include <sys/sysctl.h>
- #endif
--#if SYS_OPENBSD
-+#if defined(SYS_OPENBSD) || defined(SYS_NETBSD)
- #include <sys/param.h>
- #include <sys/sysctl.h>
- #include <machine/cpu.h>
-@@ -313,13 +313,13 @@ uint32_t x264_cpu_detect( void )
- 
- #elif ARCH_PPC
- 
--#if SYS_MACOSX || SYS_OPENBSD
-+#if defined(SYS_MACOSX) || defined(SYS_OPENBSD) || defined(SYS_NETBSD)
- #include <sys/sysctl.h>
- uint32_t x264_cpu_detect( void )
- {
-     /* Thank you VLC */
-     uint32_t cpu = 0;
--#if SYS_OPENBSD
-+#if defined(SYS_OPENBSD) || defined(SYS_NETBSD)
-     int      selectors[2] = { CTL_MACHDEP, CPU_ALTIVEC };
- #else
-     int      selectors[2] = { CTL_HW, HW_VECTORUNIT };
-@@ -447,7 +447,7 @@ int x264_cpu_num_processors( void )
- #elif SYS_MACOSX || SYS_FREEBSD || SYS_OPENBSD
-     int ncpu;
-     size_t length = sizeof( ncpu );
--#if SYS_OPENBSD
-+#if defined(SYS_OPENBSD) || defined(SYS_NETBSD)
-     int mib[2] = { CTL_HW, HW_NCPU };
-     if( sysctl(mib, 2, &ncpu, &length, NULL, 0) )
- #else