From owner-svn-ports-head@freebsd.org Wed Sep 11 11:47:02 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 22D1FD079D; Wed, 11 Sep 2019 11:47:02 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46T0Vt05n7z3Kyn; Wed, 11 Sep 2019 11:47:02 +0000 (UTC) (envelope-from jbeich@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 D688F6016; Wed, 11 Sep 2019 11:47:01 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x8BBl15E005632; Wed, 11 Sep 2019 11:47:01 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8BBl1mp005631; Wed, 11 Sep 2019 11:47:01 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201909111147.x8BBl1mp005631@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 11 Sep 2019 11:47:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r511817 - head/emulators/rpcs3/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/emulators/rpcs3/files X-SVN-Commit-Revision: 511817 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.29 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: Wed, 11 Sep 2019 11:47:02 -0000 Author: jbeich Date: Wed Sep 11 11:47:01 2019 New Revision: 511817 URL: https://svnweb.freebsd.org/changeset/ports/511817 Log: emulators/rpcs3: unbreak WITH_DEBUG build ld: error: undefined symbol: id_manager::id_traits::invalid >>> referenced by sys_vm.cpp:19 (rpcs3/Emu/Cell/lv2/sys_vm.cpp:19) >>> sys_vm.cpp.o:(sys_vm_t::~sys_vm_t()) in archive rpcs3/Emu/librpcs3_emu.a Added: head/emulators/rpcs3/files/patch-rpcs3_Emu_IdManager.h (contents, props changed) Added: head/emulators/rpcs3/files/patch-rpcs3_Emu_IdManager.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/rpcs3/files/patch-rpcs3_Emu_IdManager.h Wed Sep 11 11:47:01 2019 (r511817) @@ -0,0 +1,13 @@ +https://github.com/RPCS3/rpcs3/issues/6529 + +--- rpcs3/Emu/IdManager.h.orig 2019-09-09 16:16:02 UTC ++++ rpcs3/Emu/IdManager.h +@@ -30,7 +30,7 @@ namespace id_manager + static const u32 base = T::id_base; + static const u32 step = T::id_step; + static const u32 count = T::id_count; +- static const u32 invalid = base > 0 ? 0 : -1; ++ static constexpr u32 invalid = base > 0 ? 0 : -1; + + // Note: full 32 bits range cannot be used at current implementation + static_assert(count > 0 && step > 0 && u64{step} * count + base < u64{UINT32_MAX} + (base != 0 ? 1 : 0), "ID traits: invalid object range");