summaryrefslogtreecommitdiffstats
path: root/abs/extra/xbmc
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2012-04-21 19:33:46 (GMT)
committerJames Meyer <james.meyer@operamail.com>2012-04-21 19:33:46 (GMT)
commit4776ad244bf71b6045d3a907ffd7715bbe825668 (patch)
tree4f97b58fa7d22f48993075283d4aa973963fc07c /abs/extra/xbmc
parentbdc2af6dda9f7bffcd98a76a71b89347413648a6 (diff)
downloadlinhes_pkgbuild-4776ad244bf71b6045d3a907ffd7715bbe825668.zip
linhes_pkgbuild-4776ad244bf71b6045d3a907ffd7715bbe825668.tar.gz
linhes_pkgbuild-4776ad244bf71b6045d3a907ffd7715bbe825668.tar.bz2
merge_conflict fix..no change
Diffstat (limited to 'abs/extra/xbmc')
-rw-r--r--abs/extra/xbmc/PKGBUILD4
-rw-r--r--abs/extra/xbmc/xbmc.sh6
2 files changed, 5 insertions, 5 deletions
diff --git a/abs/extra/xbmc/PKGBUILD b/abs/extra/xbmc/PKGBUILD
index 49166cc..0a36e53 100644
--- a/abs/extra/xbmc/PKGBUILD
+++ b/abs/extra/xbmc/PKGBUILD
@@ -9,7 +9,7 @@ _prefix=/usr
pkgname=xbmc
pkgver=11.0
-pkgrel=4
+pkgrel=5
pkgdesc="A software media player and entertainment hub for digital media"
arch=('i686' 'x86_64')
url="http://xbmc.org"
@@ -105,4 +105,4 @@ package() {
# vim:set ts=2 sw=2 et:
md5sums=('9e8a26ee25173c7268abea7f1d82d428'
'5aa2e21a1f9fea60a2e5bb345e5aefd0'
- 'f30d9a68daedd28482813ee40134f243')
+ 'fcbf28e440ea3e6f78ae2cebdeb8be76')
diff --git a/abs/extra/xbmc/xbmc.sh b/abs/extra/xbmc/xbmc.sh
index a27f0f1..81584e4 100644
--- a/abs/extra/xbmc/xbmc.sh
+++ b/abs/extra/xbmc/xbmc.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#Stop XScreensaver
-stop_xss.sh &
+xscreensaver-command -exit
#Launch XBMC
/usr/bin/xbmc --lircdev /var/run/lirc/lircd
-#Once XBMC exits, kill stop xss
-killall stop_xss.sh
+#Once XBMC exits, start XSceensager again
+xscreensaver -no-splash &