Fri Dec 27 23:54:04 UTC 2013

3 files changed, 38 insertions, 17 deletions

diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD
index cb48c5d90..2809f8248 100644
--- a/libre/xbmc-libre/PKGBUILD
+++ b/libre/xbmc-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 94534 2013-07-26 12:25:32Z spupykin $
+# $Id: PKGBUILD 103051 2013-12-25 20:34:37Z idevolder $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
@@ -9,13 +9,14 @@ _prefix=/usr
 
 _pkgname=xbmc
 pkgname=xbmc-libre
-pkgver=12.2
-pkgrel=5
+pkgver=12.3
+_codename=Frodo
+pkgrel=1
 pkgdesc="A software media player and entertainment hub for digital media, with libarchive recommendation"
 arch=('i686' 'x86_64')
 url="http://xbmc.org"
 license=('GPL' 'custom')
-depends=('libpulse' 'hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva'
+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'
 	 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos'
@@ -24,7 +25,6 @@ depends=('libpulse' 'hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff'
 makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'libvdpau' 'libcec'
 	     'udisks' 'upower' 'mesa' 'doxygen' 'swig' 'java-environment')
 optdepends=('libcec: support for Pulse-Eight USB-CEC adapter'
-	    'pulseaudio: pulseaudio support'
 	    'lirc-libre: remote controller support'
 	    'udisks: automount external drives'
 	    'upower: used to trigger suspend functionality'
@@ -35,16 +35,26 @@ replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
 source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz"
-	"xbmc.service")
-md5sums=('489f3877decae4e265ece54f9eaef0ba'
-         '76fae229ebc3bcfaab7e7f27e4fb51f5')
+	"xbmc.service"
+	"polkit.rules"
+	"libass.patch::https://bugs.archlinux.org/index.php?getfile=11285")
+md5sums=('7ae385ebf8e5cfcb917393235e6efbdb'
+         '8312d6d4ac5d7c3d9eed40ab08a17d3b'
+         'd4cbb6609c8e7b713c714241f529000e'
+         '7fd6399d2ffbdf06b724f0cc2efa0784')
 
-build() {
-  cd "${srcdir}/xbmc-$pkgver"
+prepare() {
+  cd "${srcdir}/xbmc-$pkgver-$_codename"
+
+  patch -p0 <$srcdir/libass.patch
 
   # fix lsb_release dependency
   sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp
   sed -i -e 's:#include <libsmbclient.h>:#include <samba-4.0/libsmbclient.h>:' xbmc/filesystem/{SmbFile,SMBDirectory}.cpp
+}
+
+build() {
+  cd "${srcdir}/xbmc-$pkgver-$_codename"
 
   # Bootstrapping XBMC
   ./bootstrap
@@ -64,7 +74,6 @@ build() {
     --enable-rsxs \
     --enable-projectm \
     --enable-x11 \
-    --enable-pulse \
     --enable-rtmp \
     --enable-samba \
     --enable-nfs \
@@ -89,7 +98,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/xbmc-$pkgver"
+  cd "${srcdir}/xbmc-$pkgver-$_codename"
   # Running make install
   make DESTDIR="${pkgdir}" install
 
@@ -101,8 +110,8 @@ package() {
   sed -i -e "s/lsb_release -a 2> \/dev\/null | sed -e 's\/\^\/    \/'/cat \/etc\/arch-release/g" "${pkgdir}${_prefix}/bin/xbmc"
 
   # Tools
-  install -D -m 0755 "${srcdir}/xbmc-$pkgver/xbmc-xrandr" "${pkgdir}${_prefix}/share/xbmc/xbmc-xrandr"
-  install -D -m 0755 "${srcdir}/xbmc-$pkgver/tools/TexturePacker/TexturePacker" "${pkgdir}${_prefix}/share/xbmc/"
+  install -D -m 0755 "${srcdir}/xbmc-$pkgver-$_codename/xbmc-xrandr" "${pkgdir}${_prefix}/share/xbmc/xbmc-xrandr"
+  install -D -m 0755 "${srcdir}/xbmc-$pkgver-$_codename/tools/TexturePacker/TexturePacker" "${pkgdir}${_prefix}/share/xbmc/"
 
   # Licenses
   install -d -m 0755 "${pkgdir}${_prefix}/share/licenses/${_pkgname}"
@@ -110,7 +119,8 @@ package() {
     mv "${pkgdir}${_prefix}/share/doc/xbmc/${licensef}" "${pkgdir}${_prefix}/share/licenses/${_pkgname}"
   done
 
-  # systemd stuff
   install -Dm0644 $srcdir/xbmc.service $pkgdir/usr/lib/systemd/system/xbmc.service
+  install -Dm0644 $srcdir/polkit.rules $pkgdir/etc/polkit-1/rules.d/10-xbmc.rules
+  chmod 0700 $pkgdir/etc/polkit-1/rules.d/
 }
 # vim:set ts=2 sw=2 et:
diff --git a/libre/xbmc-libre/polkit.rules b/libre/xbmc-libre/polkit.rules
new file mode 100644
index 000000000..5bc7e69f5
--- /dev/null
+++ b/libre/xbmc-libre/polkit.rules
@@ -0,0 +1,11 @@
+polkit.addRule(function(action, subject) {
+  if (action.id.match("org.freedesktop.login1.") && subject.isInGroup("power")) {
+    return polkit.Result.YES;
+  }
+});
+
+polkit.addRule(function(action, subject) {
+  if (action.id.indexOf("org.freedesktop.udisks") == 0 && subject.isInGroup("storage")) {
+    return polkit.Result.YES;
+  }
+});
diff --git a/libre/xbmc-libre/xbmc.service b/libre/xbmc-libre/xbmc.service
index 431582f1b..b6430e255 100644
--- a/libre/xbmc-libre/xbmc.service
+++ b/libre/xbmc-libre/xbmc.service
@@ -6,8 +6,8 @@ After = remote-fs.target
 User = xbmc
 Group = xbmc
 Type = simple
-ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -- :0 -nolisten tcp
-Restart = always
+ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -l /run/lirc/lircd -- :0 -nolisten tcp
+Restart = on-abort
 
 [Install]
 WantedBy = multi-user.target