xbmc: 13.2

xbmc/PKGBUILD

@@ -4,9 +4,9 @@
 ### NOTE: when you update XBMC, you also have to update xbmc-pvr-addons
 
 pkgname=xbmc
-pkgver=13.1
+pkgver=13.2
 _codename=Gotham
-pkgrel=4
+pkgrel=1
 pkgdesc="XBMC Media Center is a software media player and entertainment hub for digital media"
 arch=('x86_64')
 url="http://xbmc.org"
@@ -34,19 +34,16 @@ options=('makeflags')
 source=("xbmc-$pkgver.tar.gz::https://github.com/xbmc/xbmc/archive/${pkgver}-${_codename}.tar.gz"
         "${pkgname}.service"
         "polkit.rules"
-        "enable-external-ffmpeg.patch"
-        "make-sure-applications-xbmc.desktop-does-nt-have-exe.patch")
-sha256sums=('344b604eae2ddb47c032dd7964d01f27e6fcd7a8873c84c0841d5da75961a678'
+        "enable-external-ffmpeg.patch")
+sha256sums=('acbf5dffa3034a3406240ee3cf81e721386cd383d23d056ddde1f769e050e585'
             '547e06f3141866cd34b1df34025517e9826992b67543af7621d954bcdfa0ba94'
             '4ea78374a08e13a64dcf6a424b111b8bfc11de03ed5829744fc6d9b5fc1ec96e'
-            '0239e33e87292c7340ed2092f2b5f1e82f5e283b1f763fb125b3aee78f50c355'
-            'ef7af1c4780767da3a27f96b3bd9f3912b8bb15d4b3ccd5a9f9d0de22b57914d')
+            '0239e33e87292c7340ed2092f2b5f1e82f5e283b1f763fb125b3aee78f50c355')
 
 prepare() {
-  cd xbmc-$pkgver-$_codename
+  cd xbmc-${pkgver}-${_codename}
 
   patch -p1 -i ../enable-external-ffmpeg.patch
-  patch -p1 -i ../make-sure-applications-xbmc.desktop-does-nt-have-exe.patch
 
   # fix lsb_release dependency
   sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp
@@ -54,12 +51,14 @@ prepare() {
 }
 
 build() {
-  cd xbmc-${pkgver}-$_codename
+  cd xbmc-${pkgver}-${_codename}
 
   msg "Bootstrapping XBMC"
   ./bootstrap
 
   msg "Configuring XBMC"
+  # external python v2
+  export PYTHON_VERSION=2
   ./configure --prefix=/usr \
     --enable-optimizations \
     --enable-gl \
@@ -98,7 +97,7 @@ build() {
 }
 
 package() {
-  cd xbmc-${pkgver}-$_codename
+  cd xbmc-${pkgver}-${_codename}
   msg "Running make install"
   make DESTDIR="${pkgdir}" install
 
@@ -107,8 +106,8 @@ package() {
   sed -i -e "s/lsb_release -a 2> \/dev\/null | sed -e 's\/\^\/    \/'/cat \/etc\/chakra-release/g" "${pkgdir}/usr/bin/xbmc"
 
   # Tools
-  install -D -m 0755 "${srcdir}/xbmc-$pkgver-$_codename/xbmc-xrandr" "${pkgdir}/usr/share/xbmc/xbmc-xrandr"
-  install -D -m 0755 "${srcdir}/xbmc-$pkgver-$_codename/tools/TexturePacker/TexturePacker" "${pkgdir}/usr/share/xbmc/"
+  install -D -m 0755 "${srcdir}/xbmc-${pkgver}-${_codename}/xbmc-xrandr" "${pkgdir}/usr/share/xbmc/xbmc-xrandr"
+  install -D -m 0755 "${srcdir}/xbmc-${pkgver}-${_codename}/tools/TexturePacker/TexturePacker" "${pkgdir}/usr/share/xbmc/"
 
   # Licenses
   install -d -m 0755 "${pkgdir}/usr/share/licenses/${pkgname}"
@@ -118,7 +117,7 @@ package() {
 
   # Systemd service
   install -Dm0644 "${srcdir}/xbmc.service" "${pkgdir}/usr/lib/systemd/system/xbmc.service"
-  install -Dm0644 $srcdir/polkit.rules $pkgdir/usr/share/polkit-1/rules.d/10-xbmc.rules
-  chmod 0700 $pkgdir/usr/share/polkit-1/rules.d/
+  install -Dm0644 "${srcdir}/polkit.rules" "${pkgdir}/usr/share/polkit-1/rules.d/10-xbmc.rules"
+  chmod 0700 "${pkgdir}/usr/share/polkit-1/rules.d/"
 }
 

xbmc/make-sure-applications-xbmc.desktop-does-nt-have-exe.patch

@@ -1,27 +0,0 @@
-From 6abfd7104202121d3e23ddad47e377dfaef22b10 Mon Sep 17 00:00:00 2001
-From: BlackEagle <ike.devolder@gmail.com>
-Date: Sun, 25 May 2014 12:10:01 +0200
-Subject: [PATCH] make sure applications/xbmc.desktop does'nt have executable
- flag
-
-Signed-off-by: BlackEagle <ike.devolder@gmail.com>
----
- Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 754f153..bee1fdd 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -646,7 +646,7 @@ endif
- endif
- 	@# Icons and links
- 	@install -d $(DESTDIR)$(datarootdir)/applications
--	@install tools/Linux/xbmc.desktop $(DESTDIR)$(datarootdir)/applications/xbmc.desktop
-+	@install -m 0644 tools/Linux/xbmc.desktop $(DESTDIR)$(datarootdir)/applications/xbmc.desktop
- 	@install -d $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps
- 	@install -m 0644 media/icon48x48.png $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/xbmc.png
- 	@install -d $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps
--- 
-1.9.1
-