update to x264-20170717, from Brad

multimedia/x264/Makefile

@@ -1,16 +1,15 @@
-# $OpenBSD: Makefile,v 1.42 2017/06/12 08:54:55 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.43 2017/08/10 12:01:20 sthen Exp $
 
 COMMENT=	free H.264/MPEG-4 AVC encoder
 
-V=		20170125
+V=		20170717
 DISTNAME=	x264-snapshot-${V}-2245
 PKGNAME=	x264-${V}
 CATEGORIES=	multimedia
 MASTER_SITES=	http://downloads.videolan.org/pub/videolan/x264/snapshots/
 EXTRACT_SUFX=	.tar.bz2
-REVISION=	0
 
-SHARED_LIBS=	x264	17.0
+SHARED_LIBS=	x264	18.0
 
 HOMEPAGE=	http://www.videolan.org/developers/x264.html
 
@@ -27,7 +26,7 @@ COMPILER_LANGS=	c
 MODCLANG_ARCHS=	amd64 i386
 
 .if ${MACHINE_ARCH} == "amd64"
-BUILD_DEPENDS+=	devel/yasm
+BUILD_DEPENDS+=	devel/nasm>=2.13.01
 .endif
 
 USE_GMAKE=	Yes

multimedia/x264/distinfo

@@ -1,2 +1,2 @@
-SHA256 (x264-snapshot-20170125-2245.tar.bz2) = 89zBKVQQEN2WjhiovnKKOUnD9g5DI578nCt9g46Rm8I=
-SIZE (x264-snapshot-20170125-2245.tar.bz2) = 735686
+SHA256 (x264-snapshot-20170717-2245.tar.bz2) = lSB7xxAUlKxPS99TJCERSS8ElSbDDUgDTXzAV1qTtMY=
+SIZE (x264-snapshot-20170717-2245.tar.bz2) = 750487

multimedia/x264/patches/patch-Makefile

@@ -1,6 +1,7 @@
-$OpenBSD: patch-Makefile,v 1.16 2016/05/09 06:09:09 ajacoutot Exp $
---- Makefile.orig	Sun May  8 16:45:04 2016
-+++ Makefile	Sun May  8 21:27:57 2016
+$OpenBSD: patch-Makefile,v 1.17 2017/08/10 12:01:20 sthen Exp $
+Index: Makefile
+--- Makefile.orig
++++ Makefile
 @@ -199,7 +199,7 @@ example: example$(EXE)
  endif
  
@@ -10,7 +11,7 @@ $OpenBSD: patch-Makefile,v 1.16 2016/05/09 06:09:09 ajacoutot Exp $
  
  checkasm$(EXE): $(GENERATED) .depend $(OBJCHK) $(LIBX264)
  	$(LD)$@ $(OBJCHK) $(LIBX264) $(LDFLAGS)
-@@ -302,7 +302,6 @@ ifneq ($(IMPLIBNAME),)
+@@ -303,7 +303,6 @@ ifneq ($(IMPLIBNAME),)
  	$(INSTALL) -m 755 $(SONAME) $(DESTDIR)$(bindir)
  	$(INSTALL) -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir)
  else ifneq ($(SONAME),)

multimedia/x264/patches/patch-configure

@@ -1,13 +1,14 @@
-$OpenBSD: patch-configure,v 1.22 2017/01/26 03:16:57 ajacoutot Exp $
---- configure.orig	Wed Jan 25 16:45:03 2017
-+++ configure	Wed Jan 25 20:05:15 2017
+$OpenBSD: patch-configure,v 1.23 2017/08/10 12:01:20 sthen Exp $
+Index: configure
+--- configure.orig
++++ configure
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
  
  if test x"$1" = x"-h" -o x"$1" = x"--help" ; then
  cat <<EOF
-@@ -1194,10 +1194,6 @@ if [ "$pic" = "yes" ] ; then
+@@ -1212,10 +1212,6 @@ if [ "$pic" = "yes" ] ; then
      [ $SYS = SunOS -a "$ARCH" = "X86" ] && SOFLAGS="$SOFLAGS -mimpure-text"
  fi
  
@@ -18,7 +19,7 @@ $OpenBSD: patch-configure,v 1.22 2017/01/26 03:16:57 ajacoutot Exp $
  if [ "$strip" = "yes" ]; then
      LDFLAGS="$LDFLAGS -s"
  fi
-@@ -1205,12 +1201,16 @@ fi
+@@ -1223,12 +1219,16 @@ fi
  if [ "$debug" = "yes" ]; then
      CFLAGS="-O1 -g $CFLAGS"
      RCFLAGS="$RCFLAGS -DDEBUG"
@@ -37,7 +38,7 @@ $OpenBSD: patch-configure,v 1.22 2017/01/26 03:16:57 ajacoutot Exp $
      fi
  fi
  [ "$lto" = "auto" ] && lto="no"
-@@ -1239,10 +1239,6 @@ if cc_check '' -Wshadow ; then
+@@ -1257,10 +1257,6 @@ if cc_check '' -Wshadow ; then
      CFLAGS="-Wshadow $CFLAGS"
  fi
  
@@ -48,7 +49,7 @@ $OpenBSD: patch-configure,v 1.22 2017/01/26 03:16:57 ajacoutot Exp $
  if [ $compiler = ICC -o $compiler = ICL ] ; then
      if cc_check 'extras/intel_dispatcher.h' '' 'x264_intel_dispatcher_override();' ; then
          define HAVE_INTEL_DISPATCHER
-@@ -1419,7 +1415,6 @@ if [ "$cli" = "yes" ]; then
+@@ -1437,7 +1433,6 @@ if [ "$cli" = "yes" ]; then
  fi
  
  if [ "$shared" = "yes" ]; then
@@ -56,7 +57,7 @@ $OpenBSD: patch-configure,v 1.22 2017/01/26 03:16:57 ajacoutot Exp $
      if [ "$SYS" = "WINDOWS" -o "$SYS" = "CYGWIN" ]; then
          echo "SONAME=libx264-$API.dll" >> config.mak
          if [ $compiler_style = MS ]; then
-@@ -1447,7 +1442,7 @@ if [ "$shared" = "yes" ]; then
+@@ -1465,7 +1460,7 @@ if [ "$shared" = "yes" ]; then
      else
          echo "SOSUFFIX=so" >> config.mak
          echo "SONAME=libx264.so.$API" >> config.mak