1 |
diff -p -up xbmc-10.0/configure.in.orig xbmc-10.0/configure.in |
2 |
--- xbmc-10.0/configure.in.orig 2010-12-18 20:48:34.248708117 +0200 |
3 |
+++ xbmc-10.0/configure.in 2010-12-18 20:48:34.520751808 +0200 |
4 |
@@ -640,7 +640,6 @@ else |
5 |
# paths from mysql_config |
6 |
AC_CHECK_LIB([modplug], [main],, AC_MSG_ERROR($missing_library)) |
7 |
AC_CHECK_LIB([mysqlclient],[main],, AC_MSG_ERROR($missing_library)) |
8 |
- AC_CHECK_LIB([faad], [main],, AC_MSG_ERROR($missing_library)) |
9 |
AC_CHECK_HEADER([FLAC/stream_decoder.h],, AC_MSG_ERROR($missing_library)) |
10 |
AC_CHECK_LIB([smbclient], [main],, AC_MSG_ERROR($missing_library)) |
11 |
AC_CHECK_LIB([SDL_mixer], [main],, AC_MSG_ERROR($missing_library)) |
12 |
@@ -693,7 +692,6 @@ if test "$host_vendor" != "apple"; then |
13 |
XB_FIND_SONAME([CURL], [curl]) |
14 |
XB_FIND_SONAME([FLAC], [FLAC]) |
15 |
XB_FIND_SONAME([MODPLUG], [modplug]) |
16 |
- XB_FIND_SONAME([FAAD], [faad]) |
17 |
XB_FIND_SONAME([MAD], [mad]) |
18 |
fi |
19 |
XB_FIND_SONAME([OGG], [ogg]) |
20 |
diff -p -up xbmc-10.0/xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibFaad.h.orig xbmc-10.0/xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibFaad.h |
21 |
--- xbmc-10.0/xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibFaad.h.orig 2010-12-17 08:17:41.000000000 +0200 |
22 |
+++ xbmc-10.0/xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibFaad.h 2010-12-18 20:48:34.520751808 +0200 |
23 |
@@ -24,7 +24,7 @@ |
24 |
#if (defined HAVE_CONFIG_H) && (!defined WIN32) |
25 |
#include "config.h" |
26 |
#endif |
27 |
-#if defined(_LINUX) && !defined(__APPLE__) |
28 |
+#if 0 |
29 |
#include <neaacdec.h> |
30 |
#else |
31 |
#include "libfaad/neaacdec.h" |
32 |
diff -p -up xbmc-10.0/xbmc/DllPaths_generated.h.in.orig xbmc-10.0/xbmc/DllPaths_generated.h.in |
33 |
--- xbmc-10.0/xbmc/DllPaths_generated.h.in.orig 2010-12-17 08:17:41.000000000 +0200 |
34 |
+++ xbmc-10.0/xbmc/DllPaths_generated.h.in 2010-12-18 20:48:34.520751808 +0200 |
35 |
@@ -82,7 +82,7 @@ |
36 |
#define DLL_PATH_LIBMPEG2 "special://xbmcbin/system/players/dvdplayer/libmpeg2-@ARCH@.so" |
37 |
#define DLL_PATH_LIBDVDNAV "special://xbmcbin/system/players/dvdplayer/libdvdnav-@ARCH@.so" |
38 |
#if defined(_LINUX) && !defined(__APPLE__) |
39 |
-#define DLL_PATH_LIBFAAD "@FAAD_SONAME@" |
40 |
+#define DLL_PATH_LIBFAAD "libfaad.so.2" |
41 |
#define DLL_PATH_LIBMAD "@MAD_SONAME@" |
42 |
#else |
43 |
#define DLL_PATH_LIBFAAD "special://xbmcbin/system/players/dvdplayer/libfaad-@ARCH@.so" |