File love-remove-mpg123.patch of Package love-0_7_2
---
Makefile.am | 1 -
configure.in | 3 ---
src/Makefile.am | 2 --
src/modules/sound/lullaby/Sound.cpp | 4 ----
4 files changed, 10 deletions(-)
Index: love-HEAD/Makefile.am
===================================================================
--- love-HEAD.orig/Makefile.am
+++ love-HEAD/Makefile.am
@@ -1,3 +1,2 @@
-ACLOCAL_AMFLAGS = -I platform/unix/m4
SUBDIRS = src
EXTRA_DIST = changes.txt license.txt readme.txt
Index: love-HEAD/configure.in
===================================================================
--- love-HEAD.orig/configure.in
+++ love-HEAD/configure.in
@@ -1,7 +1,6 @@
AC_INIT([love], [HEAD])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR([platform/unix])
-AC_CONFIG_MACRO_DIR([platform/unix/m4])
AC_CONFIG_SRCDIR([src/love.cpp])
AM_INIT_AUTOMAKE([foreign -Wall foreign tar-ustar])
AC_PREFIX_DEFAULT([/usr])
@@ -36,8 +35,6 @@ AC_SEARCH_LIBS([TIFFOpen], [tiff], [], A
AC_SEARCH_LIBS([FT_Load_Glyph], [freetype], [], AC_MSG_ERROR([Can't LÖVE without FreeType]))
AC_SEARCH_LIBS([PHYSFS_init], [physfs], [], AC_MSG_ERROR([Can't LÖVE without PhysicsFS]))
AC_SEARCH_LIBS([ModPlug_Load], [modplug], [], AC_MSG_ERROR([Can't LÖVE without ModPlug]))
-AC_SEARCH_LIBS([mpg123_open_feed], [mpg123], [], AC_MSG_ERROR([Can't LÖVE without Mpg123]))
-AC_SEARCH_LIBS([mpg123_seek_64], [mpg123], AC_SUBST([FILE_OFFSET],[-D_FILE_OFFSET_BITS=64]), AC_SUBST([FILE_OFFSET],[]))
AC_SEARCH_LIBS([ov_open], [vorbisfile], [], AC_MSG_ERROR([Can't LÖVE without VorbisFile]))
AC_CONFIG_FILES([
Makefile
Index: love-HEAD/src/Makefile.am
===================================================================
--- love-HEAD.orig/src/Makefile.am
+++ love-HEAD/src/Makefile.am
@@ -31,8 +31,6 @@ love_SOURCES = \
./modules/sound/lullaby/VorbisDecoder.cpp \
./modules/sound/lullaby/Sound.h \
./modules/sound/lullaby/Sound.cpp \
-./modules/sound/lullaby/Mpg123Decoder.h \
-./modules/sound/lullaby/Mpg123Decoder.cpp \
./modules/sound/lullaby/ModPlugDecoder.h \
./modules/sound/lullaby/ModPlugDecoder.cpp \
./modules/sound/lullaby/Decoder.h \
Index: love-HEAD/src/modules/sound/lullaby/Sound.cpp
===================================================================
--- love-HEAD.orig/src/modules/sound/lullaby/Sound.cpp
+++ love-HEAD/src/modules/sound/lullaby/Sound.cpp
@@ -21,7 +21,6 @@
#include "Sound.h"
#include "ModPlugDecoder.h"
-#include "Mpg123Decoder.h"
#include "VorbisDecoder.h"
//#include "FLACDecoder.h"
@@ -37,7 +36,6 @@ namespace lullaby
Sound::~Sound()
{
- Mpg123Decoder::quit();
}
const char * Sound::getName() const
@@ -55,8 +53,6 @@ namespace lullaby
// Find a suitable decoder here, and return it.
if(ModPlugDecoder::accepts(ext))
decoder = new ModPlugDecoder(data, ext, bufferSize);
- else if(Mpg123Decoder::accepts(ext))
- decoder = new Mpg123Decoder(data, ext, bufferSize);
else if(VorbisDecoder::accepts(ext))
decoder = new VorbisDecoder(data, ext, bufferSize);
/*else if (FLACDecoder::accepts(ext))
