archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2024-11-18 22:54:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

community/mgba fix

Browse source
This commit is contained in:
Kevin Mihelich 2016-03-14 12:54:30 +00:00
parent ea6af858bf
commit 68f2949b7c
2 changed files with 44 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
community/mgba/PKGBUILD
View file

@ -6,6 +6,7 @@
# ALARM: Kevin Mihelich <kevin@archlinuxarm.org> # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
# - disable LTO # - disable LTO
# - build for GLES on !aarch64 # - build for GLES on !aarch64
# - upstream patch to remove NaN usage
pkgbase=mgba pkgbase=mgba
pkgname=('libmgba' 'mgba-sdl' 'mgba-qt') pkgname=('libmgba' 'mgba-sdl' 'mgba-qt')
@ -17,11 +18,14 @@ license=('custom:MPL2')
makedepends=('cmake' 'qt5-multimedia' 'sdl2' 'zlib' 'libpng' 'libzip' 'libedit' makedepends=('cmake' 'qt5-multimedia' 'sdl2' 'zlib' 'libpng' 'libzip' 'libedit'
'ffmpeg' 'imagemagick' 'desktop-file-utils') 'ffmpeg' 'imagemagick' 'desktop-file-utils')
install=$pkgbase.install install=$pkgbase.install
source=($pkgbase-$pkgver.tar.gz::https://github.com/mgba-emu/mgba/archive/$pkgver.tar.gz) source=($pkgbase-$pkgver.tar.gz::https://github.com/mgba-emu/mgba/archive/$pkgver.tar.gz
md5sums=('b37fcab5e7139b7c161d880576d2d1cc') isnan.patch)
md5sums=('b37fcab5e7139b7c161d880576d2d1cc'
'030b38b18fb23e7f80bfb2e3e362b0da')
prepare() { prepare() {
[[ ! -d build ]] && mkdir build || rm -rf build [[ ! -d build ]] && mkdir build || rm -rf build
patch -p1 -d mgba-$pkgver -i ../isnan.patch
} }
build() { build() {

38
community/mgba/isnan.patch Normal file
View file

@ -0,0 +1,38 @@
diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp
index ed6c5ed..f5916c5 100644
--- a/src/platform/qt/Window.cpp
+++ b/src/platform/qt/Window.cpp
@@ -48,11 +48,6 @@ extern "C" {
using namespace QGBA;
-#if defined(__WIN32) || defined(__OpenBSD__)
-// This is a macro everywhere except MinGW and OpenBSD, it seems
-using std::isnan;
-#endif
-
Window::Window(ConfigController* config, int playerId, QWidget* parent)
: QMainWindow(parent)
, m_log(0)
@@ -774,7 +769,7 @@ void Window::updateTitle(float fps) {
m_controller->threadContinue();
if (title.isNull()) {
setWindowTitle(tr("%1 - %2").arg(projectName).arg(projectVersion));
- } else if (isnan(fps)) {
+ } else if (fps < 0) {
setWindowTitle(tr("%1 - %2 - %3").arg(projectName).arg(title).arg(projectVersion));
} else {
setWindowTitle(tr("%1 - %2 (%3 fps) - %4").arg(projectName).arg(title).arg(fps).arg(projectVersion));
diff --git a/src/platform/qt/Window.h b/src/platform/qt/Window.h
index 7d6ece7..5a244b9 100644
--- a/src/platform/qt/Window.h
+++ b/src/platform/qt/Window.h
@@ -142,7 +142,7 @@ private slots:
QAction* addControlledAction(QMenu* menu, QAction* action, const QString& name);
QAction* addHiddenAction(QMenu* menu, QAction* action, const QString& name);
- void updateTitle(float fps = NAN);
+ void updateTitle(float fps = -1);
GameController* m_controller;
Display* m_display;