mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-01 01:17:02 +00:00
Code Issues Releases Activity

emulators/citra: update to s20180607

Browse Source 
Changes:	8e02c70e8...98438258c
This commit is contained in:
Jan Beich 2018-06-09 00:25:29 +00:00
parent 38a5a72636
commit 854be73675
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=472029
4 changed files with 15 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
emulators/citra/Makefile
View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= citra
PORTVERSION= s20180603
PORTVERSION= s20180607
PORTREVISION?= 0
CATEGORIES= emulators
@ -23,10 +23,10 @@ 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 \
@ -35,7 +35,7 @@ GH_TUPLE= citra-emu:ext-libressl-portable:cbb1dca:libressl/externals/libressl \
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

18
emulators/citra/distinfo
View File

@ -1,12 +1,12 @@
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
@ -23,5 +23,5 @@ SHA256 (lsalzman-enet-39a72ab_GH0.tar.gz) = cdeec4d447266d93dbd56564b260c57e411d
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

12
emulators/citra/files/patch-externals_CMakeLists.txt
View File

@ -1,14 +1,4 @@
[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

17
emulators/citra/files/patch-externals_cryptopp_cryptopp_cpu.h
View File

@ -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)