Skip to content

Commit

Permalink
cleanup: removed obsolete linux build dependency and include
Browse files Browse the repository at this point in the history
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@27221 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
  • Loading branch information
mkortstiege committed Jan 27, 2010
1 parent 99e1339 commit 61760fb
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 6 deletions.
2 changes: 1 addition & 1 deletion README.linux
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Build-Depends: debhelper (>= 7.0.50), quilt, python-support, cmake,
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,
libjasper-dev, libxt-dev, libxtst-dev, libxmu-dev, libxinerama-dev, libcurl3,
libjasper-dev, libxt-dev, libxmu-dev, libxinerama-dev, libcurl3,
libcurl4-openssl-dev | libcurl-dev, libdbus-1-dev, libhal-storage-dev,
libhal-dev, libpulse-dev, libavahi-common-dev, libavahi-client-dev,
libxrandr-dev, libavcodec-dev, libavformat-dev, libavutil-dev, libpostproc-dev,
Expand Down
2 changes: 1 addition & 1 deletion README.ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -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
# 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 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.
Expand Down
3 changes: 0 additions & 3 deletions configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -398,9 +398,6 @@ else
PKG_CHECK_MODULES([XT], [xt],
[INCLUDES+=" $XT_CFLAGS"; LIBS+=" $XT_LIBS"],
AC_MSG_ERROR($missing_library))
PKG_CHECK_MODULES([XTST], [xtst],
[INCLUDES+=" $XTST_CFLAGS"; LIBS+=" $XTST_LIBS"],
AC_MSG_ERROR($missing_library))
PKG_CHECK_MODULES([XMU], [xmu],
[INCLUDES+=" $XMU_CFLAGS"; LIBS+=" $XMU_LIBS"],
AC_MSG_ERROR($missing_library))
Expand Down
1 change: 0 additions & 1 deletion xbmc/DPMSSupport.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ bool DPMSSupport::DisablePowerSaving()
// Once again, INT64 is not used in the APIs we need, so we can #ifdef it away.
#define BOOL __X11_SPECIFIC_BOOL
#define INT64 __X11_SPECIFIC_INT64
#include <X11/Xlib.h>
#include <X11/extensions/dpms.h>
#include <X11/extensions/XTest.h>
#undef INT64
Expand Down

0 comments on commit 61760fb

Please sign in to comment.