Add fix from upstream for building with newer libnfs #445174 by Winfried Lorenzen.

(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)

4 files changed, 38 insertions, 3 deletions

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index bee26aa62b90..6e2e0f3987eb 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-tv/xbmc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.156 2012/11/28 13:35:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.157 2012/12/08 18:21:49 vapier Exp $
+
+  08 Dec 2012; Mike Frysinger <vapier@gentoo.org>
+  +files/xbmc-11.0-nfs-limits.patch, xbmc-11.0-r1.ebuild, xbmc-11.0.ebuild:
+  Add fix from upstream for building with newer libnfs #445174 by Winfried
+  Lorenzen.
 
   28 Nov 2012; Samuli Suominen <ssuominen@gentoo.org> xbmc-11.0.ebuild,
   xbmc-11.0-r1.ebuild, xbmc-9999.ebuild:
diff --git a/media-tv/xbmc/files/xbmc-11.0-nfs-limits.patch b/media-tv/xbmc/files/xbmc-11.0-nfs-limits.patch
new file mode 100644
index 000000000000..ebee2d063181
--- /dev/null
+++ b/media-tv/xbmc/files/xbmc-11.0-nfs-limits.patch
@@ -0,0 +1,28 @@
+https://bugs.gentoo.org/445174
+
+fix from upstream
+
+From 6ffd1cb4e2cba40888c24ff84afd04a5a07a22e9 Mon Sep 17 00:00:00 2001
+From: Torsten Kurbad <github@tk-webart.de>
+Date: Wed, 28 Nov 2012 21:29:29 +0100
+Subject: [PATCH] NFSDirectory.cpp must include limits.h
+
+---
+ xbmc/filesystem/NFSDirectory.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/xbmc/filesystem/NFSDirectory.cpp b/xbmc/filesystem/NFSDirectory.cpp
+index 4dc0f31..d306331 100644
+--- a/xbmc/filesystem/NFSDirectory.cpp
++++ b/xbmc/filesystem/NFSDirectory.cpp
+@@ -35,6 +35,7 @@
+ #include "threads/SingleLock.h"
+ using namespace XFILE;
+ using namespace std;
++#include <limits.h>
+ #include <nfsc/libnfs-raw-mount.h>
+ #include <nfsc/libnfs-raw-nfs.h>
+ 
+-- 
+1.8.0
+
diff --git a/media-tv/xbmc/xbmc-11.0-r1.ebuild b/media-tv/xbmc/xbmc-11.0-r1.ebuild
index 3653b6b22a21..109dfe91a29f 100644
--- a/media-tv/xbmc/xbmc-11.0-r1.ebuild
+++ b/media-tv/xbmc/xbmc-11.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-11.0-r1.ebuild,v 1.2 2012/11/28 13:35:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-11.0-r1.ebuild,v 1.3 2012/12/08 18:21:49 vapier Exp $
 
 EAPI="4"
 
@@ -133,6 +133,7 @@ src_prepare() {
 		epatch "${WORKDIR}/${P}-ffmpeg-1.0-compat" #438842
 	epatch "${FILESDIR}"/${PN}-11.0-ffmpeg-0.10.2.patch #406215
 	epatch "${FILESDIR}"/${PN}-11.0-libav-r1.patch #406215
+	epatch "${FILESDIR}"/${P}-nfs-limits.patch #445174
 	# The mythtv patch touches configure.ac, so force a regen
 	rm -f configure
 
diff --git a/media-tv/xbmc/xbmc-11.0.ebuild b/media-tv/xbmc/xbmc-11.0.ebuild
index f698410e96a5..78e532cfb128 100644
--- a/media-tv/xbmc/xbmc-11.0.ebuild
+++ b/media-tv/xbmc/xbmc-11.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-11.0.ebuild,v 1.18 2012/11/28 13:35:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-11.0.ebuild,v 1.19 2012/12/08 18:21:49 vapier Exp $
 
 EAPI="4"
 
@@ -130,6 +130,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-11.0-ffmpeg-0.10.2.patch #406215
 	epatch "${FILESDIR}"/${PN}-11.0-libav.patch #406215
 	epatch "${FILESDIR}"/${PN}-11.0-ffmpeg.patch #406215
+	epatch "${FILESDIR}"/${P}-nfs-limits.patch #445174
 	# The mythtv patch touches configure.ac, so force a regen
 	rm -f configure