[arch-commits] Commit in scummvm/trunk (3 files)
David Runge
dvzrv at gemini.archlinux.org
Thu Jul 29 07:18:23 UTC 2021
Date: Thursday, July 29, 2021 @ 07:18:23
Author: dvzrv
Revision: 990029
upgpkg: scummvm 2.2.0-2: Rebuild against fluidsynth 2.2.
Add upstreamed patches to fix excessive logging and builds against fluidsynth
>= 2.0.
Remove unused patches.
Remove the use of srcdir where not needed.
Install XDG desktop integration more generically.
Modified:
scummvm/trunk/PKGBUILD
Deleted:
scummvm/trunk/68758a879e0c8ecc0d40962516d4e808aa4e15e5.patch
scummvm/trunk/8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch
------------------------------------------------+
68758a879e0c8ecc0d40962516d4e808aa4e15e5.patch | 51 -----------------------
8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch | 25 -----------
PKGBUILD | 32 +++++++++++---
3 files changed, 26 insertions(+), 82 deletions(-)
Deleted: 68758a879e0c8ecc0d40962516d4e808aa4e15e5.patch
===================================================================
--- 68758a879e0c8ecc0d40962516d4e808aa4e15e5.patch 2021-07-29 07:18:00 UTC (rev 990028)
+++ 68758a879e0c8ecc0d40962516d4e808aa4e15e5.patch 2021-07-29 07:18:23 UTC (rev 990029)
@@ -1,51 +0,0 @@
-commit 68758a879e0c8ecc0d40962516d4e808aa4e15e5
-Author: D G Turner <digitall at 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];
Deleted: 8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch
===================================================================
--- 8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch 2021-07-29 07:18:00 UTC (rev 990028)
+++ 8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch 2021-07-29 07:18:23 UTC (rev 990029)
@@ -1,25 +0,0 @@
-commit 8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6
-Author: D G Turner <digitall at 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:
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-07-29 07:18:00 UTC (rev 990028)
+++ PKGBUILD 2021-07-29 07:18:23 UTC (rev 990029)
@@ -4,7 +4,7 @@
pkgname=scummvm
pkgver=2.2.0
-pkgrel=1
+pkgrel=2
pkgdesc="A 'virtual machine' for several classic graphical point-and-click adventure games."
arch=('x86_64')
license=('GPL')
@@ -12,11 +12,31 @@
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")
-sha512sums=('001f884b9689386ef5b69ab8f5fa2362e1e4dc5e8273f96dc8dce1963be354a2fad95e724ff33d65008be7591519f0e2bac530ba3c44a449b8b7cac862f4f81e')
+source=("https://downloads.scummvm.org/frs/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz"
+ "${pkgname}-2.2.0-fluidsynth_loghandler.patch::https://github.com/scummvm/scummvm/pull/2729.patch"
+ "${pkgname}-2.2.0-fluidsynth_loghandler_fix.patch::https://github.com/scummvm/scummvm/commit/a3bc5d64b8c4041326c8a214c47f9a206fb8b693.patch"
+ "${pkgname}-2.2.0-fluidsynth2.0.patch::https://github.com/scummvm/scummvm/commit/6ef406ac20a68f53e66bb98a0c9842dc9553da07.patch"
+ "${pkgname}-2.2.0-fluidsynth2.2.patch::https://github.com/scummvm/scummvm/pull/2915.patch")
+sha512sums=('001f884b9689386ef5b69ab8f5fa2362e1e4dc5e8273f96dc8dce1963be354a2fad95e724ff33d65008be7591519f0e2bac530ba3c44a449b8b7cac862f4f81e'
+ 'ee398ad38b1587eed2640815b37410eeae5b9edf40146fbea5cedc12c0ed833139541d01efd1eedef45898762bb20a51c0f6f59db0707baad4224487b63c6353'
+ '9fd0bd3a06d95cca3ffbebec51cfb301a8cefc157ca7c2a66417e3ac02de52725eb4a1290b802b817920a310d002f7461fd71873c718b7377e2accd40e65cb99'
+ '6d65f84acb8f1e37d70b11e758b96098ee4c64618ba0ab66cba49f2e00cdbf940df876780ea0bd3c7037ce12dde3663bd6677c8f6593f373263a72e0543792c3'
+ '0bea3bcd13f4a77772a1a73d4c045fa59592e10170719bbac48f88cbd204fd6f4b693795a65ddd233cab7a70c94066ca359051c306ceb0088c8a2f66430aa629')
+b2sums=('b44a07d7ad6747b136465f81122464f02e5cc655c205d6f4424555311563f8ceaa8072972d05512af85d18fabba78d5ea9396ea314581776c1ef8d88ca6ab81b'
+ '230c0b3dbd5b72772e72da40015b8ca23783dae547dfbab5597d46b43c3873799fb8b830d6926b88de29ec0e3f6da902e2315db7cc56d32cc488fc80eaf5bcfa'
+ '17cd24ba5a6c6edfc3f8b7cc9e5eb5a7d1a3829549eab3770ec43f5e710c964e8a993260017ab0c482c91d059cca9a39fa0ac9037762a383e1d7575e8c2cb0f4'
+ '0b9e4d7e49f5b60ecf00ab97b4e0074d1ad17c3044d5d01b0e49f44bd5131e9e14779d696cec7e920703fb273c0d86ff4b6871ec2aa6515720ac0cf2dd2414ae'
+ 'c5c1f438efb17d5cbb8cb48193d57dd324aca3fa03efe6c165f6689fd3f4daf9fa8c9d6239299c4c7c0e59f499ec0a295dd060a731c99b69cf1647898fd770a5')
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -Np1 -i ../${pkgname}-2.2.0-fluidsynth_loghandler.patch
+ patch -Np1 -i ../${pkgname}-2.2.0-fluidsynth_loghandler_fix.patch
+ patch -Np1 -i ../${pkgname}-2.2.0-fluidsynth2.0.patch
+ patch -Np1 -i ../${pkgname}-2.2.0-fluidsynth2.2.patch
+}
build() {
- cd "${srcdir}"/${pkgname}-${pkgver}
+ cd ${pkgname}-${pkgver}
./configure \
--enable-c++11 \
--enable-release \
@@ -25,7 +45,7 @@
}
package() {
- cd "${srcdir}"/${pkgname}-${pkgver}
+ cd ${pkgname}-${pkgver}
make DESTDIR="${pkgdir}" install
- install -Dm644 dists/${pkgname}.desktop "${pkgdir}"/usr/share/applications/${pkgname}.desktop
+ install -vDm644 dists/${pkgname}.desktop -t "${pkgdir}"/usr/share/applications/
}
More information about the arch-commits
mailing list