Received: by mail.netbsd.org (Postfix, from userid 605) id 2E9A384D45; Wed, 21 Feb 2018 12:33:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A243284D33 for ; Wed, 21 Feb 2018 12:33:47 +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 5JStoCUkmI3v for ; Wed, 21 Feb 2018 12:33:47 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id EDF2484CEF for ; Wed, 21 Feb 2018 12:33:46 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id DDDA9FB40; Wed, 21 Feb 2018 12:33:46 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1519216426144480" MIME-Version: 1.0 Date: Wed, 21 Feb 2018 12:33:46 +0000 From: "Filip Hajny" Subject: CVS commit: pkgsrc/multimedia/x265 To: pkgsrc-changes@NetBSD.org Reply-To: fhajny@netbsd.org X-Mailer: log_accum Message-Id: <20180221123346.DDDA9FB40@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1519216426144480 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: fhajny Date: Wed Feb 21 12:33:46 UTC 2018 Modified Files: pkgsrc/multimedia/x265: distinfo Added Files: pkgsrc/multimedia/x265/patches: patch-encoder_encoder.cpp Log Message: multimedia/x265: Fix build on SunOS. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 pkgsrc/multimedia/x265/distinfo cvs rdiff -u -r0 -r1.1 \ 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. --_----------=_1519216426144480 Content-Disposition: inline Content-Length: 3061 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/multimedia/x265/distinfo diff -u pkgsrc/multimedia/x265/distinfo:1.20 pkgsrc/multimedia/x265/distinfo:1.21 --- pkgsrc/multimedia/x265/distinfo:1.20 Thu Nov 30 07:38:55 2017 +++ pkgsrc/multimedia/x265/distinfo Wed Feb 21 12:33:46 2018 @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.20 2017/11/30 07:38:55 adam Exp $ +$NetBSD: distinfo,v 1.21 2018/02/21 12:33:46 fhajny 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 (patch-CMakeLists.txt) = fbf4d08133a48b342a060f1b45bab0253455a1b1 +SHA1 (patch-encoder_encoder.cpp) = 51bbbdaf7ae823237dfde5ca5480f683afbc1247 Added files: Index: pkgsrc/multimedia/x265/patches/patch-encoder_encoder.cpp diff -u /dev/null pkgsrc/multimedia/x265/patches/patch-encoder_encoder.cpp:1.1 --- /dev/null Wed Feb 21 12:33:46 2018 +++ pkgsrc/multimedia/x265/patches/patch-encoder_encoder.cpp Wed Feb 21 12:33:46 2018 @@ -0,0 +1,24 @@ +$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); + } --_----------=_1519216426144480--