From 2a59be04aedfa81c7fd6b469178d4acb143e10bf Mon Sep 17 00:00:00 2001 From: Fabian Greffrath Date: Thu, 2 Nov 2017 12:50:36 +0100 Subject: [PATCH] Sdl2_mixer: update to 2.0.2 (#3074) * SDL2_mixer: update to 2.0.2 * SDL2_mixer: update patches * SDL2_mixer: only regenerate the configure script * SDL2_mixer: enable MP3 music by mpg123 instead of libmad --- mingw-w64-SDL2_mixer/PKGBUILD | 17 ++++++------ .../SDL2_mixer-2.0.1-find_lib.mingw.patch | 26 +++++++++---------- ...L2_mixer-2.0.1-libtool_windres.mingw.patch | 10 +++---- 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/mingw-w64-SDL2_mixer/PKGBUILD b/mingw-w64-SDL2_mixer/PKGBUILD index 3101914658d13..bd78389f74b8c 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.1 -pkgrel=3 +pkgver=2.0.2 +pkgrel=1 pkgdesc="A simple multi-channel audio mixer (Version 2) (mingw-w64)" arch=('any') url="https://libsdl.org/projects/SDL_mixer" @@ -16,16 +16,16 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-SDL2" "${MINGW_PACKAGE_PREFIX}-libvorbis" "${MINGW_PACKAGE_PREFIX}-libmodplug" - "${MINGW_PACKAGE_PREFIX}-libmad" + "${MINGW_PACKAGE_PREFIX}-mpg123" "${MINGW_PACKAGE_PREFIX}-flac" "${MINGW_PACKAGE_PREFIX}-fluidsynth") 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=('06733c61deb10f0300017e3ddaa31bd10ad9ea5c1f6926b0ab5f0e322a036dda' - 'c7c03d36f5d4bf965ad7780aa75279dc6c338abab71096bd8d0852d45b86c478' - '3a6e7d1f14a9e49d20019dac9ee8c0113118023b4855ccb3e72e5caa682156ad') +sha256sums=('ecd687e74b0aa33800812dffa2fac2714260bc91d17866d307c5379181c0a9c5' + 'e209704cd3e32932250a6191673dfc20e21a5bfe9683e3ac483212e517fe0a30' + '86fa38c76b834ea28d40c95d4639cf7896f449fe92a4348d21da641106a53132') prepare() { cd "${srcdir}/${_realname}-${pkgver}" @@ -33,7 +33,7 @@ prepare() { 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 - autoreconf -fiv + autoconf } build() { @@ -49,7 +49,8 @@ build() { --enable-static \ --enable-music-mp3 \ --disable-music-mp3-smpeg \ - --enable-music-mp3-mad-gpl + --disable-music-mp3-mad-gpl \ + --enable-music-mp3-mpg123 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 index f0c5c90f6412c..69af073bdc6c3 100644 --- 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 @@ -1,8 +1,8 @@ -diff --git a/configure.in_old b/configure.in -index 77dc3fe..47ba19c 100644 ---- a/configure.in_old -+++ b/configure.in -@@ -181,13 +181,14 @@ find_lib() +Index: SDL2_mixer-2.0.2/configure.in +=================================================================== +--- SDL2_mixer-2.0.2.orig/configure.in ++++ SDL2_mixer-2.0.2/configure.in +@@ -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'`] env_lib_path=[`echo $LIBS $LDFLAGS $* | sed 's/-L[ ]*//g'`] @@ -19,7 +19,7 @@ index 77dc3fe..47ba19c 100644 if test x$lib != x; then echo $lib return -@@ -267,7 +268,7 @@ if test x$enable_music_mod = xyes -a x$enable_music_mod_modplug = xyes; then +@@ -257,7 +258,7 @@ if test x$enable_music_mod = xyes -a x$e *-*-darwin*) modplug_lib=[`find_lib libmodplug.dylib`] ;; @@ -28,7 +28,7 @@ index 77dc3fe..47ba19c 100644 modplug_lib=[`find_lib "libmodplug*.dll"`] ;; *) -@@ -335,7 +336,7 @@ return 1; +@@ -324,7 +325,7 @@ return 1; *-*-darwin*) mikmod_lib=[`find_lib libmikmod.dylib`] ;; @@ -37,7 +37,7 @@ index 77dc3fe..47ba19c 100644 mikmod_lib=[`find_lib "libmikmod*.dll"`] ;; *) -@@ -383,7 +384,7 @@ AC_HELP_STRING([--enable-music-midi-native], [enable native MIDI music output [[ +@@ -371,7 +372,7 @@ AC_HELP_STRING([--enable-music-midi-nati *mingw32ce*) use_music_midi_native=no ;; @@ -46,7 +46,7 @@ index 77dc3fe..47ba19c 100644 use_music_midi_native=yes EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lwinmm" ;; -@@ -420,8 +421,11 @@ AC_HELP_STRING([--enable-music-midi-fluidsynth-shared], [dynamically load FluidS +@@ -408,8 +409,11 @@ AC_HELP_STRING([--enable-music-midi-flui *-*-darwin*) fluidsynth_lib=[`find_lib libfluidsynth.dylib`] ;; @@ -59,7 +59,7 @@ index 77dc3fe..47ba19c 100644 ;; *) fluidsynth_lib=[`find_lib "libfluidsynth[0-9]*.so.*"`] -@@ -469,8 +473,11 @@ if test x$enable_music_ogg = xyes; then +@@ -456,8 +460,11 @@ if test x$enable_music_ogg = xyes; then *-*-darwin*) ogg_lib=[`find_lib libvorbisidec.dylib`] ;; @@ -72,7 +72,7 @@ index 77dc3fe..47ba19c 100644 ;; *) ogg_lib=[`find_lib "libvorbisidec[0-9]*.so.*"`] -@@ -499,7 +506,7 @@ if test x$enable_music_ogg = xyes; then +@@ -485,7 +492,7 @@ if test x$enable_music_ogg = xyes; then *-*-darwin*) ogg_lib=[`find_lib libvorbisfile.dylib`] ;; @@ -81,7 +81,7 @@ index 77dc3fe..47ba19c 100644 ogg_lib=[`find_lib "libvorbisfile*.dll"`] ;; *) -@@ -559,7 +566,7 @@ if test x$enable_music_flac = xyes; then +@@ -544,7 +551,7 @@ if test x$enable_music_flac = xyes; then *-*-darwin*) flac_lib=[`find_lib libFLAC.dylib`] ;; @@ -90,7 +90,7 @@ index 77dc3fe..47ba19c 100644 flac_lib=[`find_lib "libFLAC-*.dll"`] ;; *) -@@ -602,7 +609,7 @@ if test x$enable_music_mp3 = xyes -a x$enable_music_mp3_smpeg = xyes; then +@@ -586,7 +593,7 @@ if test x$enable_music_mp3 = xyes -a x$e *-*-darwin*) smpeg_lib=[`find_lib libsmpeg2.dylib`] ;; diff --git a/mingw-w64-SDL2_mixer/SDL2_mixer-2.0.1-libtool_windres.mingw.patch b/mingw-w64-SDL2_mixer/SDL2_mixer-2.0.1-libtool_windres.mingw.patch index c7d50c7cdf839..1cb207bd6690f 100644 --- a/mingw-w64-SDL2_mixer/SDL2_mixer-2.0.1-libtool_windres.mingw.patch +++ b/mingw-w64-SDL2_mixer/SDL2_mixer-2.0.1-libtool_windres.mingw.patch @@ -1,7 +1,7 @@ -diff --git a/configure.in_old b/configure.in -index 47ba19c..efb416f 100644 ---- a/configure.in_old -+++ b/configure.in +Index: SDL2_mixer-2.0.2/configure.in +=================================================================== +--- SDL2_mixer-2.0.2.orig/configure.in ++++ SDL2_mixer-2.0.2/configure.in @@ -55,6 +55,7 @@ else hostaliaswindres="$host_alias-windres" fi @@ -10,7 +10,7 @@ index 47ba19c..efb416f 100644 dnl Set up the compiler and linker flags case "$host" in -@@ -681,10 +682,10 @@ DEPENDS=`echo "$DEPENDS" | sed 's,\\$,\\\\$,g'` +@@ -702,10 +703,10 @@ DEPENDS=`echo "$DEPENDS" | sed 's,\\$,\\ VERSION_OBJECTS=`echo $VERSION_SOURCES` VERSION_DEPENDS=`echo $VERSION_SOURCES`