We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] build fix for mp3-mad

SDL_mixer-mad.patch (text/plain), 1.54 KB, created by Ozkan Sezer on 2014-09-30 18:52:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ozkan Sezer

Created: 2014-09-30 18:52:09 UTC

Size: 1.54 KB

patch

obsolete

>diff -r 9599bb0ff844 configure.in
>--- a/configure.in	Sat Aug 23 10:57:26 2014 -0700
>+++ b/configure.in	Tue Sep 30 21:33:59 2014 +0300
>@@ -587,6 +587,7 @@
> AC_ARG_ENABLE(music-mp3,
> AC_HELP_STRING([--enable-music-mp3], [enable MP3 music [[default=yes]]]),
>               [], enable_music_mp3=yes)
>+madsources_load_mp3=yes
> 
> AC_ARG_ENABLE(music-mp3-smpeg,
> AC_HELP_STRING([--enable-music-mp3-smpeg], [enable MP3 music via smpeg [[default=yes]]]),
>@@ -609,6 +610,7 @@
>                 smpeg_lib=[`find_lib "libsmpeg2*.so.*"`]
>                 ;;
>         esac
>+        madsources_load_mp3=no
>         SOURCES="$SOURCES $srcdir/*_mp3.c"
>         EXTRA_CFLAGS="$EXTRA_CFLAGS -DMP3_MUSIC $SMPEG_CFLAGS"
>         if test x$enable_music_mp3_smpeg_shared = xyes && test x$smpeg_lib != x; then
>@@ -637,6 +639,9 @@
>     AC_MSG_RESULT($have_libmad)
>     if test x$have_libmad = xyes; then
>         SOURCES="$SOURCES $srcdir/music_mad.c"
>+        if test x$madsources_load_mp3 = xyes; then
>+            SOURCES="$SOURCES $srcdir/load_mp3.c"
>+        fi
>         EXTRA_CFLAGS="$EXTRA_CFLAGS -DMP3_MAD_MUSIC"
>         EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lmad"
>     else
>diff -r 9599bb0ff844 load_mp3.h
>--- a/load_mp3.h	Sat Aug 23 10:57:26 2014 -0700
>+++ b/load_mp3.h	Tue Sep 30 21:33:59 2014 +0300
>@@ -23,7 +23,7 @@
> 
> /* $Id$ */
> 
>-#ifdef MP3_MUSIC
>+#if defined(MP3_MUSIC) || defined(MP3_MAD_MUSIC)
> /* Don't call this directly; use Mix_LoadWAV_RW() for now. */
> SDL_AudioSpec *Mix_LoadMP3_RW (SDL_RWops *src, int freesrc,
>         SDL_AudioSpec *spec, Uint8 **audio_buf, Uint32 *audio_len);

Actions: View | Diff

Attachments on bug 2743: 1887 | 1888

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.