From owner-svn-ports-head@freebsd.org Tue Sep 25 19:33:10 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8B5FF10B9481; Tue, 25 Sep 2018 19:33:10 +0000 (UTC) (envelope-from martymac@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3968F7E1AB; Tue, 25 Sep 2018 19:33:10 +0000 (UTC) (envelope-from martymac@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 313C44DEB; Tue, 25 Sep 2018 19:33:10 +0000 (UTC) (envelope-from martymac@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w8PJX9Fc026471; Tue, 25 Sep 2018 19:33:09 GMT (envelope-from martymac@FreeBSD.org) Received: (from martymac@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8PJX9ic026470; Tue, 25 Sep 2018 19:33:09 GMT (envelope-from martymac@FreeBSD.org) Message-Id: <201809251933.w8PJX9ic026470@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: martymac set sender to martymac@FreeBSD.org using -f From: Ganael LAPLANCHE Date: Tue, 25 Sep 2018 19:33:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r480690 - head/emulators/dolphin-emu X-SVN-Group: ports-head X-SVN-Commit-Author: martymac X-SVN-Commit-Paths: head/emulators/dolphin-emu X-SVN-Commit-Revision: 480690 X-SVN-Commit-Repository: ports 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.27 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: Tue, 25 Sep 2018 19:33:10 -0000 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" \