Index: head/emulators/citra/Makefile =================================================================== --- head/emulators/citra/Makefile (revision 462072) +++ head/emulators/citra/Makefile (revision 462073) @@ -1,77 +1,79 @@ # $FreeBSD$ PORTNAME= citra PORTVERSION= s20180214 PORTREVISION?= 0 CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org COMMENT= Nintendo 3DS emulator/debugger LICENSE= BSD2CLAUSE BSD3CLAUSE BSL GPLv2+ LGPL21+ MIT UNLICENSE LICENSE_COMB= multi LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/externals/fmt/LICENSE.rst LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/externals/inih/inih/LICENSE.txt LICENSE_FILE_BSL= ${WRKSRC}/externals/catch/LICENSE.txt LICENSE_FILE_GPLv2+ = ${WRKSRC}/license.txt LICENSE_FILE_MIT= ${WRKSRC}/externals/enet/LICENSE LICENSE_FILE_LGPL21+ = ${_LICENSE_STORE}/LGPL21 # soundtouch BUILD_DEPENDS= boost-libs>=1.63:devel/boost-libs LIB_DEPENDS= libpng.so:graphics/png # backend_x64/hostloc.h:93:8: fatal error: no type named 'Reg64' in namespace 'Xbyak' ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= https://github.com/MerryMage/dynarmic/issues/35 USE_GITHUB= yes GH_ACCOUNT= citra-emu GH_TAGNAME= 775fb388 GH_TUPLE= citra-emu:ext-soundtouch:019d208:soundtouch/externals/soundtouch \ MerryMage:dynarmic:d1d4705:dynarmic/externals/dynarmic \ benhoyt:inih:r40:inih/externals/inih/inih \ catchorg:Catch2:v2.1.1:catch/externals/catch \ fmtlib:fmt:4.0.0:fmt/externals/fmt \ herumi:xbyak:v5.53-1-gc5da377:xbyak/externals/xbyak \ lsalzman:enet:39a72ab:enet/externals/enet \ neobrain:nihstro:fd69de1:nihstro/externals/nihstro \ weidai11:cryptopp:CRYPTOPP_6_0_0:cryptopp/externals/cryptopp/cryptopp USES= cmake:outsource compiler:c++14-lang iconv localbase:ldflags USE_SDL= sdl2 +EXTRA_PATCHES+= ${EXTRA_PATCHES_${OPSYS}_${OSREL:R}} +EXTRA_PATCHES_FreeBSD_10= ${PATCHDIR}/extra-patch-c++14 CXXFLAGS+= -D_GLIBCXX_USE_C99 -D_GLIBCXX_USE_C99_MATH_TR1 \ -D_DECLARE_C99_LDBL_MATH # XXX ports/193528 OPTIONS_DEFINE= CURL OPTIONS_DEFAULT=CURL OPTIONS_MULTI= GUI OPTIONS_MULTI_GUI= QT5 SDL OPTIONS_SLAVE?= SDL OPTIONS_EXCLUDE:= ${OPTIONS_MULTI_GUI} CURL_GH_TUPLE= whoshuu:cpr:1.3.0-12-gb5758fb:cpr/externals/cpr CURL_LIB_DEPENDS=libcurl.so:ftp/curl CURL_CMAKE_BOOL=ENABLE_WEB_SERVICE USE_SYSTEM_CURL SDL_CMAKE_BOOL= ENABLE_SDL2 SDL_PLIST_FILES=bin/${PORTNAME} \ man/man6/${PORTNAME}.6.gz QT5_USES= desktop-file-utils shared-mime-info QT5_USE= QT5=qmake_build,buildtools_build,concurrent_build,core,gui,opengl,widgets QT5_CMAKE_BOOL= ENABLE_QT QT5_PLIST_FILES=bin/${PORTNAME}-qt \ man/man6/${PORTNAME}-qt.6.gz \ share/applications/${PORTNAME}.desktop \ share/icons/hicolor/scalable/apps/${PORTNAME}.svg \ share/mime/packages/${PORTNAME}.xml post-patch: @${REINPLACE_CMD} -e 's,share/man,man,' \ -e '/check_submodules_present()/d' \ ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} -e 's/@GIT_BRANCH@/master/' \ -e 's/@GIT_DESC@/${GH_TAGNAME}/' \ ${WRKSRC}/src/common/scm_rev.cpp.in .include Index: head/emulators/citra/files/extra-patch-c++14 =================================================================== --- head/emulators/citra/files/extra-patch-c++14 (nonexistent) +++ head/emulators/citra/files/extra-patch-c++14 (revision 462073) @@ -0,0 +1,28 @@ +libc++ on FreeBSD 10.* doesn't support c++17 yet + +In file included from src/core/core_timing.cpp:12: +In file included from /usr/include/c++/v1/unordered_map:350: +/usr/include/c++/v1/__hash_table:1165:43: error: conflicting types for '__hash_table<_Tp, _Hash, _Equal, _Alloc>' +__hash_table<_Tp, _Hash, _Equal, _Alloc>::__hash_table() + ^ +/usr/include/c++/v1/__hash_table:852:5: note: previous declaration is here + __hash_table() + ^ +/usr/include/c++/v1/__hash_table:1233:43: error: conflicting types for '__hash_table<_Tp, _Hash, _Equal, _Alloc>' +__hash_table<_Tp, _Hash, _Equal, _Alloc>::__hash_table(__hash_table&& __u) + ^ +/usr/include/c++/v1/__hash_table:866:5: note: previous declaration is here + __hash_table(__hash_table&& __u) + ^ + +--- CMakeLists.txt.orig 2018-02-14 15:32:26 UTC ++++ CMakeLists.txt +@@ -89,7 +88,7 @@ message(STATUS "Target architecture: ${ARCHITECTURE}") + # Configure compilation flags + # =========================== + +-set(CMAKE_CXX_STANDARD 17) ++set(CMAKE_CXX_STANDARD 14) + set(CMAKE_CXX_STANDARD_REQUIRED ON) + + if (NOT MSVC) Property changes on: head/emulators/citra/files/extra-patch-c++14 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/emulators/citra/files/patch-CMakeLists.txt =================================================================== --- head/emulators/citra/files/patch-CMakeLists.txt (revision 462072) +++ head/emulators/citra/files/patch-CMakeLists.txt (revision 462073) @@ -1,38 +1,28 @@ -c++17 lacks std::bind2nd citra-qt currently needs SDL for audio and input --- CMakeLists.txt.orig 2017-08-09 15:54:29 UTC +++ CMakeLists.txt -@@ -89,7 +88,7 @@ message(STATUS "Target architecture: ${ARCHITECTURE}") - # Configure compilation flags - # =========================== - --set(CMAKE_CXX_STANDARD 17) -+set(CMAKE_CXX_STANDARD 14) - set(CMAKE_CXX_STANDARD_REQUIRED ON) - - if (NOT MSVC) @@ -207,15 +207,15 @@ if (ENABLE_SDL2) else() find_package(SDL2 REQUIRED) endif() - - if (SDL2_FOUND) - # TODO(yuriks): Make FindSDL2.cmake export an IMPORTED library instead - add_library(SDL2 INTERFACE) - target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARY}") - target_include_directories(SDL2 INTERFACE "${SDL2_INCLUDE_DIR}") - endif() else() - set(SDL2_FOUND NO) + find_package(SDL2) +endif() + +if (SDL2_FOUND) + # TODO(yuriks): Make FindSDL2.cmake export an IMPORTED library instead + add_library(SDL2 INTERFACE) + target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARY}") + target_include_directories(SDL2 INTERFACE "${SDL2_INCLUDE_DIR}") endif() if (ENABLE_QT) Index: head/emulators/citra/files/patch-externals_cryptopp_cryptopp_config.h =================================================================== --- head/emulators/citra/files/patch-externals_cryptopp_cryptopp_config.h (nonexistent) +++ head/emulators/citra/files/patch-externals_cryptopp_cryptopp_config.h (revision 462073) @@ -0,0 +1,13 @@ +https://github.com/citra-emu/citra/issues/3435 + +--- externals/cryptopp/cryptopp/config.h.orig 2018-01-22 20:54:51 UTC ++++ externals/cryptopp/cryptopp/config.h +@@ -1027,7 +1027,7 @@ NAMESPACE_END + #endif // alignof + + // lambdas: MS at VS2012 (17.00); GCC at 4.9; Clang at 3.3; Intel 12.0; SunCC 5.14. +-#if (CRYPTOPP_MSC_VERSION >= 1700) || __has_feature(cxx_lambda) || \ ++#if (CRYPTOPP_MSC_VERSION >= 1700) || __has_feature(cxx_lambdas) || \ + (__INTEL_COMPILER >= 1200) || (CRYPTOPP_GCC_VERSION >= 40900) || (__SUNPRO_CC >= 0x5140) + # define CRYPTOPP_CXX11_LAMBDA 1 + #endif // lambdas Property changes on: head/emulators/citra/files/patch-externals_cryptopp_cryptopp_config.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +CRLF \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property