Attachment #197024 for bug #227346




# $FreeBSD$

PORTNAME=	mgba
DISTVERSION=	0.6.3
PORTREVISION=	3
CATEGORIES=	emulators

PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
PATCHFILES=	a7a51a11373f.patch:-p1 \
		a2b8c4ae807a.patch:-p1

MAINTAINER=	greg@unrelenting.technology
COMMENT=	Game Boy Advance (GBA) emulator/debugger

		-DUSE_LZMA:BOOL=ON \
		-DUSE_SQLITE3:BOOL=ON \
		-DBUILD_GL:BOOL=ON \
                -DBUILD_LIBRETRO:BOOL=ON \
		-DBUILD_GLES2:BOOL=OFF
LDFLAGS+=	-Wl,--as-needed # glu

OPTIONS_DEFINE=	DEBUGGERS FFMPEG MAGICK QT5 LIBRETRO
OPTIONS_DEFAULT=	DEBUGGERS FFMPEG MAGICK QT5 LIBRETRO
OPTIONS_SUB=	yes

DEBUGGERS_DESC=	Debugging infrastructure (CLI debugger, GDB remote stub)

FFMPEG_DESC=	FFmpeg video recording support
MAGICK_DESC=	ImageMagick GIF recording support
QT5_DESC=	Qt 5 frontend
LIBRETRO_DESC=	Libretro core

DEBUGGERS_CMAKE_BOOL=	USE_DEBUGGERS USE_EDITLINE USE_GDB_STUB
DEBUGGERS_USES=		libedit

QT5_USES=	desktop-file-utils qt:5
QT5_VARS=	installs_icons=yes

LIBRETRO_CMAKE_BOOL=	BUILD_LIBRETRO
LIBRETRO_CMAKE_ON=	-DLIBRETRO_LIBDIR=${LOCALBASE}/lib/libretro

.include <bsd.port.mk>

Lines 1-6 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1535682053	1	TIMESTAMP = 1536689445
2	SHA256 (mgba-emu-mgba-0.6.1_GH0.tar.gz) = 7c78feb0aa12930b993ca1b220d282ed178e306621559e48bb168623030eb876	2	SHA256 (mgba-emu-mgba-0.6.3_GH0.tar.gz) = 35c8906c01206adae714fee9c2bc39698c514a4adb32c9c4a5a3fa58b2d10f9a
3	SIZE (mgba-emu-mgba-0.6.1_GH0.tar.gz) = 7437240	3	SIZE (mgba-emu-mgba-0.6.3_GH0.tar.gz) = 7442154
4	SHA256 (a7a51a11373f.patch) = c6c7dbced0350392cbb0efba8b417fdab65a4db929f747ff6c4159f7f07c1216	4	SHA256 (a7a51a11373f.patch) = c6c7dbced0350392cbb0efba8b417fdab65a4db929f747ff6c4159f7f07c1216
5	SIZE (a7a51a11373f.patch) = 1485	5	SIZE (a7a51a11373f.patch) = 1485
6	SHA256 (a2b8c4ae807a.patch) = 6c09491f3a095c54e93247d8875497ae5a8f151bd2ff8e8756c12030cffcdc8b	6	SHA256 (a2b8c4ae807a.patch) = 6c09491f3a095c54e93247d8875497ae5a8f151bd2ff8e8756c12030cffcdc8b




From e31373560535203d826687044290a4994706c2dd Mon Sep 17 00:00:00 2001
From: ilovezfs <ilovezfs@icloud.com>
Date: Mon, 11 Dec 2017 00:39:32 -0800
Subject: [PATCH] Qt: Fix build with Qt 5.10

Fixes "MemoryModel.cpp:102:15: error: no viable overloaded '='"
---
 src/platform/qt/MemoryModel.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- src/platform/qt/MemoryModel.cpp
+++ src/platform/qt/MemoryModel.cpp
@@ -99,7 +99,7 @@ void MemoryModel::setRegion(uint32_t base, uint32_t size, const QString& name, i
 	m_top = 0;
 	m_base = base;
 	m_size = size;
-	m_regionName = name;
+	m_regionName = QStaticText(name);
 	m_regionName.prepare(QTransform(), m_font);
 	m_currentBank = segment;
 	verticalScrollBar()->setRange(0, (size >> 4) + 1 - viewport()->size().height() / m_cellHeight);

Lines 3-8 Link Here

(-)pkg-plist (+1 lines)
3	include/mgba/flags.h	3	include/mgba/flags.h
4	lib/libmgba.so.0.6	4	lib/libmgba.so.0.6
5	lib/libmgba.so.0.6.1	5	lib/libmgba.so.0.6.1
		6	%%LIBRETRO%%lib/libretro/mgba_libretro.so
6	%%QT5%%man/man6/mgba-qt.6.gz	7	%%QT5%%man/man6/mgba-qt.6.gz
7	man/man6/mgba.6.gz	8	man/man6/mgba.6.gz
8	%%PORTDOCS%%%%DOCSDIR%%/CHANGES	9	%%PORTDOCS%%%%DOCSDIR%%/CHANGES

Return to bug 227346

Lines 1-13 Link Here

(-)Makefile (-6 / +8 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= mgba	3	PORTNAME= mgba
4	DISTVERSION= 0.6.1	4	DISTVERSION= 0.6.3
5	PORTREVISION= 3
6	CATEGORIES= emulators	5	CATEGORIES= emulators
7		6
8	PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/	7	PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
9	PATCHFILES= a7a51a11373f.patch:-p1 \
10	a2b8c4ae807a.patch:-p1
11		8
12	MAINTAINER= greg@unrelenting.technology	9	MAINTAINER= greg@unrelenting.technology
13	COMMENT= Game Boy Advance (GBA) emulator/debugger	10	COMMENT= Game Boy Advance (GBA) emulator/debugger
Lines 36-46 Link Here
36	-DUSE_LZMA:BOOL=ON \	33	-DUSE_LZMA:BOOL=ON \
37	-DUSE_SQLITE3:BOOL=ON \	34	-DUSE_SQLITE3:BOOL=ON \
38	-DBUILD_GL:BOOL=ON \	35	-DBUILD_GL:BOOL=ON \
		36	-DBUILD_LIBRETRO:BOOL=ON \
39	-DBUILD_GLES2:BOOL=OFF	37	-DBUILD_GLES2:BOOL=OFF
40	LDFLAGS+= -Wl,--as-needed # glu	38	LDFLAGS+= -Wl,--as-needed # glu
41		39
42	OPTIONS_DEFINE= DEBUGGERS FFMPEG MAGICK QT5	40	OPTIONS_DEFINE= DEBUGGERS FFMPEG MAGICK QT5 LIBRETRO
43	OPTIONS_DEFAULT= DEBUGGERS FFMPEG MAGICK QT5	41	OPTIONS_DEFAULT= DEBUGGERS FFMPEG MAGICK QT5 LIBRETRO
44	OPTIONS_SUB= yes	42	OPTIONS_SUB= yes
45		43
46	DEBUGGERS_DESC= Debugging infrastructure (CLI debugger, GDB remote stub)	44	DEBUGGERS_DESC= Debugging infrastructure (CLI debugger, GDB remote stub)
Lines 47-52 Link Here
47	FFMPEG_DESC= FFmpeg video recording support	45	FFMPEG_DESC= FFmpeg video recording support
48	MAGICK_DESC= ImageMagick GIF recording support	46	MAGICK_DESC= ImageMagick GIF recording support
49	QT5_DESC= Qt 5 frontend	47	QT5_DESC= Qt 5 frontend
		48	LIBRETRO_DESC= Libretro core
50		49
51	DEBUGGERS_CMAKE_BOOL= USE_DEBUGGERS USE_EDITLINE USE_GDB_STUB	50	DEBUGGERS_CMAKE_BOOL= USE_DEBUGGERS USE_EDITLINE USE_GDB_STUB
52	DEBUGGERS_USES= libedit	51	DEBUGGERS_USES= libedit
Lines 67-70 Link Here
67	QT5_USES= desktop-file-utils qt:5	66	QT5_USES= desktop-file-utils qt:5
68	QT5_VARS= installs_icons=yes	67	QT5_VARS= installs_icons=yes
69		68
		69	LIBRETRO_CMAKE_BOOL= BUILD_LIBRETRO
		70	LIBRETRO_CMAKE_ON= -DLIBRETRO_LIBDIR=${LOCALBASE}/lib/libretro
		71
70	.include <bsd.port.mk>	72	.include <bsd.port.mk>

Lines 1-21 Link Here

(-)files/patch-git_e3137356 (-21 lines)
1	From e31373560535203d826687044290a4994706c2dd Mon Sep 17 00:00:00 2001
2	From: ilovezfs <ilovezfs@icloud.com>
3	Date: Mon, 11 Dec 2017 00:39:32 -0800
4	Subject: [PATCH] Qt: Fix build with Qt 5.10
5
6	Fixes "MemoryModel.cpp:102:15: error: no viable overloaded '='"
7	---
8	src/platform/qt/MemoryModel.cpp \| 2 +-
9	1 file changed, 1 insertion(+), 1 deletion(-)
10
11	--- src/platform/qt/MemoryModel.cpp
12	+++ src/platform/qt/MemoryModel.cpp
13	@@ -99,7 +99,7 @@ void MemoryModel::setRegion(uint32_t base, uint32_t size, const QString& name, i
14	m_top = 0;
15	m_base = base;
16	m_size = size;
17	- m_regionName = name;
18	+ m_regionName = QStaticText(name);
19	m_regionName.prepare(QTransform(), m_font);
20	m_currentBank = segment;
21	verticalScrollBar()->setRange(0, (size >> 4) + 1 - viewport()->size().height() / m_cellHeight);