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

[Ike Devolder]

    Date: Tuesday, May 26, 2015 @ 22:45:06
  Author: idevolder
Revision: 134198

kodi :: 14.2-4

Triggered by FS#45054 rebuild on gcc5 + use external ffmpeg again

Modified:
  kodi/trunk/PKGBUILD

----------+
 PKGBUILD |   38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-05-26 19:58:05 UTC (rev 134197)
+++ PKGBUILD	2015-05-26 20:45:06 UTC (rev 134198)
@@ -15,23 +15,27 @@
 pkgname=('kodi' 'kodi-eventclients')
 pkgver=14.2
 _codename=Helix
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url="http://kodi.tv"
 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'
-  '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'
+  'afpfs-ng' 'bluez-libs' 'boost' 'cmake' 'curl' 'cwiid' 'doxygen' 'ffmpeg'
+  'git' 'glew' 'gperf' 'hicolor-icon-theme' 'jasper' 'java-runtime' 'libaacs'
+  'libcdio' 'libcec' 'libgl' 'libmariadbclient' 'libmicrohttpd' 'libmpeg2'
+  'libnfs' 'libplist' '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'
 )
 source=(
   "$pkgname-$pkgver-$_codename.tar.gz::https://github.com/xbmc/xbmc/archive/$pkgver-$_codename.tar.gz"
+  "kodi-14.0-dvddemux-ffmpeg.patch"
+  "kodi-14.0-gcc5.patch"
 )
-sha256sums=('d9cb8590430a925fb789a5beb4da2695cdcd2d2500dd31126f3b77b31aa267f4')
+sha256sums=('d9cb8590430a925fb789a5beb4da2695cdcd2d2500dd31126f3b77b31aa267f4'
+            '01453e18987b01ad40c9ae423a7e47422e537b648e74f5c942f132c37e6370f8'
+            '598f36cea0f63440e5755d88752552240fc5cd2b98e4f80a9feeb9605c917777')
 
 prepare() {
   cd "$srcdir/xbmc-$pkgver-$_codename"
@@ -44,6 +48,10 @@
   sed '/WiiRemote/d' -i tools/EventClients/Makefile.in
   sed '/mkdir -p $(DESTDIR)$(bindir)/i \
 install:' -i tools/EventClients/Makefile.in
+
+  patch -p0 -i "$srcdir/kodi-14.0-dvddemux-ffmpeg.patch"
+  patch -p1 -i "$srcdir/kodi-14.0-gcc5.patch"
+
 }
 
 build() {
@@ -61,7 +69,7 @@
     --disable-debug \
     --enable-optimizations \
     --enable-libbluray \
-    --enable-external-libraries \
+    --with-ffmpeg=shared \
     --with-lirc-device=/run/lirc/lircd \
     ac_cv_lib_bluetooth_hci_devid=no
 
@@ -77,12 +85,10 @@
   # depends expeced in FEH.py
   # 'mesa-demos' 'xorg-xdpyinfo'
   depends=(
-    'python2-pillow' 'python2-pybluez' 'python2-simplejson'
-    'mesa-demos' 'xorg-xdpyinfo'
-    'bluez-libs' 'fribidi' 'glew' 'hicolor-icon-theme' 'libcdio'
-    'libjpeg-turbo' 'libmariadbclient' 'libmicrohttpd' 'libpulse' 'libssh'
-    'libva' 'libxrandr' 'libxslt' 'lzo' 'sdl2' 'smbclient' 'taglib' 'tinyxml'
-    'yajl'
+    'python2-pillow' 'python2-pybluez' 'python2-simplejson' 'mesa-demos'
+    'xorg-xdpyinfo' 'bluez-libs' 'ffmpeg' 'glew' 'hicolor-icon-theme' 'libcdio'
+    'libjpeg-turbo' 'libmariadbclient' 'libmicrohttpd' 'libxrandr' 'libxslt'
+    'lzo' 'sdl2' 'smbclient' 'taglib' 'tinyxml' 'yajl'
   )
   optdepends=(
     'afpfs-ng: Apple shares support'