From owner-svn-ports-all@freebsd.org Tue Oct 25 13:45:15 2016 Return-Path: Delivered-To: svn-ports-all@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 552F2C21645; Tue, 25 Oct 2016 13:45:15 +0000 (UTC) (envelope-from amdmi3@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 0E9E469B; Tue, 25 Oct 2016 13:45:14 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9PDjEa5093542; Tue, 25 Oct 2016 13:45:14 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9PDjESI093540; Tue, 25 Oct 2016 13:45:14 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201610251345.u9PDjESI093540@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 25 Oct 2016 13:45:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r424624 - in head/emulators/mednafen: . 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-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Oct 2016 13:45:15 -0000 Author: amdmi3 Date: Tue Oct 25 13:45:13 2016 New Revision: 424624 URL: https://svnweb.freebsd.org/changeset/ports/424624 Log: - Fix build on 11.x+ by fixing abs() issue - Mention c++11 requirement - Mark broken on 9.x: does not build due to lacking c++11 support Approved by: portmgr blanket Added: head/emulators/mednafen/files/patch-src_cdrom_CDAccess__CCD.cpp (contents, props changed) Modified: head/emulators/mednafen/Makefile Modified: head/emulators/mednafen/Makefile ============================================================================== --- head/emulators/mednafen/Makefile Tue Oct 25 13:20:28 2016 (r424623) +++ head/emulators/mednafen/Makefile Tue Oct 25 13:45:13 2016 (r424624) @@ -16,6 +16,9 @@ LIB_DEPENDS= libcdio.so:sysutils/libcdio libsndfile.so:audio/libsndfile \ libvorbis.so:audio/libvorbis +BROKEN_sparc64= does not compile due to internal compiler error +BROKEN_FreeBSD_9= does not build + GNU_CONFIGURE= yes USE_SDL= sdl net USE_GL= gl glu @@ -27,7 +30,7 @@ SUB_FILES= pkg-message CONFIGURE_ARGS+=--disable-alsa --disable-alsatest \ --with-sdl-prefix=${LOCALBASE} -USES= cpe iconv pkgconfig:build tar:bzip2 +USES= compiler:c++11-lib cpe iconv pkgconfig:build tar:bzip2 CPE_VENDOR= david_shadoff OPTIONS_DEFINE= NLS DOCS JACK @@ -70,8 +73,6 @@ SMS_CONFIGURE_ENABLE=sms SWAN_CONFIGURE_ENABLE=wswan VB_CONFIGURE_ENABLE=vb -BROKEN_sparc64= does not compile due to internal compiler error - pre-configure: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ -e 's|/usr/X11R6|${LOCALBASE}|g' \ Added: head/emulators/mednafen/files/patch-src_cdrom_CDAccess__CCD.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/mednafen/files/patch-src_cdrom_CDAccess__CCD.cpp Tue Oct 25 13:45:13 2016 (r424624) @@ -0,0 +1,11 @@ +--- src/cdrom/CDAccess_CCD.cpp.orig 2015-02-22 20:50:48 UTC ++++ src/cdrom/CDAccess_CCD.cpp +@@ -346,7 +346,7 @@ void CDAccess_CCD::CheckSubQSanity(void) + if(prev_lba != INT_MAX && abs(lba - prev_lba) > 100) + throw MDFN_Error(0, _("Garbage subchannel Q data detected(excessively large jump in AMSF)")); + +- if(abs(lba - s) > 100) ++ if(abs((long long)lba - (long long)s) > 100) + throw MDFN_Error(0, _("Garbage subchannel Q data detected(AMSF value is out of tolerance)")); + + prev_lba = lba;