Re: [PR PATCH] [Updated] SDL2_mixer: update to 2.6.2.

[gabrielgaps <gabrielgaps@users.noreply.github.com>]

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

There is an updated pull request by gabrielgaps against master on the void-packages repository

https://github.com/gabrielgaps/void-packages master
https://github.com/void-linux/void-packages/pull/40424

SDL2_mixer: update to 2.6.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: YES

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - armv6l


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

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

From adbf01860e4522136e58f95b41249a7ed0adf216 Mon Sep 17 00:00:00 2001
From: gabbagaps <gapandfriends@cock.li>
Date: Thu, 10 Nov 2022 00:36:45 +0100
Subject: [PATCH 1/3] SDL2_mixer: update to 2.6.2.

---
 .../fix_fluidsynth_use_after_free.patch       | 30 -------------------
 srcpkgs/SDL2_mixer/template                   | 24 +++++----------
 2 files changed, 7 insertions(+), 47 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 cd740ac85c11..000000000000
--- 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 a5c0e512ba4e..7b3d8ff08c46 100644
--- a/srcpkgs/SDL2_mixer/template
+++ b/srcpkgs/SDL2_mixer/template
@@ -1,8 +1,9 @@
 # Template file for 'SDL2_mixer'
 pkgname=SDL2_mixer
-version=2.0.4
-revision=4
+version=2.6.2
+revision=1
 build_style=gnu-configure
+configure_args="--disable-static --prefix=/usr"
 hostmakedepends="pkg-config"
 makedepends="SDL2-devel libvorbis-devel libmikmod-devel libflac-devel
  libmodplug-devel mpg123-devel smpeg2-devel fluidsynth-devel opusfile-devel"
@@ -10,21 +11,10 @@ makedepends="SDL2-devel libvorbis-devel libmikmod-devel libflac-devel
 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
-}
-
-post_install() {
-	vlicense COPYING.txt COPYING
-}
+license="Zlib"
+homepage="https://github.com/libsdl-org/SDL_mixer"
+distfiles="https://github.com/libsdl-org/SDL_mixer/release-${version}/${pkgname}-${version}.tar.gz"
+checksum=8cdea810366decba3c33d32b8071bccd1c309b2499a54946d92b48e6922aa371
 
 SDL2_mixer-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 628b968755dc35e1d4bbd0aa9dd2f8306006428c Mon Sep 17 00:00:00 2001
From: gabrielgaps <76654670+gabrielgaps@users.noreply.github.com>
Date: Thu, 10 Nov 2022 17:06:17 +0100
Subject: [PATCH 2/3] Update srcpkgs/SDL2_mixer/template

Co-authored-by: classabbyamp <5366828+classabbyamp@users.noreply.github.com>
---
 srcpkgs/SDL2_mixer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/SDL2_mixer/template b/srcpkgs/SDL2_mixer/template
index 7b3d8ff08c46..b888cc8d4912 100644
--- a/srcpkgs/SDL2_mixer/template
+++ b/srcpkgs/SDL2_mixer/template
@@ -13,7 +13,7 @@ short_desc="Multi-channel audio mixer library (SDL 2.x)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib"
 homepage="https://github.com/libsdl-org/SDL_mixer"
-distfiles="https://github.com/libsdl-org/SDL_mixer/release-${version}/${pkgname}-${version}.tar.gz"
+distfiles="https://github.com/libsdl-org/SDL_mixer/release-${version}/SDL2_mixer-${version}.tar.gz"
 checksum=8cdea810366decba3c33d32b8071bccd1c309b2499a54946d92b48e6922aa371
 
 SDL2_mixer-devel_package() {

From 5ccb75539515912431cfcd8344df95c7eccbc571 Mon Sep 17 00:00:00 2001
From: gabrielgaps <76654670+gabrielgaps@users.noreply.github.com>
Date: Fri, 11 Nov 2022 07:03:34 +0100
Subject: [PATCH 3/3] fixed link

---
 srcpkgs/SDL2_mixer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/SDL2_mixer/template b/srcpkgs/SDL2_mixer/template
index b888cc8d4912..803d1d81baa9 100644
--- a/srcpkgs/SDL2_mixer/template
+++ b/srcpkgs/SDL2_mixer/template
@@ -13,7 +13,7 @@ short_desc="Multi-channel audio mixer library (SDL 2.x)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib"
 homepage="https://github.com/libsdl-org/SDL_mixer"
-distfiles="https://github.com/libsdl-org/SDL_mixer/release-${version}/SDL2_mixer-${version}.tar.gz"
+distfiles="https://github.com/libsdl-org/SDL_mixer/releases/download/release-${version}/SDL2_mixer-${version}.tar.gz"
 checksum=8cdea810366decba3c33d32b8071bccd1c309b2499a54946d92b48e6922aa371
 
 SDL2_mixer-devel_package() {