From 2bcd132e2ca6b6c64bab556b9588225208b076dc Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Tue, 20 Oct 2015 09:08:17 +0200
Subject: [PATCH] kodi{,-rpi}: update to 15.2.

---
 srcpkgs/kodi-rpi/files/polkit.rules | 11 -----------
 srcpkgs/kodi-rpi/template           | 16 +++-------------
 srcpkgs/kodi/template               | 12 +++---------
 3 files changed, 6 insertions(+), 33 deletions(-)
 delete mode 100644 srcpkgs/kodi-rpi/files/polkit.rules

diff --git a/srcpkgs/kodi-rpi/files/polkit.rules b/srcpkgs/kodi-rpi/files/polkit.rules
deleted file mode 100644
index b10fb07ea70..00000000000
--- a/srcpkgs/kodi-rpi/files/polkit.rules
+++ /dev/null
@@ -1,11 +0,0 @@
-polkit.addRule(function(action, subject) {
-  if (action.id.match("org.freedesktop.login1.") && subject.isInGroup("video")) {
-    return polkit.Result.YES;
-  }
-});
-
-polkit.addRule(function(action, subject) {
-  if (action.id.indexOf("org.freedesktop.udisks") == 0 && subject.isInGroup("video")) {
-    return polkit.Result.YES;
-  }
-});
diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
index 4152b11e84c..0006722689a 100644
--- a/srcpkgs/kodi-rpi/template
+++ b/srcpkgs/kodi-rpi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi-rpi'
 pkgname=kodi-rpi
-version=15.1
-revision=2
+version=15.2
+revision=1
 _codename="Isengard"
 wrksrc="xbmc-${version}-${_codename}"
 short_desc="A software media player and entertainment hub for digital media (RPi)"
@@ -9,7 +9,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.kodi.tv"
 license="GPL-2"
 distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
-checksum=72b2610d8fbff807128d74429f25bf6716ba880c27c2c5d9fad012ec7fc70705
+checksum=dd8aeb942e6de5d1488e243e1346cff3f6597e21b5131a3ba72ff5cc82037110
 
 only_for_archs="armv6l armv7l"
 
@@ -41,9 +41,6 @@ xbmc_homedir="/var/lib/xbmc"
 xbmc_groups="audio,input,video"
 
 pre_configure() {
-	# remove lsb_release dependency
-	sed -i -e 's:/usr/bin/lsb_release -d:echo Void:' xbmc/utils/SystemInfo.cpp
-
 	. /etc/profile.d/10_openjdk.sh
 	./bootstrap
 
@@ -94,13 +91,6 @@ do_build() {
 }
 do_install() {
 	make DESTDIR=${DESTDIR} install
-
-	# lsb_release fix
-	sed -i -e 's/which lsb_release > \/dev\/null/\[ -f \/etc\/os-release ]/g' ${DESTDIR}/usr/bin/kodi
-	sed -i -e "s/lsb_release -a 2> \/dev\/null | sed -e 's\/\^\/ \/'/echo Void/g" ${DESTDIR}/usr/bin/kodi
-
-	vinstall ${FILESDIR}/polkit.rules 0644 etc/polkit-1/rules.d 10-xbmc.rules
 	rm -rf ${DESTDIR}/usr/include
-
 	vsv xbmc-standalone
 }
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index d04363669b3..a0c2f113935 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
-version=15.1
-revision=2
+version=15.2
+revision=1
 _codename="Isengard"
 wrksrc="xbmc-${version}-${_codename}"
 short_desc="A software media player and entertainment hub for digital media"
@@ -9,7 +9,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.kodi.tv/"
 license="GPL-2"
 distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
-checksum=72b2610d8fbff807128d74429f25bf6716ba880c27c2c5d9fad012ec7fc70705
+checksum=dd8aeb942e6de5d1488e243e1346cff3f6597e21b5131a3ba72ff5cc82037110
 
 lib32disabled=yes
 broken_as_needed=yes
@@ -43,9 +43,6 @@ depends+=" glxinfo hicolor-icon-theme desktop-file-utils xdpyinfo"
 CXXFLAGS="-fpermissive"
 
 pre_configure() {
-	# remove lsb_release dependency
-	sed -i -e 's:/usr/bin/lsb_release -d:echo Void:' xbmc/utils/SystemInfo.cpp
-
 	. /etc/profile.d/10_openjdk.sh
 	./bootstrap
 }
@@ -68,9 +65,6 @@ do_build() {
 do_install() {
 	make DESTDIR=${DESTDIR} install
 	vinstall tools/TexturePacker/TexturePacker 755 usr/lib/kodi
-	# lsb_release fix
-	sed -i -e 's/which lsb_release > \/dev\/null/\[ -f \/etc\/os-release ]/g' ${DESTDIR}/usr/bin/kodi
-	sed -i -e "s/lsb_release -a 2> \/dev\/null | sed -e 's\/\^\/ \/'/echo Void/g" ${DESTDIR}/usr/bin/kodi
 	# remove unused stuff
 	rm -rf ${DESTDIR}/usr/include
 	find ${DESTDIR}/usr/lib -name "*.cmake" -delete