diff options
author | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2014-08-18 22:18:03 -0300 |
---|---|---|
committer | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2014-08-18 22:18:03 -0300 |
commit | 986f87a52c08515cd2ca56a0d009b5e3f1d3d8c6 (patch) | |
tree | 39805465471a237be48e67d84da163d797b9e210 | |
parent | 95a38ad9f37dcfa806f90879bccbccc3c1adae85 (diff) | |
download | abslibre-986f87a52c08515cd2ca56a0d009b5e3f1d3d8c6.tar.gz abslibre-986f87a52c08515cd2ca56a0d009b5e3f1d3d8c6.tar.bz2 abslibre-986f87a52c08515cd2ca56a0d009b5e3f1d3d8c6.zip |
update xbmc-libre
-rw-r--r-- | libre/xbmc-libre/0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch | 27 | ||||
-rw-r--r-- | libre/xbmc-libre/PKGBUILD | 15 | ||||
-rw-r--r-- | libre/xbmc-libre/libnfs-header-changes.patch | 24 |
3 files changed, 4 insertions, 62 deletions
diff --git a/libre/xbmc-libre/0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch b/libre/xbmc-libre/0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch deleted file mode 100644 index 71841758e..000000000 --- a/libre/xbmc-libre/0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch +++ /dev/null @@ -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 - diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD index 5c73da5b6..54fc520c4 100644 --- a/libre/xbmc-libre/PKGBUILD +++ b/libre/xbmc-libre/PKGBUILD @@ -12,9 +12,9 @@ _prefix=/usr _pkgname=xbmc pkgname=xbmc-libre -pkgver=13.1 +pkgver=13.2 _codename=Gotham -pkgrel=5 +pkgrel=1 pkgdesc="A software media player and entertainment hub for digital media (Gotham version), without nonfree addons and unrar support" arch=('i686' 'x86_64') url="http://xbmc.org" @@ -52,16 +52,12 @@ mksource=( ) source=( "https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver-$_codename.tar.gz" - '0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch' - 'libnfs-header-changes.patch' ) mksha256sums=( - '344b604eae2ddb47c032dd7964d01f27e6fcd7a8873c84c0841d5da75961a678' + 'acbf5dffa3034a3406240ee3cf81e721386cd383d23d056ddde1f769e050e585' ) sha256sums=( - '0e06a586e2b3041fd812b9d440ffe224f78779ac4cf6a21421a47c74a0f65d1f' - '5f5fe2932050265ad71c82b5d23efe5eaf7b2b3a152bdc6da66675cfb655fabe' - '9b49e98540cfcf3431d38cf9cd981ed8450ccbfcb70eed7f862f82f39d66763b' + '4d7a4e157f8805211ea0e2e15a28d856caa698d8c28a493c5f54fa2c747615bf' ) mksource() { @@ -73,8 +69,6 @@ mksource() { prepare() { cd "$srcdir/xbmc-$pkgver-$_codename" - patch -p1 -i "$srcdir/0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch" - patch -p1 -i "$srcdir/libnfs-header-changes.patch" find -type f -name *.py -exec sed 's|^#!.*python$|#!/usr/bin/python2|' -i "{}" + sed 's|^#!.*python$|#!/usr/bin/python2|' -i tools/depends/native/rpl-native/rpl @@ -122,7 +116,6 @@ build() { --enable-udev \ --enable-libusb \ --enable-libcec \ - --enable-external-libraries \ --with-lirc-device=/run/lirc/lircd \ --disable-non-free diff --git a/libre/xbmc-libre/libnfs-header-changes.patch b/libre/xbmc-libre/libnfs-header-changes.patch deleted file mode 100644 index ef3d45e2c..000000000 --- a/libre/xbmc-libre/libnfs-header-changes.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/xbmc/filesystem/NFSDirectory.cpp b/xbmc/filesystem/NFSDirectory.cpp -index 85084a5..8efa7bf 100644 ---- a/xbmc/filesystem/NFSDirectory.cpp -+++ b/xbmc/filesystem/NFSDirectory.cpp -@@ -37,6 +37,7 @@ - using namespace XFILE; - using namespace std; - #include <limits.h> -+#include <nfsc/libnfs-zdr.h> - #include <nfsc/libnfs-raw-mount.h> - #include <nfsc/libnfs-raw-nfs.h> - -diff --git a/xbmc/filesystem/NFSFile.cpp b/xbmc/filesystem/NFSFile.cpp -index 479f3fe..2aeea32 100644 ---- a/xbmc/filesystem/NFSFile.cpp -+++ b/xbmc/filesystem/NFSFile.cpp -@@ -32,6 +32,7 @@ - #include "network/DNSNameCache.h" - #include "threads/SystemClock.h" - -+#include <nfsc/libnfs-zdr.h> - #include <nfsc/libnfs-raw-mount.h> - - #ifdef TARGET_WINDOWS |