From 78766e0875947c13a97bc958cff89abc5d2f6b1b Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Wed, 11 Jun 2014 22:11:42 -0300
Subject: xbmc-libre-lts-12.3-4: updating revision based on xbmc from Arch

FIXES:
FS#40656 (https://bugs.archlinux.org/task/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
---
 libre/xbmc-libre-lts/PKGBUILD     |  9 +++++----
 libre/xbmc-libre-lts/xbmc.install | 10 ++++++++--
 libre/xbmc-libre-lts/xbmc.service |  2 +-
 3 files changed, 14 insertions(+), 7 deletions(-)

(limited to 'libre')

diff --git a/libre/xbmc-libre-lts/PKGBUILD b/libre/xbmc-libre-lts/PKGBUILD
index 8a146c2dc..5596513a9 100644
--- a/libre/xbmc-libre-lts/PKGBUILD
+++ b/libre/xbmc-libre-lts/PKGBUILD
@@ -12,7 +12,7 @@ _pkgname=xbmc
 pkgname=xbmc-libre-lts
 pkgver=12.3
 _codename=Frodo
-pkgrel=3
+pkgrel=4
 pkgdesc="A software media player and entertainment hub for digital media (Frodo version), without nonfree addons and unrar support"
 arch=('i686' 'x86_64')
 url="http://xbmc.org"
@@ -43,7 +43,7 @@ mksource=(
   "http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz"
 )
 source=(
-  "https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"
+  "https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver-$_codename.tar.gz"
   'xbmc.service'
   "libass.patch::https://bugs.archlinux.org/index.php?getfile=11285"
   '0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch'
@@ -52,8 +52,8 @@ mkmd5sums=(
   '7ae385ebf8e5cfcb917393235e6efbdb'
 )
 md5sums=(
-  '7c71af50af55b097e4365a58b70754e8'
-  'de331663cc8adc94f2fe44a262cfff58'
+  '10ed8b9cb84b2825d746c26bd5236899'
+  '12c9b4dfb8dd0d5b20cc230c28388160'
   '7fd6399d2ffbdf06b724f0cc2efa0784'
   '8998bc505ae4c66604c90b1c005be8c2'
 )
@@ -119,6 +119,7 @@ build() {
     --enable-libusb \
     --enable-libcec \
     --enable-external-libraries \
+    --with-lirc-device=/run/lirc/lircd \
     --enable-external-ffmpeg \
     --disable-non-free
 
diff --git a/libre/xbmc-libre-lts/xbmc.install b/libre/xbmc-libre-lts/xbmc.install
index 406476198..48f337c55 100644
--- a/libre/xbmc-libre-lts/xbmc.install
+++ b/libre/xbmc-libre-lts/xbmc.install
@@ -10,10 +10,16 @@ post_install() {
 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
 }
diff --git a/libre/xbmc-libre-lts/xbmc.service b/libre/xbmc-libre-lts/xbmc.service
index d36ddb05a..81a37ac7e 100644
--- a/libre/xbmc-libre-lts/xbmc.service
+++ b/libre/xbmc-libre-lts/xbmc.service
@@ -9,7 +9,7 @@ Group = xbmc
 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]
-- 
cgit v1.2.3-54-g00ecf