Index: head/emulators/citra/Makefile =================================================================== --- head/emulators/citra/Makefile (revision 472028) +++ head/emulators/citra/Makefile (revision 472029) @@ -1,96 +1,96 @@ # $FreeBSD$ PORTNAME= citra -PORTVERSION= s20180603 +PORTVERSION= s20180607 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 BROKEN_FreeBSD_10= libc++ does not support C++17 features e.g., weak_from_this BUILD_DEPENDS= boost-libs>=1.66:devel/boost-libs USE_GITHUB= yes GH_ACCOUNT= citra-emu -GH_TAGNAME= 8e02c70e8 +GH_TAGNAME= 98438258c GH_TUPLE= citra-emu:ext-libressl-portable:cbb1dca:libressl/externals/libressl \ - citra-emu:ext-soundtouch:1d0e6cf:soundtouch/externals/soundtouch \ - MerryMage:dynarmic:d1d4705:dynarmic/externals/dynarmic \ + citra-emu:ext-soundtouch:060181e:soundtouch/externals/soundtouch \ + MerryMage:dynarmic:r1-2-g4b350a3:dynarmic/externals/dynarmic \ arsenm:sanitizers-cmake:f09151b:sanitizers_cmake/externals/cubeb/cmake/sanitizers-cmake \ benhoyt:inih:r40:inih/externals/inih/inih \ catchorg:Catch2:v2.2.2:catch/externals/catch \ fmtlib:fmt:4.0.0-510-g5859e58:fmt/externals/fmt \ herumi:xbyak:v5.64:xbyak/externals/xbyak \ kinetiknz:cubeb:cubeb-0.2-1039-g44341a1:cubeb/externals/cubeb \ lsalzman:enet:39a72ab:enet/externals/enet \ neobrain:nihstro:fd69de1:nihstro/externals/nihstro \ - weidai11:cryptopp:CRYPTOPP_6_1_0:cryptopp/externals/cryptopp/cryptopp + weidai11:cryptopp:CRYPTOPP_7_0_0-23-gf320e7d9: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 LDFLAGS+= -Wl,--as-needed # Qt5Network TEST_TARGET= test OPTIONS_DEFINE= ALSA PULSEAUDIO JACK SNDIO OPTIONS_DEFAULT=ALSA PULSEAUDIO JACK OPTIONS_MULTI= GUI OPTIONS_MULTI_GUI= QT5 SDL OPTIONS_SLAVE?= SDL OPTIONS_EXCLUDE:= ${OPTIONS_MULTI_GUI} ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins ALSA_CMAKE_BOOL= USE_ALSA JACK_BUILD_DEPENDS= jackit>0:audio/jack JACK_CMAKE_BOOL= USE_JACK PULSEAUDIO_BUILD_DEPENDS=pulseaudio>0.:audio/pulseaudio PULSEAUDIO_CMAKE_BOOL= USE_PULSE SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_CMAKE_BOOL= USE_SNDIO SDL_CMAKE_BOOL= ENABLE_SDL2 SDL_PLIST_FILES=bin/${PORTNAME} \ bin/${PORTNAME}-room \ man/man6/${PORTNAME}.6.gz QT5_USES= desktop-file-utils shared-mime-info QT5_USE= QT5=qmake_build,buildtools_build,concurrent_build,core,gui,multimedia,opengl,widgets QT5_CMAKE_BOOL= ENABLE_QT QT5_PLIST_FILES=bin/${PORTNAME}-qt \ "@comment bin/${PORTNAME}-room" \ 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 .ifndef QEMU_EMULATING pre-install: do-test .endif .include Index: head/emulators/citra/distinfo =================================================================== --- head/emulators/citra/distinfo (revision 472028) +++ head/emulators/citra/distinfo (revision 472029) @@ -1,27 +1,27 @@ -TIMESTAMP = 1528057852 -SHA256 (citra-emu-citra-s20180603-8e02c70e8_GH0.tar.gz) = 916c5c90909ba9c76db9c2c52f63a40e75bb8275c39afedbd9cd47cd1faa9b36 -SIZE (citra-emu-citra-s20180603-8e02c70e8_GH0.tar.gz) = 2218376 +TIMESTAMP = 1528405798 +SHA256 (citra-emu-citra-s20180607-98438258c_GH0.tar.gz) = 4dbea26bd21eeb3905a1cc7cc2b7e76e60c62c7844d1580a4169d66965175b04 +SIZE (citra-emu-citra-s20180607-98438258c_GH0.tar.gz) = 2218438 SHA256 (citra-emu-ext-libressl-portable-cbb1dca_GH0.tar.gz) = f3741a3bb480d9f8a817f032f59d1908e659620cbb93c0fe8289cfb46d2ab89c SIZE (citra-emu-ext-libressl-portable-cbb1dca_GH0.tar.gz) = 1761962 -SHA256 (citra-emu-ext-soundtouch-1d0e6cf_GH0.tar.gz) = ee4efc44220ebc52a93d7c357c19b17a7b8292b620f81bf5d3e095b20f2c8f01 -SIZE (citra-emu-ext-soundtouch-1d0e6cf_GH0.tar.gz) = 59516 -SHA256 (MerryMage-dynarmic-d1d4705_GH0.tar.gz) = cf120bc77912cf58e0965db2abcb2067c36aca612c42459e0eb72b740ea6cb0e -SIZE (MerryMage-dynarmic-d1d4705_GH0.tar.gz) = 1248870 +SHA256 (citra-emu-ext-soundtouch-060181e_GH0.tar.gz) = a593ab188e4feaeef8376c27b554cc413986efc777c195e44c6d3d223de9a63c +SIZE (citra-emu-ext-soundtouch-060181e_GH0.tar.gz) = 59514 +SHA256 (MerryMage-dynarmic-r1-2-g4b350a3_GH0.tar.gz) = 50f84ea7b6c349b0affd684e5cae998fa0c2638f0e65f8e96554c6e54c2409f6 +SIZE (MerryMage-dynarmic-r1-2-g4b350a3_GH0.tar.gz) = 1248228 SHA256 (arsenm-sanitizers-cmake-f09151b_GH0.tar.gz) = 40d826a6c98fdedf1097bdb96944b2905be507ed5d11e74480680d459fc22431 SIZE (arsenm-sanitizers-cmake-f09151b_GH0.tar.gz) = 6856 SHA256 (benhoyt-inih-r40_GH0.tar.gz) = 0a7d8600c523ccd2d01a5bec2ef3a6482ada49794e67cf694d2bec796cb2c340 SIZE (benhoyt-inih-r40_GH0.tar.gz) = 11436 SHA256 (catchorg-Catch2-v2.2.2_GH0.tar.gz) = e93aacf012579093fe6b4e686ff0488975cabee1e6b4e4f27a0acd898e8f09fd SIZE (catchorg-Catch2-v2.2.2_GH0.tar.gz) = 497244 SHA256 (fmtlib-fmt-4.0.0-510-g5859e58_GH0.tar.gz) = 6d719fe37c54ffcd6a7c1679a288e4947304cc24b4ff00aaf679ef0b0474a7b3 SIZE (fmtlib-fmt-4.0.0-510-g5859e58_GH0.tar.gz) = 623334 SHA256 (herumi-xbyak-v5.64_GH0.tar.gz) = e329c76774ef8e1e89b6407de70e29ed1f93ad4abbfc12437f5e2b74d69b3acf SIZE (herumi-xbyak-v5.64_GH0.tar.gz) = 212271 SHA256 (kinetiknz-cubeb-cubeb-0.2-1039-g44341a1_GH0.tar.gz) = b3814177e98a26806a8c224b1994c7d2026708d149a3fc835d020595c88d32e1 SIZE (kinetiknz-cubeb-cubeb-0.2-1039-g44341a1_GH0.tar.gz) = 194990 SHA256 (lsalzman-enet-39a72ab_GH0.tar.gz) = cdeec4d447266d93dbd56564b260c57e411dc681caba6887a7e3f152009e6be1 SIZE (lsalzman-enet-39a72ab_GH0.tar.gz) = 79471 SHA256 (neobrain-nihstro-fd69de1_GH0.tar.gz) = cebeb307aad4b9fbc4d26eb54c01c90e118bc6287ab65688a50303a59272be5a SIZE (neobrain-nihstro-fd69de1_GH0.tar.gz) = 110417 -SHA256 (weidai11-cryptopp-CRYPTOPP_6_1_0_GH0.tar.gz) = 69ee71fdff9cc0d56634712703c8eba97204bf58feacdfe1a94df87faffeff55 -SIZE (weidai11-cryptopp-CRYPTOPP_6_1_0_GH0.tar.gz) = 7195344 +SHA256 (weidai11-cryptopp-CRYPTOPP_7_0_0-23-gf320e7d9_GH0.tar.gz) = 1d6f029b83a230561e75bab26b5aaf98055b8439363a25bf113ac9ff6f9d2ef4 +SIZE (weidai11-cryptopp-CRYPTOPP_7_0_0-23-gf320e7d9_GH0.tar.gz) = 7209489 Index: head/emulators/citra/files/patch-externals_cryptopp_cryptopp_cpu.h =================================================================== --- head/emulators/citra/files/patch-externals_cryptopp_cryptopp_cpu.h (revision 472028) +++ head/emulators/citra/files/patch-externals_cryptopp_cryptopp_cpu.h (nonexistent) @@ -1,17 +0,0 @@ -https://github.com/citra-emu/citra/issues/3796 - ---- externals/cryptopp/cryptopp/cpu.h.orig 2018-02-22 14:26:16 UTC -+++ externals/cryptopp/cryptopp/cpu.h -@@ -614,7 +614,12 @@ inline int GetCacheLineSize() - #define GNU_AS2(x, y) #x ", " #y ";" NEW_LINE - #define GNU_AS3(x, y, z) #x ", " #y ", " #z ";" NEW_LINE - #define GNU_ASL(x) "\n" #x ":" NEW_LINE -+// clang 5.0.0 and apple clang 9.0.0 don't support numerical backward jumps -+#if (CRYPTOPP_LLVM_CLANG_VERSION >= 50000) || (CRYPTOPP_APPLE_CLANG_VERSION >= 90000) -+ #define GNU_ASJ(x, y, z) ATT_PREFIX ";" NEW_LINE #x " " #y #z ";" NEW_LINE INTEL_PREFIX ";" NEW_LINE -+#else - #define GNU_ASJ(x, y, z) #x " " #y #z ";" NEW_LINE -+#endif - #define AS1(x) GNU_AS1(x) - #define AS2(x, y) GNU_AS2(x, y) - #define AS3(x, y, z) GNU_AS3(x, y, z) Property changes on: head/emulators/citra/files/patch-externals_cryptopp_cryptopp_cpu.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -CRLF \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/citra/files/patch-externals_CMakeLists.txt =================================================================== --- head/emulators/citra/files/patch-externals_CMakeLists.txt (revision 472028) +++ head/emulators/citra/files/patch-externals_CMakeLists.txt (revision 472029) @@ -1,21 +1,11 @@ -[0/1] cd /usr/ports/emulators/citra/work/.build && /usr/local/bin/cmake -P cmake_install.cmake --- Install configuration: "Release" --- Up-to-date: /usr/ports/emulators/citra/work/stage/usr/local/man/man6/citra.6 -CMake Error at externals/cubeb/cmake_install.cmake:44 (file): - file INSTALL cannot find - "/usr/ports/emulators/citra/work/citra-08b119153/include". -Call Stack (most recent call first): - externals/cmake_install.cmake:46 (include) - cmake_install.cmake:49 (include) - -FAILED: CMakeFiles/install.util +https://github.com/citra-emu/citra/pull/3805 --- externals/CMakeLists.txt.orig 2018-06-01 11:24:28 UTC +++ externals/CMakeLists.txt @@ -81,5 +81,5 @@ endif() # Cubeb if(ENABLE_CUBEB) set(BUILD_TESTS OFF CACHE BOOL "") - add_subdirectory(cubeb) + add_subdirectory(cubeb EXCLUDE_FROM_ALL) endif()