[arch-commits] Commit in kodi/trunk (PKGBUILD kodi.install)

[Ike Devolder]

    Date: Thursday, January 1, 2015 @ 09:46:41
  Author: idevolder
Revision: 125111

upgpkg: kodi 14.0-1

Modified:
  kodi/trunk/PKGBUILD
  kodi/trunk/kodi.install

--------------+
 PKGBUILD     |   77 ++++++++++++++++-----------------------------------------
 kodi.install |    7 -----
 2 files changed, 22 insertions(+), 62 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-01-01 08:44:50 UTC (rev 125110)
+++ PKGBUILD	2015-01-01 08:46:41 UTC (rev 125111)
@@ -12,31 +12,22 @@
 _prefix=/usr
 
 pkgbase=kodi
-pkgname=('kodi' 'kodi-texturepacker')
+pkgname=('kodi' 'kodi-eventclients')
 pkgver=14.0
 _codename=Helix
-pkgrel=0.5
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://kodi.tv"
 license=('GPL2')
 makedepends=(
-'bluez-libs' 'curl' 'glew' 'hicolor-icon-theme' 'libaacs'
-'libass' 'libbluray' 'libcdio' 'libmariadbclient' 'libmicrohttpd'
-'libpulse' 'libssh' 'libva' 'libvdpau' 'libxrandr'
-'libxslt' 'lzo' 'libgl' 'python2-pillow' 'python2-pybluez'
-'python2-simplejson' 'rtmpdump' 'smbclient' 'taglib' 'tinyxml'
-'yajl'
-'afpfs-ng' 'boost' 'cmake' 'doxygen' 'git' 'gperf' 'jasper'
-'java-runtime' 'libcec' 'libnfs' 'libplist' 'nasm' 'shairplay'
-'swig' 'unzip' 'upower' 'zip'
-'libmpeg2' 'libmodplug'
-'sdl2' 'sdl_image'
+  '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'
+  'libmodplug' 'libmpeg2' 'libnfs' 'libplist' 'libpulse' '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'
 )
-# encoders
-# flac
-# lame
-# libmodplug
-# libvorbis
 source=(
   "$pkgname-$pkgver-$_codename.tar.gz::https://github.com/xbmc/xbmc/archive/$pkgver-$_codename.tar.gz"
 )
@@ -47,7 +38,6 @@
 prepare() {
   cd "$srcdir/xbmc-$pkgver-$_codename"
 
-
   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
@@ -57,40 +47,19 @@
   cd "$srcdir/xbmc-$pkgver-$_codename"
 
 	# Bootstrapping
-  ./bootstrap
+  MAKEFLAGS=-j1 ./bootstrap
 
+  #./configure --help
+  #return 1
+
   # Configuring XBMC
   export PYTHON_VERSION=2  # external python v2
   ./configure --prefix=$_prefix --exec-prefix=$_prefix \
     --disable-debug \
     --enable-optimizations \
-    --enable-gl \
-    --enable-vaapi \
-    --enable-vdpau \
-    --enable-joystick \
-    --enable-xrandr \
-    --enable-rsxs \
-    --enable-projectm \
-    --enable-x11 \
-    --enable-pulse \
-    --enable-rtmp \
-    --enable-samba \
-    --enable-nfs \
-    --enable-afpclient \
-    --enable-airplay \
-    --enable-airtunes \
-    --enable-ffmpeg-libvorbis \
-    --enable-dvdcss \
-    --disable-hal \
-    --enable-avahi \
-    --enable-webserver \
-    --enable-optical-drive \
     --enable-libbluray \
     --enable-texturepacker \
-    --enable-udev \
-    --enable-libusb \
-    --enable-libcec \
-		--enable-external-libraries \
+    --enable-external-libraries \
     --with-lirc-device=/run/lirc/lircd
 
   # Now (finally) build
@@ -143,19 +112,17 @@
   done
 }
 
-package_kodi-texturepacker() {
-  pkgdesc="A tool to compile all images used in a skin into a single file."
+package_kodi-eventclients() {
+  pkgdesc="Kodi Event Clients"
 
-  depends=(
-    'lzo'
-    'sdl_image'
-  )
+  depends=('cwiid')
 
   cd "$srcdir/xbmc-$pkgver-$_codename"
 
-	install -Dm755 $srcdir/xbmc-$pkgver-$_codename/tools/TexturePacker/TexturePacker \
-		${pkgdir}${_prefix}/lib/kodi/TexturePacker
+  make DESTDIR="$pkgdir" eventclients WII_EXTRA_OPTS=-DCWIID_OLD
 
-  install -dm755 "${pkgdir}${_prefix}/bin"
-  ln -sf "${_prefix}/lib/kodi/TexturePacker" "${pkgdir}${_prefix}/bin/kodi-TexturePacker"
+  install -dm755 "$pkgdir/usr/share/$pkgbase/eventclients"
+  mv "$pkgdir/kodi"/* "$pkgdir/usr/share/$pkgbase/eventclients"
+  rmdir "$pkgdir/kodi"
 }
+

Modified: kodi.install
===================================================================
--- kodi.install	2015-01-01 08:44:50 UTC (rev 125110)
+++ kodi.install	2015-01-01 08:46:41 UTC (rev 125111)
@@ -1,16 +1,13 @@
 post_install() {
   update_icons
-  update_autostart
 }
 
 post_upgrade() {
   update_icons
-  update_autostart
 }
 
 post_remove() {
   update_icons
-  update_autostart
 }
 
 update_icons() {
@@ -18,7 +15,3 @@
   type -p update-desktop-database > /dev/null 2>&1 && usr/bin/update-desktop-database -q usr/share/applications
   return 0
 }
-
-update_autostart() {
-  echo "To autostart xbmc standalone read: https://wiki.archlinux.org/index.php/Xbmc#Autostarting_at_boot"
-}