diff options
author | vdrfan <vdrfan@svn> | 2010-02-15 22:46:04 +0000 |
---|---|---|
committer | vdrfan <vdrfan@svn> | 2010-02-15 22:46:04 +0000 |
commit | 70c4fc9853ae94e897be6ff898a36f4e46fff7ae (patch) | |
tree | cdb8e72bc32f1a9f2cd827d748e4de947264699a | |
parent | 9a3bc7d03e49ba1ae4e5ea52f9c68196f8d5ddcf (diff) |
added: new linux build dependency libmodplug to build system and readme files
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@27859 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
-rw-r--r-- | README.linux | 2 | ||||
-rw-r--r-- | README.ubuntu | 2 | ||||
-rw-r--r-- | configure.in | 1 | ||||
-rw-r--r-- | tools/Linux/packaging/debian/control | 3 | ||||
-rw-r--r-- | tools/Linux/packaging/debian/var_info | 3 |
5 files changed, 7 insertions, 4 deletions
diff --git a/README.linux b/README.linux index d607c8eae2..e11220f356 100644 --- a/README.linux +++ b/README.linux @@ -53,7 +53,7 @@ Build-Depends: debhelper (>= 7.0.50), quilt, python-support, cmake, libmpeg2-4-dev, libass-dev, libflac-dev, libwavpack-dev, python-dev, gawk, gperf, nasm [!amd64], libcwiid1-dev, libbluetooth-dev, zlib1g-dev, libmms-dev, libsmbclient-dev, libtiff4-dev, libiso9660-dev, libssl-dev, - libmicrohttpd-dev + libmicrohttpd-dev, libmodplug-dev *** For developers and anyone else who compiles frequently it is recommended to use ccache diff --git a/README.ubuntu b/README.ubuntu index 3db5b432d7..ae760bbcda 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 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 + # 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 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 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 1885228222..b7c244005d 100644 --- a/configure.in +++ b/configure.in @@ -339,6 +339,7 @@ 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)) +AC_CHECK_LIB([modplug], [main],, AC_MSG_ERROR($missing_library)) PKG_CHECK_MODULES([MAD], [mad], [INCLUDES+=" $MAD_CFLAGS"; LIBS+=" $MAD_LIBS"], AC_MSG_ERROR($missing_library)) diff --git a/tools/Linux/packaging/debian/control b/tools/Linux/packaging/debian/control index 7d1808f4d3..23d51ed92d 100644 --- a/tools/Linux/packaging/debian/control +++ b/tools/Linux/packaging/debian/control @@ -20,7 +20,8 @@ Build-Depends: debhelper (>= 7.0.50), python-support, cmake, python-dev, gawk, gperf, nasm [!amd64], libcwiid1-dev, libbluetooth-dev, zlib1g-dev, libmms-dev, libsmbclient-dev, libfaad-dev, libiso9660-dev, libssl-dev, lsb-release, libvdpau-dev | nvidia-190-libvdpau-dev | - nvidia-185-libvdpau-dev | nvidia-180-libvdpau-dev, libmicrohttpd-dev + nvidia-185-libvdpau-dev | nvidia-180-libvdpau-dev, libmicrohttpd-dev, + libmodplug-dev Standards-Version: 3.8.3 Homepage: http://xbmc.org/ Vcs-Git: git://git.debian.org/git/collab-maint/xbmc.git diff --git a/tools/Linux/packaging/debian/var_info b/tools/Linux/packaging/debian/var_info index 0f1fbf91d4..20081685fd 100644 --- a/tools/Linux/packaging/debian/var_info +++ b/tools/Linux/packaging/debian/var_info @@ -18,7 +18,8 @@ BUILD_DEPENDS="debhelper (>= 7.0.50), python-support, cmake, python-dev, gawk, gperf, nasm [!amd64], libcwiid1-dev, libbluetooth-dev, zlib1g-dev, libmms-dev, libsmbclient-dev, libfaad-dev, libiso9660-dev, libssl-dev, lsb-release, libvdpau-dev | nvidia-190-libvdpau-dev | - nvidia-185-libvdpau-dev | nvidia-180-libvdpau-dev, libmicrohttpd-dev," + nvidia-185-libvdpau-dev | nvidia-180-libvdpau-dev, libmicrohttpd-dev, + libmodplug-dev," if [ $(lsb_release -is) = "Ubuntu" ]; then BUILD_DEPENDS="$BUILD_DEPENDS libfaac-dev, libcrystalhd-dev," |