[PR PATCH] SDL2_mixer: update to 2.6.3.

[PR PATCH] SDL2_mixer: update to 2.6.3.

[Bnyro]

[-- Attachment #1: Type: text/plain, Size: 479 bytes --]

There is a new pull request by Bnyro against master on the void-packages repository

https://github.com/Bnyro/void-packages SDL2_mixer
https://github.com/void-linux/void-packages/pull/46133

SDL2_mixer: update to 2.6.3.

#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc



A patch file from https://github.com/void-linux/void-packages/pull/46133.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-SDL2_mixer-46133.patch --]
[-- Type: text/x-diff, Size: 3716 bytes --]

From ce2d6375f7f599f73fbfd26de3927eee18ce980b Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 12:28:54 +0200
Subject: [PATCH] SDL2_mixer: update to 2.6.3.

---
 .../fix_fluidsynth_use_after_free.patch       | 30 -------------------
 srcpkgs/SDL2_mixer/template                   | 19 ++++--------
 2 files changed, 6 insertions(+), 43 deletions(-)
 delete mode 100644 srcpkgs/SDL2_mixer/patches/fix_fluidsynth_use_after_free.patch

diff --git a/srcpkgs/SDL2_mixer/patches/fix_fluidsynth_use_after_free.patch b/srcpkgs/SDL2_mixer/patches/fix_fluidsynth_use_after_free.patch
deleted file mode 100644
index cd740ac85c113..0000000000000
--- a/srcpkgs/SDL2_mixer/patches/fix_fluidsynth_use_after_free.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 6160668079f91d57a5d7bf0b40ffdd843be70daf Mon Sep 17 00:00:00 2001
-From: Sam Lantinga <slouken@libsdl.org>
-Date: Wed, 20 Jan 2021 10:17:10 -0800
-Subject: [PATCH] Fixed use-after-free in music_fluidsynth.c
-
-Tom M.
-
-There is a dangerous use-after-free in FLUIDSYNTH_Delete(): the settings object is deleted **before** the synth. Since the settings have been created first to initialize the synth, you must first delete the synth and then delete the settings. This currently crashes all applications that use fluidsynth 2.1.6 and SDL2_mixer. Please apply the attached patch and release a bug fix release.
-
-Originally reported at https://github.com/FluidSynth/fluidsynth/issues/748
----
- src/codecs/music_fluidsynth.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/codecs/music_fluidsynth.c b/src/codecs/music_fluidsynth.c
-index 8667f0d9..a47247f4 100644
---- a/music_fluidsynth.c
-+++ b/music_fluidsynth.c
-@@ -285,9 +285,10 @@ static void FLUIDSYNTH_Stop(void *context)
- static void FLUIDSYNTH_Delete(void *context)
- {
-     FLUIDSYNTH_Music *music = (FLUIDSYNTH_Music *)context;
-+    fluid_settings_t *settings = fluidsynth.fluid_synth_get_settings(music->synth);
-     fluidsynth.delete_fluid_player(music->player);
--    fluidsynth.delete_fluid_settings(fluidsynth.fluid_synth_get_settings(music->synth));
-     fluidsynth.delete_fluid_synth(music->synth);
-+    fluidsynth.delete_fluid_settings(settings);
-     SDL_free(music);
- }
- 
diff --git a/srcpkgs/SDL2_mixer/template b/srcpkgs/SDL2_mixer/template
index a5c0e512ba4ec..c65e7df1f2b2a 100644
--- a/srcpkgs/SDL2_mixer/template
+++ b/srcpkgs/SDL2_mixer/template
@@ -1,7 +1,7 @@
 # Template file for 'SDL2_mixer'
 pkgname=SDL2_mixer
-version=2.0.4
-revision=4
+version=2.6.3
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="SDL2-devel libvorbis-devel libmikmod-devel libflac-devel
@@ -11,19 +11,12 @@ depends="libvorbis libmikmod libmpg123 libmodplug libflac smpeg2 opusfile"
 short_desc="Multi-channel audio mixer library (SDL 2.x)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
-homepage="http://www.libsdl.org/projects/SDL_mixer/"
-distfiles="http://www.libsdl.org/projects/SDL_mixer/release/${pkgname}-${version}.tar.gz"
-checksum=b4cf5a382c061cd75081cf246c2aa2f9df8db04bdda8dcdc6b6cca55bede2419
-
-pre_configure() {
-	sed -e "/CONFIG_FILE_ETC/s|/etc/timidity.cfg|/etc/timidity++/timidity.cfg|" \
-		-e "/DEFAULT_PATH/s|/etc/timidity|/etc/timidity++|" \
-		-e "/DEFAULT_PATH2/s|/usr/local/lib/timidity|/usr/lib/timidity|" \
-		-i timidity/options.h
-}
+homepage="https://www.libsdl.org/projects/SDL_mixer/"
+distfiles="https://www.libsdl.org/projects/SDL_mixer/release/${pkgname}-${version}.tar.gz"
+checksum=7a6ba86a478648ce617e3a5e9277181bc67f7ce9876605eea6affd4a0d6eea8f
 
 post_install() {
-	vlicense COPYING.txt COPYING
+	vlicense LICENSE.txt
 }
 
 SDL2_mixer-devel_package() {

Re: [PR PATCH] [Merged]: SDL2_mixer: update to 2.6.3.

[Duncaen]

[-- Attachment #1: Type: text/plain, Size: 329 bytes --]

There's a merged pull request on the void-packages repository

SDL2_mixer: update to 2.6.3.
https://github.com/void-linux/void-packages/pull/46133

Description:

#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc