x265: updated to 2.7

Version 2.7

New features
1. :option:--gop-lookahead can be used to extend the gop boundary(set by --keyint). The GOP will be extended, if a scene-cut frame is found within this many number of frames.
2. Support for RADL pictures added in x265.
   :option:--radl can be used to decide number of RADL pictures preceding the IDR picture.

Encoder enhancements
1. Moved from YASM to NASM assembler. Supports NASM assembler version 2.13 and greater.
2. Enable analysis save and load in a single run. Introduces two new cli options --analysis-save <filename> and --analysis-load <filename>.
3. Comply to HDR10+ LLC specification.
4. Reduced x265 build time by more than 50% by re-factoring ipfilter.asm.

Bug fixes
1. Fixed inconsistent output issue in deblock filter and --const-vbv.
2. Fixed Mac OS build warnings.
3. Fixed inconsistency in pass-2 when weightp and cutree are enabled.
4. Fixed deadlock issue due to dropping of BREF frames, while forcing slice types through qp file.

4 files changed, 11 insertions, 36 deletions

diff --git a/multimedia/x265/Makefile b/multimedia/x265/Makefile
index c1146e0ab4f..f14e952ed47 100644
--- a/multimedia/x265/Makefile
+++ b/multimedia/x265/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2017/11/30 07:38:55 adam Exp $
+# $NetBSD: Makefile,v 1.21 2018/03/09 12:08:08 adam Exp $
 
-DISTNAME=	x265_2.6
+DISTNAME=	x265_2.7
 PKGNAME=	${DISTNAME:S/_/-/}
 CATEGORIES=	multimedia
 MASTER_SITES=	https://bitbucket.org/multicoreware/x265/downloads/
@@ -11,8 +11,8 @@ HOMEPAGE=	http://www.x265.org/
 COMMENT=	High Efficiency Video Coding (HEVC)
 LICENSE=	gnu-gpl-v2
 
-WRKSRC=		${WRKDIR}/${DISTNAME:S/_/_v/}/source
-BUILD_DEPENDS+=	yasm>=1.0.0:../../devel/yasm
+WRKSRC=		${WRKDIR}/${DISTNAME}/source
+BUILD_DEPENDS+=	nasm>=2.13.0:../../devel/nasm
 
 CMAKE_ARGS+=	-DENABLE_PIC=ON
 
diff --git a/multimedia/x265/PLIST b/multimedia/x265/PLIST
index 64b2c936031..4e9ccc6614e 100644
--- a/multimedia/x265/PLIST
+++ b/multimedia/x265/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.17 2017/11/30 07:38:55 adam Exp $
+@comment $NetBSD: PLIST,v 1.18 2018/03/09 12:08:08 adam Exp $
 bin/x265
 include/x265.h
 include/x265_config.h
 lib/libx265.a
 lib/libx265.so
-lib/libx265.so.146
+lib/libx265.so.151
 lib/pkgconfig/x265.pc
diff --git a/multimedia/x265/distinfo b/multimedia/x265/distinfo
index 2fa2cc416b7..a71cf56b9ec 100644
--- a/multimedia/x265/distinfo
+++ b/multimedia/x265/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.21 2018/02/21 12:33:46 fhajny Exp $
+$NetBSD: distinfo,v 1.22 2018/03/09 12:08:08 adam Exp $
 
-SHA1 (x265_2.6.tar.gz) = d3cb1066830b7fe779b6c9d8d774bbec7f8c1f5a
-RMD160 (x265_2.6.tar.gz) = 9bffc2a99c576a99a49d2ce8d8dd690c375a3972
-SHA512 (x265_2.6.tar.gz) = 35c3716313e3dfd1555dd725b60f2b3b00a615d8b8d8267439722b52021d47e34eebf94b837b92a92d40c7ffab7b3198d6391365d62672b257c0a87d1db8a736
-Size (x265_2.6.tar.gz) = 1271976 bytes
+SHA1 (x265_2.7.tar.gz) = 27642953f6f620beb669129bd581d569b27a8ae6
+RMD160 (x265_2.7.tar.gz) = 25435aecd5bc9bd03929c587b72ea9602984d47b
+SHA512 (x265_2.7.tar.gz) = 58582ff5c282a8ca6213a98495b95fa941f323fa454924e4751dde6d2a0e87a08d6e8d98012164a3d83523f2b004e7a1420b60b64719fe30f460dd10ec075094
+Size (x265_2.7.tar.gz) = 1282742 bytes
 SHA1 (patch-CMakeLists.txt) = fbf4d08133a48b342a060f1b45bab0253455a1b1
-SHA1 (patch-encoder_encoder.cpp) = 51bbbdaf7ae823237dfde5ca5480f683afbc1247
diff --git a/multimedia/x265/patches/patch-encoder_encoder.cpp b/multimedia/x265/patches/patch-encoder_encoder.cpp
deleted file mode 100644
index 1515414024e..00000000000
--- a/multimedia/x265/patches/patch-encoder_encoder.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-encoder_encoder.cpp,v 1.1 2018/02/21 12:33:46 fhajny Exp $
-
-Remove ambiguous reference. Fixes build on at least SunOS.
-
---- encoder/encoder.cpp.orig	2017-11-29 03:21:40.000000000 +0000
-+++ encoder/encoder.cpp
-@@ -575,7 +575,7 @@ int Encoder::setAnalysisDataAfterZScan(x
-                             {
-                                 int mv_x = ((analysis_inter_data *)curFrame->m_analysisData.interData)->mv[k][(mbIndex * 16) + cuOffset].x;
-                                 int mv_y = ((analysis_inter_data *)curFrame->m_analysisData.interData)->mv[k][(mbIndex * 16) + cuOffset].y;
--                                double mv = sqrt(mv_x*mv_x + mv_y*mv_y);
-+                                double mv = std::sqrt(mv_x*mv_x + mv_y*mv_y);
-                                 if (numPU == PU_2Nx2N && ((srcInterData)->depth[cuPos + cuOffset] == (m_param->maxCUSize >> 5)) && mv <= MVTHRESHOLD)
-                                     memset(&curFrame->m_analysisData.modeFlag[k][cuPos + cuOffset], 1, bytes);
-                             }
-@@ -658,7 +658,7 @@ int Encoder::setAnalysisData(x265_analys
-                                     {
-                                         int mv_x = ((analysis_inter_data *)curFrame->m_analysisData.interData)->mv[i][count + pu].x;
-                                         int mv_y = ((analysis_inter_data *)curFrame->m_analysisData.interData)->mv[i][count + pu].y;
--                                        double mv = sqrt(mv_x*mv_x + mv_y*mv_y);
-+                                        double mv = std::sqrt(mv_x*mv_x + mv_y*mv_y);
-                                         if (numPU == PU_2Nx2N && m_param->num4x4Partitions <= 16 && mv <= MVTHRESHOLD)
-                                             memset(&curFrame->m_analysisData.modeFlag[i][count + pu], 1, bytes);
-                                     }