Merge branch 'remove-libmms' of github:cptspiff/xbmc. this replaces l…

…ibmms with ffmpeg's built-in mms support

README.linux

@@ -51,7 +51,7 @@ Build-Depends: debhelper (>= 7.0.50~), python-support, cmake,
  libavformat-dev, libavutil-dev, libpostproc-dev, libswscale-dev,
  libmpeg2-4-dev, libass-dev (>= 0.9.8), libmpcdec-dev, libflac-dev,
  libwavpack-dev, python-dev, gawk, gperf, nasm [!amd64], libcwiid1-dev,
- libbluetooth-dev, zlib1g-dev, libmms-dev (>= 0.4), libsmbclient-dev,
+ libbluetooth-dev, zlib1g-dev, libsmbclient-dev,
  libfaad-dev, libiso9660-dev, libssl-dev, lsb-release, libvdpau-dev, libmicrohttpd-dev,
  libmodplug-dev, librtmp-dev, libcrystalhd-dev, curl
 

README.osx

@@ -110,7 +110,6 @@ Then install the following port packages (order is very important):
  $ sudo port install libvorbis +universal
  $ sudo port install libmad macosx_deployment_target=10.4
  $ sudo port install fribidi +universal
- $ sudo port install libmms +universal
  $ sudo port install wavpack +universal
  $ sudo port install libmpeg2 +no_sdl +no_x11 +universal
 

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 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 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
@@ -58,15 +58,6 @@ In this case you will have to manually compile the latest version.
    # make
    # sudo make install
 
-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. See the previous [NOTICE].
-   # wget "http://launchpad.net/libmms/trunk/0.5/+download/libmms-0.5.tar.gz"
-   # tar zxvf libmms-0.5.tar.gz
-   # cd libmms-0.5
-   # ./configure --prefix=/usr
-   # make
-   # sudo make install
-
 --------------------------------------------------------------
 3.2. Use a single command to get all build dependencies
 --------------------------------------------------------------

XBMC.xcodeproj/project.pbxproj

@@ -1811,8 +1811,6 @@
 		F5D8D735102BB3B1004A11AB /* OverlayRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5D8D731102BB3B1004A11AB /* OverlayRenderer.cpp */; };
 		F5D8EF5B103912A4004A11AB /* DVDSubtitleParserVplayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5D8EF59103912A4004A11AB /* DVDSubtitleParserVplayer.cpp */; };
 		F5D8EF5C103912A4004A11AB /* DVDSubtitleParserVplayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5D8EF59103912A4004A11AB /* DVDSubtitleParserVplayer.cpp */; };
-		F5D8F86C104CD1C0004A11AB /* DVDInputStreamMMS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5D8F86B104CD1C0004A11AB /* DVDInputStreamMMS.cpp */; };
-		F5D8F86D104CD1C0004A11AB /* DVDInputStreamMMS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5D8F86B104CD1C0004A11AB /* DVDInputStreamMMS.cpp */; };
 		F5D8F881104CD40B004A11AB /* liblzo2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F5D8F880104CD40B004A11AB /* liblzo2.dylib */; };
 		F5D8F882104CD40B004A11AB /* liblzo2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F5D8F880104CD40B004A11AB /* liblzo2.dylib */; };
 		F5D8F88C104CD47D004A11AB /* libmms.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F5D8F88B104CD47D004A11AB /* libmms.dylib */; };
@@ -3792,8 +3790,6 @@
 		F5D8D731102BB3B1004A11AB /* OverlayRenderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OverlayRenderer.cpp; sourceTree = "<group>"; };
 		F5D8EF59103912A4004A11AB /* DVDSubtitleParserVplayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDSubtitleParserVplayer.cpp; sourceTree = "<group>"; };
 		F5D8EF5A103912A4004A11AB /* DVDSubtitleParserVplayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDSubtitleParserVplayer.h; sourceTree = "<group>"; };
-		F5D8F86A104CD1C0004A11AB /* DVDInputStreamMMS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDInputStreamMMS.h; sourceTree = "<group>"; };
-		F5D8F86B104CD1C0004A11AB /* DVDInputStreamMMS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDInputStreamMMS.cpp; sourceTree = "<group>"; };
 		F5D8F880104CD40B004A11AB /* liblzo2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = liblzo2.dylib; path = /opt/local/lib/liblzo2.dylib; sourceTree = "<absolute>"; };
 		F5D8F88B104CD47D004A11AB /* libmms.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libmms.dylib; path = /opt/local/lib/libmms.dylib; sourceTree = "<absolute>"; };
 		F5DC87E0110A287400EE1B15 /* RingBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RingBuffer.h; sourceTree = "<group>"; };
@@ -5450,8 +5446,6 @@
 				E38E15620D25F9FA00618676 /* DVDInputStreamHttp.h */,
 				E38E15630D25F9FA00618676 /* DVDInputStreamMemory.cpp */,
 				E38E15640D25F9FA00618676 /* DVDInputStreamMemory.h */,
-				F5D8F86A104CD1C0004A11AB /* DVDInputStreamMMS.h */,
-				F5D8F86B104CD1C0004A11AB /* DVDInputStreamMMS.cpp */,
 				E38E15650D25F9FA00618676 /* DVDInputStreamNavigator.cpp */,
 				E38E15660D25F9FA00618676 /* DVDInputStreamNavigator.h */,
 				E38E15670D25F9FA00618676 /* dvdnav */,
@@ -7899,7 +7893,6 @@
 				7C779E3E104A57E500F444C4 /* WinSystemOSX.mm in Sources */,
 				7C779E3F104A57E500F444C4 /* WinSystemOSXGL.mm in Sources */,
 				7C779E54104A58F900F444C4 /* GUIWindowTestPatternGL.cpp in Sources */,
-				F5D8F86C104CD1C0004A11AB /* DVDInputStreamMMS.cpp in Sources */,
 				7C62F24210505BC7002AD2C1 /* Bookmark.cpp in Sources */,
 				7C62F45E1057A62D002AD2C1 /* DirectoryNodeSingles.cpp in Sources */,
 				7CCF7E721067643800992676 /* DirectoryNodeSets.cpp in Sources */,
@@ -8778,7 +8771,6 @@
 				7C779E49104A57E500F444C4 /* WinSystemOSX.mm in Sources */,
 				7C779E4A104A57E500F444C4 /* WinSystemOSXGL.mm in Sources */,
 				7C779E56104A58F900F444C4 /* GUIWindowTestPatternGL.cpp in Sources */,
-				F5D8F86D104CD1C0004A11AB /* DVDInputStreamMMS.cpp in Sources */,
 				7C62F24310505BC7002AD2C1 /* Bookmark.cpp in Sources */,
 				7C62F45F1057A62D002AD2C1 /* DirectoryNodeSingles.cpp in Sources */,
 				7CCF7E731067643800992676 /* DirectoryNodeSets.cpp in Sources */,

configure.in

@@ -581,9 +581,6 @@ PKG_CHECK_MODULES([CDIO],       [libcdio],
 PKG_CHECK_MODULES([SAMPLERATE], [samplerate],
   [INCLUDES="$INCLUDES $SAMPLERATE_CFLAGS"; LIBS="$LIBS $SAMPLERATE_LIBS"],
   AC_MSG_ERROR($missing_library))
-PKG_CHECK_MODULES([MMS],        [libmms],
-  [INCLUDES="$INCLUDES $MMS_CFLAGS"; LIBS="$LIBS $MMS_LIBS"],
-  AC_MSG_ERROR($missing_library))
 PKG_CHECK_MODULES([FREETYPE2],  [freetype2],
   [INCLUDES="$INCLUDES $FREETYPE2_CFLAGS"; LIBS="$LIBS $FREETYPE2_LIBS"],
   AC_MSG_ERROR($missing_library))