From 276d9bd71b474a8d82fe10e06dcff17a5ff57614 Mon Sep 17 00:00:00 2001
From: TinoM <tino.miegel@gmail.com>
Date: Tue, 5 Jan 2016 07:56:42 +0100
Subject: [PATCH] SDL2_mixer: Update to 2.0.1

The .tar.gz source packages contains symbolic links (at least at the
moment), therefore using source zip archive
---
 mingw-w64-SDL2_mixer/PKGBUILD                 |  22 +---
 .../SDL2_mixer-find_lib.mingw.patch           | 101 ------------------
 2 files changed, 4 insertions(+), 119 deletions(-)
 delete mode 100644 mingw-w64-SDL2_mixer/SDL2_mixer-find_lib.mingw.patch

diff --git a/mingw-w64-SDL2_mixer/PKGBUILD b/mingw-w64-SDL2_mixer/PKGBUILD
index f8c5fc291a..7a5b9be3d7 100644
--- a/mingw-w64-SDL2_mixer/PKGBUILD
+++ b/mingw-w64-SDL2_mixer/PKGBUILD
@@ -3,8 +3,8 @@
 _realname=SDL2_mixer
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=2.0.0
-pkgrel=6
+pkgver=2.0.1
+pkgrel=1
 pkgdesc="A simple multi-channel audio mixer (Version 2) (mingw-w64)"
 arch=('any')
 url="http://www.libsdl.org/projects/SDL_mixer"
@@ -18,22 +18,8 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-flac"
          "${MINGW_PACKAGE_PREFIX}-fluidsynth")
 options=('staticlibs' 'strip')
-noextract=(${_realname}-${pkgver}.tar.gz)
-source=("$url/release/${_realname}-${pkgver}.tar.gz"
-        SDL2_mixer-find_lib.mingw.patch)
-md5sums=('65f6d80df073a1fb3bb537fbda031b50'
-         'c891fc5d73238c85ff42cfe31213da7b')
-
-prepare() {
-  [[ -d ${srcdir}/${_realname}-${pkgver} ]] || tar -xzvf ${_realname}-${pkgver}.tar.gz -C ${srcdir} || true
-
-  cd "${srcdir}"/${_realname}-${pkgver}
-
-  patch -Np1 -i ${srcdir}/SDL2_mixer-find_lib.mingw.patch
-
-  sed -i "s|/etc/timidity|/etc/timidity++|g" timidity/config.h
-  sed -i "s|/etc/timidity++.cfg|/etc/timidity++/timidity.cfg|g" timidity/config.h
-}
+source=("$url/release/${_realname}-${pkgver}.zip")
+md5sums=('a2ea0c4b63a79b95b0471cfbbde96ec7')
 
 build() {
   [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
diff --git a/mingw-w64-SDL2_mixer/SDL2_mixer-find_lib.mingw.patch b/mingw-w64-SDL2_mixer/SDL2_mixer-find_lib.mingw.patch
deleted file mode 100644
index 355aa263d0..0000000000
--- a/mingw-w64-SDL2_mixer/SDL2_mixer-find_lib.mingw.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff --git a/configure b/configure
-index 878381b..be39a38 100755
---- a/configure
-+++ b/configure
-@@ -11143,13 +11143,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'`
-     env_lib_path=`echo $LIBS $LDFLAGS $* | sed 's/-L[ ]*//g'`
-+    env_path=`echo $PATH | sed 's/:/ /g'`
-     if test "$cross_compiling" = yes; then
-         host_lib_path=""
-     else
-         host_lib_path="/usr/$base_libdir /usr/local/$base_libdir"
-     fi
--    for path in $gcc_bin_path $gcc_lib_path $env_lib_path $host_lib_path; do
--        lib=`ls -- $path/$1 2>/dev/null | sed -e '/\.so\..*\./d' -e 's,.*/,,' | sort | tail -1`
-+    for path in $gcc_bin_path $gcc_lib_path $env_lib_path $env_path $host_lib_path; do
-+        lib=`ls -- $path/$1 2>/dev/null | sort | sed 's/.*\/\(.*\)/\1/; q'`
-         if test x$lib != x; then
-             echo $lib
-             return
-@@ -11938,7 +11939,7 @@ fi
-             *-*-darwin*)
-                 modplug_lib=`find_lib libmodplug.dylib`
-                 ;;
--            *-*-cygwin* | *-*-mingw32*)
-+            *-*-cygwin* | *-*-mingw*)
-                 modplug_lib=`find_lib "libmodplug*.dll"`
-                 ;;
-             *)
-@@ -12070,7 +12071,7 @@ fi
-             *-*-darwin*)
-                 mikmod_lib=`find_lib libmikmod.dylib`
-                 ;;
--            *-*-cygwin* | *-*-mingw32*)
-+            *-*-cygwin* | *-*-mingw*)
-                 mikmod_lib=`find_lib "libmikmod*.dll"`
-                 ;;
-             *)
-@@ -12132,7 +12133,7 @@ fi
-             *mingw32ce*)
-                 use_music_midi_native=no
-                 ;;
--            *-*-cygwin* | *-*-mingw32*)
-+            *-*-cygwin* | *-*-mingw*)
-                 use_music_midi_native=yes
-                 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lwinmm"
-                 ;;
-@@ -12221,8 +12222,11 @@ fi
-                 *-*-darwin*)
-                     fluidsynth_lib=`find_lib libfluidsynth.dylib`
-                     ;;
--                *-*-cygwin* | *-*-mingw32*)
-+                *-*-cygwin* | *-*-mingw*)
-                     fluidsynth_lib=`find_lib "fluidsynth*.dll"`
-+                    if test x$fluidsynth_lib = x; then
-+                        fluidsynth_lib=`find_lib "libfluidsynth*.dll"`
-+                    fi
-                     ;;
-                 *)
-                     fluidsynth_lib=`find_lib "libfluidsynth[0-9]*.so.*"`
-@@ -12331,8 +12335,11 @@ fi
-                 *-*-darwin*)
-                     ogg_lib=`find_lib libvorbisidec.dylib`
-                     ;;
--                *-*-cygwin* | *-*-mingw32*)
-+                *-*-cygwin* | *-*-mingw*)
-                     ogg_lib=`find_lib "vorbisidec*.dll"`
-+                    if test x$ogg_lib = x; then
-+                        ogg_lib=`find_lib "libvorbisidec*.dll"`
-+                    fi
-                     ;;
-                 *)
-                     ogg_lib=`find_lib "libvorbisidec[0-9]*.so.*"`
-@@ -12409,7 +12416,7 @@ fi
-                 *-*-darwin*)
-                     ogg_lib=`find_lib libvorbisfile.dylib`
-                     ;;
--                *-*-cygwin* | *-*-mingw32*)
-+                *-*-cygwin* | *-*-mingw*)
-                     ogg_lib=`find_lib "libvorbisfile*.dll"`
-                     ;;
-                 *)
-@@ -12545,7 +12552,7 @@ fi
-                 *-*-darwin*)
-                     flac_lib=`find_lib libFLAC.dylib`
-                     ;;
--                *-*-cygwin* | *-*-mingw32*)
-+                *-*-cygwin* | *-*-mingw*)
-                     flac_lib=`find_lib "libFLAC-*.dll"`
-                     ;;
-                 *)
-@@ -12841,7 +12848,7 @@ rm -f core conftest.err conftest.$ac_objext \
-             *-*-darwin*)
-                 smpeg_lib=`find_lib libsmpeg2.dylib`
-                 ;;
--            *-*-cygwin* | *-*-mingw32*)
-+            *-*-cygwin* | *-*-mingw*)
-                 smpeg_lib=`find_lib "smpeg2*.dll"`
-                 ;;
-             *)