x265: updated to 3.5

Version 3.5

New feature

Real-time VBV for ABR (Average BitRate) encodes in –pass 2 using --vbv-live-multi-pass: Improves VBV compliance with no significant impact on coding efficiency.

Enhancements to existing features

Improved hist-based scene cut algorithm: Reduces false positives by leveraging motion and scene transition info.
Support for RADL pictures at IDR scene cuts: Improves coding efficiency with no significant impact on performance.
Bidirectional scene cut aware Frame Quantizer Selection: Saves bits than forward masking with no noticeable perceptual quality difference.

API changes

Additions to x265_param structure to support the newly added features and encoder enhancements.
New x265_param options --min-vbv-fullness and --max-vbv-fullness to control min and max VBV fullness.

Bug fixes

Incorrect VBV lookahead in --analysis-load + --scale-factor.
Encoder hang when VBV is used with slices.
QP spikes in the row-level VBV rate-control when WPP enabled.
Encoder crash in --abr-ladder.

5 files changed, 51 insertions, 23 deletions

diff --git a/multimedia/x265/Makefile b/multimedia/x265/Makefile
index 221bcacdaa7..f7d7197046e 100644
--- a/multimedia/x265/Makefile
+++ b/multimedia/x265/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.33 2020/10/29 23:58:07 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2021/04/10 08:36:03 adam Exp $
 
-DISTNAME=	x265_3.4
+DISTNAME=	x265_3.5
 PKGNAME=	${DISTNAME:S/_/-/}
 CATEGORIES=	multimedia
-MASTER_SITES=	https://bitbucket.org/multicoreware/x265/downloads/
+MASTER_SITES=	https://bitbucket.org/multicoreware/x265_git/downloads/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.x265.org/
@@ -12,8 +12,17 @@ LICENSE=	gnu-gpl-v2
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/source
 
-.include "../../mk/bsd.prefs.mk"
+USE_CMAKE=		yes
+USE_LANGUAGES=		c c++
+
+CMAKE_ARGS+=	-DENABLE_PIC=ON
+# Set version here instead of relying on git; see patch-CMakeLists.txt
+CMAKE_ARGS+=	-DX265_VERSION=${PKGVERSION_NOREV}
+CMAKE_ARGS+=	-DX265_LATEST_TAG=${PKGVERSION_NOREV}
+
+.include "options.mk"
 
+.include "../../mk/bsd.prefs.mk"
 .if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386"
 .  if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386"
 # Avoid text relocations
@@ -23,11 +32,4 @@ TOOL_DEPENDS+=	nasm>=2.13.0:../../devel/nasm
 .  endif
 .endif
 
-CMAKE_ARGS+=	-DENABLE_PIC=ON
-
-USE_CMAKE=		yes
-USE_LANGUAGES=		c c++
-
-.include "options.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/x265/PLIST b/multimedia/x265/PLIST
index de9f6435e86..16ffc74be2d 100644
--- a/multimedia/x265/PLIST
+++ b/multimedia/x265/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.25 2020/05/30 06:10:40 adam Exp $
+@comment $NetBSD: PLIST,v 1.26 2021/04/10 08:36:03 adam Exp $
 bin/x265
 include/x265.h
 include/x265_config.h
 lib/libx265.a
 lib/libx265.so
-lib/libx265.so.192
+lib/libx265.so.199
 lib/pkgconfig/x265.pc
diff --git a/multimedia/x265/distinfo b/multimedia/x265/distinfo
index b3b48de2766..3637f565cc4 100644
--- a/multimedia/x265/distinfo
+++ b/multimedia/x265/distinfo
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.34 2020/05/30 06:10:40 adam Exp $
+$NetBSD: distinfo,v 1.35 2021/04/10 08:36:03 adam Exp $
 
-SHA1 (x265_3.4.tar.gz) = 5bc27f7d4504fef1ea429551319c9bab49f6df4a
-RMD160 (x265_3.4.tar.gz) = e97d3fcdcceadeef20bd4287ef0ce3400ade1707
-SHA512 (x265_3.4.tar.gz) = 576b18711935e7da8433b2170d24ed159eb12ff1a18399360afa1b2132db33b463145c65ed918f667528ee954bbdfb5c69e5480f1c1df801515cefc592f3206e
-Size (x265_3.4.tar.gz) = 1469365 bytes
-SHA1 (patch-CMakeLists.txt) = fbf4d08133a48b342a060f1b45bab0253455a1b1
+SHA1 (x265_3.5.tar.gz) = dc8e70f441991289a9a34fd37e1649d59435bfae
+RMD160 (x265_3.5.tar.gz) = 07687818611d34e0fdec3360f905397095fe51d8
+SHA512 (x265_3.5.tar.gz) = 230e683239c3e262096ba96246c6f67229a1625d163f86647a411733bb1cf349685858aee3017bce818bb6992448d0abaa9241615a5b620561ce47ecb164f997
+Size (x265_3.5.tar.gz) = 1537044 bytes
+SHA1 (patch-CMakeLists.txt) = 60cc9452ae7aed5687fb95a75ad8b3aee3bf3624
 SHA1 (patch-common_cpu.cpp) = 86dd8d4a3f9cf51312cd93695beace4c4becb8c6
 SHA1 (patch-common_cpu.h) = 33e3bb9bc9cb60735aa09efa185c474ebd3e6af5
 SHA1 (patch-common_quant.cpp) = 810ba9af4ec6a767af18fe59a10feb0bca626777
+SHA1 (patch-common_version.cpp) = a1120089986e757395fa1d85b77e75d85acbc24f
 SHA1 (patch-encoder_analysis.cpp) = 28b23506e7ffbb3e019eb2ae9f749054cc865c9f
 SHA1 (patch-encoder_encoder.cpp) = 907db18c8e9afd51684ed886da70c23ac3d3652a
diff --git a/multimedia/x265/patches/patch-CMakeLists.txt b/multimedia/x265/patches/patch-CMakeLists.txt
index fd80d1f4608..a38f5e421af 100644
--- a/multimedia/x265/patches/patch-CMakeLists.txt
+++ b/multimedia/x265/patches/patch-CMakeLists.txt
@@ -1,4 +1,6 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2017/02/13 13:39:55 fhajny Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2021/04/10 08:36:03 adam Exp $
+
+Get X265_VERSION and X265_LATEST_TAG from outside.
 
 Solaris ld: Provided assembler is not PIC, so we pass "-mimpure-text"
             to the compiler so it doesn't send "-ztext" to ld.
@@ -7,9 +9,17 @@ Solaris ld: Passing "-Wa,--noexecstack" to gcc will generate an ELF section
             requesting a non executable stack. I don't know if Solaris ld
             is complying or just ignoring it.
 
---- CMakeLists.txt.OLD	2017-01-27 02:42:21.295232904 +0000
-+++ CMakeLists.txt	2017-01-27 02:51:32.144600352 +0000
-@@ -523,7 +523,11 @@
+--- CMakeLists.txt.orig	2021-03-16 12:53:00.000000000 +0000
++++ CMakeLists.txt
+@@ -485,7 +485,6 @@ if(POWER)
+     endif()
+ endif()
+ 
+-include(Version) # determine X265_VERSION and X265_LATEST_TAG
+ include_directories(. common encoder "${PROJECT_BINARY_DIR}")
+ 
+ option(ENABLE_PPA "Enable PPA profiling instrumentation" OFF)
+@@ -665,7 +664,11 @@ if(ENABLE_SHARED)
          elseif(CYGWIN)
              # Cygwin is not officially supported or tested. MinGW with msys is recommended.
          else()
diff --git a/multimedia/x265/patches/patch-common_version.cpp b/multimedia/x265/patches/patch-common_version.cpp
new file mode 100644
index 00000000000..a5da6b9bed3
--- /dev/null
+++ b/multimedia/x265/patches/patch-common_version.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-common_version.cpp,v 1.1 2021/04/10 08:36:03 adam Exp $
+
+Recognise NetBSD.
+
+--- common/version.cpp.orig	2021-04-10 08:24:32.907512619 +0000
++++ common/version.cpp
+@@ -61,6 +61,8 @@
+ #define ONOS    "[Windows]"
+ #elif  __linux
+ #define ONOS    "[Linux]"
++#elif __NetBSD__
++#define ONOS    "[NetBSD]"
+ #elif __OpenBSD__
+ #define ONOS    "[OpenBSD]"
+ #elif  __CYGWIN__