Update sdl(2) extra packages

package/sdl2_gfx/sdl2_gfx.hash

@@ -1,2 +1,4 @@
 # Locally calculated
-sha256 d69bcbceb811b4e5712fbad3ede737166327f44b727f1388c32581dbbe8c599a  SDL2_gfx-1.0.1.tar.gz
+sha256  63e0e01addedc9df2f85b93a248f06e8a04affa014a835c2ea34bfe34e576262  SDL2_gfx-1.0.4.tar.gz
+sha256  ec9036525fe1adde787041cce6c4b7fbb262863c238bb9051037e29a57e27bfc  COPYING
+sha256  18e6fad60b809b0e30bd2576a0d33c179ca2ac694504a849d05b6579e3c481dd  SDL2_framerate.h

package/sdl2_gfx/sdl2_gfx.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SDL2_GFX_VERSION = 1.0.1
+SDL2_GFX_VERSION = 1.0.4
 SDL2_GFX_SOURCE = SDL2_gfx-$(SDL2_GFX_VERSION).tar.gz
 SDL2_GFX_SITE = http://www.ferzkopp.net/Software/SDL2_gfx
 SDL2_GFX_LICENSE = Zlib

package/sdl2_mixer/sdl2_mixer.hash

@@ -1,2 +1,3 @@
 # Locally calculated
-sha256 5a24f62a610249d744cbd8d28ee399d8905db7222bf3bdbc8a8b4a76e597695f  SDL2_mixer-2.0.1.tar.gz
+sha256  b4cf5a382c061cd75081cf246c2aa2f9df8db04bdda8dcdc6b6cca55bede2419  SDL2_mixer-2.0.4.tar.gz
+sha256  113727180e7956cb9718b03b41da85b63ea54743a33047071a623bf672895a10  COPYING.txt

package/sdl2_mixer/sdl2_mixer.mk

@@ -4,17 +4,15 @@
 #
 ################################################################################
 
-SDL2_MIXER_VERSION = 2.0.1
+SDL2_MIXER_VERSION = 2.0.4
 SDL2_MIXER_SOURCE = SDL2_mixer-$(SDL2_MIXER_VERSION).tar.gz
 SDL2_MIXER_SITE = http://www.libsdl.org/projects/SDL_mixer/release
 SDL2_MIXER_LICENSE = Zlib
 SDL2_MIXER_LICENSE_FILES = COPYING.txt
 SDL2_MIXER_INSTALL_STAGING = YES
 SDL2_MIXER_DEPENDENCIES = sdl2 host-pkgconf
 
-SDL2_MIXER_CONF_OPTS = \
-	--disable-fluidsynth \
-	--disable-music-mp3
+SDL2_MIXER_CONF_OPTS = --disable-music-mp3
 
 ifeq ($(BR2_PACKAGE_FLAC),y)
 SDL2_MIXER_CONF_OPTS += --enable-music-flac
@@ -23,13 +21,27 @@ else
 SDL2_MIXER_CONF_OPTS += --disable-music-flac
 endif
 
+ifeq ($(BR2_PACKAGE_FLUIDSYNTH),y)
+SDL2_MIXER_CONF_OPTS += --enable-music-midi-fluidsynth
+SDL2_MIXER_DEPENDENCIES += fluidsynth
+else
+SDL2_MIXER_CONF_OPTS += --disable-music-midi-fluidsynth
+endif
+
 ifeq ($(BR2_PACKAGE_LIBMODPLUG),y)
 SDL2_MIXER_CONF_OPTS += --enable-music-mod-modplug
 SDL2_MIXER_DEPENDENCIES += libmodplug
 else
 SDL2_MIXER_CONF_OPTS += --disable-music-mod-modplug
 endif
 
+ifeq ($(BR2_PACKAGE_OPUSFILE),y)
+SDL2_MIXER_CONF_OPTS += --enable-music-opus
+SDL2_MIXER_DEPENDENCIES += opusfile
+else
+SDL2_MIXER_CONF_OPTS += --disable-music-opus
+endif
+
 ifeq ($(BR2_PACKAGE_TREMOR),y)
 SDL2_MIXER_CONF_OPTS += --enable-music-ogg-tremor
 SDL2_MIXER_DEPENDENCIES += tremor

package/sdl2_ttf/sdl2_ttf.hash

@@ -1,2 +1,3 @@
 # Locally calculated
-sha256 34db5e20bcf64e7071fe9ae25acaa7d72bdc4f11ab3ce59acc768ab62fe39276  SDL2_ttf-2.0.14.tar.gz
+sha256  a9eceb1ad88c1f1545cd7bd28e7cbc0b2c14191d40238f531a15b01b1b22cd33  SDL2_ttf-2.0.15.tar.gz
+sha256  f6370809c9f644760920d9945c5be07aed17664975f2e4741013d4d9a2ec696f  COPYING.txt

package/sdl2_ttf/sdl2_ttf.mk

@@ -4,17 +4,14 @@
 #
 ################################################################################
 
-SDL2_TTF_VERSION = 2.0.14
+SDL2_TTF_VERSION = 2.0.15
 SDL2_TTF_SOURCE = SDL2_ttf-$(SDL2_TTF_VERSION).tar.gz
 SDL2_TTF_SITE = http://www.libsdl.org/projects/SDL_ttf/release
 SDL2_TTF_LICENSE = Zlib
 SDL2_TTF_LICENSE_FILES = COPYING.txt
 SDL2_TTF_INSTALL_STAGING = YES
 SDL2_TTF_DEPENDENCIES = sdl2 freetype host-pkgconf
 
-# Two patches touching configure.in
-SDL2_TTF_AUTORECONF = YES
-
 SDL2_TTF_CONF_ENV = \
 	FREETYPE_CONFIG=$(STAGING_DIR)/usr/bin/freetype-config
 

package/sdl_image/sdl_image.hash

@@ -1,2 +1,3 @@
 # Locally calculated
-sha256	0b90722984561004de84847744d566809dbb9daf732a9e503b91a1b5a84e5699	SDL_image-1.2.12.tar.gz
+sha256  abaf55f6c3bbd7c7271b523767f360317f1fbb2a79e74c38c0523a123970ac89  sdl_image-5d792dde2f764daf15dc48521774a3354330db69.tar.gz
+sha256  653649692218d56e5807bdc5b72f51aa6067bc44d30b757e18c03b32bcaf98da  COPYING

package/sdl_image/sdl_image.mk

@@ -4,18 +4,26 @@
 #
 ################################################################################
 
-SDL_IMAGE_VERSION = 1.2.12
-SDL_IMAGE_SOURCE = SDL_image-$(SDL_IMAGE_VERSION).tar.gz
-SDL_IMAGE_SITE = http://www.libsdl.org/projects/SDL_image/release
+# The latest officially released version of SDL_image is 1.2.12, released in 2012.
+# Since then, there have been many bugfixes, including security fixes.
+#
+# This commit points to the SDL-1.2 branch from 14 Mar 2021.
+SDL_IMAGE_VERSION = 5d792dde2f764daf15dc48521774a3354330db69
+SDL_IMAGE_SITE = $(call github,libsdl-org,SDL_image,$(SDL_IMAGE_VERSION))
 SDL_IMAGE_INSTALL_STAGING = YES
 SDL_IMAGE_LICENSE = Zlib
 SDL_IMAGE_LICENSE_FILES = COPYING
+SDL_IMAGE_CPE_ID_VENDOR = libsdl
 
 SDL_IMAGE_CONF_OPTS = \
 	--with-sdl-prefix=$(STAGING_DIR)/usr \
 	--with-sdl-exec-prefix=$(STAGING_DIR)/usr \
 	--disable-sdltest \
 	--disable-static \
+	--disable-jpg-shared \
+	--disable-png-shared \
+	--disable-tif-shared \
+	--disable-webp-shared \
 	--enable-bmp=$(if $(BR2_PACKAGE_SDL_IMAGE_BMP),yes,no) \
 	--enable-gif=$(if $(BR2_PACKAGE_SDL_IMAGE_GIF),yes,no) \
 	--enable-jpg=$(if $(BR2_PACKAGE_SDL_IMAGE_JPEG),yes,no) \
@@ -43,7 +51,8 @@ HOST_SDL_IMAGE_CONF_OPTS = \
 	--disable-static \
 	--disable-jpg-shared \
 	--disable-png-shared \
-	--disable-tif-shared
+	--disable-tif-shared \
+	--disable-webp-shared
 
 HOST_SDL_IMAGE_DEPENDENCIES = host-libjpeg host-libpng host-sdl
 

package/sdl_mixer/0001-Add-Libs.private-field-to-pkg-config-file.patch

@@ -6,7 +6,7 @@ Subject: [PATCH 1/1] Add 'Libs.private' field to pkg-config file
 In order to support static linking, SDL_mixer.pc should include a
 'Libs.private' field listing all the libraries that SDL_mixer requires.
 
-This patch adds such a field and also modifies configure.in so that
+This patch adds such a field and also modifies configure.ac so that
 EXTRA_LDFLAGS (which is now also used as the value of 'Libs.private')
 no longer includes SDL_LIBS. This is done so as to prevent libraries
 required by SDL from being listed twice when 'pkg-config --libs --static
@@ -20,22 +20,22 @@ Signed-off-by: Rodrigo Rebello <rprebello@gmail.com>
 ---
  Makefile.in     | 2 +-
  SDL_mixer.pc.in | 1 +
- configure.in    | 1 -
+ configure.ac    | 1 -
  3 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 3d10565..ce4efd4 100644
+index 027a99b..18015a2 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -63,7 +63,7 @@ $(objects):
+@@ -61,7 +61,7 @@ $(objects):
  .PHONY: all install install-hdrs install-lib install-bin uninstall uninstall-hdrs uninstall-lib uninstall-bin clean distclean dist
 
  $(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS)
 -	$(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
 +	$(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(SDL_LIBS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
 
  $(objects)/playwave$(EXE): $(objects)/playwave.lo $(objects)/$(TARGET)
- 	$(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
+ 	$(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(LDFLAGS) $(objects)/$(TARGET)
 diff --git a/SDL_mixer.pc.in b/SDL_mixer.pc.in
 index 1c4965d..d793521 100644
 --- a/SDL_mixer.pc.in
@@ -47,11 +47,11 @@ index 1c4965d..d793521 100644
 +Libs.private: @EXTRA_LDFLAGS@
  Cflags: -I${includedir}/SDL
 
-diff --git a/configure.in b/configure.in
-index 2272b29..442eca6 100644
---- a/configure.in
-+++ b/configure.in
-@@ -202,7 +202,6 @@ AM_PATH_SDL($SDL_VERSION,
+diff --git a/configure.ac b/configure.ac
+index 01a3d83..3ad3b4f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -200,7 +200,6 @@ AM_PATH_SDL($SDL_VERSION,
              AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])
  )
  EXTRA_CFLAGS="$EXTRA_CFLAGS $SDL_CFLAGS"
@@ -60,5 +60,4 @@ index 2272b29..442eca6 100644
  dnl Check for math library
  AC_CHECK_LIB(m, pow, [LIBM="-lm"])
 -- 
-2.1.4
-
+2.27.0

package/sdl_mixer/0002-configure__set_macro_directory.patch

@@ -0,0 +1,34 @@
+# HG changeset patch
+# User "Yann E. MORIN" <yann.morin.1998@free.fr>
+# Date 1581183281 -3600
+#      Sat Feb 08 18:34:41 2020 +0100
+# Node ID 753a1f394620056c35790a571ff5f7c248445943
+# Parent  eb5f08bf9994bf5164ca68015f2e030c2c9dddcd
+configure: set macro directory
+
+Setting the macro directory in configure.in, rather than specifying it
+on the command line, ensures that it is properly searched in the correct
+order, and that autoreconf properly updates our macros with the newer
+system ones, if any.
+
+Fixes:
+    http://autobuild.buildroot.org/results/63a/63ae0bddb3c4436efe967c318e299047f496c5a5/build-end.log
+
+    libtool: Version mismatch error.  This is libtool 2.4.6, but the
+    libtool: definition of this LT_INIT comes from libtool 2.2.6.
+    libtool: You should recreate aclocal.m4 with macros from libtool 2.4.6
+    libtool: and run autoconf again.
+
+Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
+
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,6 +1,7 @@
+ dnl Process this file with autoconf to produce a configure script.
+ AC_INIT(README)
+ AC_CONFIG_AUX_DIR(build-scripts)
++AC_CONFIG_MACRO_DIR([acinclude])
+
+ dnl Set various version strings - taken gratefully from the GTk sources
+