From 60bf2d8f81ecf103f63b618d0f15c5095459640a Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Tue, 29 Jan 2019 00:46:50 +0000 Subject: [PATCH] emulators/mgba: update to 0.7.0 - Expose libretro core as a port option - Add USES=gl for USE_GL, USES=gnome for INSTALLS_ICONS Changes: https://github.com/mgba-emu/mgba/blob/0.7.0/CHANGES PR: 227346 Submitted by: Greg V (maintainer) --- emulators/mgba/Makefile | 17 ++++++++--------- emulators/mgba/distinfo | 10 +++------- emulators/mgba/files/patch-git_e3137356 | 21 --------------------- emulators/mgba/pkg-plist | 13 +++++++++---- 4 files changed, 20 insertions(+), 41 deletions(-) delete mode 100644 emulators/mgba/files/patch-git_e3137356 diff --git a/emulators/mgba/Makefile b/emulators/mgba/Makefile index 268de54dc078..727598fabcde 100644 --- a/emulators/mgba/Makefile +++ b/emulators/mgba/Makefile @@ -1,14 +1,9 @@ # $FreeBSD$ PORTNAME= mgba -DISTVERSION= 0.6.1 -PORTREVISION= 7 +DISTVERSION= 0.7.0 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 @@ -21,7 +16,7 @@ LICENSE_FILE_MPL20= ${WRKSRC}/LICENSE LIB_DEPENDS= libepoxy.so:graphics/libepoxy \ libpng.so:graphics/png -USES= cmake compiler:c++11-lang localbase:ldflags pkgconfig sqlite:3 +USES= cmake compiler:c++11-lang gl gnome localbase:ldflags pkgconfig sqlite:3 USE_GITHUB= yes GH_ACCOUNT= mgba-emu @@ -39,12 +34,13 @@ CMAKE_ARGS= -DCMAKE_INSTALL_DOCDIR:STRING="${DOCSDIR}" \ -DBUILD_GLES2:BOOL=OFF LDFLAGS+= -Wl,--as-needed # glu -OPTIONS_DEFINE= DEBUGGERS FFMPEG MAGICK QT5 DOCS -OPTIONS_DEFAULT= DEBUGGERS FFMPEG MAGICK QT5 +OPTIONS_DEFINE= DEBUGGERS FFMPEG LIBRETRO MAGICK QT5 DOCS +OPTIONS_DEFAULT= DEBUGGERS FFMPEG LIBRETRO MAGICK QT5 OPTIONS_SUB= yes DEBUGGERS_DESC= Debugging infrastructure (CLI debugger, GDB remote stub) FFMPEG_DESC= FFmpeg video recording support +LIBRETRO_DESC= libretro core MAGICK_DESC= ImageMagick GIF recording support QT5_DESC= Qt 5 frontend @@ -58,6 +54,9 @@ FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libavutil.so:multimedia/ffmpeg \ libswscale.so:multimedia/ffmpeg +LIBRETRO_CMAKE_BOOL= BUILD_LIBRETRO +LIBRETRO_CMAKE_ON= -DLIBRETRO_LIBDIR:PATH="${PREFIX}/lib/libretro" + MAGICK_CMAKE_BOOL= USE_MAGICK MAGICK_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick6 \ libMagickCore-6.so:graphics/ImageMagick6 diff --git a/emulators/mgba/distinfo b/emulators/mgba/distinfo index 4cdce9192b18..849f6bc1dbfd 100644 --- a/emulators/mgba/distinfo +++ b/emulators/mgba/distinfo @@ -1,7 +1,3 @@ -TIMESTAMP = 1535682053 -SHA256 (mgba-emu-mgba-0.6.1_GH0.tar.gz) = 7c78feb0aa12930b993ca1b220d282ed178e306621559e48bb168623030eb876 -SIZE (mgba-emu-mgba-0.6.1_GH0.tar.gz) = 7437240 -SHA256 (a7a51a11373f.patch) = c6c7dbced0350392cbb0efba8b417fdab65a4db929f747ff6c4159f7f07c1216 -SIZE (a7a51a11373f.patch) = 1485 -SHA256 (a2b8c4ae807a.patch) = 6c09491f3a095c54e93247d8875497ae5a8f151bd2ff8e8756c12030cffcdc8b -SIZE (a2b8c4ae807a.patch) = 975 +TIMESTAMP = 1548585797 +SHA256 (mgba-emu-mgba-0.7.0_GH0.tar.gz) = d4846db69a291b629d39c533635464ea4334c7410b16292401c5a4c58316ed83 +SIZE (mgba-emu-mgba-0.7.0_GH0.tar.gz) = 10767992 diff --git a/emulators/mgba/files/patch-git_e3137356 b/emulators/mgba/files/patch-git_e3137356 deleted file mode 100644 index efd78b3c77b4..000000000000 --- a/emulators/mgba/files/patch-git_e3137356 +++ /dev/null @@ -1,21 +0,0 @@ -From e31373560535203d826687044290a4994706c2dd Mon Sep 17 00:00:00 2001 -From: ilovezfs -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); diff --git a/emulators/mgba/pkg-plist b/emulators/mgba/pkg-plist index 34f73f534d78..ad03c9414dc9 100644 --- a/emulators/mgba/pkg-plist +++ b/emulators/mgba/pkg-plist @@ -1,13 +1,18 @@ bin/mgba %%QT5%%bin/mgba-qt include/mgba/flags.h -lib/libmgba.so.0.6 -lib/libmgba.so.0.6.1 +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