Your message dated Tue, 17 Dec 2019 21:19:50 +0000
with message-id <[email protected]>
and subject line Bug#946888: fixed in scummvm 2.1.0+dfsg1-2
has caused the Debian Bug report #946888,
regarding scummvm fails to build with the new libfluidsynth
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
946888: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=946888
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: scummvm
Version: 2.1.0+dfsg1-1
Tags: patch
User: [email protected]
Usertags: origin-ubuntu focal ubuntu-patch
scummvm fails to build with the recent libfluidsynth update,
https://buildd.debian.org/status/package.php?p=scummvm&suite=unstable
The attached patch fixes the issue by backporting upstream fixes
diff -Nru scummvm-2.1.0+dfsg1/debian/changelog scummvm-2.1.0+dfsg1/debian/changelog
--- scummvm-2.1.0+dfsg1/debian/changelog 2019-10-18 14:57:00.000000000 +0200
+++ scummvm-2.1.0+dfsg1/debian/changelog 2019-12-17 10:40:58.000000000 +0100
@@ -1,3 +1,10 @@
+scummvm (2.1.0+dfsg1-2) UNRELEASED; urgency=medium
+
+ * debian/patches/git_fluidsynth_update.patch:
+ - backport some upstream fixes to build with the new fluidsynth
+
+ -- Sebastien Bacher <[email protected]> Tue, 17 Dec 2019 10:10:30 +0100
+
scummvm (2.1.0+dfsg1-1) unstable; urgency=medium
[ Dmitry Smirnov ]
diff -Nru scummvm-2.1.0+dfsg1/debian/control scummvm-2.1.0+dfsg1/debian/control
--- scummvm-2.1.0+dfsg1/debian/control 2019-10-18 09:34:04.000000000 +0200
+++ scummvm-2.1.0+dfsg1/debian/control 2019-12-17 10:11:16.000000000 +0100
@@ -1,7 +1,8 @@
Source: scummvm
Section: games
Priority: optional
-Maintainer: Debian Games Team <[email protected]>
+Maintainer: Ubuntu Developers <[email protected]>
+XSBC-Original-Maintainer: Debian Games Team <[email protected]>
Uploaders: David Weinehall <[email protected]>
,Moritz Muehlenhoff <[email protected]>
,Dmitry Smirnov <[email protected]>
diff -Nru scummvm-2.1.0+dfsg1/debian/patches/git_fluidsynth_update.patch scummvm-2.1.0+dfsg1/debian/patches/git_fluidsynth_update.patch
--- scummvm-2.1.0+dfsg1/debian/patches/git_fluidsynth_update.patch 1970-01-01 01:00:00.000000000 +0100
+++ scummvm-2.1.0+dfsg1/debian/patches/git_fluidsynth_update.patch 2019-12-17 10:10:23.000000000 +0100
@@ -0,0 +1,38 @@
+# Description: backport upstream git fixes for build with new fluidsynth
+# https://github.com/scummvm/scummvm/commit/68758a87
+# https://github.com/scummvm/scummvm/commit/8593a9e1
+---
+ audio/softsynth/fluidsynth.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+Index: scummvm-2.1.0+dfsg1/audio/softsynth/fluidsynth.cpp
+===================================================================
+--- scummvm-2.1.0+dfsg1.orig/audio/softsynth/fluidsynth.cpp
++++ scummvm-2.1.0+dfsg1/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,8 +41,6 @@
+ #include "backends/platform/ios7/ios7_common.h"
+ #endif
+
+-#include <fluidsynth.h>
+-
+ class MidiDriver_FluidSynth : public MidiDriver_Emulated {
+ private:
+ MidiChannel_MPU401 _midiChannels[16];
diff -Nru scummvm-2.1.0+dfsg1/debian/patches/series scummvm-2.1.0+dfsg1/debian/patches/series
--- scummvm-2.1.0+dfsg1/debian/patches/series 2019-10-18 10:25:16.000000000 +0200
+++ scummvm-2.1.0+dfsg1/debian/patches/series 2019-12-17 10:08:45.000000000 +0100
@@ -1,2 +1,3 @@
python3.patch
compress-themes.patch
+git_fluidsynth_update.patch
--- End Message ---
--- Begin Message ---
Source: scummvm
Source-Version: 2.1.0+dfsg1-2
We believe that the bug you reported is fixed in the latest version of
scummvm, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Dmitry Smirnov <[email protected]> (supplier of updated scummvm package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Tue, 17 Dec 2019 21:31:28 +1100
Source: scummvm
Architecture: source
Version: 2.1.0+dfsg1-2
Distribution: unstable
Urgency: medium
Maintainer: Debian Games Team <[email protected]>
Changed-By: Dmitry Smirnov <[email protected]>
Closes: 946888
Changes:
scummvm (2.1.0+dfsg1-2) unstable; urgency=medium
.
[ Sebastien Bacher ]
* New patch to fix FTBFS with the new fluidsynth (Closes: #946888).
.
[ Markus Koschany ]
* ScummVM 2.1.0 breaks drascula 1.0+ds3 in Debian. Update Breaks
relationship.
Checksums-Sha1:
228e02d8ba40d7526ebe87e2dd620ac1854d7d70 2388 scummvm_2.1.0+dfsg1-2.dsc
d278d578d353b21a69ae01839c43bea5bfbf2181 19712
scummvm_2.1.0+dfsg1-2.debian.tar.xz
e14c0b19858f6b2af4f0fd5317693b8dbaed3301 12449
scummvm_2.1.0+dfsg1-2_amd64.buildinfo
Checksums-Sha256:
e5a12928ead1886179336a8e8ae39d1c6836b21663e3db38f3e8d2fec866f477 2388
scummvm_2.1.0+dfsg1-2.dsc
4749660a13f7e4022bcee6528d811b7322e9428795a1282a245ce651f7847d2c 19712
scummvm_2.1.0+dfsg1-2.debian.tar.xz
f8804ae2fee44ecb91e53cfb387de99d21cd4194ddd387eb7503d50c8faf3610 12449
scummvm_2.1.0+dfsg1-2_amd64.buildinfo
Files:
c65ca7c222c613284021e3356193495c 2388 games optional scummvm_2.1.0+dfsg1-2.dsc
7bd65e99098aae6f9186fe38e7c3c73b 19712 games optional
scummvm_2.1.0+dfsg1-2.debian.tar.xz
102624e95b4e86d1cdbd07942f287165 12449 games optional
scummvm_2.1.0+dfsg1-2_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCAAdFiEEULx8+TnSDCcqawZWUra72VOWjRsFAl35QgEACgkQUra72VOW
jRtRow/8CxEhGxuUgFMzQ4qsvDDscBcr0wgQvEMAcfTbYHdNyGK43PNz4/x8Ew7d
4xUUeBhhESTQqY9e0/X+aKktGe7TMGhVPreeOTB0wy8/tIgOf0Zj0r35EufPh/d6
qLUYdISdUD/5nkD7q0qyy+g++cQzLkxUxxE4///tqgcuDPmex7IK8KNvjGpIon/5
yV88lgY5wh6xj8qxlZ3ZO6J6nsXDeHtK0tB5kK724aIe1KpF+0KyqTic8i1UE1G4
DP5/KTi2eNuZhZWutsMq8sRLqxiAqSSlbDjT2aOGL052l+tq8xVf1/ghjnJuU6F0
qZRoYo0Je7QwFPzl6AsSFU12DH0IkUMz7mNIomotDtHlOk5ZUGgt+Y9JjlEo3XMM
lueGi5Hr95gstcukVWMQvRaeD3kLnmzMTKXLbwcY4waDld6GAE0C2iJ+b9E4aI0U
ugF9qvz8YHHiclxjup7sbBgSE8xkuB0+Fg/V1gQ/9RNYZf6GmWr0QQZ8uWSzgEKH
ytLKaQn2bULjhQZkk5n6lVDX2xemt8WybLQ1WTDA6mOwIfKatL2SKmnHrFi9vPTM
pm8ehVbh4pUKwEarUqd3T4NGcApmbrw9KP3+vDUKlgU4QsJAd0U6vvs8a8cJYyWq
8iSou80GB2a3sYeNQZwCrzlZ4XD2ntVxUVJjqjsqZsTCkBw9daQ=
=47mO
-----END PGP SIGNATURE-----
--- End Message ---
