Date: Tue, 25 Sep 2018 19:33:09 +0000 (UTC) From: Ganael LAPLANCHE <martymac@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r480690 - head/emulators/dolphin-emu Message-ID: <201809251933.w8PJX9ic026470@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: martymac Date: Tue Sep 25 19:33:09 2018 New Revision: 480690 URL: https://svnweb.freebsd.org/changeset/ports/480690 Log: Fix build error on archs where 'unsigned long' is 32bit (tested on i386): Source/Core/Core/NetPlayClient.cpp:1218:12: error: invalid operands to binary expression ('sf::Packet' and 'unsigned long') Ask lzo/lzodefs.h to prefer 'unsigned int' for type lzo_uint32_t (lzo_uint32e_t) over 'unsigned long int' because SFML's Packet& operator >>() cannot handle 'unsigned long int' as argument (see SFML/Network/Packet.hpp). It can accept a Uint32 reference, which is defined as an 'unsigned int' reference via SFML/Config.hpp. Also, set forgotten requirement for c++17-lang. Modified: head/emulators/dolphin-emu/Makefile Modified: head/emulators/dolphin-emu/Makefile ============================================================================== --- head/emulators/dolphin-emu/Makefile Tue Sep 25 18:56:13 2018 (r480689) +++ head/emulators/dolphin-emu/Makefile Tue Sep 25 19:33:09 2018 (r480690) @@ -42,7 +42,7 @@ LIB_DEPENDS= libpulse.so:audio/pulseaudio \ libcurl.so:ftp/curl \ libhidapi.so:comms/hidapi -USES= cmake compiler:c++11-lib desktop-file-utils iconv pkgconfig \ +USES= cmake compiler:c++17-lang desktop-file-utils iconv pkgconfig \ qmake qt:5 USE_GITHUB= yes @@ -63,6 +63,9 @@ CMAKE_ARGS+= -DTRY_X11:BOOL=ON \ -DCMAKE_REQUIRED_INCLUDES:PATH="${LOCALBASE}/include" \ -DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib" MAKE_ENV+= DESTDIR="${STAGEDIR}" + +# XXX Fix build on archs where 'unsigned long' is 32bit +CXXFLAGS+= -DLZO_CFG_PREFER_TYPEOF_ACC_INT32E_T=LZO_TYPEOF_INT # XXX Bypass git check (and set a dummy -unused- revision) CMAKE_ARGS+= -DDOLPHIN_WC_BRANCH:STRING="stable" \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809251933.w8PJX9ic026470>