changed: use system wavpack dir on linux/osx

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@27118 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

5 files changed, 5 insertions, 34 deletions

diff --git a/Makefile.in b/Makefile.in
index 15c3606b32..812a79f934 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -71,7 +71,6 @@ PAPCODECS_DIRS= \
 	xbmc/cores/paplayer/NSFCodec \
 	xbmc/cores/paplayer/timidity \
 	xbmc/cores/paplayer/SIDCodec \
-	xbmc/cores/paplayer/WavPackCodec \
 	xbmc/cores/paplayer/GYMCodec \
 	xbmc/cores/paplayer/YMCodec/StSoundLibrary \
 	xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU \
@@ -323,9 +322,6 @@ ifeq (@USE_ASAP_CODEC@,1)
 	  $(MAKE) -C xbmc/cores/paplayer/asap asap-xbmc
   endif
 endif
-ifneq (@USE_EXTERNAL_LIBWAVPACK@,1)
-	$(MAKE) -C xbmc/cores/paplayer/WavPackCodec
-endif
 	$(MAKE) -C xbmc/cores/paplayer/YMCodec/StSoundLibrary	
 ifeq ($(or $(findstring powerpc,$(ARCH)),$(findstring x86_64-linux,$(ARCH))),)
 	$(MAKE) -C xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU
diff --git a/README.ubuntu b/README.ubuntu
index cf5d8e42cc..2ea43c95c7 100644
--- a/README.ubuntu
+++ b/README.ubuntu
@@ -41,7 +41,7 @@ Two methods exist to install the required Ubuntu packages :
 
 For Ubuntu (all versions >= 7.04):
 
-   # sudo aptitude install subversion make g++ gcc gawk pmount libtool nasm automake cmake gperf unzip bison libsdl-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libfribidi-dev liblzo2-dev libfreetype6-dev libsqlite3-dev libogg-dev libasound-dev python-sqlite libglew-dev libcurl3 libcurl4-openssl-dev x11proto-xinerama-dev libxinerama-dev libxrandr-dev libxrender-dev libmad0-dev libogg-dev libvorbis-dev libsmbclient-dev libmysqlclient-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper-dev libfontconfig-dev libbz2-dev libboost-dev libfaac-dev libenca-dev libxt-dev libxtst-dev libxmu-dev libpng-dev libjpeg-dev libpulse-dev mesa-utils libcdio-dev libsamplerate-dev libmms-dev libmpeg3-dev libfaad-dev libflac-dev libiso9660-dev libass-dev libssl-dev fp-compiler gdc
+   # sudo aptitude install subversion make g++ gcc gawk pmount libtool nasm automake cmake gperf unzip bison libsdl-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libfribidi-dev liblzo2-dev libfreetype6-dev libsqlite3-dev libogg-dev libasound-dev python-sqlite libglew-dev libcurl3 libcurl4-openssl-dev x11proto-xinerama-dev libxinerama-dev libxrandr-dev libxrender-dev libmad0-dev libogg-dev libvorbis-dev libsmbclient-dev libmysqlclient-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper-dev libfontconfig-dev libbz2-dev libboost-dev libfaac-dev libenca-dev libxt-dev libxtst-dev libxmu-dev libpng-dev libjpeg-dev libpulse-dev mesa-utils libcdio-dev libsamplerate-dev libmms-dev libmpeg3-dev libfaad-dev libflac-dev libiso9660-dev libass-dev libssl-dev fp-compiler gdc libwavpack-dev
 
 On 8.04 and older versions, libmms is outdated and thus XBMC will not compile properly.
 In this case you will have to manually compile the latest version.
diff --git a/configure.in b/configure.in
index 7228d5e977..8611faeab9 100644
--- a/configure.in
+++ b/configure.in
@@ -61,8 +61,6 @@ external_libass_enabled="== Use of external libass enabled. =="
 external_libass_disabled="== Use of external libass disabled. =="
 external_libogg_enabled="== Use of external libogg enabled. =="
 external_libogg_disabled="== Use of external libogg disabled. =="
-external_libwavpack_enabled="== Use of external libwavpack enabled. =="
-external_libwavpack_disabled="== Use of external libwavpack disabled. =="
 external_python_enabled="== Use of external python enabled. =="
 external_python_disabled="== Use of external python disabled. =="
 ffmpeg_vdpau_not_supported="== External ffmpeg doesn't support VDPAU. VDPAU support disabled. =="
@@ -238,12 +236,6 @@ AC_ARG_ENABLE([external-libogg],
             [use_external_libogg=$enableval],
             [use_external_libogg=no])
 
-AC_ARG_ENABLE([external-libwavpack],
-            [AS_HELP_STRING([--enable-external-libwavpack],
-            [enable use of external libwavpack library (default is no) 'Linux only'])],
-            [use_external_libwavpack=$enableval],
-            [use_external_libwavpack=no])
-
 AC_ARG_ENABLE([external-python],
             [AS_HELP_STRING([--enable-external-python],
             [enable use of external python library (default is no) 'Linux only'])],
@@ -335,6 +327,7 @@ AC_CHECK_LIB([lzo2],        [main],, AC_MSG_ERROR($missing_library))
 AC_CHECK_LIB([z],           [main],, AC_MSG_ERROR($missing_library))
 AC_CHECK_LIB([ssl],         [main],, AC_MSG_ERROR($missing_library))
 AC_CHECK_LIB([crypto],      [main],, AC_MSG_ERROR($missing_library))
+AC_CHECK_LIB([wavpack],     [main],, AC_MSG_ERROR($missing_library))
 PKG_CHECK_MODULES([MAD],        [mad],
                   [INCLUDES+=" $MAD_CFLAGS"; LIBS+=" $MAD_LIBS"],
                   AC_MSG_ERROR($missing_library))
@@ -637,18 +630,6 @@ else
   USE_EXTERNAL_LIBOGG=0
 fi
 
-# External libwavpack
-if test "$use_external_libraries" = "yes" || test "$use_external_libwavpack" = "yes"; then
-  AC_CHECK_LIB([wavpack],          [main],, AC_MSG_ERROR($missing_library))
-
-  AC_MSG_NOTICE($external_libwavpack_enabled)
-  USE_EXTERNAL_LIBWAVPACK=1
-  AC_DEFINE([USE_EXTERNAL_LIBWAVPACK], [1], [Whether to use external libwavpack library.])
-else
-  AC_MSG_NOTICE($external_libwavpack_disabled)
-  USE_EXTERNAL_LIBWAVPACK=0
-fi
-
 # External Python
 if test "$use_external_libraries" = "yes" || test "$use_external_python" = "yes"; then
   AC_CHECK_LIB([python2.6], [main],
@@ -1018,11 +999,6 @@ else
   else
     final_message="$final_message\n  External libogg:\tNo"
   fi
-  if test "$use_external_libwavpack" = "yes"; then
-    final_message="$final_message\n  External libwavpack:\tYes"
-  else
-    final_message="$final_message\n  External libwavpack:\tNo"
-  fi
   if test "$use_external_python" = "yes"; then
     final_message="$final_message\n  External Python:\tYes"
   else
@@ -1055,7 +1031,6 @@ OUTPUT_FILES="Makefile \
              xbmc/cores/paplayer/SIDCodec/Makefile \
              xbmc/cores/paplayer/vgmstream/Makefile \
              xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU/Makefile \
-             xbmc/cores/paplayer/WavPackCodec/Makefile \
              xbmc/cores/paplayer/YMCodec/StSoundLibrary/Makefile \
              xbmc/cores/playercorefactory/Makefile \
              xbmc/karaoke/Makefile \
diff --git a/xbmc/cores/paplayer/DllWAVPack.h b/xbmc/cores/paplayer/DllWAVPack.h
index 66273fa255..2e02c89501 100644
--- a/xbmc/cores/paplayer/DllWAVPack.h
+++ b/xbmc/cores/paplayer/DllWAVPack.h
@@ -24,7 +24,7 @@
 #if (defined HAVE_CONFIG_H) && (!defined WIN32)
   #include "config.h"
 #endif
-#if (defined USE_EXTERNAL_LIBWAVPACK)
+#if (!defined WIN32)
   #include <wavpack/wavpack.h>
 #else
   #include "WavPackCodec/wavpack.h"
@@ -32,7 +32,7 @@
 #include "DynamicDll.h"
 #include "utils/log.h"
 
-#if (defined USE_EXTERNAL_LIBWAVPACK)
+#if (!defined WIN32)
 
 class DllWavPackInterface
 {
diff --git a/xbmc/cores/paplayer/WAVPackcodec.h b/xbmc/cores/paplayer/WAVPackcodec.h
index 1bba9733b0..b94e7eb531 100644
--- a/xbmc/cores/paplayer/WAVPackcodec.h
+++ b/xbmc/cores/paplayer/WAVPackcodec.h
@@ -49,7 +49,7 @@ private:
 
   char m_errormsg[512];
   WavpackContext* m_Handle;
-  #if (defined USE_EXTERNAL_LIBWAVPACK)
+  #if (!defined WIN32)
   WavpackStreamReader m_Callbacks;
   #else
   stream_reader m_Callbacks;