Date: Sunday, June 8, 2014 @ 10:35:29
Author: idevolder
Revision: 112817
xbmc :: 13.1-2
FS#40656 - [xbmc] Error when upgrading xbmc while xbmc is running
lirc device path given in configure so the trick for standalone
is no longer needed and starting xbmc from desktop also works with
lirc now
Modified:
xbmc/trunk/PKGBUILD
xbmc/trunk/xbmc.install
xbmc/trunk/xbmc.service
--------------+
PKGBUILD | 18 ++++++++++--------
xbmc.install | 10 ++++++++--
xbmc.service | 2 +-
3 files changed, 19 insertions(+), 11 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-06-08 04:01:10 UTC (rev 112816)
+++ PKGBUILD 2014-06-08 08:35:29 UTC (rev 112817)
@@ -12,7 +12,7 @@
pkgname=xbmc
pkgver=13.1
_codename=Gotham
-pkgrel=1
+pkgrel=2
pkgdesc="A software media player and entertainment hub for digital media"
arch=('i686' 'x86_64')
url="http://xbmc.org";
@@ -43,15 +43,17 @@
)
install="${pkgname}.install"
source=(
- "http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz";
+
"xbmc-$pkgver-$_codename.tar.gz::https://github.com/xbmc/xbmc/archive/$pkgver-$_codename.tar.gz";
'xbmc.service'
'enable-external-ffmpeg.patch'
'0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch'
)
-sha256sums=('344b604eae2ddb47c032dd7964d01f27e6fcd7a8873c84c0841d5da75961a678'
- 'f83097388e6c9b301cac78de95cf1797d4aaa11e4021734c28d643320e76d919'
- '0239e33e87292c7340ed2092f2b5f1e82f5e283b1f763fb125b3aee78f50c355'
- '5f5fe2932050265ad71c82b5d23efe5eaf7b2b3a152bdc6da66675cfb655fabe')
+sha256sums=(
+ '344b604eae2ddb47c032dd7964d01f27e6fcd7a8873c84c0841d5da75961a678'
+ '17ea860b675568f516df0289e5663029a2ce1829b0dfa3c71636ef1ae7cd2207'
+ '0239e33e87292c7340ed2092f2b5f1e82f5e283b1f763fb125b3aee78f50c355'
+ '5f5fe2932050265ad71c82b5d23efe5eaf7b2b3a152bdc6da66675cfb655fabe'
+)
prepare() {
cd "$srcdir/xbmc-$pkgver-$_codename"
@@ -101,9 +103,9 @@
--enable-udev \
--enable-libusb \
--enable-libcec \
- --enable-external-libraries
+ --enable-external-libraries \
+ --with-lirc-device=/run/lirc/lircd
-
# Now (finally) build
make
}
Modified: xbmc.install
===================================================================
--- xbmc.install 2014-06-08 04:01:10 UTC (rev 112816)
+++ xbmc.install 2014-06-08 08:35:29 UTC (rev 112817)
@@ -10,10 +10,16 @@
post_upgrade() {
post_install $1
if ! getent group xbmc | cut -d: -f3 | grep 420 > /dev/null 2>&1; then
- groupmod -g 420 xbmc
+ groupmod -g 420 xbmc > /dev/null 2>&1
fi
if ! id -u xbmc | grep 420 > /dev/null 2>&1; then
- usermod -u 420 xbmc
+ usermod -u 420 xbmc > /dev/null 2>&1
+ if [[ $? -ne 0 ]]; then
+ echo "Changing uid of user xbmc failed"
+ echo "It is recommended that the uid is changed."
+ echo "Stop all processes running under the xbmc user and
reinstall xbmc"
+ echo "or change the uid manually. (usermod -u 420 xbmc)"
+ fi
chown -R xbmc:xbmc /var/lib/xbmc
fi
}
Modified: xbmc.service
===================================================================
--- xbmc.service 2014-06-08 04:01:10 UTC (rev 112816)
+++ xbmc.service 2014-06-08 08:35:29 UTC (rev 112817)
@@ -9,7 +9,7 @@
PAMName=login
Type = simple
TTYPath=/dev/tty7
-ExecStart = /usr/bin/xinit /usr/bin/dbus-launch --exit-with-session
/usr/bin/xbmc-standalone -l /run/lirc/lircd -- :0 -nolisten tcp vt7
+ExecStart = /usr/bin/xinit /usr/bin/dbus-launch --exit-with-session
/usr/bin/xbmc-standalone -- :0 -nolisten tcp vt7
Restart = on-abort
[Install]
