kodi: update to 14.2

1 files changed, 15 insertions, 8 deletions

diff --git a/abs/extra/kodi/PKGBUILD b/abs/extra/kodi/PKGBUILD
index 91fe23c..134d325 100644
--- a/abs/extra/kodi/PKGBUILD
+++ b/abs/extra/kodi/PKGBUILD
@@ -13,9 +13,9 @@ _prefix=/usr
 
 pkgbase=kodi
 pkgname=('kodi' 'kodi-eventclients')
-pkgver=14.0
+pkgver=14.2
 _codename=Helix
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://kodi.tv"
 license=('GPL2')
@@ -40,6 +40,11 @@ prepare() {
   find -type f -name *.py -exec sed 's|^#!.*python$|#!/usr/bin/python2|' -i "{}" +
   sed 's|^#!.*python$|#!/usr/bin/python2|' -i tools/depends/native/rpl-native/rpl
 	sed 's/python/python2/' -i tools/Linux/kodi.sh.in
+  sed 's/shell python/shell python2/' -i tools/EventClients/Makefile.in
+  # disable wiiremote due to incompatibility with bluez-5.29
+  sed '/WiiRemote/d' -i tools/EventClients/Makefile.in
+  sed '/mkdir -p $(DESTDIR)$(bindir)/i \
+install:' -i tools/EventClients/Makefile.in
 }
 
 build() {
@@ -58,7 +63,8 @@ build() {
     --enable-optimizations \
     --enable-libbluray \
     --enable-external-libraries \
-    --with-lirc-device=/run/lirc/lircd
+    --with-lirc-device=/run/lirc/lircd \
+    ac_cv_lib_bluetooth_hci_devid=no
 
   # Now (finally) build
   make
@@ -102,6 +108,11 @@ package_kodi() {
   # Running make install
   make DESTDIR="$pkgdir" install
 
+  # We will no longer support the xbmc name
+  rm "$pkgdir/usr/share/xsessions/xbmc.desktop"
+  rm "$pkgdir/usr/bin/"xbmc{,-standalone}
+  # we will leave /usr/{include,lib,share}/xbmc for now
+
   # Licenses
 	install -dm755 ${pkgdir}${_prefix}/share/licenses/${pkgname}
   for licensef in LICENSE.GPL copying.txt; do
@@ -124,12 +135,8 @@ package_kodi-eventclients() {
   cd "$srcdir/xbmc-$pkgver-$_codename"
 
   make DESTDIR="$pkgdir" eventclients WII_EXTRA_OPTS=-DCWIID_OLD
-
-  install -dm755 "$pkgdir/usr/lib/python2.7/$pkgbase"
-  #mv "$pkgdir/kodi"/* "$pkgdir/usr/lib/python2.7/$pkgbase"
-  #rmdir "$pkgdir/kodi"
 }
 
-md5sums=('9717c539789789b8aeaf1dcfdb9f2c69'
+md5sums=('aa534c483cdd6cda71e5350c2094175b'
          'f6adc8e06d7076143ca2ad118126b158'
          'f04d1c89f5108c6aba36cf708a74cc95')