CVS commit: pkgsrc/emulators/mgba

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Jun 19 13:06:35 UTC 2020

Modified Files:
        pkgsrc/emulators/mgba: MESSAGE.NetBSD Makefile PLIST distinfo
            options.mk

Log Message:
mgba: Update to 0.8.2

0.8.2: (2020-06-14)
Emulation fixes:
 - ARM: Fix timing on Thumb shift instructions
 - GB: Fix GBC game registers after skipping BIOS
 - GB MBC: Support 4MB MBC30 ROMs (fixes mgba.io/i/1713)
 - GB Video: Fix BGPS value after skipping BIOS (fixes mgba.io/i/1717)
 - GBA: Add missing RTC overrides for Legendz games
 - GBA BIOS: Reset renderer when RegisterRamReset called (fixes mgba.io/i/1756)
 - GBA SIO: Fix Multiplayer busy bit
 - GBA SIO: Fix double-unloading active driver
 - GBA Timers: Fix deserializing count-up timers
 - GBA Video: Fix mosaic objects drawing past the end (fixes mgba.io/i/1702)
 - GBA Video: Fix disabling OBJWIN in GL renderer (fixes mgba.io/i/1759)
 - GBA Video: Add missing parts of 256-color mode 0 mosaic (fixes mgba.io/i/1701)
 - GBA Video: Fix double-size OBJ wrapping in GL renderer (fixes mgba.io/i/1712)
 - GBA Video: Simplify sprite cycle counting (fixes mgba.io/i/1279)
 - GBA Video: Fix sprite/backdrop blending regression
Other fixes:
 - 3DS: Fix framelimiter on newer citro3d (fixes mgba.io/i/1771)
 - ARM: Fix disassembling of several S-type instructions (fixes mgba.io/i/1778)
 - ARM Debugger: Clear low bit on breakpoint addresses (fixes mgba.io/i/1764)
 - CMake: Always use devkitPro toolchain when applicable (fixes mgba.io/i/1755)
 - Core: Fix ELF loading regression (fixes mgba.io/i/1669)
 - Core: Fix crash modifying hash table entry (fixes mgba.io/i/1673)
 - GB Video: Fix some cases where SGB border doesn't draw to multi-buffers
 - GBA: Reject incorrectly sized BIOSes
 - GBA: Break infinite loop for 0-frame mVLs (fixes mgba.io/i/1723)
 - Qt: Fix OpenGL 2.1 support (fixes mgba.io/i/1678)
 - Qt: Fix unmapping zipped ROM (fixes mgba.io/i/1777)
Misc:
 - 3DS: Clean up legacy initialization (fixes mgba.io/i/1768)
 - GBA Serialize: Only flunk BIOS check if official BIOS was expected
 - Qt: Disable Replace ROM option when no game loaded
 - Qt: Defer texture updates until frame is drawn (fixes mgba.io/i/1590)
 - Qt: Set icon for Discord Rich Presence
 - Qt: Show a warning when save file can't be opened


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/emulators/mgba/MESSAGE.NetBSD
cvs rdiff -u -r1.14 -r1.15 pkgsrc/emulators/mgba/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/emulators/mgba/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/emulators/mgba/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/emulators/mgba/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/mgba/MESSAGE.NetBSD
diff -u pkgsrc/emulators/mgba/MESSAGE.NetBSD:1.1 pkgsrc/emulators/mgba/MESSAGE.NetBSD:1.2
--- pkgsrc/emulators/mgba/MESSAGE.NetBSD:1.1    Sat Jun  8 22:46:03 2019
+++ pkgsrc/emulators/mgba/MESSAGE.NetBSD        Fri Jun 19 13:06:35 2020
@@ -1,7 +1,14 @@
 ===========================================================================
-$NetBSD: MESSAGE.NetBSD,v 1.1 2019/06/08 22:46:03 nia Exp $
+$NetBSD: MESSAGE.NetBSD,v 1.2 2020/06/19 13:06:35 nia Exp $
 
-Lowering the system audio latency (or blk_ms) with sysctl(8) may be
-required to achieve full performance and framerates.
+With the Qt UI (mgba-qt), the OpenGL video driver seems to cause frame
+drops below 60FPS on certain hardware. The SDL UI (mgba) seems to be solid.
+
+You might want to change the audio sample rate (in mGBA's settings)
+to the native rate of the device (usually 48000 Hz, or a multiple).
+
+NetBSD 9.0's default audio latency of 4-10ms seems good enough. If
+yours is set to any higher, sysctl hw.audio0.blk_ms might need to be
+lowered for full performance and framerates.
 
 ===========================================================================

Index: pkgsrc/emulators/mgba/Makefile
diff -u pkgsrc/emulators/mgba/Makefile:1.14 pkgsrc/emulators/mgba/Makefile:1.15
--- pkgsrc/emulators/mgba/Makefile:1.14 Tue Jun  2 08:23:46 2020
+++ pkgsrc/emulators/mgba/Makefile      Fri Jun 19 13:06:35 2020
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2020/06/02 08:23:46 adam Exp $
+# $NetBSD: Makefile,v 1.15 2020/06/19 13:06:35 nia Exp $
 
-DISTNAME=      mgba-0.8.1
-PKGREVISION=   4
+DISTNAME=      mgba-0.8.2
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=mgba-emu/}
 
@@ -10,13 +9,15 @@ HOMEPAGE=    https://mgba.io/
 COMMENT=       Emulator for running Game Boy Advance games
 LICENSE=       mpl-2.0
 
-EXTRACT_USING= bsdtar
 USE_TOOLS+=    pkg-config
 USE_CMAKE=     yes
 USE_LANGUAGES= c c++
 
-# using libzip
-CMAKE_ARGS+=   -DUSE_MINIZIP=OFF
+# C++14
+GCC_REQD+=     5
+
+CMAKE_ARGS+=   -DUSE_DISCORD_RPC=OFF
+CMAKE_ARGS+=   -DUSE_MINIZIP=OFF # using libzip
 
 .include "options.mk"
 .include "../../archivers/libzip/buildlink3.mk"

Index: pkgsrc/emulators/mgba/PLIST
diff -u pkgsrc/emulators/mgba/PLIST:1.5 pkgsrc/emulators/mgba/PLIST:1.6
--- pkgsrc/emulators/mgba/PLIST:1.5     Tue Feb 18 13:29:48 2020
+++ pkgsrc/emulators/mgba/PLIST Fri Jun 19 13:06:35 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2020/02/18 13:29:48 nia Exp $
+@comment $NetBSD: PLIST,v 1.6 2020/06/19 13:06:35 nia Exp $
 bin/mgba
 ${PLIST.qt}bin/mgba-qt
 include/mgba-util/arm-algo.h
@@ -154,9 +154,7 @@ share/doc/mGBA/LICENSE
 share/doc/mGBA/README.md
 share/doc/mGBA/README_DE.md
 share/doc/mGBA/licenses/blip_buf.txt
-share/doc/mGBA/licenses/discord-rpc.txt
 share/doc/mGBA/licenses/inih.txt
-share/doc/mGBA/licenses/rapidjson.txt
 share/icons/hicolor/128x128/apps/mgba.png
 share/icons/hicolor/16x16/apps/mgba.png
 share/icons/hicolor/24x24/apps/mgba.png

Index: pkgsrc/emulators/mgba/distinfo
diff -u pkgsrc/emulators/mgba/distinfo:1.6 pkgsrc/emulators/mgba/distinfo:1.7
--- pkgsrc/emulators/mgba/distinfo:1.6  Tue Feb 18 13:29:48 2020
+++ pkgsrc/emulators/mgba/distinfo      Fri Jun 19 13:06:35 2020
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.6 2020/02/18 13:29:48 nia Exp $
+$NetBSD: distinfo,v 1.7 2020/06/19 13:06:35 nia Exp $
 
-SHA1 (mgba-0.8.1.tar.gz) = b22963764f7213ec0e599cf1504973f5655c92a7
-RMD160 (mgba-0.8.1.tar.gz) = bb2a05688cbd1965c670b18f162675adcf7acc2b
-SHA512 (mgba-0.8.1.tar.gz) = 7873bde6a74e8a1509a3b5bba602da1c747ca1eff72adcf11f7b2572298d94766570fea0b920cb28c8b63a7d8237a15876b9feb9169edbf331b2d72f340734e2
-Size (mgba-0.8.1.tar.gz) = 11893993 bytes
+SHA1 (mgba-0.8.2.tar.gz) = 170597b9be302b942ec04e7cb2d8a24c8298c87f
+RMD160 (mgba-0.8.2.tar.gz) = 5c964dc3ef92e470c914f6a3939b343ee149c40a
+SHA512 (mgba-0.8.2.tar.gz) = 181abab9e94964e2027cb039ded6128af1364e1442c418b8703263c9e0c5befeb7aca4d925fb44f3e25e8711a2cc22b198ea00483c42aea3b1c7ba077223d426
+Size (mgba-0.8.2.tar.gz) = 12014352 bytes
 SHA1 (patch-CMakeLists.txt) = 025f67fa8cabfcbb7a2e1761e3352f23df5068f8
 SHA1 (patch-include_mgba-util_math.h) = 448ca1bb3bbe2812e7d9482917c488ddcf3b48f0
 SHA1 (patch-include_mgba-util_platform_posix_threading.h) = deabb02eda72a4682ad84f263982eb6f8db4699b
 SHA1 (patch-src_platform_qt_CMakeLists.txt) = e8adb538c1319d6a5c380aa091aa3b10e3ed29e7
+SHA1 (patch-src_platform_qt_Display.cpp) = 5cb9049b1d1dbf4652a579534bc6577908a552ca
 SHA1 (patch-version.cmake) = 7d6d44febe7bb0ff2231452f037def7cb3782e21

Index: pkgsrc/emulators/mgba/options.mk
diff -u pkgsrc/emulators/mgba/options.mk:1.4 pkgsrc/emulators/mgba/options.mk:1.5
--- pkgsrc/emulators/mgba/options.mk:1.4        Sun Jun 14 22:01:23 2020
+++ pkgsrc/emulators/mgba/options.mk    Fri Jun 19 13:06:35 2020
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.4 2020/06/14 22:01:23 nia Exp $
+# $NetBSD: options.mk,v 1.5 2020/06/19 13:06:35 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.mgba
 
-PKG_SUPPORTED_OPTIONS+=        ffmpeg imagemagick qt5 opengl
-PKG_SUGGESTED_OPTIONS+=        ffmpeg imagemagick qt5 opengl
+PKG_SUPPORTED_OPTIONS+=        ffmpeg qt5 opengl
+PKG_SUGGESTED_OPTIONS+=        ffmpeg qt5 opengl
 
 PLIST_SRC+=    PLIST
 PLIST_VARS+=   qt
@@ -17,19 +17,16 @@ CMAKE_ARGS+=        -DUSE_FFMPEG=ON
 CMAKE_ARGS+=   -DUSE_FFMPEG=OFF
 .endif
 
-.if !empty(PKG_OPTIONS:Mimagemagick)
-CMAKE_ARGS+=   -DUSE_MAGICK=ON
-.include "../../graphics/ImageMagick/buildlink3.mk"
-.else
-CMAKE_ARGS+=   -DUSE_MAGICK=OFF
-.endif
-
 .if !empty(PKG_OPTIONS:Mqt5)
 PLIST.qt=      yes
 CMAKE_ARGS+=   -DBUILD_QT=ON
+# We probably don't actually want Qt5Multimedia.
+# It's an option as an audio output, but SDL supports many more pkgsrc
+# platforms natively, without going via PulseAudio.
+CMAKE_ARGS+=   -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Multimedia=TRUE
 TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools
 .include "../../x11/qt5-qtbase/buildlink3.mk"
-.include "../../x11/qt5-qtmultimedia/buildlink3.mk"
+#.include "../../x11/qt5-qtmultimedia/buildlink3.mk"
 .else
 CMAKE_ARGS+=   -DBUILD_QT=OFF
 .endif