changed: use system mpeg2 library on linux/osx

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

1 files changed, 2 insertions, 47 deletions

diff --git a/configure.in b/configure.in
index 8611faeab9..48fe900bd5 100644
--- a/configure.in
+++ b/configure.in
@@ -55,8 +55,6 @@ external_liba52_enabled="== Use of external liba52 enabled. =="
 external_liba52_disabled="== Use of external liba52 disabled. =="
 external_libdts_enabled="== Use of external libdts enabled. =="
 external_libdts_disabled="== Use of external libdts disabled. =="
-external_libmpeg2_enabled="== Use of external libmpeg2 enabled. =="
-external_libmpeg2_disabled="== Use of external libmpeg2 disabled. =="
 external_libass_enabled="== Use of external libass enabled. =="
 external_libass_disabled="== Use of external libass disabled. =="
 external_libogg_enabled="== Use of external libogg enabled. =="
@@ -218,12 +216,6 @@ AC_ARG_ENABLE([external-libdts],
             [use_external_libdts=$enableval],
             [use_external_libdts=no])
 
-AC_ARG_ENABLE([external-libmpeg2],
-            [AS_HELP_STRING([--enable-external-libmpeg2],
-            [enable use of external libmpeg2 library (default is no) 'Linux only'])],
-            [use_external_libmpeg2=$enableval],
-            [use_external_libmpeg2=no])
-
 AC_ARG_ENABLE([external-libass],
             [AS_HELP_STRING([--enable-external-libass],
             [enable use of external libass library (default is no) 'Linux only'])],
@@ -328,6 +320,8 @@ 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))
+AC_CHECK_LIB([mpeg2],       [main],, AC_MSG_ERROR($missing_library))
+AC_CHECK_LIB([mpeg2convert],[main],, AC_MSG_ERROR($missing_library))
 PKG_CHECK_MODULES([MAD],        [mad],
                   [INCLUDES+=" $MAD_CFLAGS"; LIBS+=" $MAD_LIBS"],
                   AC_MSG_ERROR($missing_library))
@@ -592,19 +586,6 @@ else
   USE_EXTERNAL_LIBDTS=0
 fi
 
-# External libmpeg2
-if test "$use_external_libraries" = "yes" || test "$use_external_libmpeg2" = "yes"; then
-  AC_CHECK_LIB([mpeg2],          [main],, AC_MSG_ERROR($missing_library))
-  AC_CHECK_LIB([mpeg2convert],          [main],, AC_MSG_ERROR($missing_library))
-
-  AC_MSG_NOTICE($external_libmpeg2_enabled)
-  USE_EXTERNAL_LIBMPEG2=1
-  AC_DEFINE([USE_EXTERNAL_LIBMPEG2], [1], [Whether to use external libmpeg2 library.])
-else
-  AC_MSG_NOTICE($external_libmpeg2_disabled)
-  USE_EXTERNAL_LIBMPEG2=0
-fi
-
 # External libass
 if test "$use_external_libraries" = "yes" || test "$use_external_libass" = "yes"; then
   # We need libass >= 0.9.7.
@@ -984,11 +965,6 @@ else
   else
     final_message="$final_message\n  External libdts:\tNo"
   fi
-  if test "$use_external_libmpeg2" = "yes"; then
-    final_message="$final_message\n  External libmpeg2:\tYes"
-  else
-    final_message="$final_message\n  External libmpeg2:\tNo"
-  fi
   if test "$use_external_libass" = "yes"; then
     final_message="$final_message\n  External libass:\tYes"
   else
@@ -1354,27 +1330,6 @@ XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/liba52], [
   fi
 ], [$USE_EXTERNAL_LIBA52])
 
-XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libmpeg2], [
-  if test "$host_vendor" = "apple" ; then
-    CFLAGS="-fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
-    ./configure MACOSX_DEPLOYMENT_TARGET=10.4 \
-      --with-pic \
-      --disable-static \
-      --enable-shared \
-      --disable-directx \
-      --disable-sdl \
-      --without-x
-  else
-    ./configure \
-      --with-pic \
-      --disable-static \
-      --enable-shared \
-      --disable-directx \
-      --disable-sdl \
-      --without-x
-  fi
-], [$USE_EXTERNAL_LIBMPEG2])
-
 XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libmad], [
   if test "$host_vendor" = "apple" ; then
     CFLAGS="-fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \