CVS commit: pkgsrc/multimedia/x265

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Sep 18 10:04:51 UTC 2019

Modified Files:
        pkgsrc/multimedia/x265: distinfo
Added Files:
        pkgsrc/multimedia/x265/patches: patch-encoder_analysis.cpp

Log Message:
x265: Use std::log(), fixes build on SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/multimedia/x265/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/x265/patches/patch-encoder_analysis.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/x265/distinfo
diff -u pkgsrc/multimedia/x265/distinfo:1.29 pkgsrc/multimedia/x265/distinfo:1.30
--- pkgsrc/multimedia/x265/distinfo:1.29        Wed Jul 10 09:00:57 2019
+++ pkgsrc/multimedia/x265/distinfo     Wed Sep 18 10:04:51 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2019/07/10 09:00:57 adam Exp $
+$NetBSD: distinfo,v 1.30 2019/09/18 10:04:51 jperkin Exp $
 
 SHA1 (x265_3.1.1.tar.gz) = f777e15d34b13b24e959a1469b61bf393a6d6e4d
 RMD160 (x265_3.1.1.tar.gz) = 680fdd3eedc00a8a10ffbd71b21c942bd4cfb809
@@ -8,4 +8,5 @@ SHA1 (patch-CMakeLists.txt) = fbf4d08133
 SHA1 (patch-common_cpu.cpp) = 86dd8d4a3f9cf51312cd93695beace4c4becb8c6
 SHA1 (patch-common_cpu.h) = 33e3bb9bc9cb60735aa09efa185c474ebd3e6af5
 SHA1 (patch-common_quant.cpp) = 810ba9af4ec6a767af18fe59a10feb0bca626777
+SHA1 (patch-encoder_analysis.cpp) = 28b23506e7ffbb3e019eb2ae9f749054cc865c9f
 SHA1 (patch-encoder_encoder.cpp) = 907db18c8e9afd51684ed886da70c23ac3d3652a

Added files:

Index: pkgsrc/multimedia/x265/patches/patch-encoder_analysis.cpp
diff -u /dev/null pkgsrc/multimedia/x265/patches/patch-encoder_analysis.cpp:1.1
--- /dev/null   Wed Sep 18 10:04:52 2019
+++ pkgsrc/multimedia/x265/patches/patch-encoder_analysis.cpp   Wed Sep 18 10:04:51 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-encoder_analysis.cpp,v 1.1 2019/09/18 10:04:51 jperkin Exp $
+
+Ensure std::log() is used.
+
+--- encoder/analysis.cpp.orig  2019-07-08 11:10:19.000000000 +0000
++++ encoder/analysis.cpp
+@@ -3702,7 +3702,7 @@ void Analysis::normFactor(const pixel* s
+ 
+     // 2. Calculate ac component
+     uint64_t z_k = 0;
+-    int block = (int)(((log(blockSize) / log(2)) - 2) + 0.5);
++    int block = (int)(((std::log(blockSize) / std::log(2)) - 2) + 0.5);
+     primitives.cu[block].normFact(src, blockSize, shift, &z_k);
+ 
+     // Remove the DC part