Date: Mon, 11 Feb 2019 08:59:01 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r492675 - in head/emulators/visualboyadvance-m: . files Message-ID: <201902110859.x1B8x12B031636@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Mon Feb 11 08:59:01 2019 New Revision: 492675 URL: https://svnweb.freebsd.org/changeset/ports/492675 Log: Unbreak emulators/visualboyadvance-m fex/fex/File_Extractor.h:181:58: error: cannot initialize return object of type 'blargg_err_t' (aka 'const char *') with an lvalue of type 'const int' inline blargg_err_t File_Extractor::rewind_v() { return blargg_ok; } PR: 223538 Submitted by: w.schwarzenfeld@utanet.at (based on) Added: head/emulators/visualboyadvance-m/files/patch-fex_fex_blargg__common.h (contents, props changed) head/emulators/visualboyadvance-m/files/patch-src_gba_Cheats.cpp (contents, props changed) Modified: head/emulators/visualboyadvance-m/Makefile Modified: head/emulators/visualboyadvance-m/Makefile ============================================================================== --- head/emulators/visualboyadvance-m/Makefile Mon Feb 11 08:55:59 2019 (r492674) +++ head/emulators/visualboyadvance-m/Makefile Mon Feb 11 08:59:01 2019 (r492675) @@ -13,7 +13,6 @@ LICENSE= GPLv2 LIB_DEPENDS= libpng.so:graphics/png -BROKEN= fails to build BROKEN_aarch64= fails to build: regparm is not valid on this platform BROKEN_armv6= fails to build: regparm is not valid on this platform BROKEN_armv7= fails to build: regparm is not valid on this platform @@ -41,7 +40,7 @@ DOS2UNIX_REGEX= .*\.(c|cpp|h|ypp) USE_XORG= x11 xext USE_GL= gl glu USE_SDL= sdl -USES= cmake:insource dos2unix pkgconfig +USES= compiler:c++11-lang cmake:insource dos2unix gnome gl pkgconfig INSTALLS_ICONS= yes CMAKE_ARGS= -DVERSION:STRING="${PORTVERSION}" \ -DSYSCONFDIR:STRING="${PREFIX}/etc" \ Added: head/emulators/visualboyadvance-m/files/patch-fex_fex_blargg__common.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/visualboyadvance-m/files/patch-fex_fex_blargg__common.h Mon Feb 11 08:59:01 2019 (r492675) @@ -0,0 +1,11 @@ +--- fex/fex/blargg_common.h.orig 2019-02-11 08:38:11 UTC ++++ fex/fex/blargg_common.h +@@ -12,7 +12,7 @@ + typedef const char* blargg_err_t; // 0 on success, otherwise error string + + // Success; no error +-int const blargg_ok = 0; ++const char* const blargg_ok = 0; + + // BLARGG_RESTRICT: equivalent to C99's restrict, where supported + #if __GNUC__ >= 3 || _MSC_VER >= 1100 Added: head/emulators/visualboyadvance-m/files/patch-src_gba_Cheats.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/visualboyadvance-m/files/patch-src_gba_Cheats.cpp Mon Feb 11 08:59:01 2019 (r492675) @@ -0,0 +1,21 @@ +--- src/gba/Cheats.cpp.orig 2019-02-11 08:37:58 UTC ++++ src/gba/Cheats.cpp +@@ -2477,12 +2477,12 @@ void cheatsAddCBACode(const char *code, const char *de + sscanf(buffer, "%x", &value); + + u8 array[8] = { +- address & 255, +- (address >> 8) & 255, +- (address >> 16) & 255, +- (address >> 24) & 255, +- (value & 255), +- (value >> 8) & 255, ++ static_cast<u8>(address & 255), ++ static_cast<u8>((address >> 8) & 255), ++ static_cast<u8>((address >> 16) & 255), ++ static_cast<u8>((address >> 24) & 255), ++ static_cast<u8>((value & 255)), ++ static_cast<u8>((value >> 8) & 255), + 0, + 0 + };
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902110859.x1B8x12B031636>