From 22e23a7eafb7a86f674096703f4863f0bfa1abcb Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 5 Mar 2022 20:02:03 +0200 Subject: [PATCH 03/40] Make 2.0.6 minimum SDL2 requirement for sound support See osdn #44018 Signed-off-by: Marko Lindqvist --- INSTALL | 7 ++++--- doc/README.packaging | 1 + m4/sound.m4 | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/INSTALL b/INSTALL index 0196af7310..9274be93ef 100644 --- a/INSTALL +++ b/INSTALL @@ -4,7 +4,7 @@ Installing Freeciv: This file describes how to compile and install Freeciv. Last time we made sure this file is up to date was 16-Jul-06. -Last minor update was 06-Feb-22. +Last minor update was 03-Mar-22. There may be a localized version of this file in the ./doc directory, named INSTALL. (e.g., INSTALL.de). @@ -121,8 +121,9 @@ library support and for development support (for compiling programs which use those libraries). To compile Freeciv on such systems you will need to have the appropriate "development" packages installed. -Sound support is built in by default if "SDL2_mixer" library development -files are found from the system. +Sound support is built in by default if development files for +"SDL2" and"SDL2_mixer" libraries are found from the system. Minimum +version for SDL2 is 2.0.6. https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-2.0.4.tar.gz diff --git a/doc/README.packaging b/doc/README.packaging index cee94c4b1a..c455c86897 100644 --- a/doc/README.packaging +++ b/doc/README.packaging @@ -18,6 +18,7 @@ Updating from 3.1 to 3.2 ~/.freeciv-client-rc-3.0 generated by Freeciv 3.0, or ~/.civclientrc generated by Freeciv version <= 2.1). * Gtk3-client has been dropped +* Minimum SDL2 requirement for sound support is 2.0.6. * Qt6-mode is used by default. Configure option --with-qtver=qt5 can be used to still build against Qt5 diff --git a/m4/sound.m4 b/m4/sound.m4 index a14a65cfbd..3563c5917d 100644 --- a/m4/sound.m4 +++ b/m4/sound.m4 @@ -15,8 +15,8 @@ if test "x$USE_SOUND_SDL" != "xno" ; then SDL_mixer=sdl2 SOUND_SDL_OK=true else - SDL2_VERSION=2.0.0 - AM_PATH_SDL2($SDL2_VERSION, SDL2=yes, SDL2=no) + SDL2_VERSION=2.0.6 + AM_PATH_SDL2([$SDL2_VERSION], [SDL2=yes], [SDL2=no]) if test "x$SDL2" != "xno" ; then PKG_CHECK_MODULES([SDL2MIXER], [SDL2_mixer], [ -- 2.34.1