From owner-svn-ports-all@freebsd.org Tue Aug 28 12:44:47 2018 Return-Path: Delivered-To: svn-ports-all@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 5E1EE108B3CB; Tue, 28 Aug 2018 12:44:47 +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.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 13B4082325; Tue, 28 Aug 2018 12:44:47 +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 CF0605069; Tue, 28 Aug 2018 12:44:46 +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 w7SCikxV021287; Tue, 28 Aug 2018 12:44:46 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7SCikVI021285; Tue, 28 Aug 2018 12:44:46 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201808281244.w7SCikVI021285@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 28 Aug 2018 12:44:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r478309 - in head/emulators/rpcs3: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/emulators/rpcs3: . files X-SVN-Commit-Revision: 478309 X-SVN-Commit-Repository: ports 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.27 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, 28 Aug 2018 12:44:47 -0000 Author: jbeich Date: Tue Aug 28 12:44:46 2018 New Revision: 478309 URL: https://svnweb.freebsd.org/changeset/ports/478309 Log: emulators/rpcs3: unbreak on FreeBSD 10.4/11.1 Utilities/types.h:94:13: error: no member named 'byte' in namespace 'std' using std::byte; ~~~~~^ Utilities/types.h:773:18: error: no type named 'byte' in namespace 'std' alignas(A) std::byte data[S]; ~~~~~^ rpcs3/Emu/RSX/rsx_utils.h:9:10: fatal error: 'optional' file not found #include ^~~~~~~~~~ rpcs3/Emu/RSX/Overlays/overlay_controls.h:1354:20: error: no member named 'clamp' in namespace 'std' m_value = std::clamp(value, 0.f, m_limit); ~~~~~^ Reported by: pkg-fallout Pointy hat to: jbeich Added: head/emulators/rpcs3/files/extra-patch-c++14 (contents, props changed) Modified: head/emulators/rpcs3/Makefile (contents, props changed) Modified: head/emulators/rpcs3/Makefile ============================================================================== --- head/emulators/rpcs3/Makefile Tue Aug 28 12:43:27 2018 (r478308) +++ head/emulators/rpcs3/Makefile Tue Aug 28 12:44:46 2018 (r478309) @@ -42,6 +42,9 @@ USE_QT= qmake_build buildtools_build core dbus gui ne USE_XORG= x11 CMAKE_ON= CMAKE_SKIP_RPATH USE_SYSTEM_FFMPEG USE_SYSTEM_LIBPNG CMAKE_OFF= USE_NATIVE_INSTRUCTIONS +EXTRA_PATCHES+= ${EXTRA_PATCHES_${COMPILER_FEATURES:Mlib*}_${OPSYS}_${OSREL}} +EXTRA_PATCHES_libc++_FreeBSD_10.4= ${PATCHDIR}/extra-patch-c++14 +EXTRA_PATCHES_libc++_FreeBSD_11.1= ${PATCHDIR}/extra-patch-c++14 CXXFLAGS+= -D_GLIBCXX_USE_C99 # XXX ports/193528 CXXFLAGS+= -Wno-macro-redefined # __STDC_*_MACROS sys/cdefs.h vs. llvm-config LDFLAGS+= -Wl,--as-needed # GLU Added: head/emulators/rpcs3/files/extra-patch-c++14 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/rpcs3/files/extra-patch-c++14 Tue Aug 28 12:44:46 2018 (r478309) @@ -0,0 +1,104 @@ +Downgrade to C++14 as libc++ < 5 doesn't support std::byte + +--- Utilities/BEType.h.orig 2018-08-27 18:53:45 UTC ++++ Utilities/BEType.h +@@ -334,10 +334,14 @@ inline v128 operator~(const v128& other) + template + struct se_storage + { ++#if __cplusplus < 201703L ++ using type = std::aligned_storage_t; ++#else + struct type + { + alignas(Align) std::byte data[Size]; + }; ++#endif + + // Unoptimized generic byteswap for unaligned data + static void reverse(u8* dst, const u8* src) +--- Utilities/types.h.orig 2018-08-27 18:53:45 UTC ++++ Utilities/types.h +@@ -91,7 +91,11 @@ using steady_clock = std::conditional< + + namespace gsl + { ++#if __cplusplus < 201703L ++ enum class byte : u8; ++#else + using std::byte; ++#endif + } + + // Formatting helper, type-specific preprocessing for improving safety and functionality +@@ -120,6 +124,8 @@ class atomic_t; + + #if defined(__INTELLISENSE__) && !defined(_MSC_VER) + namespace std { template using void_t = void; } ++#elif defined(_LIBCPP_VERSION) && __cplusplus < 201703L ++namespace std { template using void_t = void; } + #endif + + // Extract T::simple_type if available, remove cv qualifiers +@@ -770,7 +776,11 @@ struct value_hash + template