removed: dependency on libfaac which doesn't seem to be used anywhere

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

7 files changed, 5 insertions, 37 deletions

diff --git a/README.armel b/README.armel
index 3413e59cc1..93f1cf7e12 100644
--- a/README.armel
+++ b/README.armel
@@ -212,13 +212,12 @@ It is also assumed that you have it setup with either Angstrom or Ubuntu.
 	-----------------------------------------------------------------------------
 
 	For Ubuntu: See README.linux for list of packages to install.
-	The known packages not to work are: libfaac-dev (use libfaad-dev instead)
 	If planning on not extracting the pkgs file, a few additional packages are required to be installed.
 	These are python and liblzo2
 
 	For Angstrom:
 		# opkg update
-		# opkg install subversion make g++ gcc gawk pmount libtool automake gperf unzip bison libsdl-1.2-dev libsdl-image-1.2-dev libsdl-gfx-dev libsdl-mixer-1.2-dev libfribidi-dev liblzo-dev libfreetype-dev libsqlite3-dev libasound2 python-sqlite3 libcurl4 libxrandr-dev libxrender-dev libmad-dev libogg-dev libvorbis-dev libmysqlclient-dev libpcre-dev libdbus-glib-1-dev hal-dev libjasper-dev libfontconfig-dev boost-dev libfaac-dev libxt-dev libxmu-dev libpng-dev libjpeg-dev libsamplerate0-dev
+		# opkg install subversion make g++ gcc gawk pmount libtool automake gperf unzip bison libsdl-1.2-dev libsdl-image-1.2-dev libsdl-gfx-dev libsdl-mixer-1.2-dev libfribidi-dev liblzo-dev libfreetype-dev libsqlite3-dev libasound2 python-sqlite3 libcurl4 libxrandr-dev libxrender-dev libmad-dev libogg-dev libvorbis-dev libmysqlclient-dev libpcre-dev libdbus-glib-1-dev hal-dev libjasper-dev libfontconfig-dev boost-dev libxt-dev libxmu-dev libpng-dev libjpeg-dev libsamplerate0-dev
 	
 	Unfortunately this will only install the packages that are available through opkg. There will be further packages that need to be installed.
 	Either use the method mentioned below, or selectively find and install packages, mentioned at the bottom of this README.
diff --git a/README.linux b/README.linux
index d49814dbf1..b110d155e2 100644
--- a/README.linux
+++ b/README.linux
@@ -53,7 +53,7 @@ Build-Depends: debhelper (>= 7.0.50~), python-support, cmake,
  libwavpack-dev, python-dev, gawk, gperf, nasm [!amd64], libcwiid1-dev,
  libbluetooth-dev, zlib1g-dev, libmms-dev (>= 0.4), libsmbclient-dev,
  libfaad-dev, libiso9660-dev, libssl-dev, lsb-release, libvdpau-dev, libmicrohttpd-dev,
- libmodplug-dev, librtmp-dev, libcrystalhd-dev, curl, libfaac-dev
+ libmodplug-dev, librtmp-dev, libcrystalhd-dev, curl
 
 *** For developers and anyone else who compiles frequently it is recommended to
 use ccache
diff --git a/README.ubuntu b/README.ubuntu
index 5f6df4b549..375be2ef9e 100644
--- a/README.ubuntu
+++ b/README.ubuntu
@@ -44,7 +44,7 @@ Two methods exist to install the required Ubuntu packages:
 
 For Ubuntu (all versions >= 7.04):
 
-   # sudo apt-get install subversion make g++ gcc gawk pmount libtool nasm yasm automake cmake gperf zip 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-gnutls-dev libxrandr-dev libxrender-dev libmad0-dev libogg-dev libvorbisenc2 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 libmpeg2-4-dev libmicrohttpd-dev libmodplug-dev libssh-dev gettext cvs
+   # sudo apt-get install subversion make g++ gcc gawk pmount libtool nasm yasm automake cmake gperf zip 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-gnutls-dev libxrandr-dev libxrender-dev libmad0-dev libogg-dev libvorbisenc2 libsmbclient-dev libmysqlclient-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper-dev libfontconfig-dev libbz2-dev libboost-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 libmpeg2-4-dev libmicrohttpd-dev libmodplug-dev libssh-dev gettext cvs
 
 For Ubuntu Maverick (10.10):
    # sudo apt-get install autopoint
diff --git a/configure.in b/configure.in
index 1a09435176..58bcc4d632 100644
--- a/configure.in
+++ b/configure.in
@@ -48,8 +48,6 @@ goom_enabled="== GOOM enabled. =="
 goom_disabled="== GOOM disabled. =="
 pulse_not_found="== Could not find libpulse. PulseAudio support disabled. =="
 pulse_disabled="== PulseAudio support manually disabled. =="
-faac_not_found="== Could not find libfaac. FAAC support disabled. =="
-faac_disabled="== FAAC support manually disabled. =="
 dvdcss_enabled="== DVDCSS support enabled. =="
 dvdcss_disabled="== DVDCSS support disabled. =="
 hal_not_found="== Could not find hal. HAL support disabled. =="
@@ -209,12 +207,6 @@ AC_ARG_ENABLE([ffmpeg_libvorbis],
   [use_ffmpeg_libvorbis=$enableval],
   [use_ffmpeg_libvorbis=no])
 
-AC_ARG_ENABLE([faac],
-  [AS_HELP_STRING([--enable-faac],
-  [enable FAAC support (default is yes)])],
-  [use_faac=$enableval],
-  [use_faac=yes])
-
 AC_ARG_ENABLE([dvdcss],
   [AS_HELP_STRING([--enable-dvdcss],
   [enable DVDCSS support (default is yes)])],
@@ -713,19 +705,6 @@ else
   AC_MSG_RESULT($pulse_disabled)
 fi
 
-# FAAC
-if test "$host_vendor" = "apple" ; then
-  use_faac="no"
-  AC_MSG_RESULT($faac_disabled)
-else
-  if test "$use_faac" = "yes"; then
-    AC_CHECK_LIB([faac], [main],,
-      use_faac=no;AC_MSG_RESULT($faac_not_found))
-  else
-    AC_MSG_RESULT($faac_disabled)
-  fi
-fi
-
 # HAL
 if test "$host_vendor" = "apple" ; then
   use_hal="no"
@@ -1236,12 +1215,6 @@ else
   final_message="$final_message\n  HAL Support:\tNo"
 fi
 
-if test "$use_faac" = "yes"; then
-  final_message="$final_message\n  FAAC:\t\tYes"
-else
-  final_message="$final_message\n  FAAC:\t\tNo"
-fi
-
 # DVDCSS
 if test "$use_dvdcss" = "yes"; then
   AC_MSG_NOTICE($dvdcss_enabled)
diff --git a/tools/Linux/packaging/debian/rules b/tools/Linux/packaging/debian/rules
index ee299f8997..abf4d20ad8 100755
--- a/tools/Linux/packaging/debian/rules
+++ b/tools/Linux/packaging/debian/rules
@@ -26,7 +26,7 @@ endif
 
 # Ubuntu or Debian specific options
 ifeq (Ubuntu,$(shell lsb_release -is))
-  DISTRO_SPECIFIC_OPTIONS = --enable-faac
+  DISTRO_SPECIFIC_OPTIONS = 
 else
   DISTRO_SPECIFIC_OPTIONS = --enable-external-libraries --disable-dvdcss \
     --disable-non-free
diff --git a/tools/Linux/packaging/debian/var_info b/tools/Linux/packaging/debian/var_info
index c163d48e5b..fd02b92921 100644
--- a/tools/Linux/packaging/debian/var_info
+++ b/tools/Linux/packaging/debian/var_info
@@ -20,10 +20,6 @@ BUILD_DEPENDS="debhelper (>= 7.0.50~), python-support, cmake,
  libfaad-dev, libiso9660-dev, libssl-dev, lsb-release, libvdpau-dev, libmicrohttpd-dev,
  libmodplug-dev, librtmp-dev, libcrystalhd-dev, curl,"
 
-if [ $(lsb_release -is) = "Ubuntu" ]; then
-    BUILD_DEPENDS="$BUILD_DEPENDS libfaac-dev,"
-fi
-
 case "$1" in
     BUILD_DEPENDS)
         printf "$BUILD_DEPENDS"
diff --git a/xbmc/cores/dvdplayer/Codecs/ffmpeg/build_xbmc.sh b/xbmc/cores/dvdplayer/Codecs/ffmpeg/build_xbmc.sh
index 069503a26f..3fe4415c2e 100644
--- a/xbmc/cores/dvdplayer/Codecs/ffmpeg/build_xbmc.sh
+++ b/xbmc/cores/dvdplayer/Codecs/ffmpeg/build_xbmc.sh
@@ -13,7 +13,7 @@ echo wrapping libavutil
 gcc -shared -fPIC --soname,avutil-51-i486-linux.so -o avutil-51-i486-linux.so -rdynamic libavutil/*.o 
 
 echo wrapping libavcodec
-gcc -o avcodec-51-i486-linux.so --soname,avcodec-51-i486-linux.so -shared -fPIC -rdynamic /usr/lib/libfaac.a  libavcodec/*.o libavcodec/i386/*.o `cat $XBMC_ROOT/xbmc/cores/DllLoader/exports/wrapper.def` $XBMC_ROOT/xbmc/cores/DllLoader/exports/wrapper.o
+gcc -o avcodec-51-i486-linux.so --soname,avcodec-51-i486-linux.so -shared -fPIC -rdynamic libavcodec/*.o libavcodec/i386/*.o `cat $XBMC_ROOT/xbmc/cores/DllLoader/exports/wrapper.def` $XBMC_ROOT/xbmc/cores/DllLoader/exports/wrapper.o
 
 echo wrapping libavformat
 gcc -o avformat-51-i486-linux.so --soname,avformat-51-i486-linux.so -shared  -fPIC  -rdynamic libavformat/*.o `cat $XBMC_ROOT/xbmc/cores/DllLoader/exports/wrapper.def`,-export-all-symbols $XBMC_ROOT/xbmc/cores/DllLoader/exports/wrapper.o