Attachment #194988 for bug #228487

Added Link Here

(-)i/emulators/yuzu-qt5/Makefile (+10 lines)
1	# $FreeBSD$
2
3	PORTREVISION= 0
4	PKGNAMESUFFIX= -qt5
5
6	MASTERDIR= ${.CURDIR}/../yuzu
7
8	OPTIONS_SLAVE= QT5
9
10	.include "${MASTERDIR}/Makefile"




# $FreeBSD$

PORTNAME=	yuzu
PORTVERSION=	s20180709
PORTREVISION?=	0
CATEGORIES=	emulators

MAINTAINER=	greg@unrelenting.technology
COMMENT=	Nintendo Switch emulator/debugger

LICENSE=	BSD2CLAUSE BSD3CLAUSE BSL GPLv2+ 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

BROKEN_FreeBSD_10=	libc++ does not support C++17 features e.g., weak_from_this

BUILD_DEPENDS=	boost-libs>=1.66:devel/boost-libs \
		gmake:devel/gmake

ONLY_FOR_ARCHS=	amd64
ONLY_FOR_ARCHS_REASON=	https://github.com/MerryMage/dynarmic/issues/35

USE_GITHUB=	yes
GH_ACCOUNT=	yuzu-emu
GH_TAGNAME=	639346bcf
GH_TUPLE=	MerryMage:dynarmic:f7d11baa1:dynarmic/externals/dynarmic \
		benhoyt:inih:r40:inih/externals/inih/inih \
		catchorg:Catch2:v2.1.1:catch/externals/catch \
		fmtlib:fmt:4.0.0-510-g5859e58:fmt/externals/fmt \
		lz4:lz4:v1.8.2:lz4/externals/lz4 \
		yuzu-emu:unicorn:73f4573:unicorn/externals/unicorn \
		herumi:xbyak:v5.601:xbyak/externals/xbyak

USES=		cmake:outsource compiler:c++14-lang iconv localbase:ldflags
USE_SDL=	sdl2
CXXFLAGS+=	-D_GLIBCXX_USE_C99 -D_GLIBCXX_USE_C99_MATH_TR1 \
		-D_DECLARE_C99_LDBL_MATH # XXX ports/193528
LDFLAGS+=	-Wl,--as-needed # Qt5Network

OPTIONS_MULTI=	GUI
OPTIONS_MULTI_GUI=	QT5 SDL
OPTIONS_SLAVE?=	SDL
OPTIONS_EXCLUDE:=	${OPTIONS_MULTI_GUI}

SDL_CMAKE_BOOL=	ENABLE_SDL2
SDL_PLIST_FILES=bin/${PORTNAME}-cmd

QT5_USES=	desktop-file-utils shared-mime-info
QT5_USE=	QT5=qmake_build,buildtools_build,concurrent_build,core,gui,multimedia,opengl,widgets
QT5_CMAKE_BOOL=	ENABLE_QT
QT5_PLIST_FILES=bin/${PORTNAME} \
		share/applications/${PORTNAME}.desktop \
		share/icons/hicolor/scalable/apps/${PORTNAME}.svg \
		share/mime/packages/${PORTNAME}.xml

post-patch:
	@${REINPLACE_CMD} -e 's,share/man,man,' \
		-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 <bsd.port.mk>




TIMESTAMP = 1531130012
SHA256 (yuzu-emu-yuzu-s20180709-639346bcf_GH0.tar.gz) = eafa251b7b6b95df4a86b0536da44093e18fc30d658420914a5fbcd562f00708
SIZE (yuzu-emu-yuzu-s20180709-639346bcf_GH0.tar.gz) = 929419
SHA256 (MerryMage-dynarmic-f7d11baa1_GH0.tar.gz) = 360f1a157d7c6c1802d6710629e82b3233149cd208200e3cece7bb4932a4d9fb
SIZE (MerryMage-dynarmic-f7d11baa1_GH0.tar.gz) = 1379546
SHA256 (benhoyt-inih-r40_GH0.tar.gz) = 0a7d8600c523ccd2d01a5bec2ef3a6482ada49794e67cf694d2bec796cb2c340
SIZE (benhoyt-inih-r40_GH0.tar.gz) = 11436
SHA256 (catchorg-Catch2-v2.1.1_GH0.tar.gz) = c40d3c8133c9274946067007e911a55b0d0ad3ed7c59a1f258dfcdb6836d8eff
SIZE (catchorg-Catch2-v2.1.1_GH0.tar.gz) = 481236
SHA256 (fmtlib-fmt-4.0.0-510-g5859e58_GH0.tar.gz) = 6d719fe37c54ffcd6a7c1679a288e4947304cc24b4ff00aaf679ef0b0474a7b3
SIZE (fmtlib-fmt-4.0.0-510-g5859e58_GH0.tar.gz) = 623334
SHA256 (lz4-lz4-v1.8.2_GH0.tar.gz) = 0963fbe9ee90acd1d15e9f09e826eaaf8ea0312e854803caf2db0a6dd40f4464
SIZE (lz4-lz4-v1.8.2_GH0.tar.gz) = 320742
SHA256 (yuzu-emu-unicorn-73f4573_GH0.tar.gz) = 23fe9a3f1d4618fad8b03eca85658c03d6430dd10faecff50fd7baeb894293fe
SIZE (yuzu-emu-unicorn-73f4573_GH0.tar.gz) = 3295450
SHA256 (herumi-xbyak-v5.601_GH0.tar.gz) = f6d72dd38cad946e5bc71ea3d2668eae5615d6989a6088873412b2bcbbda6ba4
SIZE (herumi-xbyak-v5.601_GH0.tar.gz) = 210923




On FreeBSD 11, unicorn samples fail with:

../libunicorn.so: undefined reference to pthread_create

Rather than add -lthr, just disable them as they are completely unnecessary here.

--- externals/unicorn/make.sh.orig	2018-07-09 09:58:24 UTC
+++ externals/unicorn/make.sh
@@ -120,15 +120,15 @@ fi
 export CC INSTALL_BIN PREFIX PKGCFGDIR LIBDIRARCH LIBARCHS CFLAGS LDFLAGS
 
 case "$1" in
-  "" ) ${MAKE};;
+  "" ) ${MAKE} 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} unicorn;;
+  "macos-universal-no" ) MACOS_UNIVERSAL=no ${MAKE} 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} unicorn;;
   "ios" ) build_iOS;;
   "ios_armv7" ) build_iOS armv7;;
   "ios_armv7s" ) build_iOS armv7s;;

Added Link Here

(-)i/emulators/yuzu/pkg-descr (+10 lines)
1	yuzu is an experimental open-source Nintendo Switch emulator/debugger
2	written in C++. It is written with portability in mind, with builds
3	actively maintained for Windows, Linux and OS X. yuzu only emulates a
4	subset of Switch hardware, and therefore is generally only useful for
5	running/debugging homebrew applications. At this time, yuzu cannot
6	play any commercial games without major problems. yuzu can boot some
7	games, to varying degrees of success, but does not implement any of the
8	necessary GPU features to render 3D graphics.
9
10	WWW: https://yuzu-emu.org

Return to bug 228487

Added Link Here

(-)i/emulators/yuzu/Makefile (+67 lines)
1	# $FreeBSD$
2
3	PORTNAME= yuzu
4	PORTVERSION= s20180709
5	PORTREVISION?= 0
6	CATEGORIES= emulators
7
8	MAINTAINER= greg@unrelenting.technology
9	COMMENT= Nintendo Switch emulator/debugger
10
11	LICENSE= BSD2CLAUSE BSD3CLAUSE BSL GPLv2+ UNLICENSE
12	LICENSE_COMB= multi
13	LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/externals/fmt/LICENSE.rst
14	LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/externals/inih/inih/LICENSE.txt
15	LICENSE_FILE_BSL= ${WRKSRC}/externals/catch/LICENSE.txt
16	LICENSE_FILE_GPLv2+ = ${WRKSRC}/license.txt
17
18	BROKEN_FreeBSD_10= libc++ does not support C++17 features e.g., weak_from_this
19
20	BUILD_DEPENDS= boost-libs>=1.66:devel/boost-libs \
21	gmake:devel/gmake
22
23	ONLY_FOR_ARCHS= amd64
24	ONLY_FOR_ARCHS_REASON= https://github.com/MerryMage/dynarmic/issues/35
25
26	USE_GITHUB= yes
27	GH_ACCOUNT= yuzu-emu
28	GH_TAGNAME= 639346bcf
29	GH_TUPLE= MerryMage:dynarmic:f7d11baa1:dynarmic/externals/dynarmic \
30	benhoyt:inih:r40:inih/externals/inih/inih \
31	catchorg:Catch2:v2.1.1:catch/externals/catch \
32	fmtlib:fmt:4.0.0-510-g5859e58:fmt/externals/fmt \
33	lz4:lz4:v1.8.2:lz4/externals/lz4 \
34	yuzu-emu:unicorn:73f4573:unicorn/externals/unicorn \
35	herumi:xbyak:v5.601:xbyak/externals/xbyak
36
37	USES= cmake:outsource compiler:c++14-lang iconv localbase:ldflags
38	USE_SDL= sdl2
39	CXXFLAGS+= -D_GLIBCXX_USE_C99 -D_GLIBCXX_USE_C99_MATH_TR1 \
40	-D_DECLARE_C99_LDBL_MATH # XXX ports/193528
41	LDFLAGS+= -Wl,--as-needed # Qt5Network
42
43	OPTIONS_MULTI= GUI
44	OPTIONS_MULTI_GUI= QT5 SDL
45	OPTIONS_SLAVE?= SDL
46	OPTIONS_EXCLUDE:= ${OPTIONS_MULTI_GUI}
47
48	SDL_CMAKE_BOOL= ENABLE_SDL2
49	SDL_PLIST_FILES=bin/${PORTNAME}-cmd
50
51	QT5_USES= desktop-file-utils shared-mime-info
52	QT5_USE= QT5=qmake_build,buildtools_build,concurrent_build,core,gui,multimedia,opengl,widgets
53	QT5_CMAKE_BOOL= ENABLE_QT
54	QT5_PLIST_FILES=bin/${PORTNAME} \
55	share/applications/${PORTNAME}.desktop \
56	share/icons/hicolor/scalable/apps/${PORTNAME}.svg \
57	share/mime/packages/${PORTNAME}.xml
58
59	post-patch:
60	@${REINPLACE_CMD} -e 's,share/man,man,' \
61	-e '/check_submodules_present()/d' \
62	${WRKSRC}/CMakeLists.txt
63	@${REINPLACE_CMD} -e 's/@GIT_BRANCH@/master/' \
64	-e 's/@GIT_DESC@/${GH_TAGNAME}/' \
65	${WRKSRC}/src/common/scm_rev.cpp.in
66
67	.include <bsd.port.mk>

Added Link Here

(-)i/emulators/yuzu/distinfo (+17 lines)
1	TIMESTAMP = 1531130012
2	SHA256 (yuzu-emu-yuzu-s20180709-639346bcf_GH0.tar.gz) = eafa251b7b6b95df4a86b0536da44093e18fc30d658420914a5fbcd562f00708
3	SIZE (yuzu-emu-yuzu-s20180709-639346bcf_GH0.tar.gz) = 929419
4	SHA256 (MerryMage-dynarmic-f7d11baa1_GH0.tar.gz) = 360f1a157d7c6c1802d6710629e82b3233149cd208200e3cece7bb4932a4d9fb
5	SIZE (MerryMage-dynarmic-f7d11baa1_GH0.tar.gz) = 1379546
6	SHA256 (benhoyt-inih-r40_GH0.tar.gz) = 0a7d8600c523ccd2d01a5bec2ef3a6482ada49794e67cf694d2bec796cb2c340
7	SIZE (benhoyt-inih-r40_GH0.tar.gz) = 11436
8	SHA256 (catchorg-Catch2-v2.1.1_GH0.tar.gz) = c40d3c8133c9274946067007e911a55b0d0ad3ed7c59a1f258dfcdb6836d8eff
9	SIZE (catchorg-Catch2-v2.1.1_GH0.tar.gz) = 481236
10	SHA256 (fmtlib-fmt-4.0.0-510-g5859e58_GH0.tar.gz) = 6d719fe37c54ffcd6a7c1679a288e4947304cc24b4ff00aaf679ef0b0474a7b3
11	SIZE (fmtlib-fmt-4.0.0-510-g5859e58_GH0.tar.gz) = 623334
12	SHA256 (lz4-lz4-v1.8.2_GH0.tar.gz) = 0963fbe9ee90acd1d15e9f09e826eaaf8ea0312e854803caf2db0a6dd40f4464
13	SIZE (lz4-lz4-v1.8.2_GH0.tar.gz) = 320742
14	SHA256 (yuzu-emu-unicorn-73f4573_GH0.tar.gz) = 23fe9a3f1d4618fad8b03eca85658c03d6430dd10faecff50fd7baeb894293fe
15	SIZE (yuzu-emu-unicorn-73f4573_GH0.tar.gz) = 3295450
16	SHA256 (herumi-xbyak-v5.601_GH0.tar.gz) = f6d72dd38cad946e5bc71ea3d2668eae5615d6989a6088873412b2bcbbda6ba4
17	SIZE (herumi-xbyak-v5.601_GH0.tar.gz) = 210923

Added Link Here

(-)i/emulators/yuzu/files/patch-externals_unicorn_make.sh (+28 lines)
1	On FreeBSD 11, unicorn samples fail with:
2
3	../libunicorn.so: undefined reference to pthread_create
4
5	Rather than add -lthr, just disable them as they are completely unnecessary here.
6
7	--- externals/unicorn/make.sh.orig 2018-07-09 09:58:24 UTC
8	+++ externals/unicorn/make.sh
9	@@ -120,15 +120,15 @@ fi
10	export CC INSTALL_BIN PREFIX PKGCFGDIR LIBDIRARCH LIBARCHS CFLAGS LDFLAGS
11
12	case "$1" in
13	- "" ) ${MAKE};;
14	+ "" ) ${MAKE} unicorn;;
15	"asan" ) asan;;
16	"install" ) install;;
17	"uninstall" ) uninstall;;
18	- "macos-universal" ) MACOS_UNIVERSAL=yes ${MAKE};;
19	- "macos-universal-no" ) MACOS_UNIVERSAL=no ${MAKE};;
20	+ "macos-universal" ) MACOS_UNIVERSAL=yes ${MAKE} unicorn;;
21	+ "macos-universal-no" ) MACOS_UNIVERSAL=no ${MAKE} unicorn;;
22	"cross-win32" ) build_cross i686-w64-mingw32;;
23	"cross-win64" ) build_cross x86_64-w64-mingw32;;
24	- "cross-android" ) CROSS=arm-linux-androideabi ${MAKE};;
25	+ "cross-android" ) CROSS=arm-linux-androideabi ${MAKE} unicorn;;
26	"ios" ) build_iOS;;
27	"ios_armv7" ) build_iOS armv7;;
28	"ios_armv7s" ) build_iOS armv7s;;