kodi-16.0-2.parabola1: updating version

2 files changed, 60 insertions, 15 deletions

diff --git a/libre/kodi/PKGBUILD b/libre/kodi/PKGBUILD
index 829608aae..96aba454a 100644
--- a/libre/kodi/PKGBUILD
+++ b/libre/kodi/PKGBUILD
@@ -1,5 +1,5 @@
 # vim:set ts=2 sw=2 et:
-# $Id: PKGBUILD 160018 2016-02-02 19:43:22Z idevolder $
+# $Id: PKGBUILD 163258 2016-02-24 08:19:13Z idevolder $
 # Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer (Arch): BlackIkeEagle < ike DOT devolder AT gmail DOT com >
 # Contributor (Arch): Brad Fanella <bradfanella@archlinux.us>
@@ -14,9 +14,9 @@
 _pkgbase=kodi-libre
 pkgbase=kodi
 pkgname=kodi
-pkgver=15.2
-_codename=Isengard
-pkgrel=5.parabola2
+pkgver=16.0
+_codename=Jarvis
+pkgrel=2.parabola1
 arch=('i686' 'x86_64' 'armv7h')
 url="http://kodi.tv"
 license=('GPL2')
@@ -28,7 +28,7 @@ makedepends=(
   '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'
+  'yajl' 'zip' 'mesa' 'libdcadec.so' 'libcrossguid'
 )
 [ "$CARCH" != "armv7h" ] && makedepends+=('libvdpau')
 mksource=(
@@ -36,14 +36,14 @@ mksource=(
 )
 source=(
   "https://repo.parabola.nu/other/$_pkgbase/$_pkgbase-$pkgver-$_codename.tar.gz"
-  'prevent-taglib-from-crashing-kodi.patch' # can stay in even with new taglib release
+  'libre.patch'
 )
 mksha256sums=(
-  'dd8aeb942e6de5d1488e243e1346cff3f6597e21b5131a3ba72ff5cc82037110'
+  '0421ea1337cdee674f8a36d995f54152b5ddc4100e53410b3aeeb3b3f7d53946'
 )
 sha256sums=(
-  '08ba84d69db5910966ac6b6118e64ba369065fbe68f0be8ce0dbdb7b35cf15e6'
-  'c588153311adbccd7484cc7381f5852b4199301fe04d917279c0a2535891159f'
+  'df7d3eaab72609ddec6666049da7783e0785154eb455d0113d40114da73e34bd'
+  '3c9b4e647a1eea8d910e7ddc4df3125de05a4c0468c3350fe4e44208158d8822'
 )
 
 mksource() {
@@ -60,13 +60,11 @@ prepare() {
   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
-  msg2 "Use addons.xml from Parabola server (without nonfree addons support)"
-  sed -i -e 's|mirrors[.]kodi[.]tv/addons/gotham/addons.xml|repo.parabola.nu/other/kodi-libre/addons/gotham/addons.xml|' addons/repository.xbmc.org/addon.xml
-  sed -i -e 's|mirrors[.]kodi[.]tv/addons/helix/addons.xml|repo.parabola.nu/other/kodi-libre/addons/helix/addons.xml|' addons/repository.xbmc.org/addon.xml
-  sed -i -e 's|mirrors[.]kodi[.]tv/addons/isengard/addons.xml|repo.parabola.nu/other/kodi-libre/addons/isengard/addons.xml|' addons/repository.xbmc.org/addon.xml
 
   # patches
-  patch -p0 -i "$srcdir/prevent-taglib-from-crashing-kodi.patch"
+  msg2 "Use addons.xml from Parabola server (without nonfree addons support) and remove nonfree stuff references"
+  rm -v xbmc/filesystem/Rar{Directory,File,Manager}.{cpp,h}
+  patch -Np1 -i ../libre.patch
 }
 
 build() {
@@ -108,7 +106,7 @@ package_kodi() {
     'bluez-libs' 'fribidi' 'glew' 'hicolor-icon-theme' 'libass' 'libcdio'
     'libjpeg-turbo' 'libmariadbclient' 'libmicrohttpd' 'libpulse' 'libssh'
     'libva' 'libxrandr' 'libxslt' 'lzo' 'sdl2' 'smbclient' 'taglib' 'tinyxml'
-    'yajl'
+    'yajl' 'mesa' 'libdcadec.so'
   )
   optdepends=(
     'afpfs-ng: Apple shares support'
diff --git a/libre/kodi/libre.patch b/libre/kodi/libre.patch
new file mode 100644
index 000000000..693162e20
--- /dev/null
+++ b/libre/kodi/libre.patch
@@ -0,0 +1,47 @@
+diff -Nur xbmc-16.0-Jarvis.orig/addons/repository.xbmc.org/addon.xml xbmc-16.0-Jarvis/addons/repository.xbmc.org/addon.xml
+--- xbmc-16.0-Jarvis.orig/addons/repository.xbmc.org/addon.xml	2016-02-20 12:21:19.000000000 -0300
++++ xbmc-16.0-Jarvis/addons/repository.xbmc.org/addon.xml	2016-02-24 13:21:20.431114069 -0300
+@@ -9,9 +9,9 @@
+ 	<extension point="xbmc.addon.repository"
+ 		name="Official XBMC.org Add-on Repository">
+ 		<dir minversion="15.9.0">
+-			<info>http://mirrors.kodi.tv/addons/jarvis/addons.xml.gz</info>
+-			<checksum>http://mirrors.kodi.tv/addons/jarvis/addons.xml.gz.md5</checksum>
+-			<datadir zip="true">http://mirrors.kodi.tv/addons/jarvis</datadir>
++			<info>http://repo.parabola.nu/other/kodi-libre/addons/jarvis/addons.xml.gz</info>
++			<checksum>http://repo.parabola.nu/other/kodi-libre/addons/jarvis/addons.xml.gz.md5</checksum>
++			<datadir zip="true">http://repo.parabola.nu/other/kodi-libre/addons/jarvis</datadir>
+ 			<hashes>true</hashes>
+ 		</dir>
+ 	</extension>
+diff -Nur xbmc-16.0-Jarvis.orig/xbmc/interfaces/builtins/ApplicationBuiltins.cpp xbmc-16.0-Jarvis/xbmc/interfaces/builtins/ApplicationBuiltins.cpp
+--- xbmc-16.0-Jarvis.orig/xbmc/interfaces/builtins/ApplicationBuiltins.cpp	2016-02-20 12:21:19.000000000 -0300
++++ xbmc-16.0-Jarvis/xbmc/interfaces/builtins/ApplicationBuiltins.cpp	2016-02-24 14:51:55.133088253 -0300
+@@ -21,7 +21,6 @@
+ #include "ApplicationBuiltins.h"
+ 
+ #include "Application.h"
+-#include "filesystem/RarManager.h"
+ #include "filesystem/ZipManager.h"
+ #include "messaging/ApplicationMessenger.h"
+ #include "interfaces/AnnouncementManager.h"
+@@ -46,7 +45,7 @@
+  */
+ static int Extract(const std::vector<std::string>& params)
+ {
+-    // Detects if file is zip or rar then extracts
++    // Detects if file is zip then extracts
+     std::string strDestDirect;
+     if (params.size() < 2)
+       strDestDirect = URIUtils::GetDirectory(params[0]);
+@@ -57,10 +56,6 @@
+ 
+     if (URIUtils::IsZIP(params[0]))
+       g_ZipManager.ExtractArchive(params[0],strDestDirect);
+-#ifdef HAS_FILESYSTEM_RAR
+-    else if (URIUtils::IsRAR(params[0]))
+-      g_RarManager.ExtractArchive(params[0],strDestDirect);
+-#endif
+     else
+       CLog::Log(LOGERROR, "Extract, No archive given");
+