xbmc & xmbc-pvr-addons: update to 13.2. closes #974.

6 files changed, 69 insertions, 188 deletions

diff --git a/abs/extra/xbmc/PKGBUILD b/abs/extra/xbmc/PKGBUILD
index 87a9e78..8e6cc91 100644
--- a/abs/extra/xbmc/PKGBUILD
+++ b/abs/extra/xbmc/PKGBUILD
@@ -4,49 +4,64 @@
 # Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
 # Contributor: Zeqadious <zeqadious.at.gmail.dot.com>
 # Contributor: BlackIkeEagle < ike DOT devolder AT gmail DOT com >
+# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
+# Contributor: Maxime Gauduin <alucryd@gmail.com>
 
 _prefix=/usr
 
 pkgname=xbmc
-pkgver=13.0
+pkgver=13.2
 _codename=Gotham
-pkgrel=2
+pkgrel=4
 pkgdesc="A software media player and entertainment hub for digital media"
 arch=('i686' 'x86_64')
 url="http://xbmc.org"
-license=('GPL' 'custom')
-depends=('hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva'
-         'libpng' 'libcdio' 'yajl' 'libmysqlclient' 'libjpeg-turbo' 'libsamplerate'
-         'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image'
-         'python2' 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump'
-         'unzip' 'mesa-demos' 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng'
-         'avahi' 'bluez-libs' 'tinyxml' 'libcap' 'swig' 'taglib'
-         'java-runtime-headless' 'glu' 'mesa' 'shairplay' 'libxslt' 'ffmpeg')
-makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'libvdpau' 'libcec'
-      'udisks' 'upower' 'mesa' 'doxygen' 'swig' 'java-environment')
-optdepends=('libcec: support for Pulse-Eight USB-CEC adapter'
-      'lirc: remote controller support'
-      'udisks: automount external drives'
-      'upower: used to trigger power management functionality'
-      'unrar: access compressed files without unpacking them'
-      'xorg-xinit: autostart xbmc')
+license=('GPL2')
+depends=(
+'avahi' 'hicolor-icon-theme' 'lame' 'libass' 'libbluray' 'libcdio' 'libmad'
+'libmicrohttpd' 'libmodplug' 'libmpeg2' 'libmysqlclient' 
+'libsamplerate' 'libssh' 'libva' 'libvdpau' 'libvorbis' 'libxrandr' 'libxslt'
+'lzo' 'mesa' 'mesa-demos' 'python2' 'python2-pillow' 'rtmpdump' 'sdl_image'
+'smbclient' 'taglib' 'tinyxml' 'unzip' 'xorg-xdpyinfo' 'yajl'
+)
+makedepends=(
+'afpfs-ng' 'libnfs' 'libplist' 'shairplay' 'libcec' 'boost' 'cmake' 'doxygen'
+'gperf' 'jasper' 'java-runtime-headless' 'nasm' 'swig' 'taglib' 'udisks'
+'zip'
+)
+optdepends=(
+'afpfs-ng: Apple File Protocol suport'
+'libnfs: NFS Share support'
+'libplist: AirPlay support'
+'shairplay: AirPlay support'
+'libcec: Pulse-Eight USB-CEC adapter support'
+'polkit: power management'
+'pulseaudio: for pulseaudio support'
+'lirc: remote controller support'
+'unrar: access compressed files without unpacking them'
+'udisks: automount external drives'
+'upower: display battery level'
+)
 install="${pkgname}.install"
 source=(
-  "xbmc-$pkgver.tar.gz::https://github.com/xbmc/xbmc/archive/13.0-Gotham.tar.gz"
-  "xbmc.service"
-  "polkit.rules"
-  "enable-external-ffmpeg.patch"
+  "xbmc-$pkgver-$_codename.tar.gz::https://github.com/xbmc/xbmc/archive/$pkgver-$_codename.tar.gz"
   "xbmc.sh"
   "xbmc_lib.conf"
-  )
+)
+#sha256sums=(
+#  'acbf5dffa3034a3406240ee3cf81e721386cd383d23d056ddde1f769e050e585'
+#)
 
 prepare() {
-  cd "${srcdir}/xbmc-$pkgver-$_codename"
-  patch -p1 -i ../enable-external-ffmpeg.patch
+  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/xbmc.sh.in
 }
 
 build() {
-  cd "${srcdir}/xbmc-$pkgver-$_codename"
+  cd "$srcdir/xbmc-$pkgver-$_codename"
 
   # Bootstrapping XBMC
   ./bootstrap
@@ -83,32 +98,26 @@ build() {
     --enable-udev \
     --enable-libusb \
     --enable-libcec \
-    --enable-external-libraries
-
+    --with-lirc-device=/run/lirc/lircd
 
   # Now (finally) build
   make
 }
 
 package() {
-  cd "${srcdir}/xbmc-$pkgver-$_codename"
+  cd "$srcdir/xbmc-$pkgver-$_codename"
   # Running make install
-  make DESTDIR="${pkgdir}" install
-
-  # run feh with python2
-  sed -i -e 's/python/python2/g' ${pkgdir}${_prefix}/bin/xbmc
+  make DESTDIR="$pkgdir" install
 
   # Tools
-  msg2 "Tools"
-  install -D -m 0755 "${srcdir}/xbmc-$pkgver-$_codename/xbmc-xrandr" "${pkgdir}${_prefix}/share/xbmc/xbmc-xrandr"
-  install -D -m 0755 "${srcdir}/xbmc-$pkgver-$_codename/tools/TexturePacker/TexturePacker" "${pkgdir}${_prefix}/share/xbmc/"
+  install -D -m 0755 "$srcdir/xbmc-$pkgver-$_codename/tools/TexturePacker/TexturePacker" \
+    "${pkgdir}$_prefix/lib/xbmc/"
 
   # Licenses
-  msg2 "Copy licenses"
-  install -dm755 ${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/xbmc/$licensef" \
+      "${pkgdir}$_prefix/share/licenses/$pkgname"
   done
 
   # LinHES stuff
@@ -116,14 +125,8 @@ package() {
   install -D -m 0755 ${srcdir}/xbmc.sh ${pkgdir}/usr/LH/bin
   #add in xbmc_lib.conf
   install -D -m0744 ${srcdir}/xbmc_lib.conf ${pkgdir}/etc/gen_lib_xml.d/xbmc_lib.conf
-
-  # install systemd service
-  install -Dm0644 $srcdir/xbmc.service $pkgdir/usr/lib/systemd/system/xbmc.service
-  install -Dm0644 $srcdir/polkit.rules $pkgdir/etc/polkit-1/rules.d/10-xbmc.rules
 }
-md5sums=('54fafd985b5209859ba6faeb50b8f142'
-         'de331663cc8adc94f2fe44a262cfff58'
-         '02f7951824ee13103344f36009c0ef2a'
-         '9f9b41cfc1e21b1e7d0bb10d6e85b3c6'
+# vim:set ts=2 sw=2 et:
+md5sums=('d80153b2cc78b88966458ab136e9494f'
          'e48a3d87984669ef206e902bc8290ff9'
          '71176cb0e5aaa230d7c9634c37245bfb')
diff --git a/abs/extra/xbmc/__changelog b/abs/extra/xbmc/__changelog
index 829f14d..20b50eb 100644
--- a/abs/extra/xbmc/__changelog
+++ b/abs/extra/xbmc/__changelog
@@ -1,3 +1,4 @@
-PKGBUILD - remove libpulse dep
+PKGBUILD - remove libpulse dep and remove --enable-pulse config option
 PKGBUILD - Added xbmc_lib.conf, this file goes in /etc/gen_lib_xml.d/
 xbmc.install - add gen_lib_xml.py to post_install and post_remove
+xbmc.install - comment out autostart message since we don't use systemd
diff --git a/abs/extra/xbmc/enable-external-ffmpeg.patch b/abs/extra/xbmc/enable-external-ffmpeg.patch
deleted file mode 100644
index 2bc1aaf..0000000
--- a/abs/extra/xbmc/enable-external-ffmpeg.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff -rupN a/configure.in b/configure.in
---- a/configure.in	2014-05-03 21:03:25.000000000 +0000
-+++ b/configure.in	2014-05-07 09:56:30.039177391 +0000
-@@ -600,7 +600,7 @@ PKG_PROG_PKG_CONFIG
- MAKE="${MAKE:-make}"
- OBJDUMP="${OBJDUMP:-objdump}"
- 
--use_external_ffmpeg=no
-+use_external_ffmpeg=yes
- use_static_ffmpeg=no
- 
- # ffmpeg needs the output of uname -s (e.x. linux, darwin) for the target_os
-@@ -632,7 +632,7 @@ case $host in
-         use_arch="x86"
-         use_cpu="i686"
-      fi
--     use_static_ffmpeg=yes
-+     use_static_ffmpeg=no
-      ;;
-   x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*)
-      ARCH="x86_64-linux"
-@@ -640,7 +640,7 @@ case $host in
-         use_arch="x86_64"
-         use_cpu="x86_64"
-      fi
--     use_static_ffmpeg=yes
-+     use_static_ffmpeg=no
-      ;;
-   i386-*-freebsd*)
-      ARCH="x86-freebsd"
-@@ -696,7 +696,7 @@ case $host in
-      use_sdl=no
-      use_x11=no
-      use_wayland=no
--     use_static_ffmpeg=yes
-+     use_static_ffmpeg=no
-      ;;
-   arm*-*linux-android*)
-      target_platform=target_android
-diff -rupN a/lib/DllAvCodec.h b/lib/DllAvCodec.h
---- a/lib/DllAvCodec.h	2014-05-03 21:03:25.000000000 +0000
-+++ b/lib/DllAvCodec.h	2014-05-07 10:10:06.298165915 +0000
-@@ -43,6 +43,7 @@ extern "C" {
- 
- #if (defined USE_EXTERNAL_FFMPEG)
-   #include <libavcodec/avcodec.h>
-+  #include <libavutil/frame.h>
- #else
-   #include "libavcodec/avcodec.h"
- #endif
-diff -rupN a/lib/DllAvUtil.h b/lib/DllAvUtil.h
---- a/lib/DllAvUtil.h	2014-05-03 21:03:25.000000000 +0000
-+++ b/lib/DllAvUtil.h	2014-05-07 10:17:31.415798448 +0000
-@@ -31,33 +31,19 @@
- #endif
- 
- extern "C" {
--#if (defined USE_EXTERNAL_FFMPEG)
--  #include <libavutil/avutil.h>
--  // for av_get_default_channel_layout
--  #include <libavutil/audioconvert.h>
--  #include <libavutil/crc.h>
--  #include <libavutil/fifo.h>
--  // for LIBAVCODEC_VERSION_INT:
--  #include <libavcodec/avcodec.h>
--  // for enum AVSampleFormat
--  #include <libavutil/samplefmt.h>
--  #include <libavutil/opt.h>
--  #include <libavutil/mem.h>
--  #include <libavutil/mathematics.h>
--  #if (defined USE_LIBAV_HACKS)
--    #include "xbmc-libav-hacks/libav_hacks.h"
--  #endif
--#else
--  #include "libavutil/avutil.h"
--  //for av_get_default_channel_layout
--  #include "libavutil/audioconvert.h"
--  #include "libavutil/crc.h"
--  #include "libavutil/opt.h"
--  #include "libavutil/mem.h"
--  #include "libavutil/fifo.h"
--  // for enum AVSampleFormat
--  #include "libavutil/samplefmt.h"
--#endif
-+#include <libavutil/avutil.h>
-+#include <libavutil/frame.h>
-+// for av_get_default_channel_layout
-+#include <libavutil/audioconvert.h>
-+#include <libavutil/crc.h>
-+#include <libavutil/fifo.h>
-+// for LIBAVCODEC_VERSION_INT:
-+#include <libavcodec/avcodec.h>
-+// for enum AVSampleFormat
-+#include <libavutil/samplefmt.h>
-+#include <libavutil/opt.h>
-+#include <libavutil/mem.h>
-+#include <libavutil/mathematics.h>
- }
- 
- #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(52,29,100)
diff --git a/abs/extra/xbmc/polkit.rules b/abs/extra/xbmc/polkit.rules
deleted file mode 100644
index 4b6d0fd..0000000
--- a/abs/extra/xbmc/polkit.rules
+++ /dev/null
@@ -1,12 +0,0 @@
-polkit.addRule(function(action, subject) {
-    if (subject.user == "xbmc") {
-        polkit.log("action=" + action);
-        polkit.log("subject=" + subject);
-        if (action.id.indexOf("org.freedesktop.login1.") == 0) {
-            return polkit.Result.YES;
-        }
-        if (action.id.indexOf("org.freedesktop.udisks.") == 0) {
-            return polkit.Result.YES;
-        }
-    }
-});
diff --git a/abs/extra/xbmc/xbmc.install b/abs/extra/xbmc/xbmc.install
index ad3b95a..72d92d8 100644
--- a/abs/extra/xbmc/xbmc.install
+++ b/abs/extra/xbmc/xbmc.install
@@ -1,21 +1,26 @@
 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 passwd xbmc > /dev/null || useradd -r -m -d /var/lib/xbmc -g xbmc xbmc
-  usermod -a -G xbmc,audio,video,network,optical xbmc
-  mkdir -p var/lib/xbmc
-  chown -R xbmc:xbmc var/lib/xbmc
+  update_icons
+#  update_autostart
   gen_lib_xml.py
 }
 
 post_upgrade() {
-  post_install $1
+  update_icons
+#  update_autostart
 }
 
 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
+  update_icons
+  update_autostart
   gen_lib_xml.py
 }
+
+update_icons() {
+  type -p gtk-update-icon-cache > /dev/null 2>&1 && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
+  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"
+}
diff --git a/abs/extra/xbmc/xbmc.service b/abs/extra/xbmc/xbmc.service
deleted file mode 100644
index d36ddb0..0000000
--- a/abs/extra/xbmc/xbmc.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description = Starts instance of XBMC using xinit
-After = systemd-user-sessions.service
-Conflicts=getty@tty7.service
-
-[Service]
-User = xbmc
-Group = xbmc
-PAMName=login
-Type = simple
-TTYPath=/dev/tty7
-ExecStart = /usr/bin/xinit /usr/bin/dbus-launch --exit-with-session /usr/bin/xbmc-standalone -l /run/lirc/lircd -- :0 -nolisten tcp vt7
-Restart = on-abort
-
-[Install]
-WantedBy = multi-user.target