4 files changed, 36 insertions, 7 deletions
diff --git a/abs/extra/xbmc/PKGBUILD b/abs/extra/xbmc/PKGBUILD
index 8206a42..49166cc 100644
--- a/abs/extra/xbmc/PKGBUILD
+++ b/abs/extra/xbmc/PKGBUILD
@@ -9,12 +9,12 @@ _prefix=/usr
 
 pkgname=xbmc
 pkgver=11.0
-pkgrel=2
+pkgrel=4
 pkgdesc="A software media player and entertainment hub for digital media"
 arch=('i686' 'x86_64')
 url="http://xbmc.org"
 license=('GPL' 'custom')
-depends=('hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva' 'libpng' 'libcdio' 'yajl' 'libmysqlclient' 'libjpeg' 'libsamplerate' 'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2' 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos' 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez')
+depends=('hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva' 'libpng' 'libcdio' 'yajl' 'libmysqlclient' 'libjpeg' 'libsamplerate' 'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2' 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos' 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez' 'linhes-scripts>=7-31')
 makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'vdpau-video' 'libcec' 'udisks' 'upower' 'bluez')
 optdepends=(
   'libcec: support for Pulse-Eight USB-CEC adapter'
@@ -26,11 +26,11 @@ optdepends=(
   'unrar: access compressed files without unpacking them'
 )
 install="${pkgname}.install"
-source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz")
-sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19')
+source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz" 'xbmc11.patch' 'xbmc.sh')
 
 build() {
   cd "${srcdir}/xbmc-$pkgver"
+  patch -p1 < ../xbmc11.patch
 
   # fix lsb_release dependency
   sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp
@@ -71,7 +71,8 @@ build() {
     --enable-libusb \
     --enable-libcec \
     --enable-external-libraries \
-    --disable-external-ffmpeg
+    --disable-external-ffmpeg \
+    --disable-crystalhd
   # Now (finally) build
   make
 }
@@ -97,5 +98,11 @@ package() {
   for licensef in LICENSE.GPL copying.txt; do
     mv "${pkgdir}${_prefix}/share/doc/xbmc/${licensef}" "${pkgdir}${_prefix}/share/licenses/${pkgname}"
   done
+
+  mkdir -p ${pkgdir}/usr/LH/bin
+  install -D -m 0755 ${srcdir}/xbmc.sh ${pkgdir}/usr/LH/bin
 }
 # vim:set ts=2 sw=2 et:
+md5sums=('9e8a26ee25173c7268abea7f1d82d428'
+         '5aa2e21a1f9fea60a2e5bb345e5aefd0'
+         'f30d9a68daedd28482813ee40134f243')
diff --git a/abs/extra/xbmc/xbmc.install b/abs/extra/xbmc/xbmc.install
index 7823fb7..2964449 100644
--- a/abs/extra/xbmc/xbmc.install
+++ b/abs/extra/xbmc/xbmc.install
@@ -5,7 +5,7 @@ post_install() {
   echo "   <button>" >> /tmp/library.xml.tmp
   echo "     <type>MENU_XBMC</type>" >> /tmp/library.xml.tmp
   echo "     <text>Launch XBMC</text>" >> /tmp/library.xml.tmp
-  echo "     <action>EXEC /usr/bin/xbmc --lircdev /var/run/lirc/lircd</action>" >> /tmp/library.xml.tmp 
+  echo "     <action>EXEC /usrLH//bin/xbmc.sh</action>" >> /tmp/library.xml.tmp 
   echo "   </button>" >> /tmp/library.xml.tmp
   echo "<!--#XBMC-->" >> /tmp/library.xml.tmp
   echo "" >> /tmp/library.xml.tmp
@@ -38,7 +38,7 @@ post_upgrade() {
   echo "   <button>" >> /tmp/library.xml.tmp
   echo "     <type>MENU_XBMC</type>" >> /tmp/library.xml.tmp
   echo "     <text>Launch XBMC</text>" >> /tmp/library.xml.tmp
-  echo "     <action>EXEC /usr/bin/xbmc --lircdev /var/run/lirc/lircd</action>" >> /tmp/library.xml.tmp 
+  echo "     <action>EXEC /usr/LH/bin/xbmc.sh</action>" >> /tmp/library.xml.tmp 
   echo "   </button>" >> /tmp/library.xml.tmp
   echo "<!--#XBMC-->" >> /tmp/library.xml.tmp
   echo "" >> /tmp/library.xml.tmp
diff --git a/abs/extra/xbmc/xbmc.sh b/abs/extra/xbmc/xbmc.sh
new file mode 100644
index 0000000..a27f0f1
--- /dev/null
+++ b/abs/extra/xbmc/xbmc.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+#Stop XScreensaver
+stop_xss.sh &
+#Launch XBMC
+/usr/bin/xbmc --lircdev /var/run/lirc/lircd
+#Once XBMC exits, kill stop xss
+killall stop_xss.sh
diff --git a/abs/extra/xbmc/xbmc11.patch b/abs/extra/xbmc/xbmc11.patch
new file mode 100644
index 0000000..fb144d1
--- /dev/null
+++ b/abs/extra/xbmc/xbmc11.patch
@@ -0,0 +1,15 @@
+diff -ruaN xbmc-11.0.orig//xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp xbmc-11.0/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp
+--- xbmc-11.0.orig//xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp	2012-03-21 22:07:50.000000000 +0000
++++ xbmc-11.0/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp	2012-04-08 21:04:19.000000000 +0000
+@@ -22,9 +22,9 @@
+ #if (defined HAVE_CONFIG_H) && (!defined WIN32)
+   #include "config.h"
+ #endif
+-#ifdef _WIN32
++//#ifdef _WIN32
+ #include "system.h" // just for HAS_LIBRTMP
+-#endif
++//#endif
+ 
+ #ifdef HAS_LIBRTMP
+ #include "settings/AdvancedSettings.h"