commit 4a51d5d391c3370eba9e6348db57d1fd2c42c73a
Author: Jan Rękorajski <bagg...@pld-linux.org>
Date: Mon Jun 1 10:27:14 2020 +0200
- up to 2.1.1
- fix building with fluidsynth that uses "__attribute__(printf)" gcc pragma
- use fluidsynth on all archs
fluidsynth-printf-attr.patch | 10 ++++++++++
scummvm.spec | 8 ++++----
2 files changed, 14 insertions(+), 4 deletions(-)
---
diff --git a/scummvm.spec b/scummvm.spec
index f31fa41..15d148c 100644
--- a/scummvm.spec
+++ b/scummvm.spec
@@ -2,25 +2,24 @@
Summary: Graphic adventure game interpreter
Summary(pl.UTF-8): Interpreter gier przygodowych
Name: scummvm
-Version: 2.1.0
+Version: 2.1.1
Release: 1
License: GPL v2+
Group: X11/Applications/Games
Source0:
http://scummvm.org/frs/scummvm/%{version}/%{name}-%{version}.tar.xz
-# Source0-md5: 9ef2432448bfa41248340da586358135
+# Source0-md5: d75fec6358f7814b47d6aca5e18c9863
Source1:
http://scummvm.org/frs/scummvm-tools/%{version_tools}/%{name}-tools-%{version_tools}.tar.xz
# Source1-md5: 5b0615e87d5148e9871ea355d03927e1
Source2: %{name}.desktop
Patch0: %{name}-wx-config.patch
Patch1: dwarf-debug.patch
+Patch2: fluidsynth-printf-attr.patch
URL: http://scummvm.org/
BuildRequires: SDL-devel >= 1.2.2
BuildRequires: alsa-lib-devel >= 0.9
BuildRequires: boost-devel
BuildRequires: flac-devel >= 1.0.1
-%ifarch %{ix86} %{x8664}
BuildRequires: fluidsynth-devel
-%endif
BuildRequires: freetype-devel
BuildRequires: libmad-devel
BuildRequires: libmpeg2-devel >= 0.3.2
@@ -1063,6 +1062,7 @@ Motyw remastered dla ScummVM.
cd scummvm-tools-%{version_tools}
%patch0 -p2
cd ..
+%patch2 -p1
%{__sed} -i -e 's:"plugins":"%{_libdir}/scummvm":' base/plugins.cpp
diff --git a/fluidsynth-printf-attr.patch b/fluidsynth-printf-attr.patch
new file mode 100644
index 0000000..652b2d0
--- /dev/null
+++ b/fluidsynth-printf-attr.patch
@@ -0,0 +1,10 @@
+--- scummvm-2.1.1/audio/softsynth/fluidsynth.cpp.orig 2020-01-17
21:06:39.000000000 +0100
++++ scummvm-2.1.1/audio/softsynth/fluidsynth.cpp 2020-06-01
10:20:46.232483212 +0200
+@@ -20,6 +20,7 @@
+ *
+ */
+
++#define FORBIDDEN_SYMBOL_ALLOW_ALL
+ #include "common/scummsys.h"
+
+ #ifdef USE_FLUIDSYNTH
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/scummvm.git/commitdiff/4a51d5d391c3370eba9e6348db57d1fd2c42c73a
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
