Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-staging/projectm/PKGBUILD
	community-testing/evas_generic_loaders-svn/PKGBUILD
	community-testing/gambas2/PKGBUILD
	community-testing/gambas3/PKGBUILD
	community-testing/libextractor/PKGBUILD
	community-testing/pdf2djvu/PKGBUILD
	community-testing/qtcreator/PKGBUILD
	community-testing/qtcreator/qtcreator.desktop
	community/galculator/PKGBUILD
	community/ristretto/PKGBUILD
	core/systemd/PKGBUILD
	extra/llvm/PKGBUILD
	extra/pyqt/PKGBUILD
	extra/python-lxml/PKGBUILD
	multilib/lib32-util-linux/PKGBUILD
	staging/glew/PKGBUILD
	staging/xine-lib/PKGBUILD
	testing/calligra/PKGBUILD
	testing/gdk-pixbuf2/PKGBUILD
	testing/gdm/PKGBUILD
	testing/gdm/fix_external_program_directories.patch
	testing/glib2/PKGBUILD
	testing/gnome-color-manager/PKGBUILD
	testing/gthumb/PKGBUILD
	testing/gtk3/PKGBUILD
	testing/gvfs/PKGBUILD
	testing/inkscape/PKGBUILD
	testing/kdebase-workspace/PKGBUILD
	testing/libreoffice/PKGBUILD
	testing/networkmanager/PKGBUILD
	testing/polkit/PKGBUILD
	testing/poppler/PKGBUILD
	testing/rhythmbox/PKGBUILD
	testing/xorg-server/PKGBUILD
	testing/xorg-xdm/PKGBUILD

3 files changed, 36 insertions, 9 deletions

diff --git a/community/xbmc/PKGBUILD b/community/xbmc/PKGBUILD
index 98c3e47f5..ce775bbd8 100644
--- a/community/xbmc/PKGBUILD
+++ b/community/xbmc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 77668 2012-10-13 11:46:04Z allan $
+# $Id: PKGBUILD 78434 2012-10-18 10:03:49Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
@@ -9,7 +9,7 @@ _prefix=/usr
 
 pkgname=xbmc
 pkgver=11.0
-pkgrel=8
+pkgrel=9
 pkgdesc="A software media player and entertainment hub for digital media"
 arch=('i686' 'x86_64')
 url="http://xbmc.org"
@@ -19,8 +19,8 @@ depends=('libpulse' 'hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff'
 	 'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2'
 	 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos'
 	 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez' 'glu')
-makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'vdpau-video' 'libcec'
-	     'udisks' 'upower' 'bluez')
+makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'libvdpau' 'libcec'
+	     'udisks' 'upower' 'bluez' 'mesa')
 optdepends=('libcec: support for Pulse-Eight USB-CEC adapter'
 	    'vdpau-video: accelerated video playback for nvidia cards'
 	    'xvba-video: accelerated video playback for amd cards'
@@ -28,11 +28,21 @@ optdepends=('libcec: support for Pulse-Eight USB-CEC adapter'
 	    'lirc: remote controller support'
 	    'udisks: automount external drives'
 	    'upower: used to trigger suspend functionality'
-	    'unrar: access compressed files without unpacking them')
+	    'unrar: access compressed files without unpacking them'
+	    'xorg-xinit: autostart xbmc')
 install="${pkgname}.install"
-source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz")
+source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz"
+	"xbmc.service")
 sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19')
 sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19')
+sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19'
+            '395ca1afd3430ad66239bafbffde0eedf9c43409b77f65341ef387f09cd65588')
+sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19'
+            '75ae8eb37e334ae1383bf897b08dd5f70df12d79ce46cdbe4a7e0d3c82bce3af')
+sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19'
+            '75ae8eb37e334ae1383bf897b08dd5f70df12d79ce46cdbe4a7e0d3c82bce3af')
+sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19'
+            '75ae8eb37e334ae1383bf897b08dd5f70df12d79ce46cdbe4a7e0d3c82bce3af')
 
 build() {
   cd "${srcdir}/xbmc-$pkgver"
@@ -103,5 +113,8 @@ package() {
   for licensef in LICENSE.GPL copying.txt; do
     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
 }
 # vim:set ts=2 sw=2 et:
diff --git a/community/xbmc/xbmc.install b/community/xbmc/xbmc.install
index 862508e73..a3ae3d0d8 100644
--- a/community/xbmc/xbmc.install
+++ b/community/xbmc/xbmc.install
@@ -1,15 +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
-  true
+  groupadd xbmc
+  useradd -G xbmc -d /var/empty xbmc
 }
 
 post_upgrade() {
   post_install $1
-  true
+  echo "You may want to add xbmc user and group to use xbmc standalone"
 }
 
 post_remove() {
   post_install $1
-  true
+  echo "You may want to remove xbmc user and group"
 }
diff --git a/community/xbmc/xbmc.service b/community/xbmc/xbmc.service
new file mode 100644
index 000000000..b66e35c80
--- /dev/null
+++ b/community/xbmc/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
+Restart = on-failure
+
+[Install]
+WantedBy = multi-user.target