From 50f8823e2e69bc597155e47e70fe40ca09e68b8d Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Wed, 5 Mar 2014 17:35:04 -0200
Subject: xbmc-libre-12.3-11: updating revision from Arch

---
 libre/xbmc-libre/PKGBUILD     | 16 ++++++++--------
 libre/xbmc-libre/xbmc.service |  4 +++-
 2 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'libre/xbmc-libre')

diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD
index cccfb7941..5a2df28db 100644
--- a/libre/xbmc-libre/PKGBUILD
+++ b/libre/xbmc-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 106277 2014-02-26 11:07:14Z spupykin $
+# $Id: PKGBUILD 106505 2014-03-05 09:28:28Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
@@ -12,11 +12,14 @@ _pkgname=xbmc
 pkgname=xbmc-libre
 pkgver=12.3
 _codename=Frodo
-pkgrel=10
+pkgrel=11
 pkgdesc="A software media player and entertainment hub for digital media, without unrar support"
 arch=('i686' 'x86_64')
 url="http://xbmc.org"
 license=('GPL' 'custom')
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
 depends=('hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva'
 	 'libpng' 'libcdio' 'yajl' 'libmariadbclient' 'libjpeg-turbo' 'libsamplerate'
 	 'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2'
@@ -31,9 +34,6 @@ optdepends=('libcec: support for Pulse-Eight USB-CEC adapter'
 	    'upower: used to trigger power management functionality'
 	    'xorg-xinit: autostart xbmc')
 install="${_pkgname}.install"
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
 mksource=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz")
 source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz"
 	"xbmc.service"
@@ -41,7 +41,7 @@ source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}
 	"libass.patch::https://bugs.archlinux.org/index.php?getfile=11285")
 mkmd5sums=('7ae385ebf8e5cfcb917393235e6efbdb')
 md5sums=('7c71af50af55b097e4365a58b70754e8'
-         'a32b879d010a0060a8057bb8cb2f4c9e'
+         'b643ab67e4675c6aa88af1857f35baf2'
          '02f7951824ee13103344f36009c0ef2a'
          '7fd6399d2ffbdf06b724f0cc2efa0784')
 
@@ -131,7 +131,7 @@ package() {
   done
 
   install -Dm0644 $srcdir/xbmc.service $pkgdir/usr/lib/systemd/system/xbmc.service
-  install -Dm0644 $srcdir/polkit.rules $pkgdir/usr/share/polkit-1/rules.d/10-xbmc.rules
-  chmod 0700 $pkgdir/usr/share/polkit-1/rules.d/
+#  install -Dm0644 $srcdir/polkit.rules $pkgdir/usr/share/polkit-1/rules.d/10-xbmc.rules
+#  chmod 0700 $pkgdir/usr/share/polkit-1/rules.d/
 }
 # vim:set ts=2 sw=2 et:
diff --git a/libre/xbmc-libre/xbmc.service b/libre/xbmc-libre/xbmc.service
index 4353defa2..d161a21a8 100644
--- a/libre/xbmc-libre/xbmc.service
+++ b/libre/xbmc-libre/xbmc.service
@@ -1,13 +1,15 @@
 [Unit]
 Description = Starts instance of XBMC using xinit
 After = remote-fs.target
+Conflicts=getty@tty7.service
 
 [Service]
 User = xbmc
 Group = xbmc
 PAMName=login
 Type = simple
-ExecStart = /usr/bin/xinit /usr/bin/dbus-launch /usr/bin/xbmc-standalone -l /run/lirc/lircd -- :0 -nolisten tcp
+TTYPath=/dev/tty7
+ExecStart = /usr/bin/xinit /usr/bin/dbus-launch /usr/bin/xbmc-standalone -l /run/lirc/lircd -- :0 -nolisten tcp vt7
 Restart = on-abort
 
 [Install]
-- 
cgit v1.2.3