From 13f8f2b278866bcb4fbf2bc70c8188a0d5a4303b Mon Sep 17 00:00:00 2001
From: Wouter Wijsman <wwijsman@live.nl>
Date: Fri, 17 Jan 2025 22:41:53 +0100
Subject: [PATCH] sdl2-mixer: update to version 2.8.0

---
 sdl2-mixer/PSPBUILD             | 13 +++++--------
 sdl2-mixer/pkg-config-fix.patch | 32 --------------------------------
 2 files changed, 5 insertions(+), 40 deletions(-)
 delete mode 100644 sdl2-mixer/pkg-config-fix.patch

diff --git a/sdl2-mixer/PSPBUILD b/sdl2-mixer/PSPBUILD
index f0fc7941..7fa476c8 100644
--- a/sdl2-mixer/PSPBUILD
+++ b/sdl2-mixer/PSPBUILD
@@ -1,6 +1,6 @@
 pkgname=sdl2-mixer
-pkgver=2.6.3
-pkgrel=9
+pkgver=2.8.0
+pkgrel=1
 pkgdesc="an audio mixer library based on the SDL2 library"
 arch=('mips')
 url="https://wiki.libsdl.org/SDL2_mixer/FrontPage"
@@ -11,14 +11,12 @@ makedepends=()
 optdepends=()
 source=(
     "https://github.com/libsdl-org/SDL_mixer/releases/download/release-${pkgver}/SDL2_mixer-${pkgver}.tar.gz"
-    "pkg-config-fix.patch"
     "CMakeLists.txt.sample"
     "main.c.sample"
     "https://pspdev.github.io/resources/test.ogg"
 )
 sha256sums=(
-    "7a6ba86a478648ce617e3a5e9277181bc67f7ce9876605eea6affd4a0d6eea8f"
-    "SKIP"
+    "1cfb34c87b26dbdbc7afd68c4f545c0116ab5f90bbfecc5aebe2a9cb4bb31549"
     "SKIP"
     "SKIP"
     "b728bb95b6018ba0bb5675d614f2e25d056d04c6b471f4f080623c570f905e01"
@@ -27,7 +25,6 @@ sha256sums=(
 prepare() {
     cd "${srcdir}/SDL2_mixer-${pkgver}"
     sed -i '/^prefix=/s/=.*$/=${PSPDEV}\/psp/' SDL2_mixer.pc.in
-    patch -Np1 -i "${srcdir}/pkg-config-fix.patch"
 }
 
 build() {
@@ -38,8 +35,8 @@ build() {
         -DSDL2MIXER_INSTALL=ON -DSDL2MIXER_SAMPLES=OFF -DSDL2MIXER_FLAC=OFF -DSDL2MIXER_OPUS=OFF \
         -DSDL2MIXER_MIDI=OFF -DSDL2MIXER_VORBIS=VORBISFILE -DSDL2MIXER_VORBIS_VORBISFILE_SHARED=OFF \
         -DSDL2MIXER_MOD=ON -DSDL2MIXER_MOD_MODPLUG=ON -DSDL2MIXER_MOD_MODPLUG_SHARED=OFF \
-        -DSDL2MIXER_MOD_XMP=OFF -DSDL2MIXER_MP3=ON -DSDL2MIXER_MP3_DRMP3=ON -DSDL2MIXER_MP3_MPG123=OFF \
-        -DCMAKE_BUILD_TYPE=Release .. "${XTRA_OPTS[@]}" || { exit 1; }
+        -DSDL2MIXER_MOD_XMP=OFF -DSDL2MIXER_MP3=ON -DSDL2MIXER_MP3_MINIMP3=ON -DSDL2MIXER_MP3_MPG123=OFF \
+        -DSDL2MIXER_WAVPACK=OFF -DCMAKE_BUILD_TYPE=Release .. "${XTRA_OPTS[@]}" || { exit 1; }
     make --quiet $MAKEFLAGS || { exit 1; }
 }
 
diff --git a/sdl2-mixer/pkg-config-fix.patch b/sdl2-mixer/pkg-config-fix.patch
deleted file mode 100644
index b3808103..00000000
--- a/sdl2-mixer/pkg-config-fix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 54317572..a066c586 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -796,8 +796,6 @@ if(SDL2MIXER_INSTALL)
-         COMPONENT devel
-     )
- 
--    if(SDL2MIXER_BUILD_SHARED_LIBS)
--        # Only create a .pc file for a shared SDL2_mixer
-         set(VERSION ${FULL_VERSION})
-         set(SDL_VERSION ${SDL_REQUIRED_VERSION})
-         set(prefix "${CMAKE_INSTALL_PREFIX}")
-@@ -817,7 +815,7 @@ if(SDL2MIXER_INSTALL)
-         else()
-             set(PC_DESTDIR "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
-         endif()
--        # Only install a SDL2_mixer.pc file in Release mode
-+        # Always install SDL2_mixer.pc file: libraries might be different between config modes
-         install(CODE "
-             # FIXME: use file(COPY_FILE) if minimum CMake version >= 3.21
-             execute_process(COMMAND \"\${CMAKE_COMMAND}\" -E copy_if_different
-@@ -825,8 +823,7 @@ if(SDL2MIXER_INSTALL)
-                 \"${CMAKE_CURRENT_BINARY_DIR}/SDL2_mixer.pc\")
-             file(INSTALL DESTINATION \"\${CMAKE_INSTALL_PREFIX}/${PC_DESTDIR}\"
-                 TYPE FILE
--                FILES \"${CMAKE_CURRENT_BINARY_DIR}/SDL2_mixer.pc\")" CONFIG Release COMPONENT devel)
--    endif()
-+                FILES \"${CMAKE_CURRENT_BINARY_DIR}/SDL2_mixer.pc\")" COMPONENT devel)
- 
-     if(SDL2MIXER_BUILD_SHARED_LIBS AND (APPLE OR (UNIX AND NOT ANDROID)))
-         install(