games/SameBoy: Updated for version 0.12.2.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
Hunter Sezen 2019-09-21 06:01:58 +07:00 committed by Willy Sudiarto Raharjo
parent 4123555623
commit ac44ea60cd
No known key found for this signature in database
GPG key ID: 887B8374D7333381
4 changed files with 9 additions and 71 deletions

View file

@ -9,7 +9,7 @@ At least one optional dependency is required to use SameBoy.
To disable the SDL2 build use:
SDL=no ./SameBoy.SlackBuild
STANDALONE=no ./SameBoy.SlackBuild
To disable the libretro build use:

View file

@ -25,7 +25,7 @@
PRGNAM=SameBoy
LIBNAM=$(printf %s $PRGNAM | tr 'A-Z' 'a-z')_libretro
SRCNAM=${LIBNAM%%_*}
VERSION=${VERSION:-0.12.1}
VERSION=${VERSION:-0.12.2}
RGBVERS=${RGBVERS:-0.3.8}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@ -48,15 +48,13 @@ LIBDIRSUFFIX=
set -eu
LIBRETRO="${LIBRETRO:-yes}"
if pkg-config --exists sdl2; then
SDL="${SDL:-yes}"
STANDALONE="${STANDALONE:-yes}"
else
SDL=no
STANDALONE=no
fi
if [ "$LIBRETRO" != yes ] && [ "$SDL" != yes ]; then
if [ "${LIBRETRO:=yes}" != yes ] && [ "$STANDALONE" != yes ]; then
printf %s\\n 'ERROR: Both the SDL2 and Libretro builds are disabled.' >&2
exit 1
fi
@ -82,11 +80,6 @@ else
CONF=release
fi
# Fix audio issues with some RetroArch audio drivers. Fixes #189
# https://github.com/LIJI32/SameBoy/commit/597dc72e460f3e95caad40b8c557fb01f53f18ee
# https://github.com/LIJI32/SameBoy/issues/189
patch -p1 < $CWD/libretro.patch
PATH="$TMP/$PRGNAM-$VERSION/rgbds-$RGBVERS/bin:$PATH"
make -C rgbds-$RGBVERS Q=
@ -94,7 +87,7 @@ make -C rgbds-$RGBVERS install Q= \
PREFIX=. \
DESTDIR=./
if [ "$SDL" = yes ]; then
if [ "$STANDALONE" = yes ]; then
make CONF=$CONF DATA_DIR=/usr/share/games/$SRCNAM/
mkdir -p $PKG/usr/games $PKG/usr/share/games
cp -av build/bin/SDL $PKG/usr/share/games/$SRCNAM

View file

@ -1,9 +1,9 @@
PRGNAM="SameBoy"
VERSION="0.12.1"
VERSION="0.12.2"
HOMEPAGE="https://sameboy.github.io/"
DOWNLOAD="https://github.com/LIJI32/SameBoy/archive/v0.12.1/SameBoy-0.12.1.tar.gz \
DOWNLOAD="https://github.com/LIJI32/SameBoy/archive/v0.12.2/SameBoy-0.12.2.tar.gz \
https://github.com/rednex/rgbds/releases/download/v0.3.8/rgbds-0.3.8.tar.gz"
MD5SUM="6d12cbeaf0ffc98de39ea41ac5573acc \
MD5SUM="cfc3c2d62a646df2152f9132be78ccb0 \
b1eac91f5e46f39150a8af0fe67cebeb"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""

View file

@ -1,55 +0,0 @@
From 597dc72e460f3e95caad40b8c557fb01f53f18ee Mon Sep 17 00:00:00 2001
From: Lior Halphon <LIJI32@gmail.com>
Date: Thu, 18 Jul 2019 00:13:41 +0300
Subject: [PATCH] Fix audio issues with some RetroArch audio drivers. Fixes
#189
---
libretro/libretro.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/libretro/libretro.c b/libretro/libretro.c
index 1dd411c1..bd93e97a 100644
--- a/libretro/libretro.c
+++ b/libretro/libretro.c
@@ -84,7 +84,7 @@ static struct retro_log_callback logging;
static retro_log_printf_t log_cb;
static retro_video_refresh_t video_cb;
-static retro_audio_sample_batch_t audio_batch_cb;
+static retro_audio_sample_t audio_sample_cb;
static retro_input_poll_t input_poll_cb;
static retro_input_state_t input_state_cb;
@@ -152,7 +152,7 @@ static void audio_callback(GB_gameboy_t *gb, GB_sample_t *sample)
{
if ((audio_out == GB_1 && gb == &gameboy[0]) ||
(audio_out == GB_2 && gb == &gameboy[1])) {
- audio_batch_cb((void*)sample, 1);
+ audio_sample_cb(sample->left, sample->right);
}
}
@@ -772,11 +772,11 @@ void retro_set_environment(retro_environment_t cb)
void retro_set_audio_sample(retro_audio_sample_t cb)
{
+ audio_sample_cb = cb;
}
void retro_set_audio_sample_batch(retro_audio_sample_batch_t cb)
{
- audio_batch_cb = cb;
}
void retro_set_input_poll(retro_input_poll_t cb)
@@ -850,8 +850,7 @@ void retro_run(void)
}
else
{
- int x = GB_run_frame(&gameboy[0]);
- log_cb(RETRO_LOG_DEBUG, "%d\n", x);
+ GB_run_frame(&gameboy[0]);
}
if (emulated_devices == 2)