Merge pull request #373 from tgc-dk/master

Fixed path issue in xbmc-rbp that prevented build, and added systemd

alarm/xbmc-rbp/PKGBUILD

@@ -2,7 +2,7 @@
 # Contributor WarheadsSE <max@warheads.net>
 pkgname=xbmc-rbp
 pkgver=12.0
-pkgrel=1
+pkgrel=2
 buildarch=16
 
 pkgdesc="A software media player and entertainment hub for digital media for the Raspberry Pi"
@@ -20,10 +20,14 @@ optdepends=(
 )
 provides=("xbmc")
 conflicts=("xbmc")
-source=(http://mirrors.xbmc.org/releases/source/xbmc-12.0.tar.gz xbmc-ae04d99-321-texturepacker-hostflags-and-rework.patch)
+install=(xbmc.install)
+source=(http://mirrors.xbmc.org/releases/source/xbmc-${pkgver}.tar.gz 
+	xbmc-ae04d99-321-texturepacker-hostflags-and-rework.patch
+	xbmc.service)
 
 md5sums=('a79128b9d094a046947bfd9bb4550809'
-         'fc6a925a09ba1b13d84daf1121b42ab9')
+         'fc6a925a09ba1b13d84daf1121b42ab9'
+         '76fae229ebc3bcfaab7e7f27e4fb51f5')
 
 _prefix=/usr
 
@@ -57,7 +61,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${_gitname}"
+  cd "${srcdir}/xbmc-${pkgver}"
   # Running make install
   make DESTDIR="${pkgdir}" install
 
@@ -81,4 +85,6 @@ 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
 }

alarm/xbmc-rbp/xbmc.install

@@ -0,0 +1,16 @@
+post_install() {
+  [[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
+  [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications
+  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
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+  echo "You may want to remove xbmc user and group"
+}

alarm/xbmc-rbp/xbmc.service

@@ -0,0 +1,13 @@
+[Unit]
+Description = Starts instance of XBMC using xinit
+After = remote-fs.target
+
+[Service]
+User = xbmc
+Group = xbmc
+Type = simple
+ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -- :0 -nolisten tcp
+Restart = always
+
+[Install]
+WantedBy = multi-user.target

aur/xbmc-rbp-git/PKGBUILD

@@ -1,7 +1,7 @@
 # Contributor tomasgroth at yahoo.dk
 # Contributor WarheadsSE <max@warheads.net>
 pkgname=xbmc-rbp-git
-pkgver=20130202
+pkgver=20130203
 pkgrel=1
 buildarch=16
 
@@ -20,9 +20,12 @@ optdepends=(
 )
 provides=("xbmc")
 conflicts=("xbmc")
-source=(xbmc-ae04d99-321-texturepacker-hostflags-and-rework.patch)
+install=(xbmc.install)
+source=(xbmc-ae04d99-321-texturepacker-hostflags-and-rework.patch
+	xbmc.service)
 
-md5sums=('fc6a925a09ba1b13d84daf1121b42ab9')
+md5sums=('fc6a925a09ba1b13d84daf1121b42ab9'
+         '76fae229ebc3bcfaab7e7f27e4fb51f5')
 
 _gitroot="git://github.com/xbmc"
 _gitname="xbmc"
@@ -94,4 +97,7 @@ 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
+
 }

aur/xbmc-rbp-git/xbmc.install

@@ -0,0 +1,16 @@
+post_install() {
+  [[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
+  [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications
+  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
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+  echo "You may want to remove xbmc user and group"
+}

aur/xbmc-rbp-git/xbmc.service

@@ -0,0 +1,13 @@
+[Unit]
+Description = Starts instance of XBMC using xinit
+After = remote-fs.target
+
+[Service]
+User = xbmc
+Group = xbmc
+Type = simple
+ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -- :0 -nolisten tcp
+Restart = always
+
+[Install]
+WantedBy = multi-user.target