ping - catch up with sdl2-mixer for 6.6?
On Sat, Jan 19, 2019 at 03:00:58PM -0800, Thomas Frohwein wrote:
> Hi,
>
> This diff updates sdl2-mixer from 2.0.2 to 2.0.4. Main changes are
> addition of Opus support via audio/opusfile and some bugfixes. Official
> changelog [1]:
>
> 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
>
> Bump minor because of symbol additions. The output of check_sym:
>
> /usr/local/lib/libSDL2_mixer.so.0.0 -->
> /usr/ports/pobj/sdl2-mixer-2.0.4/SDL2_mixer-2.0.4/build/.libs/libSDL2_mixer.so.0.1
> No dynamic export changes
> External reference changes:
> added:
> SDL_Log
> SDL_strcmp
> op_free
> op_head
> op_open_callbacks
> op_pcm_seek
> op_read
> op_seekable
>
> Tested most of the consumers (including hedgewars, sdlpop, blobwars,
> cataclysm-dda, corsixth, wesnoth, and more) briefly to make sure sound
> is there and found no issues.
>
> I'd like to take MAINTAINER to update SDL2 suite more consistently in
> the future.
>
> ok?
>
> [1] https://www.libsdl.org/projects/SDL_mixer/
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/sdl2-mixer/Makefile,v
> retrieving revision 1.10
> diff -u -p -r1.10 Makefile
> --- Makefile 27 Apr 2018 15:43:20 -0000 1.10
> +++ Makefile 19 Jan 2019 22:58:40 -0000
> @@ -1,19 +1,20 @@
> # $OpenBSD: Makefile,v 1.10 2018/04/27 15:43:20 jasper Exp $
>
> -V = 2.0.2
> +V = 2.0.4
> COMMENT = SDL2 multi-channel audio mixer library
> DISTNAME = SDL2_mixer-${V}
> PKGNAME = sdl2-mixer-${V}
> CATEGORIES = devel audio
>
> -SHARED_LIBS = SDL2_mixer 0.0 # 0.0
> +SHARED_LIBS = SDL2_mixer 0.1 # 0.4
>
> HOMEPAGE = https://www.libsdl.org/projects/SDL_mixer/
> +MAINTAINER = Thomas Frohwein <t...@openbsd.org>
>
> # zlib
> PERMIT_PACKAGE_CDROM = Yes
>
> -WANTLIB += FLAC SDL2 c m mikmod modplug ogg pthread sndio usbhid
> +WANTLIB += FLAC SDL2 c m mikmod modplug ogg opus opusfile pthread sndio
> usbhid
> WANTLIB += vorbis vorbisfile samplerate mpg123
>
> MASTER_SITES = https://www.libsdl.org/projects/SDL_mixer/release/
> @@ -24,6 +25,7 @@ LIB_DEPENDS = audio/flac \
> audio/libogg \
> audio/libvorbis \
> audio/mpg123 \
> + audio/opusfile \
> devel/sdl2
>
> CONFIGURE_STYLE = gnu
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/sdl2-mixer/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- distinfo 27 Apr 2018 15:43:20 -0000 1.3
> +++ distinfo 19 Jan 2019 22:58:40 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (SDL2_mixer-2.0.2.tar.gz) =
> TmFeJ+/KT0Od+a9qosbehBUNF8v9EhdLVIaMEvGcg7s=
> -SIZE (SDL2_mixer-2.0.2.tar.gz) = 9620763
> +SHA256 (SDL2_mixer-2.0.4.tar.gz) =
> tM9aOCwGHNdQgc8kbCqi+d+NsEvdqNzca2zKVb7eJBk=
> +SIZE (SDL2_mixer-2.0.4.tar.gz) = 11125077
> Index: patches/patch-configure
> ===================================================================
> RCS file: /cvs/ports/devel/sdl2-mixer/patches/patch-configure,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-configure
> --- patches/patch-configure 27 Apr 2018 15:43:20 -0000 1.2
> +++ patches/patch-configure 19 Jan 2019 22:58:40 -0000
> @@ -2,16 +2,16 @@ $OpenBSD: patch-configure,v 1.2 2018/04/
> Index: configure
> --- configure.orig
> +++ configure
> -@@ -12357,7 +12357,7 @@ if eval \${$as_ac_Lib+:} false; then :
> +@@ -12353,7 +12353,7 @@ if ${ac_cv_lib_vorbisfile_ov_open_callbacks+:}
> false;
> $as_echo_n "(cached) " >&6
> else
> ac_check_lib_save_LIBS=$LIBS
> --LIBS="-lvorbisfile -lvorbis -logg -lm $LIBS"
> -+LIBS="-lvorbisfile -lvorbis -logg $LIBM $LIBS"
> +-LIBS="-lvorbisfile -lvorbis -logg -lm $LIBS"
> ++LIBS="-lvorbisfile -lvorbis -logg $LIBM $LIBS"
> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> /* end confdefs.h. */
>
> -@@ -12447,7 +12447,7 @@ fi
> +@@ -12443,7 +12443,7 @@ fi
>
> if test x$have_flac_export = xyes; then
> LIBS_SAVED="$LIBS"
> @@ -20,7 +20,7 @@ Index: configure
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libflac
> so-name version >= $libflac_ver" >&5
> $as_echo_n "checking for libflac so-name version >= $libflac_ver... " >&6; }
> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -@@ -12493,7 +12493,7 @@ if ${ac_cv_lib_FLAC_FLAC__stream_decoder_new+:}
> false;
> +@@ -12489,7 +12489,7 @@ if ${ac_cv_lib_FLAC_FLAC__stream_decoder_new+:}
> false;
> $as_echo_n "(cached) " >&6
> else
> ac_check_lib_save_LIBS=$LIBS
>