diff --git a/package/sdl2_gfx/sdl2_gfx.hash b/package/sdl2_gfx/sdl2_gfx.hash
index 4cb07ee9..190c997d 100644
--- a/package/sdl2_gfx/sdl2_gfx.hash
+++ b/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
diff --git a/package/sdl2_gfx/sdl2_gfx.mk b/package/sdl2_gfx/sdl2_gfx.mk
index 1ec13871..6817391b 100644
--- a/package/sdl2_gfx/sdl2_gfx.mk
+++ b/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
diff --git a/package/sdl2_mixer/sdl2_mixer.hash b/package/sdl2_mixer/sdl2_mixer.hash
index 48bc887a..f3bab151 100644
--- a/package/sdl2_mixer/sdl2_mixer.hash
+++ b/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
diff --git a/package/sdl2_mixer/sdl2_mixer.mk b/package/sdl2_mixer/sdl2_mixer.mk
index c9908479..f349b8ca 100644
--- a/package/sdl2_mixer/sdl2_mixer.mk
+++ b/package/sdl2_mixer/sdl2_mixer.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-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
@@ -12,9 +12,7 @@ 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,6 +21,13 @@ 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
@@ -30,6 +35,13 @@ 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
diff --git a/package/sdl2_ttf/0001-fix-opengl-detection.patch b/package/sdl2_ttf/0001-fix-opengl-detection.patch
deleted file mode 100644
index 06e0abf8..00000000
--- a/package/sdl2_ttf/0001-fix-opengl-detection.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-# HG changeset patch
-# User Sam Lantinga <slouken@libsdl.org>
-# Date 1485568474 28800
-# Node ID 3b93536d291a34183592fd29ef1df9cf1416ac09
-# Parent  184c34c673d479477d34194e3c0b1abe7ca5d828
-Make sure we can link with OpenGL libraries in the OpenGL configure test
-
-[yann.morin.1998@free.fr:
-  - backported from upstream
-  - drop the configure hunk for autoreconf
-]
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-
-diff -r 184c34c673d4 -r 3b93536d291a configure.in
---- a/configure.in	Sun Jan 01 18:46:38 2017 -0800
-+++ b/configure.in	Fri Jan 27 17:54:34 2017 -0800
-@@ -164,14 +164,17 @@
- esac
- AC_MSG_CHECKING(for OpenGL support)
- have_opengl=no
--AC_TRY_COMPILE([
-+save_LIBS="$LIBS"
-+LIBS="$LIBS $SYS_GL_LIBS"
-+AC_TRY_LINK([
-  #include "SDL_opengl.h"
- ],[
-- GLuint texture;
-+ glOrtho( -2.0, 2.0, -2.0, 2.0, -20.0, 20.0 );
- ],[
- have_opengl=yes
- ])
- AC_MSG_RESULT($have_opengl)
-+LIBS="$save_LIBS"
- if test x$have_opengl = xyes; then
-     CFLAGS="$CFLAGS -DHAVE_OPENGL"
-     GL_LIBS="$SYS_GL_LIBS"
-
diff --git a/package/sdl2_ttf/0002-fix-autoreconf.patch b/package/sdl2_ttf/0002-fix-autoreconf.patch
deleted file mode 100644
index 88543a94..00000000
--- a/package/sdl2_ttf/0002-fix-autoreconf.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-# HG changeset patch
-# User "Yann E. MORIN" <yann.morin.1998@free.fr>
-# Date 1485597428 -3600
-# Node ID 26376ce4a3e6565885fd984b3fe5a39a6895dcdd
-# Parent  3b93536d291a34183592fd29ef1df9cf1416ac09
-configure: fix autoreconf
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-
-diff --git a/configure.in b/configure.in
---- a/configure.in
-+++ b/configure.in
-@@ -1,5 +1,6 @@
- dnl Process this file with autoconf to produce a configure script.
--AC_INIT(README.txt)
-+dnl The version string must be a literal
-+AC_INIT([SDL2_ttf],[2.0.14])
- 
- dnl Set various version strings - taken gratefully from the GTk sources
- 
-@@ -42,7 +42,7 @@
- AC_CANONICAL_HOST
- 
- dnl Setup for automake
--AM_INIT_AUTOMAKE(SDL2_ttf, $VERSION)
-+AM_INIT_AUTOMAKE([foreign])
- 
- dnl Check for tools
- AC_PROG_LIBTOOL
-
diff --git a/package/sdl2_ttf/sdl2_ttf.hash b/package/sdl2_ttf/sdl2_ttf.hash
index 515189af..16459e4a 100644
--- a/package/sdl2_ttf/sdl2_ttf.hash
+++ b/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
diff --git a/package/sdl2_ttf/sdl2_ttf.mk b/package/sdl2_ttf/sdl2_ttf.mk
index dbe30dd5..326cb993 100644
--- a/package/sdl2_ttf/sdl2_ttf.mk
+++ b/package/sdl2_ttf/sdl2_ttf.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-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
@@ -12,9 +12,6 @@ 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
 
diff --git a/package/sdl_image/SDL_image-1.2.12-interlaced-png-warning-fix.patch b/package/sdl_image/SDL_image-1.2.12-interlaced-png-warning-fix.patch
deleted file mode 100644
index 74dc43c8..00000000
--- a/package/sdl_image/SDL_image-1.2.12-interlaced-png-warning-fix.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -up SDL_image-1.2.12/IMG_png.c~ SDL_image-1.2.12/IMG_png.c
---- SDL_image-1.2.12/IMG_png.c~	2012-01-21 02:51:33.000000000 +0100
-+++ SDL_image-1.2.12/IMG_png.c	2015-12-26 12:39:21.150828413 +0100
-@@ -95,6 +95,7 @@ static struct {
- 	void (*png_set_packing) (png_structp png_ptr);
- 	void (*png_set_read_fn) (png_structp png_ptr, png_voidp io_ptr, png_rw_ptr read_data_fn);
- 	void (*png_set_strip_16) (png_structp png_ptr);
-+	int (*png_set_interlace_handling) (png_structp png_ptr);
- 	int (*png_sig_cmp) (png_bytep sig, png_size_t start, png_size_t num_to_check);
- #ifndef LIBPNG_VERSION_12
- 	jmp_buf* (*png_set_longjmp_fn) (png_structp, png_longjmp_ptr, size_t);
-@@ -228,6 +229,13 @@ int IMG_InitPNG()
- 			SDL_UnloadObject(lib.handle);
- 			return -1;
- 		}
-+		lib.png_set_interlace_handling =
-+			(void (*) (png_structp))
-+			SDL_LoadFunction(lib.handle, "png_set_interlace_handling");
-+		if ( lib.png_set_interlace_handling == NULL ) {
-+			SDL_UnloadObject(lib.handle);
-+			return -1;
-+		}
- 		lib.png_sig_cmp =
- 			(int (*) (png_bytep, png_size_t, png_size_t))
- 			SDL_LoadFunction(lib.handle, "png_sig_cmp");
-@@ -280,6 +288,7 @@ int IMG_InitPNG()
- 		lib.png_set_packing = png_set_packing;
- 		lib.png_set_read_fn = png_set_read_fn;
- 		lib.png_set_strip_16 = png_set_strip_16;
-+		lib.png_set_interlace_handling = png_set_interlace_handling;
- 		lib.png_sig_cmp = png_sig_cmp;
- #ifndef LIBPNG_VERSION_12
- 		lib.png_set_longjmp_fn = png_set_longjmp_fn;
-@@ -404,6 +413,9 @@ SDL_Surface *IMG_LoadPNG_RW(SDL_RWops *s
- 	/* tell libpng to strip 16 bit/color files down to 8 bits/color */
- 	lib.png_set_strip_16(png_ptr) ;
- 
-+	/* tell libpng to de-interlace (if the image is interlaced) */
-+	lib.png_set_interlace_handling(png_ptr) ;
-+
- 	/* Extract multiple pixels with bit depths of 1, 2, and 4 from a single
- 	 * byte into separate bytes (useful for paletted and grayscale images).
- 	 */
diff --git a/package/sdl_image/sdl_image.hash b/package/sdl_image/sdl_image.hash
index 83622348..a0a2709f 100644
--- a/package/sdl_image/sdl_image.hash
+++ b/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
diff --git a/package/sdl_image/sdl_image.mk b/package/sdl_image/sdl_image.mk
index ee0712cc..dafb64df 100644
--- a/package/sdl_image/sdl_image.mk
+++ b/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
 
diff --git a/package/sdl_mixer/0001-Add-Libs.private-field-to-pkg-config-file.patch b/package/sdl_mixer/0001-Add-Libs.private-field-to-pkg-config-file.patch
index e0e85710..07346001 100644
--- a/package/sdl_mixer/0001-Add-Libs.private-field-to-pkg-config-file.patch
+++ b/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,14 +20,14 @@ 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)
@@ -35,7 +35,7 @@ index 3d10565..ce4efd4 100644
 +	$(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
diff --git a/package/sdl_mixer/0002-add-LDFLAGS-while-linking.patch b/package/sdl_mixer/0002-add-LDFLAGS-while-linking.patch
deleted file mode 100644
index da781cab..00000000
--- a/package/sdl_mixer/0002-add-LDFLAGS-while-linking.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Pass LDFLAGS while creating binaries.
-
-Fixes following linking error with uClibc-ng:
-br/output/host/usr/lib/gcc/powerpc-buildroot-linux-uclibc/5.4.0/libgcc.a(unwind-dw2-fde-dip.o): In function `_Unwind_Find_FDE':
-br/output/build/host-gcc-final-5.4.0/build/powerpc-buildroot-linux-uclibc/libgcc/../../../libgcc/unwind-dw2-fde-dip.c:465: undefined reference to `dl_iterate_phdr'
-collect2: error: ld returned 1 exit status
-
-Since uClibc-ng 1.0.18 a circular dependency between libc and libgcc
-exist, when static linking is used. It can be resolved by the compiler
-when -static is correctly passed in the linking step.
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-Revised patch so it would also work with SDL_mixer 1.2.13
-
-diff -Nur SDL_mixer-1.2.13.orig/Makefile.in SDL_mixer-1.2.13/Makefile.in
---- SDL_mixer-1.2.13.orig/Makefile.in	2012-01-15 23:01:04.000000000 +0100
-+++ SDL_mixer-1.2.13/Makefile.in	2016-12-07 08:29:22.479786596 +0100
-@@ -63,13 +63,13 @@
- .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) $(SDL_LIBS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
-+	$(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(SDL_LIBS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
- 
- $(objects)/playwave$(EXE): $(objects)/playwave.lo $(objects)/$(TARGET)
--	$(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(LDFLAGS) $(objects)/$(TARGET)
-+	$(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(LDFLAGS) $(LDFLAGS) $(objects)/$(TARGET)
- 
- $(objects)/playmus$(EXE): $(objects)/playmus.lo $(objects)/$(TARGET)
--	$(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(LDFLAGS) $(objects)/$(TARGET)
-+	$(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(LDFLAGS) $(LDFLAGS) $(objects)/$(TARGET)
- 
- install: all install-hdrs install-lib #install-bin
- install-hdrs:
diff --git a/package/sdl_mixer/0002-configure__set_macro_directory.patch b/package/sdl_mixer/0002-configure__set_macro_directory.patch
new file mode 100644
index 00000000..9802333a
--- /dev/null
+++ b/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
+ 
diff --git a/package/sdl_mixer/0004-modpluginclude.patch b/package/sdl_mixer/0004-modpluginclude.patch
deleted file mode 100644
index 8ab86d4c..00000000
--- a/package/sdl_mixer/0004-modpluginclude.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru SDL_mixer-1.2.13.org/configure.in SDL_mixer-1.2.13/configure.in
---- SDL_mixer-1.2.13.org/configure.in	2012-01-15 23:01:05.000000000 +0100
-+++ SDL_mixer-1.2.13/configure.in	2014-07-03 05:25:44.761854572 +0200
-@@ -301,7 +301,7 @@
-         have_libmikmod=yes
-         AC_MSG_CHECKING([for libmikmod - version >= $libmikmod_ver])
-         AC_TRY_RUN([
--#include "mikmod.h"
-+#include "libmodplug/mikmod.h"
- #include "stdio.h"
- 
- int main(int argc, char **argv)
diff --git a/package/sdl_mixer/0005-Fixwontbuildontremor.patch b/package/sdl_mixer/0005-Fixwontbuildontremor.patch
deleted file mode 100644
index d057301a..00000000
--- a/package/sdl_mixer/0005-Fixwontbuildontremor.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- a/configure.in
-+++ a/configure.in
-@@ -449,7 +449,7 @@
-                 echo "-- dynamic libvorbisidec -> $ogg_lib"
-                 EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_DYNAMIC=\\\"$ogg_lib\\\""
-             else
--                EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisidec -lvorbis"
-+                EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisidec "
-             fi
-         else
-             AC_MSG_WARN([*** Unable to find Ogg Vorbis Tremor library (http://www.xiph.org/)])
-@@ -457,7 +457,7 @@
-         fi
-     else
-         AC_CHECK_HEADER([vorbis/vorbisfile.h], [have_ogg_hdr=yes])
--        AC_CHECK_LIB([vorbisfile], [ov_open_callbacks], [have_ogg_lib=yes], [], [-lvorbis -logg -lm])
-+        AC_CHECK_LIB([vorbisfile], [ov_open_callbacks], [have_ogg_lib=yes], [], [ -logg -lm])
-         if test x$have_ogg_hdr = xyes -a x$have_ogg_lib = xyes; then
-             case "$host" in
-                 *-*-darwin*)
-@@ -479,7 +479,7 @@
-                 echo "-- dynamic libvorbisfile -> $ogg_lib"
-                 EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_DYNAMIC=\\\"$ogg_lib\\\""
-             else
--                EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisfile -lvorbis -logg -lm"
-+                EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisfile  -logg -lm"
-             fi
-         else
-             AC_MSG_WARN([*** Unable to find Ogg Vorbis library (http://www.xiph.org/)])
---- a/configure
-+++ a/configure
-@@ -13936,7 +13936,7 @@
-                 echo "-- dynamic libvorbisidec -> $ogg_lib"
-                 EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_DYNAMIC=\\\"$ogg_lib\\\""
-             else
--                EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisidec -lvorbis"
-+                EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisidec "
-             fi
-         else
-             { $as_echo "$as_me:$LINENO: WARNING: *** Unable to find Ogg Vorbis Tremor library (http://www.xiph.org/)" >&5
-@@ -14083,7 +14083,7 @@
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lvorbisfile -lvorbis -logg -lm $LIBS"
-+LIBS="-lvorbisfile  -logg -lm $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -14167,7 +14167,7 @@
-                 echo "-- dynamic libvorbisfile -> $ogg_lib"
-                 EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_DYNAMIC=\\\"$ogg_lib\\\""
-             else
--                EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisfile -lvorbis -logg -lm"
-+                EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisfile  -logg -lm"
-             fi
-         else
-             { $as_echo "$as_me:$LINENO: WARNING: *** Unable to find Ogg Vorbis library (http://www.xiph.org/)" >&5
diff --git a/package/sdl_mixer/Config.in b/package/sdl_mixer/Config.in
index 42dfe63c..a886b7c1 100644
--- a/package/sdl_mixer/Config.in
+++ b/package/sdl_mixer/Config.in
@@ -9,3 +9,13 @@ config BR2_PACKAGE_SDL_MIXER
 	  SMPEG MP3 libraries.
 
 	  http://www.libsdl.org/projects/SDL_mixer/
+
+if BR2_PACKAGE_SDL_MIXER
+
+config BR2_PACKAGE_SDL_MIXER_MIDI_TIMIDITY
+	bool "MIDI support with built-in Timidity synth"
+	help
+	  Support MIDI audio using the built-in synth based on Timidity.
+	  You will need MIDI instruments installed in the filesystem.
+
+endif
diff --git a/package/sdl_mixer/sdl_mixer.hash b/package/sdl_mixer/sdl_mixer.hash
new file mode 100644
index 00000000..57917089
--- /dev/null
+++ b/package/sdl_mixer/sdl_mixer.hash
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256  b3c0f36500b23a6f5832d472f3e07b74f1d3f6bd00bf6700bc5e99babc9ba2ab  sdl_mixer-d1725fcb7c4e987aeb7ecdc94cb8b6375b702170.tar.gz
+sha256  bc4c3bc32b311044d81c32b5e5402a6bc971a3b235850bb63445ec14bb6fe59e  COPYING
diff --git a/package/sdl_mixer/sdl_mixer.mk b/package/sdl_mixer/sdl_mixer.mk
index e49c0fd5..8402879e 100644
--- a/package/sdl_mixer/sdl_mixer.mk
+++ b/package/sdl_mixer/sdl_mixer.mk
@@ -4,49 +4,72 @@
 #
 ################################################################################
 
-SDL_MIXER_VERSION = 1.2.13
-SDL_MIXER_SOURCE = SDL-1.2.tar.gz
-SDL_MIXER_SITE =  https://github.com/SDL-mirror/SDL_mixer/archive
-SDL_MIXER_LICENSE = zlib
+# The latest officially released version of SDL_mixer is 1.2.12, released in 2012.
+# Since then, there have been many bugfixes on master.
+#
+# This commit points to the SDL-1.2 branch from 15 Mar 2021.
+SDL_MIXER_VERSION = d1725fcb7c4e987aeb7ecdc94cb8b6375b702170
+SDL_MIXER_SITE = $(call github,libsdl-org,SDL_mixer,$(SDL_MIXER_VERSION))
+SDL_MIXER_LICENSE = Zlib
 SDL_MIXER_LICENSE_FILES = COPYING
 
+# Package does not build in parallel due to improper make rules
+SDL_MIXER_MAKE = $(MAKE1)
+
 SDL_MIXER_INSTALL_STAGING = YES
 SDL_MIXER_DEPENDENCIES = sdl
+
+# We're patching configure.in, so we need to autoreconf
+SDL_MIXER_AUTORECONF = YES
+
 SDL_MIXER_CONF_OPTS = \
 	--without-x \
 	--with-sdl-prefix=$(STAGING_DIR)/usr \
-	--disable-music-mp3 \
 	--disable-music-mod \
+	--disable-music-mp3 \
 	--disable-music-flac # configure script fails when cross compiling
 
-ifeq ($(BR2_PACKAGE_MPG123),y)
-SDL_MIXER_CONF_OPTS += --enable-music-mp3
-SDL_MIXER_DEPENDENCIES += mpg123
-else
-SDL_MIXER_CONF_OPTS += --disable-music-mp3
+ifeq ($(BR2_PACKAGE_FLUIDSYNTH),y)
+SDL_MIXER_DEPENDENCIES += fluidsynth
+SDL_MIXER_CONF_OPTS += \
+	--enable-music-midi \
+	--enable-music-fluidsynth-midi
+SDL_MIXER_HAS_MIDI = YES
 endif
 
-# Prefer libmikmod over Modplug due to dependency on C++
-ifeq ($(BR2_PACKAGE_LIBMIKMOD),y)
-SDL_MIXER_CONF_OPTS += --enable-music-mod
-SDL_MIXER_DEPENDENCIES += libmikmod
+ifeq ($(BR2_PACKAGE_SDL_MIXER_MIDI_TIMIDITY),y)
+SDL_MIXER_CONF_OPTS += \
+	--enable-music-midi \
+	--enable-music-timidity-midi
+SDL_MIXER_HAS_MIDI = YES
+endif
+
+ifneq ($(SDL_MIXER_HAS_MIDI),YES)
+SDL_MIXER_CONF_OPTS += --disable-music-midi
+endif
+
+ifeq ($(BR2_PACKAGE_LIBMAD),y)
+SDL_MIXER_CONF_OPTS += --enable-music-mp3-mad-gpl
+SDL_MIXER_DEPENDENCIES += libmad
 else
+SDL_MIXER_CONF_OPTS += --disable-music-mp3-mad-gpl
+endif
+
 ifeq ($(BR2_PACKAGE_LIBMODPLUG),y)
 SDL_MIXER_CONF_OPTS += --enable-music-mod-modplug
-SDL_MIXER_DEPENDENCIES += libmodplug
+SDL_MIXER_DEPENDENCIES += host-pkgconf libmodplug
 else
 SDL_MIXER_CONF_OPTS += --disable-music-mod-modplug
 endif
-endif
 
-# prefer tremor over libvorbis
 ifeq ($(BR2_PACKAGE_TREMOR),y)
 SDL_MIXER_CONF_OPTS += --enable-music-ogg-tremor
 SDL_MIXER_DEPENDENCIES += tremor
+else ifeq ($(BR2_PACKAGE_LIBVORBIS),y)
+SDL_MIXER_CONF_OPTS += --enable-music-ogg
+SDL_MIXER_DEPENDENCIES += libvorbis
 else
 SDL_MIXER_CONF_OPTS += --disable-music-ogg
 endif
 
-SDL_MIXER_CONF_OPTS += --enable-music-timidity-midi
-
 $(eval $(autotools-package))
diff --git a/package/sdl_net/sdl_net.hash b/package/sdl_net/sdl_net.hash
index 56a74842..e2b64336 100644
--- a/package/sdl_net/sdl_net.hash
+++ b/package/sdl_net/sdl_net.hash
@@ -1,2 +1,3 @@
 # Locally calculated
-sha256	5f4a7a8bb884f793c278ac3f3713be41980c5eedccecff0260411347714facb4	SDL_net-1.2.8.tar.gz
+sha256  7549dbc91813c37986300e7f34e63a068b42fd91abb41cabcaca63b4c7404ea5  SDL_net-620b0ba7dd84a0fdbd4cc8ef1b2be1cc10f90ae3.tar.gz
+sha256  e542f822a6cd82deccf82cf0f50192917b0158d725a6bc6348ab1ccdd890ecbe  COPYING
diff --git a/package/sdl_net/sdl_net.mk b/package/sdl_net/sdl_net.mk
index c7e409a1..5f014af1 100644
--- a/package/sdl_net/sdl_net.mk
+++ b/package/sdl_net/sdl_net.mk
@@ -4,8 +4,12 @@
 #
 ################################################################################
 
-SDL_NET_VERSION = 1.2.8
-SDL_NET_SITE = http://www.libsdl.org/projects/SDL_net/release
+# The latest officially released version of SDL_image is 1.2.8, released in 2012.
+# Since then, there have been several bugfixes.
+#
+# This commit points to the SDL-1.2 branch from 18 Feb 2021.
+SDL_NET_VERSION = 620b0ba7dd84a0fdbd4cc8ef1b2be1cc10f90ae3
+SDL_NET_SITE = $(call github,libsdl-org,SDL_net,$(SDL_NET_VERSION))
 SDL_NET_SOURCE = SDL_net-$(SDL_NET_VERSION).tar.gz
 SDL_NET_LICENSE = Zlib
 SDL_NET_LICENSE_FILES = COPYING
diff --git a/package/sdl_ttf/sdl_ttf.hash b/package/sdl_ttf/sdl_ttf.hash
index 48a0a372..7c5a5326 100644
--- a/package/sdl_ttf/sdl_ttf.hash
+++ b/package/sdl_ttf/sdl_ttf.hash
@@ -1,2 +1,3 @@
 # Locally calculated
-sha256	d22b229d16b72bdb29d252aef059a0e96aac6c4148792e21cb0cf40adb6c7cb7	7dbd7cd826d6.tar.gz
+sha256  c24e3b48f5ffa5afb3256d23700506fad72117ac2834147c2e46ee94c3cb12b5  sdl_ttf-70b2940cc75e92aab02a67d2f827caf2836a2c74.tar.gz
+sha256  b609721d3d4ac67facaf86f068c8b311b6c5f6cef89b6d84268aa38b7867ab7b  COPYING
diff --git a/package/sdl_ttf/sdl_ttf.mk b/package/sdl_ttf/sdl_ttf.mk
index d7b30a27..25400044 100644
--- a/package/sdl_ttf/sdl_ttf.mk
+++ b/package/sdl_ttf/sdl_ttf.mk
@@ -4,9 +4,10 @@
 #
 ################################################################################
 
-SDL_TTF_VERSION = 7dbd7cd826d6
-SDL_TTF_SOURCE = $(SDL_TTF_VERSION).tar.gz
-SDL_TTF_SITE = https://hg.libsdl.org/SDL_ttf/archive
+# There is unlikely to be a new SDL_ttf release for the foreseeable future:
+# https://bugzilla.libsdl.org/show_bug.cgi?id=5344#c1
+SDL_TTF_VERSION = 70b2940cc75e92aab02a67d2f827caf2836a2c74
+SDL_TTF_SITE = $(call github,libsdl-org,SDL_ttf,$(SDL_TTF_VERSION))
 SDL_TTF_LICENSE = Zlib
 SDL_TTF_LICENSE_FILES = COPYING