Update to mgba-0.9.2.

This commit is contained in:
bentley 2021-10-16 08:51:35 +00:00
parent 8a11777172
commit 85fea34372
5 changed files with 29 additions and 36 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.43 2020/12/13 12:31:54 mestre Exp $
# $OpenBSD: Makefile,v 1.44 2021/10/16 08:51:35 bentley Exp $
COMMENT-main = Game Boy Color/Advance emulator
COMMENT-qt = Game Boy Color/Advance emulator with GUI
COMMENT-libretro = Game Boy Color/Advance core for retroarch
V = 0.8.4
V = 0.9.2
GH_ACCOUNT = mgba-emu
GH_PROJECT = mgba
GH_TAGNAME = $V
@ -17,7 +17,7 @@ DEBUG_PACKAGES = -main -qt -libretro
.include <bsd.port.arch.mk>
SHARED_LIBS += mgba 1.0 # 0.1
SHARED_LIBS += mgba 2.0 # 0.1
CATEGORIES = emulators
@ -28,13 +28,12 @@ MAINTAINER = Anthony J. Bentley <anthony@anjbe.name>
# MPL 2.0
PERMIT_PACKAGE = Yes
cWANTLIB = GL GLU SDL2 avfilter \
cWANTLIB = GL SDL2 avfilter \
avcodec avformat avutil c curses edit m png \
pthread sqlite3 swresample swscale z zip elf \
avresample
pthread sqlite3 swresample swscale z zip elf
WANTLIB-main = ${cWANTLIB}
WANTLIB-qt = ${cWANTLIB} mgba Qt5Core Qt5Gui Qt5Multimedia \
Qt5Network Qt5OpenGL Qt5Widgets ${COMPILER_LIBCXX}
Qt5Network Qt5Widgets ${COMPILER_LIBCXX}
WANTLIB-libretro = m pthread z
MODULES = devel/cmake
@ -53,7 +52,8 @@ RUN_DEPENDS-qt = devel/desktop-file-utils \
x11/gtk+3,-guic
CONFIGURE_ARGS += -DBUILD_LIBRETRO=ON \
-DUSE_PLEDGE_UNVEIL=ON
-DUSE_PLEDGE_UNVEIL=ON \
-DUSE_MINIZIP=OFF
.if ${BUILD_PACKAGES:M-qt}
MODULES += x11/qt5

View File

@ -1,2 +1,2 @@
SHA256 (mgba-0.8.4.tar.gz) = a5SHPayQQP1v2fE/dtxI80LpVPO0z4Jxe1lgHDoytyw=
SIZE (mgba-0.8.4.tar.gz) = 12347906
SHA256 (mgba-0.9.2.tar.gz) = Kcoi68VrJqTnIk77tfoSycAGVj1BmQr7CHTQSNt2rdQ=
SIZE (mgba-0.9.2.tar.gz) = 12761919

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-CMakeLists_txt,v 1.5 2020/09/24 07:31:51 bentley Exp $
$OpenBSD: patch-CMakeLists_txt,v 1.6 2021/10/16 08:51:35 bentley Exp $
Add option to drop privileges with pledge().
From https://github.com/mgba-emu/mgba/pull/1271.
@ -6,7 +6,7 @@ From https://github.com/mgba-emu/mgba/pull/1271.
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -35,6 +35,7 @@ if(NOT LIBMGBA_ONLY)
@@ -50,6 +50,7 @@ if(NOT LIBMGBA_ONLY)
set(USE_EDITLINE ON CACHE BOOL "Whether or not to enable the CLI-mode debugger")
endif()
set(USE_GDB_STUB ON CACHE BOOL "Whether or not to enable the GDB stub ARM debugger")
@ -14,29 +14,22 @@ Index: CMakeLists.txt
set(USE_FFMPEG ON CACHE BOOL "Whether or not to enable FFmpeg support")
set(USE_ZLIB ON CACHE BOOL "Whether or not to enable zlib support")
set(USE_MINIZIP ON CACHE BOOL "Whether or not to enable external minizip support")
@@ -477,6 +478,10 @@ find_feature(USE_SQLITE3 "sqlite3")
find_feature(USE_ELF "libelf")
find_feature(ENABLE_PYTHON "PythonLibs")
@@ -547,6 +548,14 @@ if(USE_GDB_STUB)
endif()
source_group("Debugger" FILES ${DEBUGGER_SRC})
+if(USE_PLEDGE_UNVEIL)
+ set(USE_EPOXY OFF)
+endif()
+
if(USE_FFMPEG)
set(USE_LIBAVRESAMPLE ON)
set(USE_LIBSWRESAMPLE ON)
@@ -508,6 +513,10 @@ if(USE_GDB_STUB)
endif()
source_group("Debugger" FILES ${DEBUGGER_SRC})
+if(USE_PLEDGE_UNVEIL)
+ list(APPEND FEATURES PLEDGE_UNVEIL)
+endif()
+
if(USE_FFMPEG)
list(APPEND FEATURES FFMPEG)
if(USE_LIBSWRESAMPLE)
@@ -1228,6 +1237,7 @@ if(NOT QUIET AND NOT LIBMGBA_ONLY)
if(LIBSWRESAMPLE_FOUND)
@@ -1231,6 +1240,7 @@ if(NOT QUIET AND NOT LIBMGBA_ONLY)
message(STATUS " CLI debugger: ${USE_EDITLINE}")
endif()
message(STATUS " GDB stub: ${USE_GDB_STUB}")

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_platform_sdl_main_c,v 1.4 2020/04/13 02:53:05 bentley Exp $
$OpenBSD: patch-src_platform_sdl_main_c,v 1.5 2021/10/16 08:51:35 bentley Exp $
Add option to drop privileges with pledge().
From https://github.com/mgba-emu/mgba/pull/1271.
@ -6,7 +6,7 @@ From https://github.com/mgba-emu/mgba/pull/1271.
Index: src/platform/sdl/main.c
--- src/platform/sdl/main.c.orig
+++ src/platform/sdl/main.c
@@ -44,6 +44,11 @@ static void mSDLDeinit(struct mSDLRenderer* renderer);
@@ -43,6 +43,11 @@ static void mSDLDeinit(struct mSDLRenderer* renderer);
static int mSDLRun(struct mSDLRenderer* renderer, struct mArguments* args);
@ -18,7 +18,7 @@ Index: src/platform/sdl/main.c
static struct VFile* _state = NULL;
static void _loadState(struct mCoreThread* thread) {
@@ -149,6 +154,15 @@ int main(int argc, char** argv) {
@@ -164,6 +169,15 @@ int main(int argc, char** argv) {
renderer.player.bindings = &renderer.core->inputMap;
mSDLInitBindingsGBA(&renderer.core->inputMap);
mSDLInitEvents(&renderer.events);
@ -34,7 +34,7 @@ Index: src/platform/sdl/main.c
mSDLEventsLoadConfig(&renderer.events, mCoreConfigGetInput(&renderer.core->config));
mSDLAttachPlayer(&renderer.events, &renderer.player);
mSDLPlayerLoadConfig(&renderer.player, mCoreConfigGetInput(&renderer.core->config));
@@ -264,6 +278,12 @@ int mSDLRun(struct mSDLRenderer* renderer, struct mArg
@@ -282,6 +296,12 @@ int mSDLRun(struct mSDLRenderer* renderer, struct mArg
state->close(state);
}
}
@ -47,7 +47,7 @@ Index: src/platform/sdl/main.c
renderer->runloop(renderer, &thread);
mSDLPauseAudio(&renderer->audio);
if (mCoreThreadHasCrashed(&thread)) {
@@ -312,3 +332,43 @@ static void mSDLDeinit(struct mSDLRenderer* renderer)
@@ -321,3 +341,43 @@ static void mSDLDeinit(struct mSDLRenderer* renderer)
SDL_Quit();
}

View File

@ -1,12 +1,12 @@
@comment $OpenBSD: PLIST-main,v 1.7 2020/09/24 07:31:51 bentley Exp $
@comment $OpenBSD: PLIST-main,v 1.8 2021/10/16 08:51:36 bentley Exp $
@bin bin/mgba
include/mgba/
include/mgba-util/
include/mgba-util/arm-algo.h
include/mgba-util/circle-buffer.h
include/mgba-util/common.h
include/mgba-util/configuration.h
include/mgba-util/crc32.h
include/mgba-util/dllexports.h
include/mgba-util/elf-read.h
include/mgba-util/export.h
include/mgba-util/formatting.h
@ -73,7 +73,6 @@ include/mgba/core/timing.h
include/mgba/core/version.h
include/mgba/debugger/
include/mgba/debugger/debugger.h
include/mgba/dllexports.h
include/mgba/feature/
include/mgba/feature/commandline.h
include/mgba/feature/thread-proxy.h
@ -105,6 +104,7 @@ include/mgba/internal/debugger/
include/mgba/internal/debugger/cli-debugger.h
include/mgba/internal/debugger/gdb-stub.h
include/mgba/internal/debugger/parser.h
include/mgba/internal/debugger/stack-trace.h
include/mgba/internal/debugger/symbols.h
include/mgba/internal/gb/
include/mgba/internal/gb/audio.h
@ -115,6 +115,7 @@ include/mgba/internal/gb/debugger/symbols.h
include/mgba/internal/gb/extra/
include/mgba/internal/gb/extra/cli.h
include/mgba/internal/gb/gb.h
include/mgba/internal/gb/input.h
include/mgba/internal/gb/io.h
include/mgba/internal/gb/mbc.h
include/mgba/internal/gb/memory.h
@ -151,15 +152,12 @@ include/mgba/internal/gba/renderers/common.h
include/mgba/internal/gba/renderers/gl.h
include/mgba/internal/gba/renderers/proxy.h
include/mgba/internal/gba/renderers/video-software.h
include/mgba/internal/gba/rr/
include/mgba/internal/gba/rr/mgm.h
include/mgba/internal/gba/rr/rr.h
include/mgba/internal/gba/rr/vbm.h
include/mgba/internal/gba/savedata.h
include/mgba/internal/gba/serialize.h
include/mgba/internal/gba/sharkport.h
include/mgba/internal/gba/sio/
include/mgba/internal/gba/sio.h
include/mgba/internal/gba/sio/dolphin.h
include/mgba/internal/gba/sio/lockstep.h
include/mgba/internal/gba/timer.h
include/mgba/internal/gba/vfame.h
@ -181,6 +179,8 @@ share/doc/mGBA/CHANGES
share/doc/mGBA/LICENSE
share/doc/mGBA/README.md
share/doc/mGBA/README_DE.md
share/doc/mGBA/README_ES.md
share/doc/mGBA/README_ZH_CN.md
share/doc/mGBA/licenses/
share/doc/mGBA/licenses/blip_buf.txt
share/doc/mGBA/licenses/discord-rpc.txt