PACKAGE/DEFCONFIG: bump sdl_mixer pkg ver. & allow here for mikmod linking (#105)

add `libmikmod` to shared defconfigs

configs/miyoo_musl_defconfig

@@ -178,6 +178,7 @@ BR2_PACKAGE_PYTHON_PYGAME_MENU=y
 BR2_PACKAGE_LIBASPLIB=y
 BR2_PACKAGE_LIBID3TAG=y
 BR2_PACKAGE_LIBMAD=y
+BR2_PACKAGE_LIBMIKMOD=y
 BR2_PACKAGE_LIBSNDFILE=y
 BR2_PACKAGE_OPENAL=y
 BR2_PACKAGE_SPEEX=y

configs/miyoo_uclibc_defconfig

@@ -176,6 +176,7 @@ BR2_PACKAGE_PYTHON_PYGAME_MENU=y
 BR2_PACKAGE_LIBASPLIB=y
 BR2_PACKAGE_LIBID3TAG=y
 BR2_PACKAGE_LIBMAD=y
+BR2_PACKAGE_LIBMIKMOD=y
 BR2_PACKAGE_LIBSNDFILE=y
 BR2_PACKAGE_OPENAL=y
 BR2_PACKAGE_SPEEX=y

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

@@ -1,63 +0,0 @@
-From abf3a1b9c9cdacb574c2b9cdbf3f2a5e18c39ab9 Mon Sep 17 00:00:00 2001
-From: Rodrigo Rebello <rprebello@gmail.com>
-Date: Mon, 29 Feb 2016 22:53:49 -0300
-Subject: [PATCH] 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.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
-SDL_mixer' is run (they're already shown because of the 'Requires: sdl'
-line in SDL_mixer.pc). Makefile.in is also adjusted accordingly.
-
-Upstream status: submitted
-https://bugzilla.libsdl.org/show_bug.cgi?id=3278
-
-Signed-off-by: Rodrigo Rebello <rprebello@gmail.com>
----
- Makefile.in     | 2 +-
- SDL_mixer.pc.in | 1 +
- configure.ac    | 1 -
- 3 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 027a99b..18015a2 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -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) $(LDFLAGS) $(objects)/$(TARGET)
-diff --git a/SDL_mixer.pc.in b/SDL_mixer.pc.in
-index 1c4965d..d793521 100644
---- a/SDL_mixer.pc.in
-+++ b/SDL_mixer.pc.in
-@@ -8,5 +8,6 @@ Description: mixer library for Simple DirectMedia Layer
- Version: @VERSION@
- Requires: sdl >= @SDL_VERSION@
- Libs: -L${libdir} -lSDL_mixer
-+Libs.private: @EXTRA_LDFLAGS@
- Cflags: -I${includedir}/SDL
- 
-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"
--EXTRA_LDFLAGS="$EXTRA_LDFLAGS $SDL_LIBS"
- 
- dnl Check for math library
- AC_CHECK_LIB(m, pow, [LIBM="-lm"])
--- 
-2.27.0

package/sdl_mixer/0002-configure__set_macro_directory.patch

@@ -1,34 +0,0 @@
-# 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
- 

package/sdl_mixer/0003-configure.ac-fix-static-linking-with-tremor.patch

@@ -1,24 +0,0 @@
-From 02e247a0b820753977315786087b969f3b2c53da Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Sat, 10 Apr 2021 11:50:17 +0200
-Subject: [PATCH] configure.ac: fix linking with tremor
-
-backported from: https://github.com/libsdl-org/SDL_mixer/pull/312
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index c8dbcdb..93d5db0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -453,7 +453,7 @@ if test x$enable_music_ogg = xyes; then
-                 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/)])

package/sdl_mixer/sdl_mixer.hash

@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  b3c0f36500b23a6f5832d472f3e07b74f1d3f6bd00bf6700bc5e99babc9ba2ab  sdl_mixer-d1725fcb7c4e987aeb7ecdc94cb8b6375b702170.tar.gz
+sha256  7faff2fcd3a82453c77acbfea42b21ee3faf20b80d62726bbe3df0e6c08c41f7  sdl_mixer-ed76d39cda0735d26c14a3e4f4da996e420f6478.tar.gz
 sha256  bc4c3bc32b311044d81c32b5e5402a6bc971a3b235850bb63445ec14bb6fe59e  COPYING

package/sdl_mixer/sdl_mixer.mk

@@ -8,7 +8,7 @@
 # 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_VERSION = ed76d39cda0735d26c14a3e4f4da996e420f6478
 SDL_MIXER_SITE = $(call github,libsdl-org,SDL_mixer,$(SDL_MIXER_VERSION))
 SDL_MIXER_LICENSE = Zlib
 SDL_MIXER_LICENSE_FILES = COPYING
@@ -24,7 +24,6 @@ SDL_MIXER_AUTORECONF = YES
 
 SDL_MIXER_CONF_OPTS = \
 	--with-sdl-prefix=$(STAGING_DIR)/usr \
-	--disable-music-mod \
 	--disable-music-mp3 \
 	--disable-music-flac # configure script fails when cross compiling
 
@@ -54,11 +53,15 @@ else
 SDL_MIXER_CONF_OPTS += --disable-music-mp3-mad-gpl
 endif
 
+ifeq ($(BR2_PACKAGE_LIBMIKMOD),y)
+SDL_MIXER_DEPENDENCIES += host-pkgconf libmikmod
+SDL_MIXER_CONF_OPTS += LIBMIKMOD_CONFIG=$(STAGING_DIR)/usr/bin/libmikmod-config
+else
+SDL_MIXER_CONF_OPTS += --disable-music-mod
 ifeq ($(BR2_PACKAGE_LIBMODPLUG),y)
 SDL_MIXER_CONF_OPTS += --enable-music-mod-modplug
 SDL_MIXER_DEPENDENCIES += host-pkgconf libmodplug
-else
+endif
-SDL_MIXER_CONF_OPTS += --disable-music-mod-modplug
 endif
 
 ifeq ($(BR2_PACKAGE_TREMOR),y)