Commit d8bd3d1f authored by Francesco Marinucci's avatar Francesco Marinucci

[skip-ci] scummvm: update to 2.1.1

parent 23f11462
pkgname=scummvm
pkgver=1.9.0
pkgver=2.1.1
pkgrel=1
pkgdesc="A virtual machine for several classic graphical point-and-click adventure games."
arch=('x86_64')
license=('GPL3')
url="http://www.scummvm.org/"
depends=('alsa-lib' 'flac' 'fluidsynth' 'glu' 'libmad' 'libvorbis' 'sdl' 'zlib')
categories=('games')
source=("https://github.com/scummvm/scummvm/archive/v${pkgver}.tar.gz"
"${pkgname}.desktop")
sha256sums=('2b107719d6d8e242ea5c3103eb483c0193669e973158a0f6ff93d24ad3a08a27'
'1165dfe59a4ba25d9605ca0e1be650706bbd784b0c7f66d7a9700538d0031090')
sha256sums=('02051c4cef5d14b95ebeb40d0c88f73644cbf606a5777e5c14d0f74c5037a4f5'
'1165dfe59a4ba25d9605ca0e1be650706bbd784b0c7f66d7a9700538d0031090')
depends=('libpng' 'libtheora' 'sdl2' 'sdl2_net' 'fluidsynth' 'flac' 'faad2' 'libvorbis' 'libmad' 'freetype2'
'libgl' 'glu' 'libjpeg-turbo' 'libmpeg2' 'curl' 'a52dec')
makedepends=('mesa')
source=("https://scummvm.org/frs/scummvm/${pkgver}/scummvm-${pkgver}.tar.xz"
fluidsynth2_a.patch
fluidsynth2_b.patch)
sha256sums=('5753769356f3396fde1e614b40496c61392a2903c53ca436b721dde58353dca8'
'369e1b7de468b7758d2ab4c568a82977aabf2db45e9ef8fd7c97fec053fada23'
'dd19a18e0ba605cba32d39e1832d73243ccf2b00fe649befa79e98611a8076bc')
prepare() {
cd "${srcdir}"/${pkgname}-${pkgver}
patch -Np1 -i "${srcdir}"/fluidsynth2_a.patch
patch -Np1 -i "${srcdir}"/fluidsynth2_b.patch
}
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
./configure --prefix=/usr \
--with-flac-prefix=/usr \
--backend=sdl \
--disable-debug
cd "${srcdir}"/${pkgname}-${pkgver}
./configure \
--enable-c++11 \
--enable-release \
--prefix=/usr \
--disable-debug
make
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
# Manual installation.
install -Dm755 "${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
install -Dm644 "dists/${pkgname}.6" "${pkgdir}/usr/share/man/man6/${pkgname}.6"
# Desktop integration.
install -Dm644 "dists/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
install -Dm644 "icons/${pkgname}.xpm" "${pkgdir}/usr/share/pixmaps/${pkgname}.xpm"
# Themes.
install -Dm644 gui/themes/scummmodern.zip "${pkgdir}/usr/share/scummvm/scummmodern.zip"
cd "${srcdir}"/${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install
install -Dm644 dists/${pkgname}.desktop "${pkgdir}"/usr/share/applications/${pkgname}.desktop
}
commit 8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6
Author: D G Turner <digitall@scummvm.org>
Date: Sun Dec 15 22:22:20 2019 +0000
AUDIO: Fix Compilation Against Fluidsynth v2.1+
This is as reported by eriktorbjorn.
diff --git a/audio/softsynth/fluidsynth.cpp b/audio/softsynth/fluidsynth.cpp
index 4034b2ffc3..33a74a1524 100644
--- a/audio/softsynth/fluidsynth.cpp
+++ b/audio/softsynth/fluidsynth.cpp
@@ -35,7 +35,12 @@
#include "backends/platform/ios7/ios7_common.h"
#endif
+// Fluidsynth v2.1+ uses printf in one of it's headers, so this is
+// needed to allow compilation, as reported by eriktorbjorn on 20191215
+// This is in include/fluidsynth/log.h around line 82
+#define FORBIDDEN_SYMBOL_EXCEPTION_printf
#include <fluidsynth.h>
+#undef FORBIDDEN_SYMBOL_EXCEPTION_printf
class MidiDriver_FluidSynth : public MidiDriver_Emulated {
private:
commit 68758a879e0c8ecc0d40962516d4e808aa4e15e5
Author: D G Turner <digitall@scummvm.org>
Date: Tue Dec 17 04:21:04 2019 +0000
AUDIO: Really Fix Compilation Against Fluidsynth v2.1+
The previous fix did not work as the forbidden exception had no effect
since scummsys.h and thus forbidden.h had already been included prior
to the fluidsynth header being included. This also meant that undefining
the exception define after the header would have had no effect anyway.
This new solution was suggest by eriktorbjorn on bug #11278 and should
avoid the need to add an exception which would persist over the entire
source file.
diff --git a/audio/softsynth/fluidsynth.cpp b/audio/softsynth/fluidsynth.cpp
index 33a74a1524..f8c2412492 100644
--- a/audio/softsynth/fluidsynth.cpp
+++ b/audio/softsynth/fluidsynth.cpp
@@ -20,10 +20,16 @@
*
*/
-#include "common/scummsys.h"
+#include "config.h"
#ifdef USE_FLUIDSYNTH
+// Fluidsynth v2.1+ uses printf in one of it's headers,
+// include/fluidsynth/log.h around line 82 so need to include this
+// prior scummsys.h inclusion and thus forbidden.h
+#include <fluidsynth.h>
+
+#include "common/scummsys.h"
#include "common/config-manager.h"
#include "common/error.h"
#include "common/system.h"
@@ -35,13 +41,6 @@
#include "backends/platform/ios7/ios7_common.h"
#endif
-// Fluidsynth v2.1+ uses printf in one of it's headers, so this is
-// needed to allow compilation, as reported by eriktorbjorn on 20191215
-// This is in include/fluidsynth/log.h around line 82
-#define FORBIDDEN_SYMBOL_EXCEPTION_printf
-#include <fluidsynth.h>
-#undef FORBIDDEN_SYMBOL_EXCEPTION_printf
-
class MidiDriver_FluidSynth : public MidiDriver_Emulated {
private:
MidiChannel_MPU401 _midiChannels[16];
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment