MP3 support is disabled by default because SMPEG isn't updated for SD…

…L 2.0 and libmad is GPL and not allowed to link with commercial closed-source programs
libsdl-org · Feb 16, 2013 · adbe9ce · adbe9ce
1 parent 6b47900
commit adbe9ce
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/configure b/configure
@@ -1556,7 +1556,7 @@ Optional Features:
   --enable-music-flac     enable FLAC music [[default=yes]]
   --enable-music-flac-shared
                           dynamically load FLAC support [[default=yes]]
-  --enable-music-mp3      enable MP3 music via smpeg [[default=yes]]
+  --enable-music-mp3      enable MP3 music via smpeg [[default=no]]
   --enable-music-mp3-shared
                           dynamically load MP3 support [[default=yes]]
   --disable-smpegtest       Do not try to compile and run a test SMPEG program
@@ -12430,7 +12430,7 @@ done
 if test "${enable_music_mp3+set}" = set; then :
   enableval=$enable_music_mp3;
 else
-  enable_music_mp3=yes
+  enable_music_mp3=no
 fi
 
 # Check whether --enable-music-mp3-shared was given.

diff --git a/configure.in b/configure.in
@@ -560,8 +560,8 @@ AC_CHECK_HEADERS([signal.h], [EXTRA_CFLAGS="$EXTRA_CFLAGS -DHAVE_SIGNAL_H"])
 AC_CHECK_FUNCS(setbuf, [EXTRA_CFLAGS="$EXTRA_CFLAGS -DHAVE_SETBUF"])
 
 AC_ARG_ENABLE(music-mp3,
-AC_HELP_STRING([--enable-music-mp3], [enable MP3 music via smpeg [[default=yes]]]),
-              [], enable_music_mp3=yes)
+AC_HELP_STRING([--enable-music-mp3], [enable MP3 music via smpeg [[default=no]]]),
+              [], enable_music_mp3=no)
 AC_ARG_ENABLE([music-mp3-shared],
 AC_HELP_STRING([--enable-music-mp3-shared], [dynamically load MP3 support [[default=yes]]]),
               [], [enable_music_mp3_shared=yes])

diff --git a/debian/rules b/debian/rules
@@ -10,11 +10,11 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--no-undefined -Wl,-Bsymbolic -Wl,--as-nee
 confflags = --enable-music-cmd
 
 # explicitly enable/disable all supported sound
-# use smpeg instead of mad because the GPL is incompatible with commercial software
+# MP3 support is disabled by default because SMPEG isn't updated for SDL 2.0 and libmad is GPL and not allowed to link with commercial closed-source programs
+confflags += --disable-music-mp3
 confflags += --disable-music-mp3-mad-gpl
 confflags += --enable-music-mod
 confflags += --enable-music-mod
-confflags += --enable-music-mp3
 confflags += --enable-music-ogg
 confflags += --enable-music-wave