rendered paste bodyIndex: xbmc/cores/dvdplayer/Codecs/Makefile.in===================================================================--- xbmc/cores/dvdplayer/Codecs/Makefile.in (revision 23280)+++ xbmc/cores/dvdplayer/Codecs/Makefile.in (working copy)@@ -10,9 +10,6 @@ ifneq (@USE_EXTERNAL_FFMPEG@,1) DIRS+=ffmpeg endif-ifneq (@USE_EXTERNAL_LIBMAD@,1)- DIRS+=libmad-endif ifneq (@USE_EXTERNAL_LIBA52@,1) DIRS+=liba52 endif@@ -34,9 +31,6 @@ postproc-51-$(ARCH).so \ swscale-0.6.1-$(ARCH).so endif-ifneq (@USE_EXTERNAL_LIBMAD@,1)- LIBS+=libmad-$(ARCH).so-endif ifneq (@USE_EXTERNAL_LIBA52@,1) LIBS+=liba52-$(ARCH).so \ libao-$(ARCH).so@@ -51,6 +45,11 @@ LIBS+=libmpeg2-$(ARCH).so endif +ifeq ($(findstring osx,$(ARCH)),osx)+ DIRS+=libmad+ LIBS+=libmad-$(ARCH).so+endif+ ifneq (,$(findstring powerpc,$(ARCH))) ARCH_DIR=ppc else@@ -202,9 +201,6 @@ $(CC) -o $@ $(LDFLAGS) --soname,$@ libfaad2/libfaad/*.o \ `cat $(WRAPPER:.o=.def)` $(WRAPPER) -$(SYSDIR)/libmad-$(ARCH).so: libmad/libmad.la- cp libmad/.libs/libmad.so $@- $(SYSDIR)/liba52-$(ARCH).so: $(WRAPPER) liba52/liba52/liba52.la $(CC) -o $@ $(LDFLAGS) --soname,$@ liba52/liba52/.libs/*.o \ -Wl`cat $(WRAPPER:.o=.def)` $(WRAPPER)@@ -225,10 +221,6 @@ libfaad2: $(MAKE) -C $@ -libmad/libmad.la: libmad;-libmad:- $(MAKE) -C $@- liba52/liba52/liba52.la: liba52 liba52/libao/libao.a: liba52 liba52:Index: xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibMad.h===================================================================--- xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibMad.h (revision 23281)+++ xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibMad.h (working copy)@@ -25,13 +25,12 @@ #endif /* undefine byte from PlatformDefs.h since it's used in mad.h */ #undef byte-#if (defined USE_EXTERNAL_LIBMAD)+#if defined(_LINUX) && !defined(__APPLE__) #include <mad.h> #else #include "libmad/mad.h" #endif #include "DynamicDll.h"-#include "utils/log.h" class DllLibMadInterface {@@ -53,54 +52,8 @@ virtual mad_timer_t Get_mad_timer_zero() = 0; }; -#if (defined USE_EXTERNAL_LIBMAD)- class DllLibMad : public DllDynamic, DllLibMadInterface {-public:- virtual ~DllLibMad() {}- virtual void mad_synth_init(struct mad_synth *synth)- { return ::mad_synth_init(synth); }- virtual void mad_stream_init(struct mad_stream *stream)- { return ::mad_stream_init(stream); }- virtual void mad_frame_init(struct mad_frame *frame)- { return ::mad_frame_init(frame); }- virtual void mad_stream_finish(struct mad_stream *stream)- { return ::mad_stream_finish(stream); }- virtual void mad_frame_finish(struct mad_frame *frame)- { return ::mad_frame_finish(frame); }- virtual void mad_stream_buffer(struct mad_stream *stream, unsigned char const *buffer, unsigned long size)- { return ::mad_stream_buffer(stream, buffer, size); }- virtual void mad_synth_frame(struct mad_synth *synth, struct mad_frame const *frame)- { return ::mad_synth_frame(synth, frame); }- virtual int mad_frame_decode(struct mad_frame *frame, struct mad_stream *stream)- { return ::mad_frame_decode(frame, stream); }- virtual int mad_stream_sync(struct mad_stream *stream)- { return ::mad_stream_sync(stream); }- virtual char const* mad_stream_errorstr(struct mad_stream const *stream)- { return ::mad_stream_errorstr(stream); }- virtual void mad_frame_mute(struct mad_frame *frame)- { return ::mad_frame_mute(frame); }- virtual void mad_synth_mute(struct mad_synth *synth)- { return ::mad_synth_mute(synth); }- virtual void mad_timer_add(mad_timer_t *t1, mad_timer_t t2)- { return ::mad_timer_add(t1, t2); }- virtual mad_timer_t Get_mad_timer_zero()- { return ::mad_timer_zero; }-- // DLL faking.- virtual bool ResolveExports() { return true; }- virtual bool Load() {- CLog::Log(LOGDEBUG, "DllLibMad: Using libmad system library");- return true;- }- virtual void Unload() {}-};--#else--class DllLibMad : public DllDynamic, DllLibMadInterface-{ DECLARE_DLL_WRAPPER(DllLibMad, DLL_PATH_LIBMAD) DEFINE_METHOD1(void, mad_synth_init, (struct mad_synth * p1)) DEFINE_METHOD1(void, mad_stream_init, (struct mad_stream * p1))@@ -134,4 +87,3 @@ END_METHOD_RESOLVE() }; -#endifIndex: xbmc/DllPaths_generated.h.in===================================================================--- xbmc/DllPaths_generated.h.in (revision 23280)+++ xbmc/DllPaths_generated.h.in (working copy)@@ -27,7 +27,6 @@ #define DLL_PATH_DCA_CODEC "special://xbmc/system/players/paplayer/dcacodec-@ARCH@.so" #define DLL_PATH_FLAC_CODEC "special://xbmc/system/players/paplayer/libFLAC-@ARCH@.so" #define DLL_PATH_GYM_CODEC "special://xbmc/system/players/paplayer/gensapu-@ARCH@.so"-#define DLL_PATH_MAD_CODEC "special://xbmc/system/players/dvdplayer/libmad-@ARCH@.so" #define DLL_PATH_MID_CODEC "special://xbmc/system/players/paplayer/timidity-@ARCH@.so" #define DLL_PATH_MODULE_CODEC "special://xbmc/system/players/paplayer/dumb-@ARCH@.so" #define DLL_PATH_MPC_CODEC "special://xbmc/system/players/paplayer/libmpcdec-@ARCH@.so"@@ -46,7 +45,11 @@ #define DLL_PATH_LIBA52 "special://xbmc/system/players/dvdplayer/liba52-@ARCH@.so" #define DLL_PATH_LIBDTS "special://xbmc/system/players/dvdplayer/libdts-@ARCH@.so" #define DLL_PATH_LIBFAAD "special://xbmc/system/players/dvdplayer/libfaad-@ARCH@.so"+#if defined(_LINUX) && !defined(__APPLE__)+#define DLL_PATH_LIBMAD "libmad.so.0"+#else #define DLL_PATH_LIBMAD "special://xbmc/system/players/dvdplayer/libmad-@ARCH@.so"+#endif #define DLL_PATH_LIBMPEG2 "special://xbmc/system/players/dvdplayer/libmpeg2-@ARCH@.so" #define DLL_PATH_LIBDVDNAV "special://xbmc/system/players/dvdplayer/libdvdnav-@ARCH@.so" Index: configure.in===================================================================--- configure.in (revision 23280)+++ configure.in (working copy)@@ -47,8 +47,6 @@ external_libraries_disabled="== Use of all supported external libraries disabled. ==" external_ffmpeg_enabled="== Use of external ffmpeg enabled. ==" external_ffmpeg_disabled="== Use of external ffmpeg disabled. =="-external_libmad_enabled="== Use of external libmad enabled. =="-external_libmad_disabled="== Use of external libmad disabled. ==" external_liba52_enabled="== Use of external liba52 enabled. ==" external_liba52_disabled="== Use of external liba52 disabled. ==" external_libdts_enabled="== Use of external libdts enabled. =="@@ -192,12 +190,6 @@ [use_external_ffmpeg=$enableval], [use_external_ffmpeg=no]) -AC_ARG_ENABLE([external-libmad],- [AS_HELP_STRING([--enable-external-libmad],- [enable use of external libmad library (default is no) 'Linux only'])],- [use_external_libmad=$enableval],- [use_external_libmad=no])- AC_ARG_ENABLE([external-liba52], [AS_HELP_STRING([--enable-external-liba52], [enable use of external liba52 library (default is no) 'Linux only'])],@@ -501,18 +493,6 @@ USE_EXTERNAL_FFMPEG=0 fi -# External libmad-if test "$use_external_libraries" = "yes" || test "$use_external_libmad" = "yes"; then- AC_CHECK_LIB([mad], [main],, AC_MSG_ERROR($missing_library))-- AC_MSG_NOTICE($external_libmad_enabled)- USE_EXTERNAL_LIBMAD=1- AC_DEFINE([USE_EXTERNAL_LIBMAD], [1], [Whether to use external libmad library.])-else- AC_MSG_NOTICE($external_libmad_disabled)- USE_EXTERNAL_LIBMAD=0-fi- # External liba52 if test "$use_external_libraries" = "yes" || test "$use_external_liba52" = "yes"; then AC_CHECK_LIB([a52], [main],, AC_MSG_ERROR($missing_library))@@ -942,11 +922,6 @@ else final_message="$final_message\n External FFmpeg:\tNo" fi- if test "$use_external_libmad" = "yes"; then- final_message="$final_message\n External libmad:\tYes"- else- final_message="$final_message\n External libmad:\tNo"- fi if test "$use_external_liba52" = "yes"; then final_message="$final_message\n External liba52:\tYes" else@@ -1063,7 +1038,6 @@ AC_SUBST(BUILD_DVDCSS) AC_SUBST(USE_EXTERNAL_LIBRARIES) AC_SUBST(USE_EXTERNAL_FFMPEG)-AC_SUBST(USE_EXTERNAL_LIBMAD) AC_SUBST(USE_EXTERNAL_LIBA52) AC_SUBST(USE_EXTERNAL_LIBDTS) AC_SUBST(USE_EXTERNAL_LIBFAAD)@@ -1379,12 +1353,11 @@ if test "$host_vendor" = "apple" ; then CFLAGS="-fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \ ./configure MACOSX_DEPLOYMENT_TARGET=10.4 \- --with-pic - else- ./configure \ --with-pic+ else+ true fi-], [$USE_EXTERNAL_LIBMAD])+], 0) XB_CONFIG_MODULE([xbmc/lib/cximage-6.0/zlib], [ if test "$host_vendor" = "apple" ; then