diff -p -up xbmc-pvr-testing2-27961/configure.in.orig xbmc-pvr-testing2-27961/configure.in --- xbmc-pvr-testing2-27961/configure.in.orig 2010-02-19 04:11:39.000000000 +0200 +++ xbmc-pvr-testing2-27961/configure.in 2010-02-19 16:29:02.152320489 +0200 @@ -410,7 +410,6 @@ else # paths from mysql_config AC_CHECK_LIB([modplug], [main],, AC_MSG_ERROR($missing_library)) AC_CHECK_LIB([mysqlclient], [main],, AC_MSG_ERROR($missing_library)) - AC_CHECK_LIB([faad], [main],, AC_MSG_ERROR($missing_library)) AC_CHECK_HEADER([FLAC/stream_decoder.h],, AC_MSG_ERROR($missing_library)) AC_CHECK_LIB([smbclient], [main],, AC_MSG_ERROR($missing_library)) AC_CHECK_LIB([SDL_mixer], [main],, AC_MSG_ERROR($missing_library)) @@ -600,7 +599,6 @@ fi # External libdts if test "$use_external_libraries" = "yes" || test "$use_external_libdts" = "yes"; then - AC_CHECK_LIB([dts], [main],, AC_MSG_ERROR($missing_library)) AC_MSG_NOTICE($external_libdts_enabled) USE_EXTERNAL_LIBDTS=1 diff -p -up xbmc-pvr-testing2-27961/xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibDts.h.orig xbmc-pvr-testing2-27961/xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibDts.h --- xbmc-pvr-testing2-27961/xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibDts.h.orig 2010-02-19 04:11:39.000000000 +0200 +++ xbmc-pvr-testing2-27961/xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibDts.h 2010-02-19 16:29:02.153320528 +0200 @@ -25,7 +25,7 @@ #include "config.h" #endif extern "C" { -#if (defined USE_EXTERNAL_LIBDTS) +#if 0 #include <dts.h> #else #include "libdts/dts.h" @@ -61,7 +61,7 @@ public: virtual void dts_free (dts_state_t * state)=0; }; -#if (defined USE_EXTERNAL_LIBDTS) +#if 0 class DllLibDts : public DllDynamic, DllLibDtsInterface { @@ -107,14 +107,14 @@ class DllLibDts : public DllDynamic, Dll DEFINE_METHOD1(sample_t *, dts_samples, (dts_state_t * p1)) DEFINE_METHOD1(void, dts_free, (dts_state_t * p1)) BEGIN_METHOD_RESOLVE() - RESOLVE_METHOD(dts_init) - RESOLVE_METHOD(dts_syncinfo) - RESOLVE_METHOD(dts_frame ) - RESOLVE_METHOD(dts_dynrng) - RESOLVE_METHOD(dts_blocks_num) - RESOLVE_METHOD(dts_block) - RESOLVE_METHOD(dts_samples) - RESOLVE_METHOD(dts_free) + RESOLVE_METHOD_RENAME(dca_init, dts_init) + RESOLVE_METHOD_RENAME(dca_syncinfo, dts_syncinfo) + RESOLVE_METHOD_RENAME(dca_frame, dts_frame ) + RESOLVE_METHOD_RENAME(dca_dynrng, dts_dynrng) + RESOLVE_METHOD_RENAME(dca_blocks_num, dts_blocks_num) + RESOLVE_METHOD_RENAME(dca_block, dts_block) + RESOLVE_METHOD_RENAME(dca_samples, dts_samples) + RESOLVE_METHOD_RENAME(dca_free, dts_free) END_METHOD_RESOLVE() }; diff -p -up xbmc-pvr-testing2-27961/xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibFaad.h.orig xbmc-pvr-testing2-27961/xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibFaad.h --- xbmc-pvr-testing2-27961/xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibFaad.h.orig 2010-02-19 04:11:39.000000000 +0200 +++ xbmc-pvr-testing2-27961/xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibFaad.h 2010-02-19 16:29:02.157069653 +0200 @@ -24,7 +24,7 @@ #if (defined HAVE_CONFIG_H) && (!defined WIN32) #include "config.h" #endif -#if defined(_LINUX) && !defined(__APPLE__) +#if 0 #include <neaacdec.h> #else #include "libfaad/neaacdec.h" diff -p -up xbmc-pvr-testing2-27961/xbmc/cores/paplayer/DllDCACodec.h.orig xbmc-pvr-testing2-27961/xbmc/cores/paplayer/DllDCACodec.h --- xbmc-pvr-testing2-27961/xbmc/cores/paplayer/DllDCACodec.h.orig 2010-02-19 04:11:39.000000000 +0200 +++ xbmc-pvr-testing2-27961/xbmc/cores/paplayer/DllDCACodec.h 2010-02-19 16:29:02.161069329 +0200 @@ -25,7 +25,7 @@ #include "config.h" #endif extern "C" { -#if (defined USE_EXTERNAL_LIBDTS) +#if 0 #include <dts.h> #else #include "../dvdplayer/DVDCodecs/Audio/libdts/dts.h" @@ -64,7 +64,7 @@ public: virtual void dts_free (dts_state_t * state)=0; }; -#if (defined USE_EXTERNAL_LIBDTS) +#if 0 class DllDCACodec : public DllDynamic, DllDCACodecInterface { @@ -110,14 +110,14 @@ class DllDCACodec : public DllDynamic, D DEFINE_METHOD1(sample_t *, dts_samples, (dts_state_t * p1)) DEFINE_METHOD1(void, dts_free, (dts_state_t * p1)) BEGIN_METHOD_RESOLVE() - RESOLVE_METHOD(dts_init) - RESOLVE_METHOD(dts_syncinfo) - RESOLVE_METHOD(dts_frame ) - RESOLVE_METHOD(dts_dynrng) - RESOLVE_METHOD(dts_blocks_num) - RESOLVE_METHOD(dts_block) - RESOLVE_METHOD(dts_samples) - RESOLVE_METHOD(dts_free) + RESOLVE_METHOD_RENAME(dca_init, dts_init) + RESOLVE_METHOD_RENAME(dca_syncinfo, dts_syncinfo) + RESOLVE_METHOD_RENAME(dca_frame, dts_frame ) + RESOLVE_METHOD_RENAME(dca_dynrng, dts_dynrng) + RESOLVE_METHOD_RENAME(dca_blocks_num, dts_blocks_num) + RESOLVE_METHOD_RENAME(dca_block, dts_block) + RESOLVE_METHOD_RENAME(dca_samples, dts_samples) + RESOLVE_METHOD_RENAME(dca_free, dts_free) END_METHOD_RESOLVE() }; diff -p -up xbmc-pvr-testing2-27961/xbmc/DllPaths_generated.h.in.orig xbmc-pvr-testing2-27961/xbmc/DllPaths_generated.h.in --- xbmc-pvr-testing2-27961/xbmc/DllPaths_generated.h.in.orig 2010-02-19 04:11:39.000000000 +0200 +++ xbmc-pvr-testing2-27961/xbmc/DllPaths_generated.h.in 2010-02-19 16:29:02.165069523 +0200 @@ -50,7 +50,7 @@ /* dvdplayer */ #define DLL_PATH_LIBASS "special://xbmc/system/players/dvdplayer/libass-@ARCH@.so" #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_LIBDTS "libdca.so.0" #define DLL_PATH_LIBMPEG2 "special://xbmc/system/players/dvdplayer/libmpeg2-@ARCH@.so" #define DLL_PATH_LIBDVDNAV "special://xbmc/system/players/dvdplayer/libdvdnav-@ARCH@.so" #if defined(_LINUX) && !defined(__APPLE__)