Attachment #201443 for bug #227346




# $FreeBSD$

PORTNAME=	mgba
DISTVERSION=	0.7.0
PORTREVISION=	7
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


LIB_DEPENDS=	libepoxy.so:graphics/libepoxy \
		libpng.so:graphics/png

USES=		cmake compiler:c++11-lang localbase:ldflags pkgconfig sqlite:3 gnome gl

USE_GITHUB=	yes
GH_ACCOUNT=	mgba-emu

		-DBUILD_GLES2:BOOL=OFF
LDFLAGS+=	-Wl,--as-needed # glu

OPTIONS_DEFINE=	DEBUGGERS FFMPEG MAGICK QT5 LIBRETRO DOCS
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=${PREFIX}/lib/libretro

.include <bsd.port.mk>

Lines 1-7 Link Here

(-)w/emulators/mgba/distinfo (-7 / +3 lines)
1	TIMESTAMP = 1535682053	1	TIMESTAMP = 1548585797
2	SHA256 (mgba-emu-mgba-0.6.1_GH0.tar.gz) = 7c78feb0aa12930b993ca1b220d282ed178e306621559e48bb168623030eb876	2	SHA256 (mgba-emu-mgba-0.7.0_GH0.tar.gz) = d4846db69a291b629d39c533635464ea4334c7410b16292401c5a4c58316ed83
3	SIZE (mgba-emu-mgba-0.6.1_GH0.tar.gz) = 7437240	3	SIZE (mgba-emu-mgba-0.7.0_GH0.tar.gz) = 10767992
4	SHA256 (a7a51a11373f.patch) = c6c7dbced0350392cbb0efba8b417fdab65a4db929f747ff6c4159f7f07c1216
5	SIZE (a7a51a11373f.patch) = 1485
6	SHA256 (a2b8c4ae807a.patch) = 6c09491f3a095c54e93247d8875497ae5a8f151bd2ff8e8756c12030cffcdc8b
7	SIZE (a2b8c4ae807a.patch) = 975




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);




bin/mgba
%%QT5%%bin/mgba-qt
include/mgba/flags.h
lib/libmgba.so.0.7
lib/libmgba.so.0.7.0
%%LIBRETRO%%lib/libretro/mgba_libretro.so
%%QT5%%man/man6/mgba-qt.6.gz
man/man6/mgba.6.gz
%%PORTDOCS%%%%DOCSDIR%%/CHANGES
%%PORTDOCS%%%%DOCSDIR%%/README.md
%%QT5%%share/applications/mgba-qt.desktop
%%PORTDOCS%%%%DOCSDIR%%/CHANGES
%%PORTDOCS%%%%DOCSDIR%%/LICENSE
%%PORTDOCS%%%%DOCSDIR%%/README.md
%%PORTDOCS%%%%DOCSDIR%%/README_DE.md
%%PORTDOCS%%%%DOCSDIR%%/licenses/blip_buf.txt
%%PORTDOCS%%%%DOCSDIR%%/licenses/inih.txt
share/icons/hicolor/128x128/apps/mgba.png
share/icons/hicolor/16x16/apps/mgba.png
share/icons/hicolor/24x24/apps/mgba.png

Return to bug 227346

Lines 1-14 Link Here

(-)w/emulators/mgba/Makefile (-9 / +8 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= mgba	3	PORTNAME= mgba
4	DISTVERSION= 0.6.1	4	DISTVERSION= 0.7.0
5	PORTREVISION= 7
6	CATEGORIES= emulators	5	CATEGORIES= emulators
7		6
8	PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
9	PATCHFILES= a7a51a11373f.patch:-p1 \
10	a2b8c4ae807a.patch:-p1
11
12	MAINTAINER= greg@unrelenting.technology	7	MAINTAINER= greg@unrelenting.technology
13	COMMENT= Game Boy Advance (GBA) emulator/debugger	8	COMMENT= Game Boy Advance (GBA) emulator/debugger
14		9
Lines 21-27 LICENSE_FILE_MPL20= ${WRKSRC}/LICENSE Link Here
21	LIB_DEPENDS= libepoxy.so:graphics/libepoxy \	16	LIB_DEPENDS= libepoxy.so:graphics/libepoxy \
22	libpng.so:graphics/png	17	libpng.so:graphics/png
23		18
24	USES= cmake compiler:c++11-lang localbase:ldflags pkgconfig sqlite:3	19	USES= cmake compiler:c++11-lang localbase:ldflags pkgconfig sqlite:3 gnome gl
25		20
26	USE_GITHUB= yes	21	USE_GITHUB= yes
27	GH_ACCOUNT= mgba-emu	22	GH_ACCOUNT= mgba-emu
Lines 39-52 CMAKE_ARGS= -DCMAKE_INSTALL_DOCDIR:STRING="${DOCSDIR}" \ Link Here
39	-DBUILD_GLES2:BOOL=OFF	34	-DBUILD_GLES2:BOOL=OFF
40	LDFLAGS+= -Wl,--as-needed # glu	35	LDFLAGS+= -Wl,--as-needed # glu
41		36
42	OPTIONS_DEFINE= DEBUGGERS FFMPEG MAGICK QT5 DOCS	37	OPTIONS_DEFINE= DEBUGGERS FFMPEG MAGICK QT5 LIBRETRO DOCS
43	OPTIONS_DEFAULT= DEBUGGERS FFMPEG MAGICK QT5	38	OPTIONS_DEFAULT= DEBUGGERS FFMPEG MAGICK QT5 LIBRETRO
44	OPTIONS_SUB= yes	39	OPTIONS_SUB= yes
45		40
46	DEBUGGERS_DESC= Debugging infrastructure (CLI debugger, GDB remote stub)	41	DEBUGGERS_DESC= Debugging infrastructure (CLI debugger, GDB remote stub)
47	FFMPEG_DESC= FFmpeg video recording support	42	FFMPEG_DESC= FFmpeg video recording support
48	MAGICK_DESC= ImageMagick GIF recording support	43	MAGICK_DESC= ImageMagick GIF recording support
49	QT5_DESC= Qt 5 frontend	44	QT5_DESC= Qt 5 frontend
		45	LIBRETRO_DESC= Libretro core
50		46
51	DEBUGGERS_CMAKE_BOOL= USE_DEBUGGERS USE_EDITLINE USE_GDB_STUB	47	DEBUGGERS_CMAKE_BOOL= USE_DEBUGGERS USE_EDITLINE USE_GDB_STUB
52	DEBUGGERS_USES= libedit	48	DEBUGGERS_USES= libedit
Lines 67-70 QT5_USE= qt=qmake_build,buildtools_build,core,gui,widgets,network,opengl,multime Link Here
67	QT5_USES= desktop-file-utils qt:5	63	QT5_USES= desktop-file-utils qt:5
68	QT5_VARS= installs_icons=yes	64	QT5_VARS= installs_icons=yes
69		65
		66	LIBRETRO_CMAKE_BOOL= BUILD_LIBRETRO
		67	LIBRETRO_CMAKE_ON= -DLIBRETRO_LIBDIR=${PREFIX}/lib/libretro
		68
70	.include <bsd.port.mk>	69	.include <bsd.port.mk>

Removed Link Here

(-)c/emulators/mgba/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);

Lines 1-13 Link Here

(-)w/emulators/mgba/pkg-plist (-4 / +9 lines)
1	bin/mgba	1	bin/mgba
2	%%QT5%%bin/mgba-qt	2	%%QT5%%bin/mgba-qt
3	include/mgba/flags.h	3	include/mgba/flags.h
4	lib/libmgba.so.0.6	4	lib/libmgba.so.0.7
5	lib/libmgba.so.0.6.1	5	lib/libmgba.so.0.7.0
		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%%/README.md
10	%%QT5%%share/applications/mgba-qt.desktop	9	%%QT5%%share/applications/mgba-qt.desktop
		10	%%PORTDOCS%%%%DOCSDIR%%/CHANGES
		11	%%PORTDOCS%%%%DOCSDIR%%/LICENSE
		12	%%PORTDOCS%%%%DOCSDIR%%/README.md
		13	%%PORTDOCS%%%%DOCSDIR%%/README_DE.md
		14	%%PORTDOCS%%%%DOCSDIR%%/licenses/blip_buf.txt
		15	%%PORTDOCS%%%%DOCSDIR%%/licenses/inih.txt
11	share/icons/hicolor/128x128/apps/mgba.png	16	share/icons/hicolor/128x128/apps/mgba.png
12	share/icons/hicolor/16x16/apps/mgba.png	17	share/icons/hicolor/16x16/apps/mgba.png
13	share/icons/hicolor/24x24/apps/mgba.png	18	share/icons/hicolor/24x24/apps/mgba.png