20170712:

x86: AVX-512 pixel_avg_weight_w8
x86: AVX-512 pixel_avg_weight_w16
x86: AVX-512 sub8x16_dct_dc
x86: AVX-512 sub8x8_dct_dc
x86: AVX-512 add8x8_idct
x86: AVX-512 sub16x16_dct
x86: AVX-512 sub8x8_dct
x86: AVX-512 sub4x4_dct
x86: AVX-512 mbtree_propagate_list
x86inc: Add aesni cpuflag define

4 files changed, 15 insertions, 17 deletions

diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile
index 29f07e5e666..c5a1b8bf1ba 100644
--- a/multimedia/x264-devel/Makefile
+++ b/multimedia/x264-devel/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.62 2017/06/16 05:39:23 adam Exp $
+# $NetBSD: Makefile,v 1.63 2017/07/14 08:12:33 adam Exp $
 
-SNAPSHOT_DATE=	20170615
-
-DISTNAME=	x264-snapshot-${SNAPSHOT_DATE}-2245
-PKGNAME=	x264-devel-${SNAPSHOT_DATE}
+DISTNAME=	x264-snapshot-20170712-2245
+PKGNAME=	${DISTNAME:S/-snapshot-/-devel-/:S/-2245$//}
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.videolan.org/pub/videolan/x264/snapshots/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/multimedia/x264-devel/buildlink3.mk b/multimedia/x264-devel/buildlink3.mk
index 3c967e8f12d..c604538d82f 100644
--- a/multimedia/x264-devel/buildlink3.mk
+++ b/multimedia/x264-devel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2017/06/16 05:39:23 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2017/07/14 08:12:33 adam Exp $
 
 BUILDLINK_TREE+=	x264-devel
 
@@ -19,7 +19,7 @@ X264_DEVEL_BUILDLINK3_MK:=
 ###	  Prior specification: x264-devel>=20130703 # X264_BUILD 133
 ###	  Prior specification: x264-devel>=20131015 # X264_BUILD 138
 ###
-BUILDLINK_API_DEPENDS.x264-devel?=	x264-devel>=20140303 # X264 BUILD 142
+BUILDLINK_API_DEPENDS.x264-devel+=	x264-devel>=20140303 # X264 BUILD 142
 BUILDLINK_PKGSRCDIR.x264-devel?=	../../multimedia/x264-devel
 pkgbase:= x264-devel
 .include "../../mk/pkg-build-options.mk"
diff --git a/multimedia/x264-devel/distinfo b/multimedia/x264-devel/distinfo
index 1e0fc152250..c9ddf09a8e0 100644
--- a/multimedia/x264-devel/distinfo
+++ b/multimedia/x264-devel/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.46 2017/06/16 05:39:23 adam Exp $
+$NetBSD: distinfo,v 1.47 2017/07/14 08:12:33 adam Exp $
 
-SHA1 (x264-snapshot-20170615-2245.tar.bz2) = b2988d6b54208f8ce35993463750a1b6a191480c
-RMD160 (x264-snapshot-20170615-2245.tar.bz2) = eeac6a746658b36a96ddd32efff8c0bf4fded600
-SHA512 (x264-snapshot-20170615-2245.tar.bz2) = 54b2066747cdad0804ab27e730fe1218589b979567af1c930280f83eea5aed140f09b847c48ec1bd928ab106a6eec5fb8f8c3c40fb7c9e33df513594e7bc4e23
-Size (x264-snapshot-20170615-2245.tar.bz2) = 746854 bytes
+SHA1 (x264-snapshot-20170712-2245.tar.bz2) = 1f247cfd5d122f670231dd8db84e5abadf040439
+RMD160 (x264-snapshot-20170712-2245.tar.bz2) = fd4f02d485d64b9748131baa723c8d17374dff90
+SHA512 (x264-snapshot-20170712-2245.tar.bz2) = 4d692b3dd435c51217cbe86b8f43ef82a512a18fea5fb0a5bdc8dc49a398d0c85d41fd8ea68cde24edb660e0b27a63197c35bf5b36bee5ec4378996ba79b0b0c
+Size (x264-snapshot-20170712-2245.tar.bz2) = 750522 bytes
 SHA1 (patch-Makefile) = 8637cc22e142081ad309b462fb30c654d3688cce
 SHA1 (patch-configure) = 0a69da50452159e0b12fb7ac294d1f15cd42bdca
-SHA1 (patch-encoder_analyse.c) = 1ef090172fd8a48d4e031525ac82433865d549e2
+SHA1 (patch-encoder_analyse.c) = 2057583899e029a4c2173c511293e6a35cf80f78
diff --git a/multimedia/x264-devel/patches/patch-encoder_analyse.c b/multimedia/x264-devel/patches/patch-encoder_analyse.c
index 4bce7588bb9..da1e8d054e2 100644
--- a/multimedia/x264-devel/patches/patch-encoder_analyse.c
+++ b/multimedia/x264-devel/patches/patch-encoder_analyse.c
@@ -1,13 +1,13 @@
-$NetBSD: patch-encoder_analyse.c,v 1.1 2017/06/16 05:39:23 adam Exp $
+$NetBSD: patch-encoder_analyse.c,v 1.2 2017/07/14 08:12:34 adam Exp $
 
 Use logf() instead of log2f.
 
---- encoder/analyse.c.orig	2017-06-15 20:45:03.000000000 +0000
+--- encoder/analyse.c.orig	2017-07-12 20:45:03.000000000 +0000
 +++ encoder/analyse.c
-@@ -306,7 +306,7 @@ int x264_analyse_init_costs( x264_t *h )
+@@ -309,7 +309,7 @@ int x264_analyse_init_costs( x264_t *h )
  
      logs[0] = 0.718f;
-     for( int i = 1; i <= 2*4*2048; i++ )
+     for( int i = 1; i <= 2*4*mv_range; i++ )
 -        logs[i] = log2f( i+1 ) * 2.0f + 1.718f;
 +        logs[i] = logf(i+1)*2.88539f + 1.718f;