cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

emulators/yuzu: update to s20201107

Browse Source 
Changes:	91a45834f...e82997374
This commit is contained in:
Jan Beich 2020-11-08 00:20:41 +00:00
parent 007ed7c723
commit 51e3e90ff7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=554428
6 changed files with 12 additions and 331 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emulators/yuzu-qt5/Makefile
View File

@ -1,6 +1,6 @@
# $FreeBSD$
PORTREVISION= 1
PORTREVISION= 0
PKGNAMESUFFIX= -qt5
MASTERDIR= ${.CURDIR}/../yuzu

10
emulators/yuzu/Makefile
View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yuzu
PORTVERSION= s20201106
PORTVERSION= s20201107
PORTREVISION?= 0
CATEGORIES= emulators
@ -24,7 +24,6 @@ ONLY_FOR_ARCHS= aarch64 amd64 powerpc64
ONLY_FOR_ARCHS_REASON= requires int128
BUILD_DEPENDS= catch>0:devel/catch \
gmake:devel/gmake \
nlohmann-json>0:devel/nlohmann-json
LIB_DEPENDS= liblz4.so:archivers/liblz4 \
libzip.so:archivers/libzip \
@ -36,9 +35,8 @@ LIB_DEPENDS= liblz4.so:archivers/liblz4 \
USE_GITHUB= yes
GH_ACCOUNT= yuzu-emu
GH_TAGNAME= 91a45834f
GH_TUPLE= yuzu-emu:unicorn:1.0.1-153-g73f45735:unicorn/externals/unicorn \
DarkLordZach:mbedtls:a280e60:mbedtls/externals/mbedtls \
GH_TAGNAME= e82997374
GH_TUPLE= DarkLordZach:mbedtls:a280e60:mbedtls/externals/mbedtls \
KhronosGroup:SPIRV-Headers:2c51218:SPIRV_Headers/externals/sirit/externals/SPIRV-Headers \
KhronosGroup:Vulkan-Headers:v1.2.145:Vulkan_Headers/externals/Vulkan-Headers \
MerryMage:dynarmic:r3-242-g0e1112b7:dynarmic/externals/dynarmic \
@ -49,7 +47,7 @@ GH_TUPLE= yuzu-emu:unicorn:1.0.1-153-g73f45735:unicorn/externals/unicorn \
kinetiknz:cubeb:cubeb-0.2-1251-ga7e83aa:cubeb/externals/cubeb \
benhoyt:inih:r52:inih/externals/inih/inih
USES= cmake compiler:c++17-lang localbase:ldflags python:build sdl ssl
USES= cmake compiler:c++17-lang localbase:ldflags sdl ssl
USE_SDL= sdl2
LDFLAGS+= -Wl,--as-needed # Qt5Network
TEST_TARGET= test

8
emulators/yuzu/distinfo
View File

@ -1,10 +1,8 @@
TIMESTAMP = 1604687593
TIMESTAMP = 1604786493
SHA256 (libcxx-10.0.1.src.tar.xz) = def674535f22f83131353b3c382ccebfef4ba6a35c488bdb76f10b68b25be86c
SIZE (libcxx-10.0.1.src.tar.xz) = 1839172
SHA256 (yuzu-emu-yuzu-s20201106-91a45834f_GH0.tar.gz) = f4a3798e22d4f764a0a4431bb85b6587fa08fee591ae5b1b5739a3ab81a6bdcf
SIZE (yuzu-emu-yuzu-s20201106-91a45834f_GH0.tar.gz) = 4052638
SHA256 (yuzu-emu-unicorn-1.0.1-153-g73f45735_GH0.tar.gz) = 8f7b4d8eb998c2a4c146268d83b44fc22ca8d4d276f26d6af1071e51f4b5bd4f
SIZE (yuzu-emu-unicorn-1.0.1-153-g73f45735_GH0.tar.gz) = 3296254
SHA256 (yuzu-emu-yuzu-s20201107-e82997374_GH0.tar.gz) = a1fcce3d35ab51b87bf58e231c29abeb3d6e05c88ce44f472b3e6c6cdba8cdb2
SIZE (yuzu-emu-yuzu-s20201107-e82997374_GH0.tar.gz) = 4046422
SHA256 (DarkLordZach-mbedtls-a280e60_GH0.tar.gz) = 4fc6ddc256bc75b975fd5ad8bb7d31ff79c62d49daafb0108585c9ef80c6c5a7
SIZE (DarkLordZach-mbedtls-a280e60_GH0.tar.gz) = 2283313
SHA256 (KhronosGroup-SPIRV-Headers-2c51218_GH0.tar.gz) = 08f70947b69e17c7e322156adcd471cf02b4b3f63e7baf8ee0f02d32603ac5ff

35
emulators/yuzu/files/patch-externals_unicorn_make.sh
View File

@ -1,35 +0,0 @@
- DragonFly also has BSD make as make(1)
- Build verbosely to help debugging *FLAGS
- Ignore -lpthread underlinking (on WITHOUT_LLD_IS_LD) in unused samples
--- externals/unicorn/make.sh.orig 2018-01-04 00:41:12 UTC
+++ externals/unicorn/make.sh
@@ -112,7 +112,7 @@ if [ "$UNAME" = SunOS ]; then
CC=gcc
fi
-if [ -n "`echo "$UNAME" | grep BSD`" ]; then
+if [ -n "`echo "$UNAME" | grep -e DragonFly -e BSD`" ]; then
MAKE=gmake
PREFIX="${PREFIX-/usr/local}"
fi
@@ -120,15 +120,15 @@ fi
export CC INSTALL_BIN PREFIX PKGCFGDIR LIBDIRARCH LIBARCHS CFLAGS LDFLAGS
case "$1" in
- "" ) ${MAKE};;
+ "" ) ${MAKE} V=1 unicorn;;
"asan" ) asan;;
"install" ) install;;
"uninstall" ) uninstall;;
- "macos-universal" ) MACOS_UNIVERSAL=yes ${MAKE};;
- "macos-universal-no" ) MACOS_UNIVERSAL=no ${MAKE};;
+ "macos-universal" ) MACOS_UNIVERSAL=yes ${MAKE} V=1 unicorn;;
+ "macos-universal-no" ) MACOS_UNIVERSAL=no ${MAKE} V=1 unicorn;;
"cross-win32" ) build_cross i686-w64-mingw32;;
"cross-win64" ) build_cross x86_64-w64-mingw32;;
- "cross-android" ) CROSS=arm-linux-androideabi ${MAKE};;
+ "cross-android" ) CROSS=arm-linux-androideabi ${MAKE} V=1 unicorn;;
"ios" ) build_iOS;;
"ios_armv7" ) build_iOS armv7;;
"ios_armv7s" ) build_iOS armv7s;;

8
emulators/yuzu/files/patch-opus
View File

@ -286,14 +286,14 @@ Revert https://github.com/yuzu-emu/yuzu/commit/d5dfe34c4935
- opus/silk/float
- opus/src
-)
--- src/core/CMakeLists.txt.orig 2020-07-07 22:13:55 UTC
--- src/core/CMakeLists.txt.orig 2020-11-07 06:39:05 UTC
+++ src/core/CMakeLists.txt
@@ -614,7 +614,7 @@ endif()
@@ -644,7 +644,7 @@ endif()
create_target_directory_groups(core)
target_link_libraries(core PUBLIC common PRIVATE audio_core video_core)
-target_link_libraries(core PUBLIC Boost::boost PRIVATE fmt::fmt nlohmann_json::nlohmann_json mbedtls opus unicorn zip)
+target_link_libraries(core PUBLIC Boost::boost PRIVATE fmt::fmt nlohmann_json::nlohmann_json mbedtls Opus::Opus unicorn zip)
-target_link_libraries(core PUBLIC Boost::boost PRIVATE fmt::fmt nlohmann_json::nlohmann_json mbedtls opus zip)
+target_link_libraries(core PUBLIC Boost::boost PRIVATE fmt::fmt nlohmann_json::nlohmann_json mbedtls Opus::Opus zip)
if (YUZU_ENABLE_BOXCAT)
target_compile_definitions(core PRIVATE -DYUZU_ENABLE_BOXCAT)

280
emulators/yuzu/files/patch-python3
View File

@ -1,280 +0,0 @@
https://github.com/yuzu-emu/yuzu/issues/3066
https://github.com/unicorn-engine/unicorn/commit/f4cc35a24afb
--- externals/unicorn/CREDITS.TXT.orig 2018-01-04 00:41:12 UTC
+++ externals/unicorn/CREDITS.TXT
@@ -67,3 +67,4 @@ Andrew Dutcher: uc_context_{save, restore} API.
Stephen Groat: improved CI setup.
David Zimmer: VB6 binding.
zhangwm: ARM & ARM64 big endian.
+Huitao Chen (chenhuitao) & KaiJern Lau (xwings): Python3 support for building
--- externals/unicorn/qemu/configure.orig 2018-01-04 00:41:12 UTC
+++ externals/unicorn/qemu/configure
@@ -554,9 +554,8 @@ fi
# Note that if the Python conditional here evaluates True we will exit
# with status 1 which is a shell 'false' value.
-if ! $python -c 'import sys; sys.exit(sys.version_info < (2,4) or sys.version_info >= (3,))'; then
+if ! $python -c 'import sys; sys.exit(sys.version_info < (2,4))'; then
error_exit "Cannot use '$python', Python 2.4 or later is required." \
- "Note that Python 3 or later is not yet supported." \
"Use --python=/path/to/python to specify a supported Python."
fi
--- externals/unicorn/qemu/scripts/ordereddict.py.orig 2018-01-04 00:41:12 UTC
+++ externals/unicorn/qemu/scripts/ordereddict.py
@@ -20,7 +20,12 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
# OTHER DEALINGS IN THE SOFTWARE.
-from UserDict import DictMixin
+try:
+ from UserDict import UserDict
+ from UserDict import DictMixin
+except ImportError:
+ from collections import UserDict
+ from collections import MutableMapping as DictMixin
class OrderedDict(dict, DictMixin):
@@ -94,9 +99,6 @@ class OrderedDict(dict, DictMixin):
pop = DictMixin.pop
values = DictMixin.values
items = DictMixin.items
- iterkeys = DictMixin.iterkeys
- itervalues = DictMixin.itervalues
- iteritems = DictMixin.iteritems
def __repr__(self):
if not self:
--- externals/unicorn/qemu/scripts/qapi-types.py.orig 2018-01-04 00:41:12 UTC
+++ externals/unicorn/qemu/scripts/qapi-types.py
@@ -171,7 +171,7 @@ const int %(name)s_qtypes[QTYPE_MAX] = {
for key in members:
qapi_type = members[key]
- if builtin_type_qtypes.has_key(qapi_type):
+ if qapi_type in builtin_type_qtypes:
qtype = builtin_type_qtypes[qapi_type]
elif find_struct(qapi_type):
qtype = "QTYPE_QDICT"
@@ -284,8 +284,8 @@ try:
opts, args = getopt.gnu_getopt(sys.argv[1:], "chbp:i:o:",
["source", "header", "builtins",
"prefix=", "input-file=", "output-dir="])
-except getopt.GetoptError, err:
- print str(err)
+except getopt.GetoptError as err:
+ print(str(err))
sys.exit(1)
output_dir = ""
@@ -321,7 +321,7 @@ h_file = output_dir + prefix + h_file
try:
os.makedirs(output_dir)
-except os.error, e:
+except os.error as e:
if e.errno != errno.EEXIST:
raise
@@ -329,8 +329,12 @@ def maybe_open(really, name, opt):
if really:
return open(name, opt)
else:
- import StringIO
- return StringIO.StringIO()
+ try:
+ import StringIO
+ return StringIO.StringIO()
+ except ImportError:
+ from io import StringIO
+ return StringIO()
fdef = maybe_open(do_c, c_file, 'w')
fdecl = maybe_open(do_h, h_file, 'w')
@@ -383,7 +387,8 @@ fdecl.write(mcgen('''
guard=guardname(h_file)))
exprs = parse_schema(input_file)
-exprs = filter(lambda expr: not expr.has_key('gen'), exprs)
+exprs = filter(lambda expr: 'gen' not in expr, exprs)
+exprs = list(exprs)
fdecl.write(guardstart("QAPI_TYPES_BUILTIN_STRUCT_DECL"))
for typename in builtin_types:
@@ -392,13 +397,13 @@ fdecl.write(guardend("QAPI_TYPES_BUILTIN_STRUCT_DECL")
for expr in exprs:
ret = "\n"
- if expr.has_key('type'):
+ if 'type' in expr:
ret += generate_fwd_struct(expr['type'], expr['data'])
- elif expr.has_key('enum'):
+ elif 'enum' in expr:
ret += generate_enum(expr['enum'], expr['data']) + "\n"
ret += generate_fwd_enum_struct(expr['enum'], expr['data'])
fdef.write(generate_enum_lookup(expr['enum'], expr['data']))
- elif expr.has_key('union'):
+ elif 'union' in expr:
ret += generate_fwd_struct(expr['union'], expr['data']) + "\n"
enum_define = discriminator_find_enum_define(expr)
if not enum_define:
@@ -429,19 +434,19 @@ if do_builtins:
for expr in exprs:
ret = "\n"
- if expr.has_key('type'):
+ if 'type' in expr:
ret += generate_struct(expr) + "\n"
ret += generate_type_cleanup_decl(expr['type'] + "List")
fdef.write(generate_type_cleanup(expr['type'] + "List") + "\n")
ret += generate_type_cleanup_decl(expr['type'])
fdef.write(generate_type_cleanup(expr['type']) + "\n")
- elif expr.has_key('union'):
+ elif 'union' in expr:
ret += generate_union(expr)
ret += generate_type_cleanup_decl(expr['union'] + "List")
fdef.write(generate_type_cleanup(expr['union'] + "List") + "\n")
ret += generate_type_cleanup_decl(expr['union'])
fdef.write(generate_type_cleanup(expr['union']) + "\n")
- elif expr.has_key('enum'):
+ elif 'enum' in expr:
ret += generate_type_cleanup_decl(expr['enum'] + "List")
fdef.write(generate_type_cleanup(expr['enum'] + "List") + "\n")
else:
--- externals/unicorn/qemu/scripts/qapi-visit.py.orig 2018-01-04 00:41:12 UTC
+++ externals/unicorn/qemu/scripts/qapi-visit.py
@@ -439,8 +439,8 @@ try:
opts, args = getopt.gnu_getopt(sys.argv[1:], "chbp:i:o:",
["source", "header", "builtins", "prefix=",
"input-file=", "output-dir="])
-except getopt.GetoptError, err:
- print str(err)
+except getopt.GetoptError as err:
+ print(str(err))
sys.exit(1)
input_file = ""
@@ -476,7 +476,7 @@ h_file = output_dir + prefix + h_file
try:
os.makedirs(output_dir)
-except os.error, e:
+except os.error as e:
if e.errno != errno.EEXIST:
raise
@@ -484,8 +484,12 @@ def maybe_open(really, name, opt):
if really:
return open(name, opt)
else:
- import StringIO
- return StringIO.StringIO()
+ try:
+ import StringIO
+ return StringIO.StringIO()
+ except ImportError:
+ from io import StringIO
+ return StringIO()
fdef = maybe_open(do_c, c_file, 'w')
fdecl = maybe_open(do_h, h_file, 'w')
@@ -554,14 +558,14 @@ if do_builtins:
fdef.write(generate_visit_list(typename, None))
for expr in exprs:
- if expr.has_key('type'):
+ if 'type' in expr:
ret = generate_visit_struct(expr)
ret += generate_visit_list(expr['type'], expr['data'])
fdef.write(ret)
ret = generate_declaration(expr['type'], expr['data'])
fdecl.write(ret)
- elif expr.has_key('union'):
+ elif 'union' in expr:
ret = generate_visit_union(expr)
ret += generate_visit_list(expr['union'], expr['data'])
fdef.write(ret)
@@ -573,7 +577,7 @@ for expr in exprs:
expr['data'].keys())
ret += generate_declaration(expr['union'], expr['data'])
fdecl.write(ret)
- elif expr.has_key('enum'):
+ elif 'enum' in expr:
ret = generate_visit_list(expr['enum'], expr['data'])
ret += generate_visit_enum(expr['enum'], expr['data'])
fdef.write(ret)
--- externals/unicorn/qemu/scripts/qapi.py.orig 2018-01-04 00:41:12 UTC
+++ externals/unicorn/qemu/scripts/qapi.py
@@ -16,6 +16,11 @@ from ordereddict import OrderedDict
import os
import sys
+try:
+ basestring
+except NameError:
+ basestring = str
+
builtin_types = [
'str', 'int', 'number', 'bool',
'int8', 'int16', 'int32', 'int64',
@@ -116,7 +121,7 @@ class QAPISchema:
continue
try:
fobj = open(include_path, 'r')
- except IOError, e:
+ except IOError as e:
raise QAPIExprError(expr_info,
'%s: %s' % (e.strerror, include))
exprs_include = QAPISchema(fobj, include, self.include_hist,
@@ -319,15 +324,15 @@ def check_union(expr, expr_info):
def check_exprs(schema):
for expr_elem in schema.exprs:
expr = expr_elem['expr']
- if expr.has_key('union'):
+ if 'union' in expr:
check_union(expr, expr_elem['info'])
- if expr.has_key('event'):
+ if 'event' in expr:
check_event(expr, expr_elem['info'])
def parse_schema(input_file):
try:
schema = QAPISchema(open(input_file, "r"))
- except (QAPISchemaError, QAPIExprError), e:
+ except (QAPISchemaError, QAPIExprError) as e:
print >>sys.stderr, e
exit(1)
@@ -335,24 +340,24 @@ def parse_schema(input_file):
for expr_elem in schema.exprs:
expr = expr_elem['expr']
- if expr.has_key('enum'):
+ if 'enum' in expr:
add_enum(expr['enum'], expr['data'])
- elif expr.has_key('union'):
+ elif 'union' in expr:
add_union(expr)
- elif expr.has_key('type'):
+ elif 'type' in expr:
add_struct(expr)
exprs.append(expr)
# Try again for hidden UnionKind enum
for expr_elem in schema.exprs:
expr = expr_elem['expr']
- if expr.has_key('union'):
+ if 'union' in expr:
if not discriminator_find_enum_define(expr):
add_enum('%sKind' % expr['union'])
try:
check_exprs(schema)
- except QAPIExprError, e:
+ except QAPIExprError as e:
print >>sys.stderr, e
exit(1)