revert: r27221 - cleanup: removed obsolete linux build dependency and include

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

4 files changed, 6 insertions, 2 deletions

diff --git a/README.linux b/README.linux
index f69c06dc30..24fe581ef9 100644
--- a/README.linux
+++ b/README.linux
@@ -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, libxmu-dev, libxinerama-dev, libcurl3,
+ libjasper-dev, libxt-dev, libxtst-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,
diff --git a/README.ubuntu b/README.ubuntu
index fd64331b4f..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 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
+   # 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 3920f6a215..23fee49922 100644
--- a/configure.in
+++ b/configure.in
@@ -398,6 +398,9 @@ 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))
diff --git a/xbmc/DPMSSupport.cpp b/xbmc/DPMSSupport.cpp
index fa460c6e07..ef141cc915 100644
--- a/xbmc/DPMSSupport.cpp
+++ b/xbmc/DPMSSupport.cpp
@@ -122,6 +122,7 @@ 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