Index: head/emulators/yuzu/Makefile =================================================================== --- head/emulators/yuzu/Makefile (revision 554427) +++ head/emulators/yuzu/Makefile (revision 554428) @@ -1,119 +1,117 @@ # $FreeBSD$ PORTNAME= yuzu -PORTVERSION= s20201106 +PORTVERSION= s20201107 PORTREVISION?= 0 CATEGORIES= emulators PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= 905e8016a04e.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/1340 MAINTAINER= jbeich@FreeBSD.org COMMENT= Nintendo Switch emulator/debugger LICENSE= APACHE20 BSD3CLAUSE GPLv2+ ISCL LGPL21+ LGPL3+ MIT UNLICENSE LICENSE_COMB= multi LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/externals/inih/inih/LICENSE.txt LICENSE_FILE_GPLv2+ = ${WRKSRC}/license.txt LICENSE_FILE_ISCL= ${WRKSRC}/externals/cubeb/LICENSE LICENSE_FILE_LGPL21+ = ${_LICENSE_STORE}/LGPL21 # soundtouch LICENSE_FILE_LGPL3+ = ${_LICENSE_STORE}/LGPL3 # sirit LICENSE_FILE_MIT= ${WRKSRC}/externals/sirit/externals/SPIRV-Headers/LICENSE 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 \ libzstd.so:archivers/zstd \ libopus.so:audio/opus \ libboost_context.so:devel/boost-libs \ libfmt.so:devel/libfmt \ libavcodec.so:multimedia/ffmpeg 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 \ ReinUsesLisp:sirit:eefca56:sirit/externals/sirit \ arsenm:sanitizers-cmake:aab6948:sanitizers_cmake/externals/cubeb/cmake/sanitizers-cmake \ citra-emu:ext-soundtouch:060181e:soundtouch/externals/soundtouch \ herumi:xbyak:v5.96:xbyak/externals/xbyak \ 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 OPTIONS_DEFINE= ALSA PULSEAUDIO JACK SNDIO VULKAN OPTIONS_DEFAULT=PULSEAUDIO JACK SNDIO VULKAN 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 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}-cmd \ bin/${PORTNAME}-tester QT5_USES= desktop-file-utils qt:5 shared-mime-info QT5_USE= QT=qmake_build,buildtools_build,linguisttools_build,concurrent_build,core,gui,webengine,widgets QT5_CMAKE_BOOL= ENABLE_QT ENABLE_QT_TRANSLATION YUZU_USE_QT_WEB_ENGINE QT5_PLIST_FILES=bin/${PORTNAME} \ share/applications/${PORTNAME}.desktop \ share/icons/hicolor/scalable/apps/${PORTNAME}.svg \ share/mime/packages/${PORTNAME}.xml VULKAN_DESC= Vulkan renderer VULKAN_RUN_DEPENDS= ${LOCALBASE}/lib/libvulkan.so:graphics/vulkan-loader 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 # XXX Drop after FreeBSD 12.1 EOL .if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 100 . if ${LLVM_DEFAULT:C/[1-5]./&0/:S,-devel,990,} < 100 LLVM_DEFAULT= 10 . endif BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} CC= clang${LLVM_DEFAULT} CXX= clang++${LLVM_DEFAULT} CPP= clang-cpp${LLVM_DEFAULT} .endif # XXX Drop after FreeBSD 12.1 EOL .if make(makesum) || (!exists(/usr/include/c++/v1/fenv.h) && exists(/usr/lib/libc++.so)) MASTER_SITES+= https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VER}/:libcxx DISTFILES+= libcxx-${LLVM_VER}.src.tar.xz:libcxx CXXFLAGS+= -nostdinc++ -isystem${WRKDIR}/libcxx-${LLVM_VER}.src/include LLVM_VER= 10.0.1 .endif .include Index: head/emulators/yuzu/distinfo =================================================================== --- head/emulators/yuzu/distinfo (revision 554427) +++ head/emulators/yuzu/distinfo (revision 554428) @@ -1,29 +1,27 @@ -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 SIZE (KhronosGroup-SPIRV-Headers-2c51218_GH0.tar.gz) = 280829 SHA256 (KhronosGroup-Vulkan-Headers-v1.2.145_GH0.tar.gz) = c8656969f0dc33f5f544b9449f02d66b7c9de67e6e58376c1cd4999694ab8517 SIZE (KhronosGroup-Vulkan-Headers-v1.2.145_GH0.tar.gz) = 766896 SHA256 (MerryMage-dynarmic-r3-242-g0e1112b7_GH0.tar.gz) = f552cb543bd8937dc145a780e6a11925f510b90b6fe281db44de93e74db07654 SIZE (MerryMage-dynarmic-r3-242-g0e1112b7_GH0.tar.gz) = 1646910 SHA256 (ReinUsesLisp-sirit-eefca56_GH0.tar.gz) = cc95e8155e14e596526c378d0a3cc2bb4bfe7da68773a79f224d48f89b20685a SIZE (ReinUsesLisp-sirit-eefca56_GH0.tar.gz) = 22035 SHA256 (arsenm-sanitizers-cmake-aab6948_GH0.tar.gz) = d9009e17948aff769a6f6e16b52d4d8752c5cc2cab1e9c381d3a31fd1a680b58 SIZE (arsenm-sanitizers-cmake-aab6948_GH0.tar.gz) = 7240 SHA256 (citra-emu-ext-soundtouch-060181e_GH0.tar.gz) = a593ab188e4feaeef8376c27b554cc413986efc777c195e44c6d3d223de9a63c SIZE (citra-emu-ext-soundtouch-060181e_GH0.tar.gz) = 59514 SHA256 (herumi-xbyak-v5.96_GH0.tar.gz) = 727f15d3ed786cae255ebfed1829a84a357c0e4856c6304456d77f1b56c3d2c6 SIZE (herumi-xbyak-v5.96_GH0.tar.gz) = 226999 SHA256 (kinetiknz-cubeb-cubeb-0.2-1251-ga7e83aa_GH0.tar.gz) = ded9dbd4a35aaba5a5e15883da17111ec46395241f283223683590adb1cfaf19 SIZE (kinetiknz-cubeb-cubeb-0.2-1251-ga7e83aa_GH0.tar.gz) = 206804 SHA256 (benhoyt-inih-r52_GH0.tar.gz) = 439cff9ce9a8afc52d08772ac3e93b3cecd79c7707f871fb4534fb3a48201880 SIZE (benhoyt-inih-r52_GH0.tar.gz) = 16808 SHA256 (905e8016a04e.patch) = cecc02f098917ee236ace0a350f37a9ffbb4aae92232f6c105a520476f7b23b5 SIZE (905e8016a04e.patch) = 2545 Index: head/emulators/yuzu/files/patch-externals_unicorn_make.sh =================================================================== --- head/emulators/yuzu/files/patch-externals_unicorn_make.sh (revision 554427) +++ head/emulators/yuzu/files/patch-externals_unicorn_make.sh (nonexistent) @@ -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;; Property changes on: head/emulators/yuzu/files/patch-externals_unicorn_make.sh ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/yuzu/files/patch-python3 =================================================================== --- head/emulators/yuzu/files/patch-python3 (revision 554427) +++ head/emulators/yuzu/files/patch-python3 (nonexistent) @@ -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) - Property changes on: head/emulators/yuzu/files/patch-python3 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/yuzu/files/patch-opus =================================================================== --- head/emulators/yuzu/files/patch-opus (revision 554427) +++ head/emulators/yuzu/files/patch-opus (revision 554428) @@ -1,299 +1,299 @@ Revert https://github.com/yuzu-emu/yuzu/commit/d5dfe34c4935 --- .gitmodules.orig 2020-09-02 16:49:39 UTC +++ .gitmodules @@ -34,6 +34,3 @@ [submodule "xbyak"] path = externals/xbyak url = https://github.com/herumi/xbyak.git -[submodule "opus"] - path = externals/opus/opus - url = https://github.com/xiph/opus.git --- CMakeLists.txt.orig 2020-08-10 17:53:43 UTC +++ CMakeLists.txt @@ -166,6 +166,8 @@ macro(yuzu_find_packages) #"libzip 1.5 libzip/1.5.2@bincrafters/stable" "lz4 1.8 lz4/1.9.2" "nlohmann_json 3.8 nlohmann_json/3.8.0" + # we need to be careful as the version check might be broken https://github.com/xiph/opus/issues/110 + "opus 1.3 opus/1.3.1" "ZLIB 1.2 zlib/1.2.11" "zstd 1.4 zstd/1.4.5" ) --- externals/CMakeLists.txt.orig 2020-10-16 03:59:34 UTC +++ externals/CMakeLists.txt @@ -85,6 +85,3 @@ if (ENABLE_WEB_SERVICE) target_link_libraries(httplib INTERFACE crypt32 cryptui ws2_32) endif() endif() - -# Opus -add_subdirectory(opus) --- externals/opus/CMakeLists.txt.orig 2020-07-07 22:13:55 UTC +++ externals/opus/CMakeLists.txt @@ -1,254 +0,0 @@ -cmake_minimum_required(VERSION 3.8) - -project(opus) - -option(OPUS_STACK_PROTECTOR "Use stack protection" OFF) -option(OPUS_USE_ALLOCA "Use alloca for stack arrays (on non-C99 compilers)" OFF) -option(OPUS_CUSTOM_MODES "Enable non-Opus modes, e.g. 44.1 kHz & 2^n frames" OFF) -option(OPUS_FIXED_POINT "Compile as fixed-point (for machines without a fast enough FPU)" OFF) -option(OPUS_ENABLE_FLOAT_API "Compile with the floating point API (for machines with float library" ON) - -include(opus/opus_functions.cmake) - -if(OPUS_STACK_PROTECTOR) - if(NOT MSVC) # GC on by default on MSVC - check_and_set_flag(STACK_PROTECTION_STRONG -fstack-protector-strong) - endif() -else() - if(MSVC) - check_and_set_flag(BUFFER_SECURITY_CHECK /GS-) - endif() -endif() - -add_library(opus STATIC - # CELT sources - opus/celt/bands.c - opus/celt/celt.c - opus/celt/celt_decoder.c - opus/celt/celt_encoder.c - opus/celt/celt_lpc.c - opus/celt/cwrs.c - opus/celt/entcode.c - opus/celt/entdec.c - opus/celt/entenc.c - opus/celt/kiss_fft.c - opus/celt/laplace.c - opus/celt/mathops.c - opus/celt/mdct.c - opus/celt/modes.c - opus/celt/pitch.c - opus/celt/quant_bands.c - opus/celt/rate.c - opus/celt/vq.c - - # SILK sources - opus/silk/A2NLSF.c - opus/silk/CNG.c - opus/silk/HP_variable_cutoff.c - opus/silk/LPC_analysis_filter.c - opus/silk/LPC_fit.c - opus/silk/LPC_inv_pred_gain.c - opus/silk/LP_variable_cutoff.c - opus/silk/NLSF2A.c - opus/silk/NLSF_VQ.c - opus/silk/NLSF_VQ_weights_laroia.c - opus/silk/NLSF_decode.c - opus/silk/NLSF_del_dec_quant.c - opus/silk/NLSF_encode.c - opus/silk/NLSF_stabilize.c - opus/silk/NLSF_unpack.c - opus/silk/NSQ.c - opus/silk/NSQ_del_dec.c - opus/silk/PLC.c - opus/silk/VAD.c - opus/silk/VQ_WMat_EC.c - opus/silk/ana_filt_bank_1.c - opus/silk/biquad_alt.c - opus/silk/bwexpander.c - opus/silk/bwexpander_32.c - opus/silk/check_control_input.c - opus/silk/code_signs.c - opus/silk/control_SNR.c - opus/silk/control_audio_bandwidth.c - opus/silk/control_codec.c - opus/silk/dec_API.c - opus/silk/decode_core.c - opus/silk/decode_frame.c - opus/silk/decode_indices.c - opus/silk/decode_parameters.c - opus/silk/decode_pitch.c - opus/silk/decode_pulses.c - opus/silk/decoder_set_fs.c - opus/silk/enc_API.c - opus/silk/encode_indices.c - opus/silk/encode_pulses.c - opus/silk/gain_quant.c - opus/silk/init_decoder.c - opus/silk/init_encoder.c - opus/silk/inner_prod_aligned.c - opus/silk/interpolate.c - opus/silk/lin2log.c - opus/silk/log2lin.c - opus/silk/pitch_est_tables.c - opus/silk/process_NLSFs.c - opus/silk/quant_LTP_gains.c - opus/silk/resampler.c - opus/silk/resampler_down2.c - opus/silk/resampler_down2_3.c - opus/silk/resampler_private_AR2.c - opus/silk/resampler_private_IIR_FIR.c - opus/silk/resampler_private_down_FIR.c - opus/silk/resampler_private_up2_HQ.c - opus/silk/resampler_rom.c - opus/silk/shell_coder.c - opus/silk/sigm_Q15.c - opus/silk/sort.c - opus/silk/stereo_LR_to_MS.c - opus/silk/stereo_MS_to_LR.c - opus/silk/stereo_decode_pred.c - opus/silk/stereo_encode_pred.c - opus/silk/stereo_find_predictor.c - opus/silk/stereo_quant_pred.c - opus/silk/sum_sqr_shift.c - opus/silk/table_LSF_cos.c - opus/silk/tables_LTP.c - opus/silk/tables_NLSF_CB_NB_MB.c - opus/silk/tables_NLSF_CB_WB.c - opus/silk/tables_gain.c - opus/silk/tables_other.c - opus/silk/tables_pitch_lag.c - opus/silk/tables_pulses_per_block.c - - # Opus sources - opus/src/analysis.c - opus/src/mapping_matrix.c - opus/src/mlp.c - opus/src/mlp_data.c - opus/src/opus.c - opus/src/opus_decoder.c - opus/src/opus_encoder.c - opus/src/opus_multistream.c - opus/src/opus_multistream_decoder.c - opus/src/opus_multistream_encoder.c - opus/src/opus_projection_decoder.c - opus/src/opus_projection_encoder.c - opus/src/repacketizer.c -) - -if (DEBUG) - target_sources(opus PRIVATE opus/silk/debug.c) -endif() - -if (OPUS_FIXED_POINT) - target_sources(opus PRIVATE - opus/silk/fixed/LTP_analysis_filter_FIX.c - opus/silk/fixed/LTP_scale_ctrl_FIX.c - opus/silk/fixed/apply_sine_window_FIX.c - opus/silk/fixed/autocorr_FIX.c - opus/silk/fixed/burg_modified_FIX.c - opus/silk/fixed/corrMatrix_FIX.c - opus/silk/fixed/encode_frame_FIX.c - opus/silk/fixed/find_LPC_FIX.c - opus/silk/fixed/find_LTP_FIX.c - opus/silk/fixed/find_pitch_lags_FIX.c - opus/silk/fixed/find_pred_coefs_FIX.c - opus/silk/fixed/k2a_FIX.c - opus/silk/fixed/k2a_Q16_FIX.c - opus/silk/fixed/noise_shape_analysis_FIX.c - opus/silk/fixed/pitch_analysis_core_FIX.c - opus/silk/fixed/prefilter_FIX.c - opus/silk/fixed/process_gains_FIX.c - opus/silk/fixed/regularize_correlations_FIX.c - opus/silk/fixed/residual_energy16_FIX.c - opus/silk/fixed/residual_energy_FIX.c - opus/silk/fixed/schur64_FIX.c - opus/silk/fixed/schur_FIX.c - opus/silk/fixed/solve_LS_FIX.c - opus/silk/fixed/vector_ops_FIX.c - opus/silk/fixed/warped_autocorrelation_FIX.c - ) -else() - target_sources(opus PRIVATE - opus/silk/float/LPC_analysis_filter_FLP.c - opus/silk/float/LPC_inv_pred_gain_FLP.c - opus/silk/float/LTP_analysis_filter_FLP.c - opus/silk/float/LTP_scale_ctrl_FLP.c - opus/silk/float/apply_sine_window_FLP.c - opus/silk/float/autocorrelation_FLP.c - opus/silk/float/burg_modified_FLP.c - opus/silk/float/bwexpander_FLP.c - opus/silk/float/corrMatrix_FLP.c - opus/silk/float/encode_frame_FLP.c - opus/silk/float/energy_FLP.c - opus/silk/float/find_LPC_FLP.c - opus/silk/float/find_LTP_FLP.c - opus/silk/float/find_pitch_lags_FLP.c - opus/silk/float/find_pred_coefs_FLP.c - opus/silk/float/inner_product_FLP.c - opus/silk/float/k2a_FLP.c - opus/silk/float/noise_shape_analysis_FLP.c - opus/silk/float/pitch_analysis_core_FLP.c - opus/silk/float/process_gains_FLP.c - opus/silk/float/regularize_correlations_FLP.c - opus/silk/float/residual_energy_FLP.c - opus/silk/float/scale_copy_vector_FLP.c - opus/silk/float/scale_vector_FLP.c - opus/silk/float/schur_FLP.c - opus/silk/float/sort_FLP.c - opus/silk/float/warped_autocorrelation_FLP.c - opus/silk/float/wrappers_FLP.c - ) -endif() - -target_compile_definitions(opus PRIVATE OPUS_BUILD ENABLE_HARDENING) - -if(NOT MSVC) - if(MINGW) - target_compile_definitions(opus PRIVATE _FORTIFY_SOURCE=0) - else() - target_compile_definitions(opus PRIVATE _FORTIFY_SOURCE=2) - endif() -endif() - -# It is strongly recommended to uncomment one of these VAR_ARRAYS: Use C99 -# variable-length arrays for stack allocation USE_ALLOCA: Use alloca() for stack -# allocation If none is defined, then the fallback is a non-threadsafe global -# array -if(OPUS_USE_ALLOCA OR MSVC) - target_compile_definitions(opus PRIVATE USE_ALLOCA) -else() - target_compile_definitions(opus PRIVATE VAR_ARRAYS) -endif() - -if(OPUS_CUSTOM_MODES) - target_compile_definitions(opus PRIVATE CUSTOM_MODES) -endif() - -if(NOT OPUS_ENABLE_FLOAT_API) - target_compile_definitions(opus PRIVATE DISABLE_FLOAT_API) -endif() - -target_compile_definitions(opus -PUBLIC - -DOPUS_VERSION="\\"1.3.1\\"" - -PRIVATE - # Use C99 intrinsics to speed up float-to-int conversion - HAVE_LRINTF -) - -if (FIXED_POINT) - target_compile_definitions(opus PRIVATE -DFIXED_POINT=1 -DDISABLE_FLOAT_API) -endif() - -target_include_directories(opus -PUBLIC - opus/include - -PRIVATE - opus/celt - opus/silk - opus/silk/fixed - 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) Index: head/emulators/yuzu-qt5/Makefile =================================================================== --- head/emulators/yuzu-qt5/Makefile (revision 554427) +++ head/emulators/yuzu-qt5/Makefile (revision 554428) @@ -1,10 +1,10 @@ # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 0 PKGNAMESUFFIX= -qt5 MASTERDIR= ${.CURDIR}/../yuzu OPTIONS_SLAVE= QT5 .include "${MASTERDIR}/Makefile"