From owner-svn-ports-head@freebsd.org Sat Nov 19 11:30:15 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3316FC492EE; Sat, 19 Nov 2016 11:30:15 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EBBB4BEB; Sat, 19 Nov 2016 11:30:14 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAJBUEeL024152; Sat, 19 Nov 2016 11:30:14 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAJBUEoV024151; Sat, 19 Nov 2016 11:30:14 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201611191130.uAJBUEoV024151@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sat, 19 Nov 2016 11:30:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r426356 - head/multimedia/kdenlive/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Nov 2016 11:30:15 -0000 Author: tcberner Date: Sat Nov 19 11:30:13 2016 New Revision: 426356 URL: https://svnweb.freebsd.org/changeset/ports/426356 Log: Fix build of multimedia/kdenlive -- ambiguity of abs() Approved by: antoine Added: head/multimedia/kdenlive/files/ head/multimedia/kdenlive/files/patch-src_scopes_audioscopes_spectrogram.cpp (contents, props changed) Added: head/multimedia/kdenlive/files/patch-src_scopes_audioscopes_spectrogram.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/kdenlive/files/patch-src_scopes_audioscopes_spectrogram.cpp Sat Nov 19 11:30:13 2016 (r426356) @@ -0,0 +1,37 @@ +Fix ambiguity of abs(). + +[7%] Building CXX object src/CMakeFiles/kdenlive.dir/scopes/audioscopes/spectrogram.cpp.o +/tmp/usr/ports/multimedia/kdenlive/work/kdenlive-16.04.3/src/scopes/audioscopes/spectrogram.cpp:276:77: error: call to 'abs' is ambiguous + hideText = m_aTrackMouse->isChecked() && m_mouseWithinWidget && abs(x-(leftDist + mouseX + 30)) < (int) minDistX + ^~~ +/usr/include/stdlib.h:83:6: note: candidate function +int abs(int) __pure2; + ^ +/usr/include/c++/v1/stdlib.h:115:44: note: candidate function +inline _LIBCPP_INLINE_VISIBILITY long abs( long __x) _NOEXCEPT {return labs(__x);} + ^ +/usr/include/c++/v1/stdlib.h:117:44: note: candidate function +inline _LIBCPP_INLINE_VISIBILITY long long abs(long long __x) _NOEXCEPT {return llabs(__x);} + ^ +[...] + +--- src/scopes/audioscopes/spectrogram.cpp.orig 2016-07-12 21:44:03 UTC ++++ src/scopes/audioscopes/spectrogram.cpp +@@ -245,7 +245,7 @@ QImage Spectrogram::renderHUD(uint) + x = leftDist + (m_innerScopeRect.width()-1) * ((float)hz)/m_freqMax; + + // Hide text if it would overlap with the text drawn at the mouse position +- hideText = m_aTrackMouse->isChecked() && m_mouseWithinWidget && abs(x-(leftDist + mouseX + 20)) < (int) minDistX + 16 ++ hideText = m_aTrackMouse->isChecked() && m_mouseWithinWidget && abs((int)(x-(leftDist + mouseX + 20))) < (int) minDistX + 16 + && mouseX < m_innerScopeRect.width() && mouseX >= 0; + + if (x <= rightBorder) { +@@ -273,7 +273,7 @@ QImage Spectrogram::renderHUD(uint) + } + // Draw the line at the very right (maximum frequency) + x = leftDist + m_innerScopeRect.width()-1; +- hideText = m_aTrackMouse->isChecked() && m_mouseWithinWidget && abs(x-(leftDist + mouseX + 30)) < (int) minDistX ++ hideText = m_aTrackMouse->isChecked() && m_mouseWithinWidget && abs((int)(x-(leftDist + mouseX + 30))) < (int) minDistX + && mouseX < m_innerScopeRect.width() && mouseX >= 0; + davinci.drawLine(x, topDist, x, topDist + m_innerScopeRect.height()+6); + if (!hideText) {