Update to gambatte-0.5.0.571.

This commit is contained in:
bentley 2014-11-19 10:32:48 +00:00
parent 0bd0eb80b5
commit 618cae847c
8 changed files with 55 additions and 92 deletions

View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.9 2014/03/10 04:18:25 bentley Exp $
# $OpenBSD: Makefile,v 1.10 2014/11/19 10:32:48 bentley Exp $
COMMENT = highly accurate Game Boy Color emulator
REV = 550
REV = 571
DISTNAME = gambatte_src-r${REV}
PKGNAME = gambatte-0.5.0.${REV}
REVISION = 0
CATEGORIES = emulators
@ -27,7 +26,7 @@ LIB_DEPENDS = devel/sdl
TEST_DEPENDS = graphics/png
pre-configure:
${SUBST_CMD} ${WRKDIST}/testrunner/SConstruct
${SUBST_CMD} ${WRKDIST}/test/SConstruct
do-build:
${SETENV} ${MAKE_ENV} ${MODSCONS_BIN} -C ${WRKDIST}/libgambatte \
@ -40,9 +39,9 @@ do-install:
${INSTALL_DATA} ${FILESDIR}/gambatte_sdl.6 ${PREFIX}/man/man6
do-test:
${SETENV} ${MAKE_ENV} ${MODSCONS_BIN} -C ${WRKDIST}/testrunner \
${SETENV} ${MAKE_ENV} ${MODSCONS_BIN} -C ${WRKDIST}/test \
${MODSCONS_ENV} ${MODSCONS_FLAGS} ${ALL_TARGET}
cd ${WRKDIST}/testrunner && \
cd ${WRKDIST}/test && \
${MODPY_BIN} qdgbas.py hwtests/*.asm hwtests/*/*.asm \
hwtests/*/*/*.asm hwtests/*/*/*/*.asm && ./run_tests.sh

View File

@ -1,2 +1,2 @@
SHA256 (gambatte_src-r550.tar.gz) = i9IA5g67SGefXVr+4Q8s0plzM0ZLiXip2BwmJynB1dg=
SIZE (gambatte_src-r550.tar.gz) = 520348
SHA256 (gambatte_src-r571.tar.gz) = JbfAtc6CFCPGBi3X/MJa1+gXmUy2j/a8p2OT6dVwJOE=
SIZE (gambatte_src-r571.tar.gz) = 522199

View File

@ -1,4 +1,4 @@
.\" $OpenBSD: gambatte_sdl.6,v 1.1 2014/03/10 04:18:25 bentley Exp $
.\" $OpenBSD: gambatte_sdl.6,v 1.2 2014/11/19 10:32:48 bentley Exp $
.Dd August 27, 2007
.Dt GAMBATTE 6
.Os
@ -9,7 +9,7 @@
.Nm gambatte
.Op Fl f
.Op Fl i Ar keys
.Op Fl Fl list-keys
.Op Fl -list-keys
.Op Fl r Ar freq
.Op Fl s Ar scale
.Op Fl v Ar filter
@ -23,24 +23,24 @@ loaded as a Game Boy cartridge.
.Pp
The options are as follows:
.Bl -tag -width Ds
.It Fl Fl controls
.It Fl -controls
Show keyboard controls.
.It Fl Fl force-dmg
.It Fl -force-dmg
Force DMG mode.
.It Fl f , Fl Fl full-screen
.It Fl f , Fl -full-screen
Start in full screen mode.
.It Fl Fl gba-cgb
Emulate the Game Boy Advance's CGB mode.
.It Fl Fl multicart-compat
.It Fl -gba-cgb
Emulate the Game Boy Advance\(cqs CGB mode.
.It Fl -multicart-compat
Support certain multicart ROM images by not strictly respecting the MBC type
in the ROM header.
.It Fl i Ar keys , Fl Fl input Ar keys
.It Fl i Ar keys , Fl -input Ar keys
Use the 8 given input
.Ar keys
for respectively
.br
START SELECT A B UP DOWN LEFT RIGHT
.It Fl l Ar n , Fl Fl latency Ar n
.It Fl l Ar n , Fl -latency Ar n
Use audio buffer latency of
.Ar n
ms.
@ -48,10 +48,10 @@ ms.
16 \(<=
.Ar n
\(<= 5000, default: 133
.It Fl Fl list-keys
.It Fl -list-keys
List valid input
.Ar keys .
.It Fl p Ar n , Fl Fl periods Ar n
.It Fl p Ar n , Fl -periods Ar n
Use
.Ar n
audio buffer periods.
@ -59,7 +59,7 @@ audio buffer periods.
1 \(<=
.Ar n
\(<= 32, default: 4
.It Fl Fl resampler Ar n
.It Fl -resampler Ar n
Use audio resampler number
.Ar n.
.Bl -inset -compact
@ -76,7 +76,7 @@ Very high quality
Highest quality
.Pq polyphase FIR
.El
.It Fl r Ar n , Fl Fl sample-rate Ar n
.It Fl r Ar n , Fl -sample-rate Ar n
Use sound sample rate of
.Ar n
Hz.
@ -84,52 +84,52 @@ Hz.
32000 \(<=
.Ar n
\(<= 192000, default: 48000
.It Fl s Ar n , Fl Fl scale Ar n
.It Fl s Ar n , Fl -scale Ar n
Scale video output by an integer factor of
.Ar n .
.It Fl v Ar n , Fl Fl video-filter Ar n
.It Fl v Ar n , Fl -video-filter Ar n
Use video filter number
.Ar n :
.Bl -inset -compact
.It 0
None
.It 1
Bicubic Catmull-Rom spline 2\(mu
Bicubic Catmull\(hyRom spline 2\(mu
.It 2
Bicubic Catmull-Rom spline 3\(mu
Bicubic Catmull\(hyRom spline 3\(mu
.It 3
Kreed's 2xSal
Kreed\(cqs 2xSal
.It 4
MaxSt's hq2x
MaxSt\(cqs hq2x
.It 5
MaxSt's hq3x
MaxSt\(cqs hq3x
.El
.It Fl y , Fl Fl yuv-overlay
.It Fl y , Fl -yuv-overlay
Use YUV overlay for
.Pq usually faster
scaling.
.El
.Sh INTERACTIVE KEYBOARD CONTROLS
.Bl -hang
.It Cm TAB
fast-forward
.It Cm Ctrl-f
.Bl -hang -width "<Return>" -compact
.It Aq Cm Tab
fast\(hyforward
.It Aq Cm Ctrl Ns + Ns Cm f
toggle full screen
.It Cm Ctrl-r
.It Aq Cm Ctrl Ns + Ns Cm r
reset
.It Cm F5
.It Aq Cm F5
save state
.It Cm F6
.It Aq Cm F6
choose previous state slot
.It Cm F7
.It Aq Cm F7
choose next state slot
.It Cm F8
.It Aq Cm F8
load state
.It Cm 0\(en9
choose state slot 0 to 9
.It Cm Return
.It Aq Cm Return
Start
.It Cm Shift
.It Aq Cm Shift
Select
.It Cm d
A

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gambatte_sdl_src_gambatte_sdl_cpp,v 1.1 2013/05/31 15:34:56 bentley Exp $
--- gambatte_sdl/src/gambatte_sdl.cpp.orig Thu May 30 13:44:21 2013
+++ gambatte_sdl/src/gambatte_sdl.cpp Thu May 30 13:44:22 2013
@@ -804,7 +804,7 @@ int GambatteSdl::run(long const sampleRate, int const
return 0;
BlitterWrapper::Buf const &vbuf = blitter.inBuf();
- std::size_t runsamples = gb_samples_per_frame - bufsamples;
+ unsigned runsamples = gb_samples_per_frame - bufsamples;
std::ptrdiff_t const vidFrameDoneSampleCnt = gambatte.runFor(
vbuf.pixels, vbuf.pitch, audioBuf + bufsamples, runsamples);
std::size_t const outsamples = vidFrameDoneSampleCnt >= 0

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-libgambatte_include_gambatte_h,v 1.1 2013/05/31 15:34:56 bentley Exp $
--- libgambatte/include/gambatte.h.orig Thu May 30 13:33:56 2013
+++ libgambatte/include/gambatte.h Thu May 30 13:34:01 2013
@@ -81,7 +81,7 @@ class GB { (public)
* if no new video frame was completed.
*/
std::ptrdiff_t runFor(gambatte::uint_least32_t *videoBuf, std::ptrdiff_t pitch,
- gambatte::uint_least32_t *audioBuf, std::size_t &samples);
+ gambatte::uint_least32_t *audioBuf, unsigned &samples);
/**
* Reset to initial state.

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-libgambatte_src_gambatte_cpp,v 1.1 2013/05/31 15:34:56 bentley Exp $
--- libgambatte/src/gambatte.cpp.orig Thu May 30 13:41:10 2013
+++ libgambatte/src/gambatte.cpp Thu May 30 13:41:15 2013
@@ -55,7 +55,7 @@ GB::~GB() {
}
std::ptrdiff_t GB::runFor(gambatte::uint_least32_t *const videoBuf, std::ptrdiff_t const pitch,
- gambatte::uint_least32_t *const soundBuf, std::size_t &samples) {
+ gambatte::uint_least32_t *const soundBuf, unsigned &samples) {
if (!p_->cpu.loaded()) {
samples = 0;
return -1;

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-test_SConstruct,v 1.1 2014/11/19 10:32:48 bentley Exp $
--- test/SConstruct.orig Wed Nov 19 03:18:18 2014
+++ test/SConstruct Wed Nov 19 03:18:41 2014
@@ -5,9 +5,10 @@ vars = Variables()
vars.Add('CC')
vars.Add('CXX')
-env = Environment(CPPPATH = ['.', '../common', '../libgambatte/include'],
+env = Environment(CPPPATH = ['.', '../common', '../libgambatte/include', '${LOCALBASE}/include'],
CFLAGS = global_cflags + global_defines,
CXXFLAGS = global_cxxflags + global_defines,
+ LIBPATH = '${LOCALBASE}/lib',
LIBS = 'm',
variables = vars)

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-testrunner_SConstruct,v 1.5 2014/01/31 08:58:21 bentley Exp $
--- testrunner/SConstruct.orig Wed Dec 18 07:14:51 2013
+++ testrunner/SConstruct Fri Jan 31 01:54:42 2014
@@ -5,9 +5,10 @@ vars = Variables()
vars.Add('CC')
vars.Add('CXX')
-env = Environment(CPPPATH = ['.', '../libgambatte/include'],
+env = Environment(CPPPATH = ['.', '../libgambatte/include', '${LOCALBASE}/include'],
CFLAGS = global_cflags + global_defines,
CXXFLAGS = global_cxxflags + global_defines,
+ LIBPATH = '${LOCALBASE}/lib',
LIBS = 'm',
variables = vars)