Received: by mail.netbsd.org (Postfix, from userid 605) id 3DD0D84D99; Sat, 10 Apr 2021 08:36:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7800984D69 for ; Sat, 10 Apr 2021 08:36:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id oh5Hu_o9l83P for ; Sat, 10 Apr 2021 08:36:03 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id A397D84D58 for ; Sat, 10 Apr 2021 08:36:03 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id A02B7FA95; Sat, 10 Apr 2021 08:36:03 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1618043763219270" MIME-Version: 1.0 Date: Sat, 10 Apr 2021 08:36:03 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/multimedia/x265 To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20210410083603.A02B7FA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1618043763219270 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="UTF-8" Module Name: pkgsrc Committed By: adam Date: Sat Apr 10 08:36:03 UTC 2021 Modified Files: pkgsrc/multimedia/x265: Makefile PLIST distinfo pkgsrc/multimedia/x265/patches: patch-CMakeLists.txt Added Files: pkgsrc/multimedia/x265/patches: patch-common_version.cpp Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 pkgsrc/multimedia/x265/Makefile cvs rdiff -u -r1.25 -r1.26 pkgsrc/multimedia/x265/PLIST cvs rdiff -u -r1.34 -r1.35 pkgsrc/multimedia/x265/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/x265/patches/patch-CMakeLists.txt cvs rdiff -u -r0 -r1.1 \ pkgsrc/multimedia/x265/patches/patch-common_version.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1618043763219270 Content-Disposition: inline Content-Length: 5854 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/multimedia/x265/Makefile diff -u pkgsrc/multimedia/x265/Makefile:1.33 pkgsrc/multimedia/x265/Makefile:1.34 --- pkgsrc/multimedia/x265/Makefile:1.33 Thu Oct 29 23:58:07 2020 +++ pkgsrc/multimedia/x265/Makefile Sat Apr 10 08:36:03 2021 @@ -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/ . endif .endif -CMAKE_ARGS+= -DENABLE_PIC=ON - -USE_CMAKE= yes -USE_LANGUAGES= c c++ - -.include "options.mk" - .include "../../mk/bsd.pkg.mk" Index: pkgsrc/multimedia/x265/PLIST diff -u pkgsrc/multimedia/x265/PLIST:1.25 pkgsrc/multimedia/x265/PLIST:1.26 --- pkgsrc/multimedia/x265/PLIST:1.25 Sat May 30 06:10:40 2020 +++ pkgsrc/multimedia/x265/PLIST Sat Apr 10 08:36:03 2021 @@ -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 Index: pkgsrc/multimedia/x265/distinfo diff -u pkgsrc/multimedia/x265/distinfo:1.34 pkgsrc/multimedia/x265/distinfo:1.35 --- pkgsrc/multimedia/x265/distinfo:1.34 Sat May 30 06:10:40 2020 +++ pkgsrc/multimedia/x265/distinfo Sat Apr 10 08:36:03 2021 @@ -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 Index: pkgsrc/multimedia/x265/patches/patch-CMakeLists.txt diff -u pkgsrc/multimedia/x265/patches/patch-CMakeLists.txt:1.1 pkgsrc/multimedia/x265/patches/patch-CMakeLists.txt:1.2 --- pkgsrc/multimedia/x265/patches/patch-CMakeLists.txt:1.1 Mon Feb 13 13:39:55 2017 +++ pkgsrc/multimedia/x265/patches/patch-CMakeLists.txt Sat Apr 10 08:36:03 2021 @@ -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" 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() Added files: Index: pkgsrc/multimedia/x265/patches/patch-common_version.cpp diff -u /dev/null pkgsrc/multimedia/x265/patches/patch-common_version.cpp:1.1 --- /dev/null Sat Apr 10 08:36:03 2021 +++ pkgsrc/multimedia/x265/patches/patch-common_version.cpp Sat Apr 10 08:36:03 2021 @@ -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__ --_----------=_1618043763219270--