Re: [ptxdist] [APPLIED] sdl_mixer: Remove after one year in staging

[Michael Olbrich <m.olbrich@pengutronix.de>]

Thanks, applied as 6f44732a14827e0fd8ad928e1d200a2ffafb128b.

Michael

[sent from post-receive hook]

On Mon, 18 May 2026 09:54:07 +0200, Thorsten Scherer <t.scherer@eckelmann.de> wrote:
> Signed-off-by: Thorsten Scherer <t.scherer@eckelmann.de>
> Message-Id: <20260504125319.64605-1-t.scherer@eckelmann.de>
> [mol: remove patches as well]
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/SDL_mixer-1.2.11/0001-fix-parallel-build.patch b/patches/SDL_mixer-1.2.11/0001-fix-parallel-build.patch
> deleted file mode 100644
> index 99bb837e3697..000000000000
> --- a/patches/SDL_mixer-1.2.11/0001-fix-parallel-build.patch
> +++ /dev/null
> @@ -1,48 +0,0 @@
> -From: Marc Kleine-Budde <mkl@pengutronix.de>
> -Date: Sat, 29 Oct 2011 18:51:39 +0200
> -Subject: [PATCH] fix parallel build
> -
> -We have to create the objects dir before saving gcc's output into it.
> -
> -Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> -Signed-off-by: Robert Schwebel <rsc@pengutronix.de>
> ----
> -V2:
> -  rsc: ported to 1.2.11
> -
> -V1:
> -  mkl: patch for 1.2.8
> -
> - Makefile.in |    8 ++++----
> - 1 files changed, 4 insertions(+), 4 deletions(-)
> -
> -diff --git a/Makefile.in b/Makefile.in
> -index 76fdd3c..26961b7 100644
> ---- a/Makefile.in
> -+++ b/Makefile.in
> -@@ -71,13 +71,13 @@ $(objects):
> - -include $(PLAYMUS_OBJECTS:.lo=.d)
> - @PLAYMUS_DEPENDS@
> - 
> --$(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS)
> -+$(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS) $(objects)
> - 	$(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
> - 
> --$(objects)/playwave$(EXE): $(objects)/playwave.lo $(objects)/$(TARGET)
> -+$(objects)/playwave$(EXE): $(objects)/playwave.lo $(objects)/$(TARGET) $(objects)
> - 	$(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
> - 
> --$(objects)/playmus$(EXE): $(objects)/playmus.lo $(objects)/$(TARGET)
> -+$(objects)/playmus$(EXE): $(objects)/playmus.lo $(objects)/$(TARGET) $(objects)
> - 	$(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
> - 
> - install: all install-hdrs install-lib #install-bin
> -@@ -92,7 +92,7 @@ install-hdrs:
> - install-lib: $(objects) $(objects)/$(TARGET)
> - 	$(SHELL) $(auxdir)/mkinstalldirs $(libdir)
> - 	$(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(libdir)/$(TARGET)
> --install-bin:
> -+install-bin: $(objects)
> - 	$(SHELL) $(auxdir)/mkinstalldirs $(bindir)
> - 	$(LIBTOOL) --mode=install $(INSTALL) -m 755 $(objects)/playwave$(EXE) $(bindir)/playwave$(EXE)
> - 	$(LIBTOOL) --mode=install $(INSTALL) -m 755 $(objects)/playmus$(EXE) $(bindir)/playmus$(EXE)
> diff --git a/patches/SDL_mixer-1.2.11/0002-fix-cross-compiling-issue.patch b/patches/SDL_mixer-1.2.11/0002-fix-cross-compiling-issue.patch
> deleted file mode 100644
> index 66dde567c52e..000000000000
> --- a/patches/SDL_mixer-1.2.11/0002-fix-cross-compiling-issue.patch
> +++ /dev/null
> @@ -1,39 +0,0 @@
> -From: Michael Olbrich <m.olbrich@pengutronix.de>
> -Date: Sat, 29 Oct 2011 18:51:39 +0200
> -Subject: [PATCH] fix cross-compiling issue
> -
> -use AC_COMPILE_IFELSE instead of AC_TRY_RUN
> -
> -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> ----
> - configure.in |   14 ++++++++------
> - 1 files changed, 8 insertions(+), 6 deletions(-)
> -
> -diff --git a/configure.in b/configure.in
> -index 7d23387..a3f440b 100644
> ---- a/configure.in
> -+++ b/configure.in
> -@@ -417,15 +417,17 @@ if test x$enable_music_flac = xyes; then
> -         LIBS_SAVED="$LIBS"
> -         LIBS="-lFLAC"
> -         AC_MSG_CHECKING([for libflac so-name version >= $libflac_ver])
> --        AC_TRY_RUN([
> -+        AC_COMPILE_IFELSE([
> - #include "FLAC/export.h"
> --#include "stdio.h"
> -+
> -+#ifndef FLAC_API_VERSION_CURRENT
> -+#error no version
> -+#endif
> -+#if FLAC_API_VERSION_CURRENT < $libflac_ver
> -+#error too old
> -+#endif
> - int main( int argc, char *argv[] ) {
> --#if defined(FLAC_API_VERSION_CURRENT) && (FLAC_API_VERSION_CURRENT >= $libflac_ver)
> -     return 0;
> --#else
> --    return 1;
> --#endif
> - }
> - ], have_flac_ver=yes, have_flac_ver=no)
> -         LIBS="$LIBS_SAVED"
> diff --git a/patches/SDL_mixer-1.2.11/autogen.sh b/patches/SDL_mixer-1.2.11/autogen.sh
> deleted file mode 100755
> index fb1a35ab9675..000000000000
> --- a/patches/SDL_mixer-1.2.11/autogen.sh
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -
> -./autogen.sh
> -
> diff --git a/patches/SDL_mixer-1.2.11/series b/patches/SDL_mixer-1.2.11/series
> deleted file mode 100644
> index 881e6b3aaef6..000000000000
> --- a/patches/SDL_mixer-1.2.11/series
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-fix-parallel-build.patch
> -0002-fix-cross-compiling-issue.patch
> -# 6d52e70075099a363f22c56add5be9b9  - git-ptx-patches magic
> diff --git a/rules/sdl_mixer.in b/rules/sdl_mixer.in
> deleted file mode 100644
> index 98ad49793c61..000000000000
> --- a/rules/sdl_mixer.in
> +++ /dev/null
> @@ -1,56 +0,0 @@
> -## SECTION=staging
> -## old section:
> -### SECTION=multimedia_sdl
> -
> -menuconfig SDL_MIXER
> -	tristate
> -	prompt "SDL mixer                     "
> -	select SDL
> -	select LIBVORBIS	if SDL_MIXER_OGG
> -	select LIBMAD		if SDL_MIXER_MP3
> -	select LIBMIKMOD	if SDL_MIXER_MOD
> -	select FLAC		if SDL_MIXER_FLAC
> -
> -	help
> -	  SDL Mixer is a sample multi-channel audio mixer library.
> -	  It supports 4 channels of 16 bit stereo audio, plus a single
> -	  channel of music, mixed by the popular MikMod MOD, Timidity
> -	  MIDI, and SMPEG MP3 libraries.
> -
> -	  STAGING: remove in PTXdist 2026.03.0
> -	  Obsolete and replaced by SDL2.
> -
> -if SDL_MIXER
> -
> -config SDL_MIXER_WAVE
> -	bool
> -	prompt "WAVE support"
> -
> -config SDL_MIXER_MOD
> -	bool
> -	depends on STAGING
> -	prompt "MOD support"
> -
> -config SDL_MIXER_MIDI_TIMIDITY
> -	bool
> -	prompt "MIDI support (via timidity)"
> -
> -config SDL_MIXER_MIDI_NATIVE
> -	bool
> -	depends on BROKEN
> -	prompt "MIDI support (native)"
> -
> -config SDL_MIXER_OGG
> -	bool
> -	prompt "OGG support"
> -
> -config SDL_MIXER_FLAC
> -	bool
> -	prompt "FLAC support"
> -
> -config SDL_MIXER_MP3
> -	bool
> -	prompt "MP3 support"
> -
> -endif
> -
> diff --git a/rules/sdl_mixer.make b/rules/sdl_mixer.make
> deleted file mode 100644
> index cf5f9742b914..000000000000
> --- a/rules/sdl_mixer.make
> +++ /dev/null
> @@ -1,72 +0,0 @@
> -# -*-makefile-*-
> -#
> -# Copyright (C) 2008 by Marek Moeckel
> -#               2009 by Marc Kleine-Budde <mkl@pengutronix.de>
> -#
> -# For further information about the PTXdist project and license conditions
> -# see the README file.
> -#
> -
> -#
> -# We provide this package
> -#
> -PACKAGES-$(PTXCONF_SDL_MIXER) += sdl_mixer
> -
> -#
> -# Paths and names
> -#
> -SDL_MIXER_VERSION	:= 1.2.11
> -SDL_MIXER_MD5		:= 65ada3d997fe85109191a5fb083f248c
> -SDL_MIXER		:= SDL_mixer-$(SDL_MIXER_VERSION)
> -SDL_MIXER_SUFFIX	:= tar.gz
> -SDL_MIXER_URL		:= https://www.libsdl.org/projects/SDL_mixer/release/$(SDL_MIXER).$(SDL_MIXER_SUFFIX)
> -SDL_MIXER_SOURCE	:= $(SRCDIR)/$(SDL_MIXER).$(SDL_MIXER_SUFFIX)
> -SDL_MIXER_DIR		:= $(BUILDDIR)/$(SDL_MIXER)
> -SDL_MIXER_LICENSE	:= LGPL-2.1-only
> -
> -# ----------------------------------------------------------------------------
> -# Prepare
> -# ----------------------------------------------------------------------------
> -
> -#
> -# autoconf
> -#
> -SDL_MIXER_CONF_TOOL := autoconf
> -SDL_MIXER_CONF_OPT := \
> -	$(CROSS_AUTOCONF_USR) \
> -	--with-sdl-prefix=$(SYSROOT)/usr \
> -	--disable-music-mp3 \
> -	--$(call ptx/endis, PTXCONF_SDL_MIXER_WAVE)-music-wave \
> -	--$(call ptx/endis, PTXCONF_SDL_MIXER_MOD)-music-mod \
> -	--$(call ptx/endis, PTXCONF_SDL_MIXER_MIDI_TIMIDITY)-music-timidity-midi \
> -	--$(call ptx/endis, PTXCONF_SDL_MIXER_MIDI_NATIVE)-music-native-midi-gpl \
> -	--$(call ptx/endis, PTXCONF_SDL_MIXER_OGG)-music-ogg \
> -	--$(call ptx/endis, PTXCONF_SDL_MIXER_FLAC)-music-flac \
> -	--$(call ptx/endis, PTXCONF_SDL_MIXER_MP3)-music-mp3-mad-gpl
> -
> -ifneq ($(PTXCONF_SDL_MIXER_MIDI_TIMIDITY)$(PTXCONF_SDL_MIXER_MIDI_NATIVE),)
> -SDL_MIXER_CONF_OPT += --enable-music-midi
> -else
> -SDL_MIXER_CONF_OPT += --disable-music-midi
> -endif
> -
> -# ----------------------------------------------------------------------------
> -# Target-Install
> -# ----------------------------------------------------------------------------
> -
> -$(STATEDIR)/sdl_mixer.targetinstall:
> -	@$(call targetinfo)
> -
> -	@$(call install_init, sdl_mixer)
> -	@$(call install_fixup, sdl_mixer,PRIORITY,optional)
> -	@$(call install_fixup, sdl_mixer,SECTION,base)
> -	@$(call install_fixup, sdl_mixer,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
> -	@$(call install_fixup, sdl_mixer,DESCRIPTION,missing)
> -
> -	@$(call install_lib, sdl_mixer, 0, 0, 0644, libSDL_mixer-1.2)
> -
> -	@$(call install_finish, sdl_mixer)
> -
> -	@$(call touch)
> -
> -# vim: syntax=make