gentoo resync : 15.01.2020

2 files changed, 50 insertions, 60 deletions

diff --git a/games-strategy/dunelegacy/files/dunelegacy-0.96.3-build.patch b/games-strategy/dunelegacy/files/dunelegacy-0.96.3-build.patch
deleted file mode 100644
index 93dd907738bc..000000000000
--- a/games-strategy/dunelegacy/files/dunelegacy-0.96.3-build.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Author: hasufell <hasufell@gentoo.org>
-Date:   Thu Aug 9 18:57:40 2012 +0200
-
-    respect flags
-    use pkg-config
-    use LDADD instead of LDFLAGS for libs
-
---- configure.ac
-+++ configure.ac
-@@ -16,14 +16,6 @@
- 
- AC_SUBST(dunelegacydatadir)
- 
--dnl Some flags for gcc
--CXXFLAGS="-O3 -pipe -pedantic -Wall -Wextra -Wno-unused-parameter -DNDEBUG"
--dnl Additional flags: -Wconversion -Wno-sign-conversion
--
--dnl Some flags for clang
--dnl CXXFLAGS="-O3 -pipe -pedantic -Weverything -Wno-sign-conversion -Wno-conversion -Wno-shadow -Wno-missing-noreturn -Wno-padded -Wno-packed -Wno-weak-vtables -Wno-c++11-narrowing -Wno-cast-align -Wno-unreachable-code -Wno-missing-prototypes -Wno-float-equal -Wno-global-constructors -Wno-exit-time-destructors -Wno-format-nonliteral -Wno-unused-macros -Wextra -Wno-unused-parameter"
--
--
- dnl test for -ffp-contract=off (gcc >= 4.6) and use -mno-fused-madd instead
- oldCFLAGS="$CFLAGS"
- CFLAGS="-ffp-contract=off"
-@@ -33,34 +25,14 @@
- )
- CFLAGS="$oldCFLAGS"
- 
--case "$target_cpu" in
--i*86) CXXFLAGS="$CXXFLAGS -mfpmath=sse -msse";;
--esac
--
--AC_ARG_ENABLE([debug],
--            [AS_HELP_STRING([--enable-debug],
--              [compile with debug information @<:@default=disabled@:>@])],
--            [],
--            [])
--
--if test "$enable_debug" = "yes" ; then
--	CXXFLAGS="$CXXFLAGS -g"
--fi
- 
- dnl Check for SDL library
- SDL_VERSION=1.2.0
--AM_PATH_SDL($SDL_VERSION, : , AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]))
-+PKG_CHECK_MODULES([SDL], [sdl >= $SDL_VERSION SDL_mixer])
- CFLAGS="$CFLAGS $SDL_CFLAGS"
- CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
- LIBS="$LIBS $SDL_LIBS"
- 
--dnl Check for SDL_mixer library.
--AC_CHECK_LIB(SDL_mixer, 
--       Mix_OpenAudio, 
--       LIBS="$LIBS -lSDL_mixer", 
--       AC_MSG_ERROR([*** SDL_mixer library not found!]) 
--)
--
- dnl enet defines
- AC_CHECK_FUNC(gethostbyaddr_r, [AC_DEFINE(HAS_GETHOSTBYADDR_R)])
- AC_CHECK_FUNC(gethostbyname_r, [AC_DEFINE(HAS_GETHOSTBYNAME_R)])
diff --git a/games-strategy/dunelegacy/files/dunelegacy-0.96.4-init-mid.patch b/games-strategy/dunelegacy/files/dunelegacy-0.96.4-init-mid.patch
new file mode 100644
index 000000000000..46966269dcad
--- /dev/null
+++ b/games-strategy/dunelegacy/files/dunelegacy-0.96.4-init-mid.patch
@@ -0,0 +1,50 @@
+From e227fc26ffff199a6a659dbe954ff7b764658d4d Mon Sep 17 00:00:00 2001
+From: Richard Schaller <richard.schaller@gmx.de>
+Date: Sat, 30 Mar 2019 18:07:28 +0100
+Subject: [PATCH] Support for SDL_mixer 2.0.2 or higher: MIX_INIT_FLUIDSYNTH
+ was renamed to MIX_INIT_MID
+
+---
+ src/FileClasses/music/DirectoryPlayer.cpp | 4 ++++
+ src/FileClasses/music/XMIPlayer.cpp       | 6 ++++++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/src/FileClasses/music/DirectoryPlayer.cpp b/src/FileClasses/music/DirectoryPlayer.cpp
+index 531d971..05d800c 100644
+--- a/src/FileClasses/music/DirectoryPlayer.cpp
++++ b/src/FileClasses/music/DirectoryPlayer.cpp
+@@ -59,7 +59,11 @@ DirectoryPlayer::DirectoryPlayer() : MusicPlayer(settings.audio.playMusic, setti
+ 
+     music = nullptr;
+ 
++#if SDL_VERSIONNUM(SDL_MIXER_MAJOR_VERSION, SDL_MIXER_MINOR_VERSION, SDL_MIXER_PATCHLEVEL) >= SDL_VERSIONNUM(2,0,2)
++    Mix_Init(MIX_INIT_MID | MIX_INIT_FLAC | MIX_INIT_MP3 | MIX_INIT_OGG);
++#else
+     Mix_Init(MIX_INIT_FLUIDSYNTH | MIX_INIT_FLAC | MIX_INIT_MP3 | MIX_INIT_OGG);
++#endif
+ }
+ 
+ DirectoryPlayer::~DirectoryPlayer() {
+diff --git a/src/FileClasses/music/XMIPlayer.cpp b/src/FileClasses/music/XMIPlayer.cpp
+index a7e5150..0fcfa8f 100644
+--- a/src/FileClasses/music/XMIPlayer.cpp
++++ b/src/FileClasses/music/XMIPlayer.cpp
+@@ -30,9 +30,15 @@
+ XMIPlayer::XMIPlayer() : MusicPlayer(settings.audio.playMusic, settings.audio.musicVolume) {
+     music = nullptr;
+ 
++#if SDL_VERSIONNUM(SDL_MIXER_MAJOR_VERSION, SDL_MIXER_MINOR_VERSION, SDL_MIXER_PATCHLEVEL) >= SDL_VERSIONNUM(2,0,2)
++    if((Mix_Init(MIX_INIT_MID) & MIX_INIT_MID) == 0) {
++        SDL_Log("XMIPlayer: Failed to init required midi support: %s", SDL_GetError());
++    }
++#else
+     if((Mix_Init(MIX_INIT_FLUIDSYNTH) & MIX_INIT_FLUIDSYNTH) == 0) {
+         SDL_Log("XMIPlayer: Failed to init required midi support: %s", SDL_GetError());
+     }
++#endif
+ }
+ 
+ XMIPlayer::~XMIPlayer() {
+-- 
+2.24.1
+