diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-07-14 00:53:39 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-07-14 00:53:39 -0300 |
| commit | 54bf44ce7dea4fef3e7072fec787be1e92096895 (patch) | |
| tree | d134c31af860a03ce14d9e9caf713cc66d21909e | |
| parent | ec5a1c7a941eb21729d3ebdd578f38b8a59f33dc (diff) | |
xbmc-libre-13.1-3: libnfs 1.9.4 build issue fixed
| -rw-r--r-- | libre/xbmc-libre/PKGBUILD | 9 | ||||
| -rw-r--r-- | libre/xbmc-libre/libnfs-header-changes.patch | 24 | ||||
| -rw-r--r-- | libre/xbmc-libre/xbmc.service | 2 |
3 files changed, 31 insertions, 4 deletions
diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD index bd8e32c35..f97c7bae7 100644 --- a/libre/xbmc-libre/PKGBUILD +++ b/libre/xbmc-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 112817 2014-06-08 08:35:29Z idevolder $ +# $Id: PKGBUILD 115116 2014-07-05 17:16:22Z idevolder $ # Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor (Arch): Brad Fanella <bradfanella@archlinux.us> # Contributor (Arch): [vEX] <niechift.dot.vex.at.gmail.dot.com> @@ -14,7 +14,7 @@ _pkgname=xbmc pkgname=xbmc-libre pkgver=13.1 _codename=Gotham -pkgrel=2 +pkgrel=3 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" @@ -54,15 +54,17 @@ source=( 'xbmc.service' 'enable-external-ffmpeg.patch' '0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch' + 'libnfs-header-changes.patch' ) mksha256sums=( '344b604eae2ddb47c032dd7964d01f27e6fcd7a8873c84c0841d5da75961a678' ) sha256sums=( '0e06a586e2b3041fd812b9d440ffe224f78779ac4cf6a21421a47c74a0f65d1f' - '17ea860b675568f516df0289e5663029a2ce1829b0dfa3c71636ef1ae7cd2207' + '1a94a7952ef99cd3dd6f4b921630563f72a3b907265e91e0a37b07339081558c' '0239e33e87292c7340ed2092f2b5f1e82f5e283b1f763fb125b3aee78f50c355' '5f5fe2932050265ad71c82b5d23efe5eaf7b2b3a152bdc6da66675cfb655fabe' + '9b49e98540cfcf3431d38cf9cd981ed8450ccbfcb70eed7f862f82f39d66763b' ) mksource() { @@ -76,6 +78,7 @@ prepare() { cd "$srcdir/xbmc-$pkgver-$_codename" patch -p1 -i "$srcdir/enable-external-ffmpeg.patch" 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 diff --git a/libre/xbmc-libre/libnfs-header-changes.patch b/libre/xbmc-libre/libnfs-header-changes.patch new file mode 100644 index 000000000..ef3d45e2c --- /dev/null +++ b/libre/xbmc-libre/libnfs-header-changes.patch @@ -0,0 +1,24 @@ +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 diff --git a/libre/xbmc-libre/xbmc.service b/libre/xbmc-libre/xbmc.service index 81a37ac7e..90119f07d 100644 --- a/libre/xbmc-libre/xbmc.service +++ b/libre/xbmc-libre/xbmc.service @@ -1,6 +1,6 @@ [Unit] Description = Starts instance of XBMC using xinit -After = systemd-user-sessions.service +After = systemd-user-sessions.service network.target Conflicts=getty@tty7.service [Service] |