From 033b7d65ba9fab251b72c1e971da87614a990ca3 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Mon, 24 Feb 2014 17:44:54 -0200
Subject: xbmc-libre-12.3-9: add --disable-non-free option on the building

---
 libre/xbmc-libre/PKGBUILD     | 15 ++++++++-------
 libre/xbmc-libre/xbmc.install |  3 ++-
 libre/xbmc-libre/xbmc.service |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD
index a565c8421..6d883edd9 100644
--- a/libre/xbmc-libre/PKGBUILD
+++ b/libre/xbmc-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 104515 2014-01-22 06:55:21Z spupykin $
+# $Id: PKGBUILD 106153 2014-02-24 09:49:46Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
@@ -11,8 +11,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=9
+pkgdesc="A software media player and entertainment hub for digital media, with libarchive recommendation and without nonfree components"
 arch=('i686' 'x86_64')
 url="http://xbmc.org"
 license=('GPL' 'custom')
@@ -39,7 +39,7 @@ source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz"
 	"polkit.rules"
 	"libass.patch::https://bugs.archlinux.org/index.php?getfile=11285")
 md5sums=('7ae385ebf8e5cfcb917393235e6efbdb'
-         '8312d6d4ac5d7c3d9eed40ab08a17d3b'
+         '4d3cc17703a9a477a32db486c257a305'
          '02f7951824ee13103344f36009c0ef2a'
          '7fd6399d2ffbdf06b724f0cc2efa0784')
 
@@ -93,7 +93,8 @@ build() {
     --enable-libusb \
     --enable-libcec \
     --enable-external-libraries \
-    --enable-external-ffmpeg
+    --enable-external-ffmpeg \
+    --disable-non-free
   # Now (finally) build
   make
 }
@@ -121,7 +122,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.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..9987dfeb9 100644
--- a/libre/xbmc-libre/xbmc.service
+++ b/libre/xbmc-libre/xbmc.service
@@ -6,7 +6,7 @@ After = remote-fs.target
 User = xbmc
 Group = xbmc
 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]
-- 
cgit v1.2.3-54-g00ecf