3 files changed, 29 insertions, 24 deletions
diff --git a/abs/extra/kodi/PKGBUILD b/abs/extra/kodi/PKGBUILD
index 91fe23c..6623868 100644
--- a/abs/extra/kodi/PKGBUILD
+++ b/abs/extra/kodi/PKGBUILD
@@ -9,12 +9,10 @@
 # Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Maxime Gauduin <alucryd@gmail.com>
 
-_prefix=/usr
-
 pkgbase=kodi
 pkgname=('kodi' 'kodi-eventclients')
-pkgver=14.0
-_codename=Helix
+pkgver=16.1
+_codename=Jarvis
 pkgrel=2
 arch=('i686' 'x86_64')
 url="http://kodi.tv"
@@ -22,11 +20,12 @@ license=('GPL2')
 makedepends=(
   'afpfs-ng' 'bluez-libs' 'boost' 'cmake' 'curl' 'cwiid' 'doxygen' 'git' 'glew'
   'gperf' 'hicolor-icon-theme' 'jasper' 'java-runtime' 'libaacs' 'libass'
-  'libbluray' 'libcdio' 'libcec' 'libgl' 'libmariadbclient' 'libmicrohttpd'
+  'libbluray' 'libcdio' 'libcec' 'libgl' 'libmysqlclient' 'libmicrohttpd'
   'libmodplug' 'libmpeg2' 'libnfs' 'libplist' 'libssh' 'libva'
-  'libvdpau' 'libxrandr' 'libxslt' 'lzo' 'nasm' 'nss-mdns' 'python2-pillow'
-  'python2-pybluez' 'python2-simplejson' 'rtmpdump' 'sdl2' 'sdl_image'
-  'shairplay' 'smbclient' 'swig' 'taglib' 'tinyxml' 'unzip' 'upower' 'yajl' 'zip'
+  'libvdpau' 'libxrandr' 'libxslt' 'lzo' 'mesa' 'nasm' 'nss-mdns'
+  'python2-pillow' 'python2-pybluez' 'python2-simplejson' 'rtmpdump' 'sdl2'
+  'sdl_image' 'shairplay' 'smbclient' 'swig' 'taglib' 'tinyxml' 'unzip' 'upower'
+  'yajl' 'zip' 'mesa' 'dcadec' 'libcrossguid'
 )
 source=(
   "$pkgname-$pkgver-$_codename.tar.gz::https://github.com/xbmc/xbmc/archive/$pkgver-$_codename.tar.gz"
@@ -40,6 +39,9 @@ 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
+
+  # patches
 }
 
 build() {
@@ -53,12 +55,13 @@ build() {
 
   # Configuring XBMC
   export PYTHON_VERSION=2  # external python v2
-  ./configure --prefix=$_prefix --exec-prefix=$_prefix \
+  ./configure --prefix=/usr --exec-prefix=/usr \
     --disable-debug \
     --enable-optimizations \
     --enable-libbluray \
-    --enable-external-libraries \
-    --with-lirc-device=/run/lirc/lircd
+    --enable-shared-libraries \
+    --with-lirc-device=/run/lirc/lircd \
+    ac_cv_type__Bool=yes
 
   # Now (finally) build
   make
@@ -74,10 +77,10 @@ package_kodi() {
   depends=(
     'python2-pillow' 'python2-pybluez' 'python2-simplejson'
     'mesa-demos' 'xorg-xdpyinfo'
-    'bluez-libs' 'fribidi' 'glew' 'hicolor-icon-theme' 'libcdio'
-    'libjpeg-turbo' 'libmariadbclient' 'libmicrohttpd' 'libssh'
+    'bluez-libs' 'fribidi' 'glew' 'hicolor-icon-theme' 'libass' 'libcdio'
+    'libjpeg-turbo' 'libmysqlclient' 'libmicrohttpd' 'libssh'
     'libva' 'libxrandr' 'libxslt' 'lzo' 'sdl2' 'smbclient' 'taglib' 'tinyxml'
-    'yajl'
+    'yajl' 'mesa' 'dcadec' 'desktop-file-utils'
   )
   optdepends=(
     'afpfs-ng: Apple shares support'
@@ -102,11 +105,16 @@ 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}
+	install -dm755 ${pkgdir}/usr/share/licenses/${pkgname}
   for licensef in LICENSE.GPL copying.txt; do
-		mv ${pkgdir}${_prefix}/share/doc/kodi/${licensef} \
-			${pkgdir}${_prefix}/share/licenses/${pkgname}
+		mv ${pkgdir}/usr/share/doc/kodi/${licensef} \
+			${pkgdir}/usr/share/licenses/${pkgname}
   done
 
   # LinHES stuff
@@ -124,12 +132,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=('79358ad5f77f42c5498a9412d5a78dd5'
          'f6adc8e06d7076143ca2ad118126b158'
          'f04d1c89f5108c6aba36cf708a74cc95')
diff --git a/abs/extra/kodi/__changelog b/abs/extra/kodi/__changelog
index 8015995..6069eb3 100644
--- a/abs/extra/kodi/__changelog
+++ b/abs/extra/kodi/__changelog
@@ -2,3 +2,4 @@ PKGBUILD - remove libpulse dep and remove --enable-pulse config option
 PKGBUILD - Add /usr/LH/bin/kodi.sh
 PKGBUILD - Add /etc/gen_lib_xml.d/kodi_lib.conf
 kodi.install - add gen_lib_xml.py to post_install and post_remove
+PKGBUILD - change dep libmariadbclient to libmysqlclient
diff --git a/abs/extra/kodi/kodi.install b/abs/extra/kodi/kodi.install
index d28289b..01c138d 100644
--- a/abs/extra/kodi/kodi.install
+++ b/abs/extra/kodi/kodi.install
@@ -1,6 +1,6 @@
 post_install() {
   update_icons
-  gen_lib_xml.py 
+  gen_lib_xml.py
 }
 
 post_upgrade() {
@@ -9,7 +9,7 @@ post_upgrade() {
 
 post_remove() {
   update_icons
-  gen_lib_xml.py 
+  gen_lib_xml.py
 }
 
 update_icons() {