From owner-svn-ports-head@freebsd.org Mon Nov 28 20:49:35 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 E8BF0C59489; Mon, 28 Nov 2016 20:49:35 +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 9E1CC1061; Mon, 28 Nov 2016 20:49:35 +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 uASKnY6s062532; Mon, 28 Nov 2016 20:49:34 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uASKnYPL062531; Mon, 28 Nov 2016 20:49:34 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201611282049.uASKnYPL062531@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Mon, 28 Nov 2016 20:49:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r427345 - head/multimedia/k9copy-kde4/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: Mon, 28 Nov 2016 20:49:36 -0000 Author: tcberner Date: Mon Nov 28 20:49:34 2016 New Revision: 427345 URL: https://svnweb.freebsd.org/changeset/ports/427345 Log: multimedia/k9copy-kde4 : fix 'abs is ambiguous Work around the call to abs() being ambigous by simply calculating the absolute value in place. PR: 214640 Approved by: just fix it, rakuco (mentor) Added: head/multimedia/k9copy-kde4/files/patch-src_backup_k9dvdbackup.cpp (contents, props changed) Added: head/multimedia/k9copy-kde4/files/patch-src_backup_k9dvdbackup.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/k9copy-kde4/files/patch-src_backup_k9dvdbackup.cpp Mon Nov 28 20:49:34 2016 (r427345) @@ -0,0 +1,25 @@ +/wrkdirs/usr/ports/multimedia/k9copy-kde4/work/k9copy-2.3.4-Source/src/backup/k9dvdbackup.cpp:888:24: error: call to 'abs' is ambiguous + *_offset = abs(vobu1->newSector - vobu2->newSector) | maskOffset1 ; + ^~~ +/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/backup/k9dvdbackup.cpp.orig 2016-11-18 20:25:13 UTC ++++ src/backup/k9dvdbackup.cpp +@@ -885,7 +885,8 @@ k9Vobu * k9DVDBackup::remapOffset(uint32 + + + if ((vobu1 !=NULL) && (vobu2!=NULL)) { +- *_offset = abs(vobu1->newSector - vobu2->newSector) | maskOffset1 ; ++ uint32_t delta = ( vobu1->newSector > vobu2->newSector ? vobu1->newSector - vobu2->newSector : vobu2->newSector - vobu1->newSector ); ++ *_offset = delta | maskOffset1 ; + *_offset |= maskOffset2; + return vobu2; + }