xbmc: upgpkg

2 files changed, 29 insertions, 22 deletions

diff --git a/abs/extra/xbmc/PKGBUILD b/abs/extra/xbmc/PKGBUILD
index 8e3aae1..87a9e78 100644
--- a/abs/extra/xbmc/PKGBUILD
+++ b/abs/extra/xbmc/PKGBUILD
@@ -10,32 +10,39 @@ _prefix=/usr
 pkgname=xbmc
 pkgver=13.0
 _codename=Gotham
-pkgrel=1
+pkgrel=2
 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')
+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')
+      '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')
+      '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')
 install="${pkgname}.install"
 source=(
-    "xbmc-$pkgver.tar.gz::https://github.com/xbmc/xbmc/archive/13.0-Gotham.tar.gz"
-    "xbmc.service"
-    "polkit.rules"
-    "xbmc.sh"
-    "xbmc_lib.conf"
+  "xbmc-$pkgver.tar.gz::https://github.com/xbmc/xbmc/archive/13.0-Gotham.tar.gz"
+  "xbmc.service"
+  "polkit.rules"
+  "enable-external-ffmpeg.patch"
+  "xbmc.sh"
+  "xbmc_lib.conf"
   )
 
 prepare() {
   cd "${srcdir}/xbmc-$pkgver-$_codename"
-
+  patch -p1 -i ../enable-external-ffmpeg.patch
 }
 
 build() {
@@ -76,7 +83,7 @@ build() {
     --enable-udev \
     --enable-libusb \
     --enable-libcec \
-		--enable-external-libraries
+    --enable-external-libraries
 
 
   # Now (finally) build
@@ -92,16 +99,16 @@ package() {
   sed -i -e 's/python/python2/g' ${pkgdir}${_prefix}/bin/xbmc
 
   # Tools
-	msg2 "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/"
 
   # Licenses
-	msg2 "Copy licenses"
-	install -dm755 ${pkgdir}${_prefix}/share/licenses/${pkgname}
+  msg2 "Copy licenses"
+  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
@@ -114,9 +121,9 @@ package() {
   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
 }
-# vim:set ts=2 sw=2 et:
 md5sums=('54fafd985b5209859ba6faeb50b8f142'
          'de331663cc8adc94f2fe44a262cfff58'
          '02f7951824ee13103344f36009c0ef2a'
+         '9f9b41cfc1e21b1e7d0bb10d6e85b3c6'
          'e48a3d87984669ef206e902bc8290ff9'
          '71176cb0e5aaa230d7c9634c37245bfb')
diff --git a/abs/extra/xbmc/__changelog b/abs/extra/xbmc/__changelog
index ddbbf7b..829f14d 100644
--- a/abs/extra/xbmc/__changelog
+++ b/abs/extra/xbmc/__changelog
@@ -1,3 +1,3 @@
+PKGBUILD - remove libpulse dep
 PKGBUILD - Added xbmc_lib.conf, this file goes in /etc/gen_lib_xml.d/
-PKGBUILD - keep --disable-external-ffmpeg instead of using external ffmpeg
 xbmc.install - add gen_lib_xml.py to post_install and post_remove