aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaestroDD <MaestroDD@svn>2010-01-26 12:58:18 +0000
committerMaestroDD <MaestroDD@svn>2010-01-26 12:58:18 +0000
commit0f46d5eebb416507a64d84394574a0ded4073d94 (patch)
tree9fa69c460e5373bef24b5727372a5db1ecc8ade8
parent9e37d418e85b52b36a54b72b56058c9113a00951 (diff)
[linux]fixed: add missing libvorbisenc check from r27184
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@27192 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
-rw-r--r--README.linux2
-rw-r--r--README.ubuntu2
-rw-r--r--configure.in6
3 files changed, 5 insertions, 5 deletions
diff --git a/README.linux b/README.linux
index f4f13f379f..24fe581ef9 100644
--- a/README.linux
+++ b/README.linux
@@ -41,7 +41,7 @@ external libraries enabled).
Build-Depends: debhelper (>= 7.0.50), quilt, python-support, cmake,
autotools-dev, autoconf, automake, unzip, libboost-dev,
libgl1-mesa-dev | libgl-dev, libglu-dev, libglew-dev, libmad0-dev, libjpeg-dev,
- libsamplerate-dev, libogg-dev, libvorbis-dev, libfreetype6-dev,
+ libsamplerate-dev, libogg-dev, libvorbis-dev, libvorbisenc2, libfreetype6-dev,
libfontconfig-dev, libbz2-dev, libfribidi-dev, libsqlite3-dev,
libmysqlclient-dev, libasound-dev, libpng-dev, libpcre3-dev, liblzo2-dev,
libcdio-dev, libsdl-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libenca-dev,
diff --git a/README.ubuntu b/README.ubuntu
index 4343c8ac74..6434bd0e27 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 libwavpack-dev libmpeg2-4-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
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 73febd30e8..23fee49922 100644
--- a/configure.in
+++ b/configure.in
@@ -355,6 +355,9 @@ PKG_CHECK_MODULES([OGG], [ogg],
PKG_CHECK_MODULES([VORBIS], [vorbis],
[INCLUDES+=" $VORBIS_CFLAGS"; LIBS+=" $VORBIS_LIBS"],
AC_MSG_ERROR($missing_library))
+PKG_CHECK_MODULES([VORBISENC], [vorbisenc],
+ [INCLUDES+=" $VORBISENC_CFLAGS"; LIBS+=" $VORBISENC_LIBS"],
+ AC_MSG_ERROR($missing_library))
# platform dependent libraries
if test "$host_vendor" = "apple" ; then
@@ -364,9 +367,6 @@ if test "$host_vendor" = "apple" ; then
PKG_CHECK_MODULES([VORBISFILE], [vorbisfile],
[INCLUDES+=" $VORBISFILE_CFLAGS"; LIBS+=" $VORBISFILE_LIBS"],
AC_MSG_ERROR($missing_library))
- PKG_CHECK_MODULES([VORBISENC], [vorbisenc],
- [INCLUDES+=" $VORBISENC_CFLAGS"; LIBS+=" $VORBISENC_LIBS"],
- AC_MSG_ERROR($missing_library))
else
AC_CHECK_PROG(MYSQL_CONFIG, mysql_config, "yes", "no")
if test $MYSQL_CONFIG = "yes"; then