Index: branches/2020Q3/emulators/citra/Makefile =================================================================== --- branches/2020Q3/emulators/citra/Makefile (revision 548274) +++ branches/2020Q3/emulators/citra/Makefile (revision 548275) @@ -1,94 +1,94 @@ # $FreeBSD$ PORTNAME= citra -PORTVERSION= s20200902 +PORTVERSION= s20200910 PORTREVISION?= 0 CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org COMMENT= Nintendo 3DS emulator/debugger LICENSE= BSD2CLAUSE BSD3CLAUSE BSL GPLv2+ ISCL LGPL21+ MIT OpenSSL 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_ISCL= ${WRKSRC}/externals/cubeb/LICENSE LICENSE_FILE_LGPL21+ = ${_LICENSE_STORE}/LGPL21 # soundtouch LICENSE_FILE_MIT= ${WRKSRC}/externals/enet/LICENSE LICENSE_FILE_OpenSSL= ${WRKSRC}/externals/libressl/COPYING USE_GITHUB= yes GH_ACCOUNT= citra-emu -GH_TAGNAME= 6a77547bd +GH_TAGNAME= df9e230d6 GH_TUPLE= citra-emu:ext-boost:36603a1:boost/externals/boost \ citra-emu:ext-libressl-portable:7d01cb0:libressl/externals/libressl \ citra-emu:ext-soundtouch:060181e:soundtouch/externals/soundtouch \ MerryMage:dynarmic:r2-37-g8d1699ba:dynarmic/externals/dynarmic \ arsenm:sanitizers-cmake:aab6948:sanitizers_cmake/externals/cubeb/cmake/sanitizers-cmake \ arun11299:cpp-jwt:v1.1.1:cpp_jwt/externals/cpp-jwt \ benhoyt:inih:r42-6-g2023872:inih/externals/inih/inih \ catchorg:Catch2:v2.3.0:catch/externals/catch \ facebook:zstd:v1.4.4:zstd/externals/zstd \ fmtlib:fmt:6.0.0-56-g4b8f8fac:fmt/externals/fmt \ herumi:xbyak:v5.95:xbyak/externals/xbyak \ kinetiknz:cubeb:cubeb-0.2-1253-g49312d4:cubeb/externals/cubeb \ lsalzman:enet:0eaf48e:enet/externals/enet \ lvandeve:lodepng:31d9704:lodepng/externals/lodepng/lodepng \ neobrain:nihstro:fd69de1:nihstro/externals/nihstro \ weidai11:cryptopp:CRYPTOPP_7_0_0-23-gf320e7d9:cryptopp/externals/cryptopp/cryptopp \ wwylele:teakra:3e032a7:teakra/externals/teakra USES= cmake compiler:c++17-lang iconv localbase:ldflags sdl USE_SDL= sdl2 # XXX https://github.com/citra-emu/citra/issues/5234 #CMAKE_ON= USE_SYSTEM_BOOST LDFLAGS+= -Wl,--as-needed # Qt5Network TEST_TARGET= test OPTIONS_DEFINE= ALSA FFMPEG PULSEAUDIO JACK SNDIO OPTIONS_DEFAULT=FFMPEG PULSEAUDIO JACK SNDIO OPTIONS_MULTI= GUI OPTIONS_MULTI_GUI= QT5 SDL OPTIONS_SLAVE?= SDL OPTIONS_EXCLUDE:= ${OPTIONS_MULTI_GUI} ALSA_BUILD_DEPENDS= alsa-lib>0:audio/alsa-lib ALSA_CMAKE_BOOL= USE_ALSA FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg FFMPEG_CMAKE_BOOL= ENABLE_FFMPEG_AUDIO_DECODER ENABLE_FFMPEG_VIDEO_DUMPER 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_BUILD_DEPENDS= sndio>0:audio/sndio SNDIO_CMAKE_BOOL= USE_SNDIO SDL_CMAKE_BOOL= ENABLE_SDL2 SDL_PLIST_FILES=bin/${PORTNAME} \ bin/${PORTNAME}-room \ share/man/man6/${PORTNAME}.6.gz QT5_USES= desktop-file-utils qt:5 shared-mime-info QT5_USE= QT=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" \ share/applications/${PORTNAME}.desktop \ share/icons/hicolor/scalable/apps/${PORTNAME}.svg \ share/man/man6/${PORTNAME}-qt.6.gz \ share/mime/packages/${PORTNAME}.xml post-patch: @${REINPLACE_CMD} -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: branches/2020Q3/emulators/citra/distinfo =================================================================== --- branches/2020Q3/emulators/citra/distinfo (revision 548274) +++ branches/2020Q3/emulators/citra/distinfo (revision 548275) @@ -1,37 +1,37 @@ -TIMESTAMP = 1599084263 -SHA256 (citra-emu-citra-s20200902-6a77547bd_GH0.tar.gz) = fc6e5f50a364954c5de960e0e0806c7687941ef9e7e0f5a3e0af3e7c4cb746f8 -SIZE (citra-emu-citra-s20200902-6a77547bd_GH0.tar.gz) = 5284903 +TIMESTAMP = 1599749278 +SHA256 (citra-emu-citra-s20200910-df9e230d6_GH0.tar.gz) = 8877debe194b21d93ec6d61a3dadf378c09570434d16b67cfdec7578ed60b2de +SIZE (citra-emu-citra-s20200910-df9e230d6_GH0.tar.gz) = 5280152 SHA256 (citra-emu-ext-boost-36603a1_GH0.tar.gz) = a1885cf0f7b1c790f8a83e963fec591bad1232e6b824e64d8db136920ec1b67d SIZE (citra-emu-ext-boost-36603a1_GH0.tar.gz) = 2351603 SHA256 (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = f3fc8c9d4991b05ca1e1c8f5907ecd3ffd9724a8dccf328087b4784cda5c7db3 SIZE (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = 1762942 SHA256 (citra-emu-ext-soundtouch-060181e_GH0.tar.gz) = a593ab188e4feaeef8376c27b554cc413986efc777c195e44c6d3d223de9a63c SIZE (citra-emu-ext-soundtouch-060181e_GH0.tar.gz) = 59514 SHA256 (MerryMage-dynarmic-r2-37-g8d1699ba_GH0.tar.gz) = d465cd339224eab9eec74e28386d1c18673128a6d43f8fa3d2fa4550f0fa7656 SIZE (MerryMage-dynarmic-r2-37-g8d1699ba_GH0.tar.gz) = 1482230 SHA256 (arsenm-sanitizers-cmake-aab6948_GH0.tar.gz) = d9009e17948aff769a6f6e16b52d4d8752c5cc2cab1e9c381d3a31fd1a680b58 SIZE (arsenm-sanitizers-cmake-aab6948_GH0.tar.gz) = 7240 SHA256 (arun11299-cpp-jwt-v1.1.1_GH0.tar.gz) = 6dbf93969ec48d97ecb6c157014985846df8c01995a0011c21f4e2c146594922 SIZE (arun11299-cpp-jwt-v1.1.1_GH0.tar.gz) = 1231375 SHA256 (benhoyt-inih-r42-6-g2023872_GH0.tar.gz) = 7ea50578066fbcff2c33a303850eb165f0aeb4dc0af1dcf0e068b3ad6acc7fea SIZE (benhoyt-inih-r42-6-g2023872_GH0.tar.gz) = 12913 SHA256 (catchorg-Catch2-v2.3.0_GH0.tar.gz) = aaf6bbf81ce8522131bae2ea4d013a77b003bbb2017614f5872d5787687f8f5f SIZE (catchorg-Catch2-v2.3.0_GH0.tar.gz) = 506374 SHA256 (facebook-zstd-v1.4.4_GH0.tar.gz) = a364f5162c7d1a455cc915e8e3cf5f4bd8b75d09bc0f53965b0c9ca1383c52c8 SIZE (facebook-zstd-v1.4.4_GH0.tar.gz) = 1962617 SHA256 (fmtlib-fmt-6.0.0-56-g4b8f8fac_GH0.tar.gz) = f9ea86d434fe49d50ee62d9a4166ece47872690a2d60956252103dff9c722d2e SIZE (fmtlib-fmt-6.0.0-56-g4b8f8fac_GH0.tar.gz) = 713067 SHA256 (herumi-xbyak-v5.95_GH0.tar.gz) = f479a0ef4e3f94f4a02d37081f2164b6b08ac6d685803a885246e10798f919e7 SIZE (herumi-xbyak-v5.95_GH0.tar.gz) = 226726 SHA256 (kinetiknz-cubeb-cubeb-0.2-1253-g49312d4_GH0.tar.gz) = a2870fbfa76f79e29f809577f921a83bb4ce2ebc74a810426b8d1953d6ccb091 SIZE (kinetiknz-cubeb-cubeb-0.2-1253-g49312d4_GH0.tar.gz) = 203221 SHA256 (lsalzman-enet-0eaf48e_GH0.tar.gz) = 50c3a47329096908d53ac906b18d5759f06600b4c6612120d18be2aee481e216 SIZE (lsalzman-enet-0eaf48e_GH0.tar.gz) = 79503 SHA256 (lvandeve-lodepng-31d9704_GH0.tar.gz) = 86e140a13d1f425d45f891a082111435d3333385d36b66c94a031c029f4422c1 SIZE (lvandeve-lodepng-31d9704_GH0.tar.gz) = 161881 SHA256 (neobrain-nihstro-fd69de1_GH0.tar.gz) = cebeb307aad4b9fbc4d26eb54c01c90e118bc6287ab65688a50303a59272be5a SIZE (neobrain-nihstro-fd69de1_GH0.tar.gz) = 110417 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 SHA256 (wwylele-teakra-3e032a7_GH0.tar.gz) = 14662b40f0eac637ea9bec201ce8e00bf1592b7b02f62b9d0b0b901e178bcf2d SIZE (wwylele-teakra-3e032a7_GH0.tar.gz) = 953167 Index: branches/2020Q3 =================================================================== --- branches/2020Q3 (revision 548274) +++ branches/2020Q3 (revision 548275) Property changes on: branches/2020Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r548270