SDL2_mixer: Update to 2.0.4

msys2 · Nov 2, 2018 · 1284751 · 1284751
1 parent e32b7a9
commit 1284751
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 17 deletions.
diff --git a/mingw-w64-SDL2_mixer/PKGBUILD b/mingw-w64-SDL2_mixer/PKGBUILD
@@ -3,36 +3,35 @@
 _realname=SDL2_mixer
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=2.0.2
-pkgrel=2
+pkgver=2.0.4
+pkgrel=1
 pkgdesc="A simple multi-channel audio mixer (Version 2) (mingw-w64)"
 arch=('any')
 url="https://libsdl.org/projects/SDL_mixer"
 license=("MIT")
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
-             "${MINGW_PACKAGE_PREFIX}-pkg-config"
-             "${MINGW_PACKAGE_PREFIX}-smpeg2")
+             "${MINGW_PACKAGE_PREFIX}-pkg-config")
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-SDL2"
+         "${MINGW_PACKAGE_PREFIX}-flac"
+         "${MINGW_PACKAGE_PREFIX}-fluidsynth"
          "${MINGW_PACKAGE_PREFIX}-libvorbis"
          "${MINGW_PACKAGE_PREFIX}-libmodplug"
          "${MINGW_PACKAGE_PREFIX}-mpg123"
-         "${MINGW_PACKAGE_PREFIX}-flac"
-         "${MINGW_PACKAGE_PREFIX}-fluidsynth")
+         "${MINGW_PACKAGE_PREFIX}-opusfile")
 options=('staticlibs' 'strip')
 source=("$url/release/${_realname}-${pkgver}.zip"
         SDL2_mixer-2.0.1-find_lib.mingw.patch
         SDL2_mixer-2.0.1-libtool_windres.mingw.patch)
-sha256sums=('ecd687e74b0aa33800812dffa2fac2714260bc91d17866d307c5379181c0a9c5'
-            'bc213c14a7a9d9e67c4c5075ee3267e43f7c095510aee6314f7cf68fa58c634d'
+sha256sums=('9affb8c7bf6fbffda0f6906bfb99c0ea50dca9b188ba9e15be90042dc03c5ded'
+            '8c906b09cb9318b54dac6b63eff49e63fb83bf1fc97219581b720709723ce5c1'
             '86fa38c76b834ea28d40c95d4639cf7896f449fe92a4348d21da641106a53132')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
 
   patch -Np1 -i ${srcdir}/SDL2_mixer-2.0.1-find_lib.mingw.patch
   patch -Np1 -i ${srcdir}/SDL2_mixer-2.0.1-libtool_windres.mingw.patch
-
   autoconf
 }
 
@@ -50,10 +49,13 @@ build() {
     --disable-music-ogg-shared \
     --disable-music-flac-shared \
     --enable-music-mp3 \
-    --disable-music-mp3-smpeg \
     --disable-music-mp3-mad-gpl \
     --enable-music-mp3-mpg123 \
-    --disable-music-mp3-mpg123-shared
+    --disable-music-mp3-mpg123-shared \
+    --enable-music-opus \
+    --disable-music-opus-shared \
+    --disable-music-midi-fluidsynth-shared \
+    --disable-music-mod-modplug-shared
 
   make
 }

diff --git a/mingw-w64-SDL2_mixer/SDL2_mixer-2.0.1-find_lib.mingw.patch b/mingw-w64-SDL2_mixer/SDL2_mixer-2.0.1-find_lib.mingw.patch
@@ -2,6 +2,15 @@ Index: SDL2_mixer-2.0.2/configure.in
 ===================================================================
 --- SDL2_mixer-2.0.2.orig/configure.in
 +++ SDL2_mixer-2.0.2/configure.in
+@@ -116,7 +116,7 @@
+         #VERSION_SOURCES="$srcdir/version.rc"
+         EXE=".exe"
+     ;;
+-    *-*-cygwin* | *-*-mingw32*)
++    *-*-cygwin* | *-*-mingw*)
+         VERSION_SOURCES="$srcdir/version.rc"
+         EXE=".exe"
+         if test "$build" != "$host"; then # cross-compiling
 @@ -173,13 +173,14 @@ find_lib()
      gcc_bin_path=[`$CC -print-search-dirs 2>/dev/null | fgrep programs: | sed 's/[^=]*=\(.*\)/\1/' | sed 's/:/ /g'`]
      gcc_lib_path=[`$CC -print-search-dirs 2>/dev/null | fgrep libraries: | sed 's/[^=]*=\(.*\)/\1/' | sed 's/:/ /g'`]
@@ -90,21 +99,21 @@ Index: SDL2_mixer-2.0.2/configure.in
                      flac_lib=[`find_lib "libFLAC-*.dll"`]
                      ;;
                  *)
-@@ -586,7 +593,7 @@ if test x$enable_music_mp3 = xyes -a x$e
+@@ -648,7 +655,7 @@ if test x$enable_music_mp3_mpg123 = xyes
              *-*-darwin*)
-                 smpeg_lib=[`find_lib libsmpeg2.dylib`]
+                 mpg123_lib=[`find_lib libmpg123.dylib`]
                  ;;
 -            *-*-cygwin* | *-*-mingw32*)
 +            *-*-cygwin* | *-*-mingw*)
-                 smpeg_lib=[`find_lib "smpeg2*.dll"`]
+                 mpg123_lib=[`find_lib "libmpg123*.dll"`]
                  ;;
              *)
-@@ -648,7 +655,7 @@ if test x$enable_music_mp3_mpg123 = xyes
+@@ -674,7 +674,7 @@
              *-*-darwin*)
-                 mpg123_lib=[`find_lib libmpg123.dylib`]
+                 opusfile_lib=[`find_lib libopusfile.dylib`]
                  ;;
 -            *-*-cygwin* | *-*-mingw32*)
 +            *-*-cygwin* | *-*-mingw*)
-                 mpg123_lib=[`find_lib "libmpg123*.dll"`]
+                 opusfile_lib=[`find_lib "libopusfile*.dll"`]
                  ;;
              *)