move alarm/xbmc-rbp-git to alarm/kodi-rbp-git; update to 14.20141118

alarm/kodi-rbp-git/PKGBUILD

@@ -3,12 +3,12 @@
 
 buildarch=16
 
-pkgname=xbmc-rbp-git
+pkgname=kodi-rbp-git
-pkgver=14.20140921
+pkgver=14.20141118
 pkgrel=1
 pkgdesc="A software media player and entertainment hub for digital media for the Raspberry Pi"
 arch=('armv6h')
-url="http://xbmc.org"
+url="http://kodi.tv"
 license=('GPL' 'custom')
 depends=('hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva' 'libpng' 'libcdio' 'yajl' 'libmariadbclient' 'libjpeg-turbo' 'libsamplerate' 'libssh' 'libmicrohttpd' 'sdl_image' 'python2' 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'avahi' 'bluez-libs' 'tinyxml' 'raspberrypi-firmware' 'libcec' 'libplist' 'swig' 'taglib' 'libxslt' 'shairplay-git')
 makedepends=('boost' 'cmake' 'gperf' 'nasm' 'zip' 'udisks' 'upower' 'git' 'autoconf' 'java-environment')
@@ -18,10 +18,11 @@ optdepends=(
   'upower: used to trigger power management functionality'
   'unrar: access compressed files without unpacking them')
 
-provides=("xbmc")
+provides=('xbmc')
-conflicts=("xbmc")
+conflicts=('xbmc')
-install="xbmc.install"
+replaces=('xbmc-rbp-git')
-source=('xbmc.service'
+install="kodi.install"
+source=('kodi.service'
         'polkit.rules')
 
 md5sums=('55e6d3aab86e810c49a7f550be5b7f69'
@@ -61,10 +62,10 @@ prepare() {
 build() {
   cd "${srcdir}/${_gitname}"
 
-  # Bootstrapping XBMC
+  # Bootstrapping KODI
   ./bootstrap
 
-  # Configuring XBMC
+  # Configuring KODI
   export PYTHON_VERSION=2  # external python v2
   # we need to compile for armv6 instead of armv5 to avoid problems compiling assembler code
   export CFLAGS="-Ofast -mcpu=arm1176jzf-s -mtune=arm1176jzf-s -fexcess-precision=fast -mfloat-abi=hard \
@@ -85,9 +86,7 @@ build() {
   --disable-x11 \
   --disable-sdl \
   --enable-optimizations \
-  --disable-external-libraries \
   --disable-goom \
-  --disable-hal \
   --disable-pulse \
   --disable-vaapi \
   --disable-vdpau \
@@ -107,8 +106,6 @@ build() {
   --enable-rsxs \
   --enable-rtmp \
   --disable-vaapi \
-  --disable-vdadecoder \
-  --disable-external-ffmpeg \
   --enable-optical-drive \
   --enable-player=omxplayer
   make
@@ -120,26 +117,22 @@ package() {
   make DESTDIR="${pkgdir}" install
 
   # run feh with python2
-  sed -i -e 's/python/python2/g' ${pkgdir}${_prefix}/bin/xbmc
+  sed -i -e 's/python/python2/g' ${pkgdir}${_prefix}/bin/kodi
-
-  # Remove checks that don't apply to the raspberry pi
-  head -n 171 "${pkgdir}${_prefix}/share/xbmc/FEH.py" > "${pkgdir}${_prefix}/share/xbmc/FEH.py.new"
-  mv "${pkgdir}${_prefix}/share/xbmc/FEH.py.new"  "${pkgdir}${_prefix}/share/xbmc/FEH.py"
 
   # lsb_release fix
-  sed -i -e 's/which lsb_release > \/dev\/null/\[ -f \/etc\/arch-release ]/g' "${pkgdir}${_prefix}/bin/xbmc"
+  sed -i -e 's/which lsb_release > \/dev\/null/\[ -f \/etc\/arch-release ]/g' "${pkgdir}${_prefix}/bin/kodi"
-  sed -i -e "s/lsb_release -a 2> \/dev\/null | sed -e 's\/\^\/    \/'/cat \/etc\/arch-release/g" "${pkgdir}${_prefix}/bin/xbmc"
+  sed -i -e "s/lsb_release -a 2> \/dev\/null | sed -e 's\/\^\/    \/'/cat \/etc\/arch-release/g" "${pkgdir}${_prefix}/bin/kodi"
 
   # Tools
-  install -D -m 0755 "${srcdir}/${_gitname}/tools/TexturePacker/TexturePacker" "${pkgdir}${_prefix}/share/xbmc/"
+  install -D -m 0755 "${srcdir}/${_gitname}/tools/TexturePacker/TexturePacker" "${pkgdir}${_prefix}/lib/kodi"
 
   # Licenses
-  install -d -m 0755 "${pkgdir}${_prefix}/share/licenses/${pkgname}"
+  install -dm755 "${pkgdir}${_prefix}/share/licenses/${pkgname}"
   for licensef in LICENSE.GPL copying.txt; do
-    mv "${pkgdir}${_prefix}/share/doc/xbmc/${licensef}" "${pkgdir}${_prefix}/share/licenses/${pkgname}"
+    mv "${pkgdir}${_prefix}/share/doc/kodi/${licensef}" "${pkgdir}${_prefix}/share/licenses/${pkgname}"
   done
 
-  install -Dm0644 $srcdir/xbmc.service $pkgdir/usr/lib/systemd/system/xbmc.service
+  install -Dm0644 $srcdir/kodi.service $pkgdir/usr/lib/systemd/system/kodi.service
-  install -Dm0644 $srcdir/polkit.rules $pkgdir/usr/share/polkit-1/rules.d/10-xbmc.rules
+  install -Dm0644 $srcdir/polkit.rules $pkgdir/usr/share/polkit-1/rules.d/10-kodi.rules
   chmod 0700 $pkgdir/usr/share/polkit-1/rules.d/
 }

alarm/kodi-rbp-git/kodi.install

@@ -1,14 +1,14 @@
 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 -r xbmc
+  getent group kodi > /dev/null || groupadd -r kodi
-  getent passwd xbmc > /dev/null || useradd -r -m -d /var/lib/xbmc -g xbmc xbmc
+  getent passwd kodi > /dev/null || useradd -r -m -d /var/lib/kodi -g kodi kodi
-  usermod -a -G xbmc,audio,video,power,network,optical,storage,disk xbmc
+  usermod -a -G kodi,audio,video,power,network,optical,storage,disk kodi
-  mkdir -p var/lib/xbmc
+  mkdir -p var/lib/kodi
-  chown -R xbmc:xbmc var/lib/xbmc
+  chown -R kodi:kodi var/lib/kodi
 
   echo "****************************************************************"
-  echo "If xbmc systemd service does not start, try adding a udev rule:"
+  echo "If kodi 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 "****************************************************************"
 }
@@ -20,5 +20,5 @@ post_upgrade() {
 post_remove() {
   [[ $(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 passwd xbmc > /dev/null && userdel xbmc
+  getent passwd kodi > /dev/null && userdel kodi
 }

alarm/kodi-rbp-git/kodi.service

@@ -3,10 +3,10 @@ Description = Starts an instance of XBMC
 After = remote-fs.target
 
 [Service]
-User = xbmc
+User = kodi
-Group = xbmc
+Group = kodi
 Type = simple
-ExecStart = /usr/bin/xbmc-standalone -l /run/lirc/lircd
+ExecStart = /usr/bin/kodi-standalone -l /run/lirc/lircd
 Restart = on-failure
 
 [Install]

alarm/kodi-rbp-git/polkit.rules

@@ -1,5 +1,5 @@
 polkit.addRule(function(action, subject) {
-    if (subject.user == "xbmc") {
+    if (subject.user == "kodi") {
         polkit.log("action=" + action);
         polkit.log("subject=" + subject);
         if (action.id.indexOf("org.freedesktop.login1.") == 0) {