alarm/xbmc-rbp sync with upstream, enable optical/dvd/bluray, remove xinit from service

alarm/xbmc-rbp/PKGBUILD

@@ -2,7 +2,7 @@
 # Contributor WarheadsSE <max@warheads.net>
 pkgname=xbmc-rbp
 pkgver=12.2
-pkgrel=2
+pkgrel=3
 buildarch=16
 
 pkgdesc="A software media player and entertainment hub for digital media for the Raspberry Pi"
@@ -17,20 +17,19 @@ optdepends=(
   'udisks: automount external drives'
   'upower: used to trigger suspend functionality'
   'unrar: access compressed files without unpacking them'
-  'xorg-server: use systemd to start xbmc'
-  'xf86-video-fbdev: use systemd to start xbmc'
 )
 provides=("xbmc")
 conflicts=("xbmc")
 install="xbmc.install"
-source=(http://mirrors.xbmc.org/releases/source/xbmc-${pkgver}.tar.gz 
-	xbmc-ae04d99-321-texturepacker-hostflags-and-rework.patch
-	xbmc.service)
+source=("http://mirrors.xbmc.org/releases/source/xbmc-${pkgver}.tar.gz" 
+	"xbmc-ae04d99-321-texturepacker-hostflags-and-rework.patch"
+	"polkit.rules"
+	"xbmc.service")
 
 md5sums=('489f3877decae4e265ece54f9eaef0ba'
          'fc6a925a09ba1b13d84daf1121b42ab9'
-         '76fae229ebc3bcfaab7e7f27e4fb51f5')
-
+         'd4cbb6609c8e7b713c714241f529000e'
+         '4e28664d3e0df08e08dba5b09a855ced')
 _prefix=/usr
 
 prepare() {
@@ -62,12 +61,29 @@ build() {
   export CXXFLAGS="-O3 -mcpu=arm1176jzf-s -mtune=arm1176jzf-s -mfloat-abi=hard -mfpu=vfp -mabi=aapcs-linux -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2 -I/opt/vc/include/ -I/opt/vc/include/IL -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux"
   export LDFLAGS="$LDFLAGS -L/opt/vc/lib"
 #  export MAKEFLAGS="-j1"
-  ./configure --prefix=$_prefix --exec-prefix=$_prefix  \
-  --enable-gles --disable-sdl --disable-x11 --disable-xrandr --disable-openmax \
-  --disable-optical-drive --disable-dvdcss --disable-joystick --disable-debug \
-  --disable-crystalhd --disable-vtbdecoder --disable-vaapi --disable-vdpau \
-  --disable-pulse --disable-projectm --with-platform=raspberry-pi --enable-optimizations \
-  --enable-libcec --enable-player=omxplayer 
+
+./configure --prefix=$_prefix --exec-prefix=$_prefix  \
+  --disable-gl \
+  --enable-gles \
+  --disable-sdl
+  --disable-x11 \
+  --disable-xrandr \
+  --disable-openmax \
+  --disable-joystick \
+  --disable-debug \
+  --disable-crystalhd \
+  --disable-vtbdecoder \
+  --disable-vaapi \
+  --disable-vdpau \
+  --disable-pulse \
+  --disable-projectm \
+  --with-platform=raspberry-pi \
+  --enable-optimizations \
+  --enable-libcec \
+  --enable-dvdcss \
+  --enable-optical-drive \
+  --enable-libbluray \
+  --enable-player=omxplayer
 
   make
 }
@@ -99,4 +115,6 @@ package() {
 
   # 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/
 }

alarm/xbmc-rbp/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;
+  }
+});

alarm/xbmc-rbp/xbmc.install

@@ -4,6 +4,11 @@ post_install() {
   getent group xbmc > /dev/null || groupadd xbmc
   getent passwd xbmc > /dev/null || useradd -m -d /var/lib/xbmc -g xbmc xbmc
   usermod -a -G xbmc,audio,video,power,network,optical,storage,disk xbmc
+
+  echo "****************************************************************"
+  echo "If xbmc systemd service does not start, try adding a udev rule:"
+  echo "echo 'SUBSYSTEM==\"vchiq\",GROUP=\"video\",MODE=\"0660\"' > /etc/udev/rules.d/10-vchiq-permissions.rules"
+  echo "****************************************************************"
 }
 
 post_upgrade() {

alarm/xbmc-rbp/xbmc.service

@@ -6,7 +6,7 @@ After = remote-fs.target
 User = xbmc
 Group = xbmc
 Type = simple
-ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -- :0 -nolisten tcp
+ExecStart = /usr/bin/xbmc-standalone -l /run/lirc/lircd
 Restart = always
 
 [Install]