Hello community,
here is the log from the commit of package dunelegacy for openSUSE:Factory
checked in at 2018-04-11 13:56:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dunelegacy (Old)
and /work/SRC/openSUSE:Factory/.dunelegacy.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dunelegacy"
Wed Apr 11 13:56:45 2018 rev:3 rq:594551 version:0.96.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/dunelegacy/dunelegacy.changes 2017-07-19
12:22:02.383632893 +0200
+++ /work/SRC/openSUSE:Factory/.dunelegacy.new/dunelegacy.changes
2018-04-11 13:56:46.858105172 +0200
@@ -1,0 +2,7 @@
+Sat Apr 7 18:21:47 UTC 2018 - wba...@tmo.at
+
+- Add fix-build-with-SDL_mixer-2.0.2.patch to fix build with
+ SDL2_mixer 2.0.2 where MIX_INIT_FLUIDSYNTH has been renamed to
+ MIX_INIT_MID
+
+-------------------------------------------------------------------
New:
----
fix-build-with-SDL_mixer-2.0.2.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dunelegacy.spec ++++++
--- /var/tmp/diff_new_pack.9ec7a0/_old 2018-04-11 13:56:47.694074943 +0200
+++ /var/tmp/diff_new_pack.9ec7a0/_new 2018-04-11 13:56:47.694074943 +0200
@@ -28,6 +28,8 @@
Source8: %{name}.appdata.xml
# PATCH-FEATURE-UPSTREAM https://sourceforge.net/p/dunelegacy/patches/7/
Source9: %{name}.6
+# PATCH-FIX-OPENSUSE fix-build-with-SDL_mixer-2.0.2.patch wba...@tmo.at -- fix
build with SDL2_mixer 2.0.2 where MIX_INIT_FLUIDSYNTH has been renamed to
MIX_INIT_MID
+Patch: fix-build-with-SDL_mixer-2.0.2.patch
BuildRequires: cppunit-devel
BuildRequires: dos2unix
BuildRequires: gcc-c++
@@ -55,6 +57,7 @@
%prep
%setup -q
+%patch -p1
dos2unix ToDo.txt
%build
++++++ fix-build-with-SDL_mixer-2.0.2.patch ++++++
diff -ur dunelegacy-0.96.4.orig/src/FileClasses/music/DirectoryPlayer.cpp
dunelegacy-0.96.4/src/FileClasses/music/DirectoryPlayer.cpp
--- dunelegacy-0.96.4.orig/src/FileClasses/music/DirectoryPlayer.cpp
2016-11-20 15:57:02.000000000 +0100
+++ dunelegacy-0.96.4/src/FileClasses/music/DirectoryPlayer.cpp 2018-04-07
20:18:15.596685772 +0200
@@ -61,7 +61,7 @@
music = nullptr;
- Mix_Init(MIX_INIT_FLUIDSYNTH | MIX_INIT_FLAC | MIX_INIT_MP3 |
MIX_INIT_OGG);
+ Mix_Init(MIX_INIT_MID | MIX_INIT_FLAC | MIX_INIT_MP3 | MIX_INIT_OGG);
}
DirectoryPlayer::~DirectoryPlayer() {
diff -ur dunelegacy-0.96.4.orig/src/FileClasses/music/XMIPlayer.cpp
dunelegacy-0.96.4/src/FileClasses/music/XMIPlayer.cpp
--- dunelegacy-0.96.4.orig/src/FileClasses/music/XMIPlayer.cpp 2016-11-18
00:06:11.000000000 +0100
+++ dunelegacy-0.96.4/src/FileClasses/music/XMIPlayer.cpp 2018-04-07
20:18:15.568685771 +0200
@@ -32,7 +32,7 @@
XMIPlayer::XMIPlayer() : MusicPlayer(settings.audio.playMusic,
settings.audio.musicVolume) {
music = nullptr;
- if((Mix_Init(MIX_INIT_FLUIDSYNTH) & MIX_INIT_FLUIDSYNTH) == 0) {
+ if((Mix_Init(MIX_INIT_MID) & MIX_INIT_MID) == 0) {
SDL_Log("XMIPlayer: Failed to init required midi support: %s",
SDL_GetError());
}
}
