diff options
author | adam <adam@pkgsrc.org> | 2018-11-01 21:12:40 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2018-11-01 21:12:40 +0000 |
commit | dc789deed94f35c3f93f83c130005ae09f6432ba (patch) | |
tree | dc347a7978f2c26ff965967c3ab31a46b657f16d /audio | |
parent | a85b4427aee7ec760511eec59dbbe17cbf5edc7d (diff) | |
download | pkgsrc-dc789deed94f35c3f93f83c130005ae09f6432ba.tar.gz |
SDL2_mixer: updated to 2.0.4
2.0.4:
* Removed smpeg support for mp3 music, now that it's replaced by libmpg123
* Fixed mp3 mad decoder to skip tags, which otherwise would lead to crashes
* Added support for Opus music playback using opusfile library
2.0.3:
* Fixed regression where Mix_Init() would return 0 for available music formats
Diffstat (limited to 'audio')
-rw-r--r-- | audio/SDL2_mixer/Makefile | 9 | ||||
-rw-r--r-- | audio/SDL2_mixer/distinfo | 11 | ||||
-rw-r--r-- | audio/SDL2_mixer/options.mk | 33 | ||||
-rw-r--r-- | audio/SDL2_mixer/patches/patch-configure | 15 |
4 files changed, 30 insertions, 38 deletions
diff --git a/audio/SDL2_mixer/Makefile b/audio/SDL2_mixer/Makefile index 9751de38c4b..56a873ec049 100644 --- a/audio/SDL2_mixer/Makefile +++ b/audio/SDL2_mixer/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.7 2018/07/26 08:02:24 adam Exp $ +# $NetBSD: Makefile,v 1.8 2018/11/01 21:12:40 adam Exp $ -DISTNAME= SDL2_mixer-2.0.2 +DISTNAME= SDL2_mixer-2.0.4 CATEGORIES= audio devel MASTER_SITES= http://www.libsdl.org/projects/SDL_mixer/release/ @@ -17,5 +17,10 @@ PKGCONFIG_OVERRIDE+= SDL2_mixer.pc.in .include "options.mk" +.include "../../audio/flac/buildlink3.mk" +.include "../../audio/libmodplug/buildlink3.mk" +.include "../../audio/libvorbis/buildlink3.mk" +.include "../../audio/mpg123/buildlink3.mk" +.include "../../audio/opusfile/buildlink3.mk" .include "../../devel/SDL2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/SDL2_mixer/distinfo b/audio/SDL2_mixer/distinfo index 8cf3cfba305..34dd4cf0593 100644 --- a/audio/SDL2_mixer/distinfo +++ b/audio/SDL2_mixer/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.5 2018/06/24 10:28:45 adam Exp $ +$NetBSD: distinfo,v 1.6 2018/11/01 21:12:40 adam Exp $ -SHA1 (SDL2_mixer-2.0.2.tar.gz) = 24af8db6e3e0e2a3f4af53fe08e891423d02f1d4 -RMD160 (SDL2_mixer-2.0.2.tar.gz) = f748e93033cf5e2fb9fbd8bed86459a7b4d40c76 -SHA512 (SDL2_mixer-2.0.2.tar.gz) = c40b5ac93933df1cc932e7afe796ad6765aafb24077601a23f98ac625a83341079ad903c164eafd022aff6011872e7a7956eebd8e3d3edad1bf5dc7eb9c306b7 -Size (SDL2_mixer-2.0.2.tar.gz) = 9620763 bytes +SHA1 (SDL2_mixer-2.0.4.tar.gz) = 242a63b1c7f38e358e94b1e0dc5120a6c1f3763b +RMD160 (SDL2_mixer-2.0.4.tar.gz) = d5674a92bc9a81e3aba0072c4d7e2314e56958d6 +SHA512 (SDL2_mixer-2.0.4.tar.gz) = 98c56069640668aaececa63748de21fc8f243c7d06386c45c43d0ee472bbb2595ccda644d9886ce5b95c3a3dee3c0a96903cf9a89ddc18d38f041133470699a3 +Size (SDL2_mixer-2.0.4.tar.gz) = 11125077 bytes +SHA1 (patch-configure) = 1666d97f82c5f3dca03eb45dad6b9e73dc61dffd diff --git a/audio/SDL2_mixer/options.mk b/audio/SDL2_mixer/options.mk index 2518bd2fb1a..56e05fe811f 100644 --- a/audio/SDL2_mixer/options.mk +++ b/audio/SDL2_mixer/options.mk @@ -1,42 +1,13 @@ -# $NetBSD: options.mk,v 1.2 2018/06/24 10:28:45 adam Exp $ +# $NetBSD: options.mk,v 1.3 2018/11/01 21:12:40 adam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.SDL2_mixer -PKG_SUPPORTED_OPTIONS= flac fluidsynth modplug mpg123 vorbis -PKG_SUGGESTED_OPTIONS+= flac modplug mpg123 vorbis +PKG_SUPPORTED_OPTIONS= fluidsynth .include "../../mk/bsd.options.mk" -.if !empty(PKG_OPTIONS:Mflac) -.include "../../audio/flac/buildlink3.mk" -CONFIGURE_ARGS+= --enable-music-flac=yes -.else -CONFIGURE_ARGS+= --enable-music-flac=no -.endif - .if !empty(PKG_OPTIONS:Mfluidsynth) .include "../../audio/fluidsynth/buildlink3.mk" CONFIGURE_ARGS+= --enable-music-midi-fluidsynth=yes .else CONFIGURE_ARGS+= --enable-music-midi-fluidsynth=no .endif - -.if !empty(PKG_OPTIONS:Mmodplug) -.include "../../audio/libmodplug/buildlink3.mk" -CONFIGURE_ARGS+= --enable-music-mod-modplug=yes -.else -CONFIGURE_ARGS+= --enable-music-mod-modplug=no -.endif - -.if !empty(PKG_OPTIONS:Mmpg123) -.include "../../audio/mpg123/buildlink3.mk" -CONFIGURE_ARGS+= --enable-music-mp3-mpg123=yes -.else -CONFIGURE_ARGS+= --enable-music-mp3-mpg123=no -.endif - -.if !empty(PKG_OPTIONS:Mvorbis) -.include "../../audio/libvorbis/buildlink3.mk" -CONFIGURE_ARGS+= --enable-music-ogg=yes -.else -CONFIGURE_ARGS+= --enable-music-ogg=no -.endif diff --git a/audio/SDL2_mixer/patches/patch-configure b/audio/SDL2_mixer/patches/patch-configure new file mode 100644 index 00000000000..50036c90674 --- /dev/null +++ b/audio/SDL2_mixer/patches/patch-configure @@ -0,0 +1,15 @@ +$NetBSD: patch-configure,v 1.1 2018/11/01 21:12:40 adam Exp $ + +Use absolute paths for dlopen(); don't expect users set LD_LIBRARY_PATH. + +--- configure.orig 2018-11-01 20:04:16.000000000 +0000 ++++ configure +@@ -11150,7 +11150,7 @@ find_lib() + host_lib_path="/usr/$base_libdir /usr/local/$base_libdir" + fi + for path in $env_lib_path $gcc_bin_path $gcc_lib_path $host_lib_path; do +- lib=`ls -- $path/$1 2>/dev/null | sed -e '/\.so\..*\./d' -e 's,.*/,,' | sort | tail -1` ++ lib=`ls -- $path/$1 2>/dev/null | sed -e '/\.so\..*\./d' | sort | tail -1` + if test x$lib != x; then + echo $lib + return |