CVS commit: pkgsrc/multimedia/x265

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri May 25 14:42:07 UTC 2018

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

Log Message:
x265: Fix overloaded function call.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/multimedia/x265/distinfo
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/multimedia/x265/patches/patch-encoder_encoder.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.23 pkgsrc/multimedia/x265/distinfo:1.24
--- pkgsrc/multimedia/x265/distinfo:1.23        Mon May 21 20:03:56 2018
+++ pkgsrc/multimedia/x265/distinfo     Fri May 25 14:42:06 2018
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.23 2018/05/21 20:03:56 adam Exp $
+$NetBSD: distinfo,v 1.24 2018/05/25 14:42:06 jperkin Exp $
 
 SHA1 (x265_2.8.tar.gz) = e2ef1ad186d9581239463d4e5177a25bc57b9fc0
 RMD160 (x265_2.8.tar.gz) = 547adcf4886f9ae60c115b5da21ff12f6c718b8d
 SHA512 (x265_2.8.tar.gz) = c2a8eaec64aa022badcbcd2a96304a9abd9d08489300b6a9c4c9d76066f3d9848e6948238c84ae16ea91bff0b2fac528a67ee29950d94dcd0ea7c0e9e7baa714
 Size (x265_2.8.tar.gz) = 1379551 bytes
 SHA1 (patch-CMakeLists.txt) = fbf4d08133a48b342a060f1b45bab0253455a1b1
+SHA1 (patch-encoder_encoder.cpp) = 907db18c8e9afd51684ed886da70c23ac3d3652a

Added files:

Index: pkgsrc/multimedia/x265/patches/patch-encoder_encoder.cpp
diff -u /dev/null pkgsrc/multimedia/x265/patches/patch-encoder_encoder.cpp:1.3
--- /dev/null   Fri May 25 14:42:07 2018
+++ pkgsrc/multimedia/x265/patches/patch-encoder_encoder.cpp    Fri May 25 14:42:07 2018
@@ -0,0 +1,14 @@
+$NetBSD: patch-encoder_encoder.cpp,v 1.3 2018/05/25 14:42:07 jperkin Exp $
+
+Fix error: call of overloaded 'pow(int, int)' is ambiguous
+
+--- encoder/encoder.cpp.orig   2018-05-21 08:33:10.000000000 +0000
++++ encoder/encoder.cpp
+@@ -55,6 +55,7 @@ const char g_sliceTypeToChar[] = {'B', '
+ static const char* defaultAnalysisFileName = "x265_analysis.dat";
+ 
+ using namespace X265_NS;
++using std::pow;
+ 
+ Encoder::Encoder()
+ {