Date: Tue, 11 Aug 2020 05:37:44 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r544667 - in head/emulators/yuzu: . files Message-ID: <202008110537.07B5bipZ001522@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Tue Aug 11 05:37:43 2020 New Revision: 544667 URL: https://svnweb.freebsd.org/changeset/ports/544667 Log: emulators/yuzu: update to s20200810 Changes: https://github.com/yuzu-emu/yuzu/compare/6c7292de3...257b1d2c4 Added: head/emulators/yuzu/files/patch-boost (contents, props changed) Modified: head/emulators/yuzu/Makefile (contents, props changed) head/emulators/yuzu/distinfo (contents, props changed) head/emulators/yuzu/files/patch-opus (contents, props changed) Modified: head/emulators/yuzu/Makefile ============================================================================== --- head/emulators/yuzu/Makefile Tue Aug 11 05:21:49 2020 (r544666) +++ head/emulators/yuzu/Makefile Tue Aug 11 05:37:43 2020 (r544667) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= yuzu -PORTVERSION= s20200803 +PORTVERSION= s20200810 PORTREVISION?= 0 CATEGORIES= emulators @@ -37,7 +37,7 @@ LIB_DEPENDS= liblz4.so:archivers/liblz4 \ USE_GITHUB= yes GH_ACCOUNT= yuzu-emu -GH_TAGNAME= 6c7292de3 +GH_TAGNAME= 257b1d2c4 GH_TUPLE= yuzu-emu:unicorn:1.0.1-153-g73f45735:unicorn/externals/unicorn \ DarkLordZach:mbedtls:a280e60:mbedtls/externals/mbedtls \ KhronosGroup:SPIRV-Headers:2c51218:SPIRV_Headers/externals/sirit/externals/SPIRV-Headers \ @@ -97,4 +97,17 @@ post-patch: -e 's/@GIT_DESC@/${GH_TAGNAME}/' \ ${WRKSRC}/src/common/scm_rev.cpp.in -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +# XXX Drop after FreeBSD 11.3/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 + +.include <bsd.port.post.mk> Modified: head/emulators/yuzu/distinfo ============================================================================== --- head/emulators/yuzu/distinfo Tue Aug 11 05:21:49 2020 (r544666) +++ head/emulators/yuzu/distinfo Tue Aug 11 05:37:43 2020 (r544667) @@ -1,6 +1,6 @@ -TIMESTAMP = 1596452414 -SHA256 (yuzu-emu-yuzu-s20200803-6c7292de3_GH0.tar.gz) = 2c2d1f63247cb9bd8e37701ea86daeb481d3279fb24523f27e2fbb91fe8d5968 -SIZE (yuzu-emu-yuzu-s20200803-6c7292de3_GH0.tar.gz) = 2945802 +TIMESTAMP = 1597082023 +SHA256 (yuzu-emu-yuzu-s20200810-257b1d2c4_GH0.tar.gz) = 4a7fc607baed5420e18997429f26cfca29fea0ad906c03de142f3fe4ac95729c +SIZE (yuzu-emu-yuzu-s20200810-257b1d2c4_GH0.tar.gz) = 2945337 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 (DarkLordZach-mbedtls-a280e60_GH0.tar.gz) = 4fc6ddc256bc75b975fd5ad8bb7d31ff79c62d49daafb0108585c9ef80c6c5a7 Added: head/emulators/yuzu/files/patch-boost ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/yuzu/files/patch-boost Tue Aug 11 05:37:43 2020 (r544667) @@ -0,0 +1,16 @@ +https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=246106 + +-- Could NOT find Boost: Found unsuitable version "1.72.0", but required is at least "1.73" (found /usr/local/include) +-- Packages boost/1.73.0 not found! + +--- CMakeLists.txt.orig 2020-08-10 17:53:43 UTC ++++ CMakeLists.txt +@@ -159,7 +159,7 @@ macro(yuzu_find_packages) + # Capitalization matters here. We need the naming to match the generated paths from Conan + set(REQUIRED_LIBS + # Cmake Pkg Prefix Version Conan Pkg +- "Boost 1.73 boost/1.73.0" ++ "Boost 1.72 boost/1.72.0" + "Catch2 2.13 catch2/2.13.0" + "fmt 7.0 fmt/7.0.1" + # can't use until https://github.com/bincrafters/community/issues/1173 Modified: head/emulators/yuzu/files/patch-opus ============================================================================== --- head/emulators/yuzu/files/patch-opus Tue Aug 11 05:21:49 2020 (r544666) +++ head/emulators/yuzu/files/patch-opus Tue Aug 11 05:37:43 2020 (r544667) @@ -9,16 +9,16 @@ Revert https://github.com/yuzu-emu/yuzu/commit/d5dfe34 -[submodule "opus"] - path = externals/opus/opus - url = https://github.com/xiph/opus.git ---- CMakeLists.txt.orig 2020-07-07 22:13:55 UTC +--- CMakeLists.txt.orig 2020-08-10 17:53:43 UTC +++ CMakeLists.txt -@@ -156,6 +156,8 @@ macro(yuzu_find_packages) +@@ -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.7 nlohmann_json/3.7.3" + "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.4" + "zstd 1.4 zstd/1.4.5" ) --- externals/CMakeLists.txt.orig 2020-07-07 22:13:55 UTC +++ externals/CMakeLists.txt
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008110537.07B5bipZ001522>