Merge branch 'master' of git://projects.parabolagnulinux.org/abslibre

3 files changed, 22 insertions, 10 deletions

diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD
index a565c8421..cccfb7941 100644
--- a/libre/xbmc-libre/PKGBUILD
+++ b/libre/xbmc-libre/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 104515 2014-01-22 06:55:21Z spupykin $
+# $Id: PKGBUILD 106277 2014-02-26 11:07:14Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
 # Contributor: Zeqadious <zeqadious.at.gmail.dot.com>
 # Contributor: BlackIkeEagle < ike DOT devolder AT gmail DOT com >
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _prefix=/usr
 
@@ -11,8 +12,8 @@ _pkgname=xbmc
 pkgname=xbmc-libre
 pkgver=12.3
 _codename=Frodo
-pkgrel=8.1
-pkgdesc="A software media player and entertainment hub for digital media, with libarchive recommendation"
+pkgrel=10
+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')
@@ -28,21 +29,29 @@ optdepends=('libcec: support for Pulse-Eight USB-CEC adapter'
 	    'lirc: remote controller support'
 	    'udisks: automount external drives'
 	    'upower: used to trigger power management functionality'
-	    'libarchive: access compressed files without unpacking them'
 	    'xorg-xinit: autostart xbmc')
 install="${_pkgname}.install"
 replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
-source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz"
+mksource=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz")
+source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz"
 	"xbmc.service"
 	"polkit.rules"
 	"libass.patch::https://bugs.archlinux.org/index.php?getfile=11285")
-md5sums=('7ae385ebf8e5cfcb917393235e6efbdb'
-         '8312d6d4ac5d7c3d9eed40ab08a17d3b'
+mkmd5sums=('7ae385ebf8e5cfcb917393235e6efbdb')
+md5sums=('7c71af50af55b097e4365a58b70754e8'
+         'a32b879d010a0060a8057bb8cb2f4c9e'
          '02f7951824ee13103344f36009c0ef2a'
          '7fd6399d2ffbdf06b724f0cc2efa0784')
 
+mksource() {
+  cd "${srcdir}/xbmc-$pkgver-$_codename"
+
+  # remove unrar files from the source
+  rm -rv lib/UnrarXLib
+}
+
 prepare() {
   cd "${srcdir}/xbmc-$pkgver-$_codename"
 
@@ -93,7 +102,8 @@ build() {
     --enable-libusb \
     --enable-libcec \
     --enable-external-libraries \
-    --enable-external-ffmpeg
+    --enable-external-ffmpeg \
+    --disable-non-free
   # Now (finally) build
   make
 }
diff --git a/libre/xbmc-libre/xbmc.install b/libre/xbmc-libre/xbmc.install
index 32626f28f..8076fe2d3 100644
--- a/libre/xbmc-libre/xbmc.install
+++ b/libre/xbmc-libre/xbmc.install
@@ -3,7 +3,8 @@ post_install() {
   [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications
   getent group xbmc > /dev/null || groupadd -r xbmc
   getent passwd xbmc > /dev/null || useradd -r -m -d /var/lib/xbmc -g xbmc xbmc
-  usermod -a -G xbmc,audio,video,power,network,optical,storage,disk xbmc
+  usermod -a -G xbmc,audio,video,network,optical xbmc
+  mkdir -p var/lib/xbmc
   chown -R xbmc:xbmc var/lib/xbmc
 }
 
diff --git a/libre/xbmc-libre/xbmc.service b/libre/xbmc-libre/xbmc.service
index b6430e255..4353defa2 100644
--- a/libre/xbmc-libre/xbmc.service
+++ b/libre/xbmc-libre/xbmc.service
@@ -5,8 +5,9 @@ After = remote-fs.target
 [Service]
 User = xbmc
 Group = xbmc
+PAMName=login
 Type = simple
-ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -l /run/lirc/lircd -- :0 -nolisten tcp
+ExecStart = /usr/bin/xinit /usr/bin/dbus-launch /usr/bin/xbmc-standalone -l /run/lirc/lircd -- :0 -nolisten tcp
 Restart = on-abort
 
 [Install]