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

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

5 files changed, 55 insertions, 13 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/Manifest b/media-tv/xbmc/Manifest
index b36151ddd01f..145d18972a82 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -5,6 +5,7 @@ AUX xbmc-11.0-ffmpeg-0.10.2.patch 1197 SHA256 84e2a842c81c1bc6a346c946301f38e478
 AUX xbmc-11.0-ffmpeg.patch 1566 SHA256 5515321c4cb46b0ac1c959b9e8752c370344352d9f7de1be3991760fa6ffc70f SHA512 c7ccba50e6f8fa8dd714ddf0cf1348c7311aefa9d9e971b0287757f75b51d8640d7e404940e12f7b53dbca3ce0bdc81c5b2913d6a73e2edd1ca7351b0a986fdb WHIRLPOOL 088d39196324112d2b133df19489427ca6e84fe7eaf410d9be5603601562019dd78427c4ff438814928c1e3db4c22d742824b6458ef15b79a46ea2c8b79f749d
 AUX xbmc-11.0-libav-r1.patch 3436 SHA256 ad2dde73e0c9ed1f96c0c6aa4c3d80edadbb92c3092d3c1f34e28bab45983ecb SHA512 42a5fd80b76d31e1b0661d3bda15e3015b90852c53f37b50927ddd15484e9a7f02efbb685b92a48594425c74bfc82ac9a2f256c69530a483d10c4d3b81e7ad79 WHIRLPOOL e9b4c62f15aa706f32926a21406b4d845de9219edd35ff0996916317d0bfca21b8bef2c3452fc03253fa99e24a3a6f93862d6a44a18d51be9641ea927c5daea6
 AUX xbmc-11.0-libav.patch 3636 SHA256 b30f3c16595f9d79fe4f091504ae9d1f7b01042c988394e89ec467583d1e371d SHA512 cb71c6601df413136eb80c61345d6123ed4c7c5b3c99346f32986cf177afe966ab56cee13b4aa8a91ed37150c73c6f2c891e7f7ba7c34935483e47b7fda525d4 WHIRLPOOL 3487e0d19c1fffba396b406e95f1a9ab85d2ae33c6ca3f88ab3e35ac170e670d0611529ede7a6568f96df73f2dd4b311f3ef5acfde75384166d2b9da0b17473a
+AUX xbmc-11.0-nfs-limits.patch 727 SHA256 0161fe96fc164517ba83dab4e48fb7863aebfe031109dc9f31a8c41cec0e7c63 SHA512 ef97cc76a6b84b898fd4f173e5a132f6bf587905f40d521b21590ad562915b0fc0760ffcb0be20735009ee1a26fd49172824f880dd8552b37e5f0aca0a8742a7 WHIRLPOOL c9764497f5c768885861731ab6345bf531c451326328a63c5655de88d1bc45ea2258272af6a1c15c766995878c0cdcf33e1b9191afcfd32e2a4da76aef651780
 AUX xbmc-11.0-no-arm-flags.patch 542 SHA256 72164a8b91f3209cff06ea1a103580f827135951a7a798eefabc04ee1a6d3e84 SHA512 7d40be4bdef2a2b1e53f8b96c489a87ec67975ae486fb44e619d66c1b5333ad33f896f64cca4e1c8050c3d92cd6537a9ca776e743c88fc2c8cabea1eae62b4b5 WHIRLPOOL 7c6666198b7d987028925e0f578d71796f6541995aa87964de3275f6a087610ef69d630ac349500a7c534de213b8fbff4cca6c25c3d0e6f1b1d8cd89f27d3d9d
 AUX xbmc-11.0-no-exec-stack.patch 807 SHA256 e36c83746838dd362512a046dc066c0f3fdc1252289b2761be381f84262cab78 SHA512 d0d4c2d4bb257c722ec40470fb6c8da59033009152598e69133b6184b25da36debf42f86859389c878a072603f3d583e28a52519e8dca47d9bdf7edd5f9e44c5 WHIRLPOOL d18dd387fe55b18be78fdad08b0a4319c2a5ccd161f1dfc0d5ab8015d88c5842780415c903a098a4683524658fc31c07e285e61fcff04ad6e4777c77e5691f38
 AUX xbmc-11.0-nomythtv.patch 6190 SHA256 ffb1eb49f94b4ae41e5d79172499671915122a58af248b0585ee276e4aa2c87e SHA512 4a9ff4b4f5cb56c92932f05b5b812bee0fdce37ed9f568a6e0dc0cd62335e2131361a63d8026b64f9c7078fa9c4ef0e439b52234c722b1b854aeeed1cc2764c7 WHIRLPOOL ce457b509c6fd222ae6002420db7cc438e1352114f38790b623f04e6834eb5508d4609a1bf71628bfafde3bcef830e84b42448619c19227d5729d6d8a824a13c
@@ -12,19 +13,25 @@ AUX xbmc-9999-no-arm-flags.patch 478 SHA256 075db2562d31914d86b4394500d4b3168ea7
 AUX xbmc-9999-nomythtv.patch 1680 SHA256 fe0289d1361b0dde3c261bc082bcad123c9cc9a2b7398e4eb48773f976be93a2 SHA512 403389bb1bf1442be1a8d23106bd78dc672c66fcf588b6076e6105023a69a92ca58cdaa91c9e2664123f244c3d5f42a9de6f72845c702339e3f8a0e976330ca1 WHIRLPOOL dcf13b59133f2b7288bc734803ad1317d6e943f7cd85b0428ec257b2ec9fb6a23311fbdd8574dbfb985a473dac7cf8ca30c2ac6d59b62797adb1f63d8bcc0b12
 DIST xbmc-11.0-ffmpeg-1.0-compat-1.tar.bz2 32687 SHA256 bfdca8283c35d0062ed2c2b3f67da29dcd71bb3e0f6b06c1dcc2e43d35d7c427 SHA512 e28f69719ee9b7343c8f43f34b0ae932b66452507daf3876f10e78c79fc2edeee2569c8470c0a7519ff24a43bf2558fe6d9e08a3aca73123ef423447b90f6abf WHIRLPOOL e0caafa34d99f8cfd7908ee7755352f2972794cd7460b04ab207d4f55ec39cbf09a22c77fc954b269d09b232dcf0cb357d6a41568337df5ea97aae6ee0d6faa6
 DIST xbmc-11.0.tar.gz 63012044 SHA256 1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19 SHA512 ba738129f70dd171b3fae385ab44317f62c9041a116bfe809d6d07c99ea69c663ad5d598552a17be0b942251ce12a68f34d0be21b303b256055849a6dde90043 WHIRLPOOL 4dd068749c86542e39b8fc42b45bbb56e885813b17876d3583cb4d91c902ff075e1f16f1c19720e3430dc149c40e52e7d1ab3323f666263fb353a59e2ef94a8e
-EBUILD xbmc-11.0-r1.ebuild 6460 SHA256 f4b46148d8643e8111d4e6578b8459144fc9f2d19b4501a589006f85308cd8d5 SHA512 3d09d65ba0dd1ce44822dc44e33655be9eda33eda6333b53f24b7b2d665fd69f7339d5dcfe988965fbe3d16d9ccaf9dd28cc946f3624de94ed766394cb69e683 WHIRLPOOL 6645646762e8df5b31f5d2051d2da3cdabab2629c0f680df414f753828e8dceb9c0882da9645b37b138b78d94a01417a324546dd9b629daf71c892f4e44b15c9
-EBUILD xbmc-11.0.ebuild 6248 SHA256 019240f2d50a6668d98762ffaf1ee5c31fa67f185a645e4deecb7f2aba1a0765 SHA512 ef46dea4eb04f1e21a76455c12cb27ebd7dff0f8a6c51f4a916ca5332b440f42693eb5f3f24d76b6304557e02469643f6fa047a4e6bb7d05bc7c0c3f5599460d WHIRLPOOL bb5a1f8340cb74ba4e0017564b991e34c657b7be9fcfe62e47b75dcb78a7256fe299291d7b243ca433954bc557a997c9b3c68043848d66f2358f5f1e93fa9d95
+EBUILD xbmc-11.0-r1.ebuild 6509 SHA256 eb80e9c0f938833ad8cf7571dc718a4c29fedaee05646d58d1d509ef8a5a5902 SHA512 ec3732f072a4d7a4960a9ccb270c93c72b3d07fbeccec213fa62f4f5e1fc681db161b577ee226330900200fc1bb96b7b20b6e36f9908e36d77588fe4c31a6af1 WHIRLPOOL c84d67c21ac1287f82e41fd41a81f99947105ab22d900f1f8d82172f3fb9d3ebe73b8d707e5ed536c02f94f56a5bb14df33b936367a9baf93bff11dc4847eaf3
+EBUILD xbmc-11.0.ebuild 6297 SHA256 7395c414fbd86dc3cc3bef80a68a108ee750c4cb39280d255b2a4f086658c98d SHA512 c2ecfb837deac387388b56bdf297f5d0305a24b2f251f6fc9722c74e44689997a6b62330c98d7d72b73ecba6681b7659916f0f5ce8d5c7f2af22342653e0e3d0 WHIRLPOOL eebbf81f6e994a118a1b0bea796df3189d0f86a1f9984059d67d8968fe17b7c03de35b326d1569fe32762c4dd744740e5e04f5a4d8559dcd513c614408c61fb6
 EBUILD xbmc-9999.ebuild 6066 SHA256 d1e43a833d850a0c2850d5a1e83c26c896116ad3e0d87074ff39d5917ff8272b SHA512 004a2e8cbb9a22f06d385d7ceff0200245726e8e02d7fde1cda788728ba6bdcf70de17ccbff7d58e1bfd2f514db90bc3df74579e8319de8460fcf6761027238b WHIRLPOOL 45839fb232eefc5e77a623b45b540b569b2dd605938aabcf83dfa50fa084dd83a8c43ab8a47db983ea6d3ed9476f4c9a64f9033af60df4f3929ef21fd35ebb54
-MISC ChangeLog 25360 SHA256 21679907dcc5db50a1c99d87e63141d38bc12e148b4933efd7e60b79b00d551b SHA512 71d6ec24dc5cb6ad73d1ddfe94393e9129ca9c9c6f989140f7f003d26d348ac091564542966e0f252bab6959ae110e49318a42245deb45d3931671163700a25c WHIRLPOOL 846b759108b6959b75f6be5565658705143e44baef5e151a570933fcb06dc31197014cd1ef113d77ab2cbd61beb64c009f27e6c6c9f1ec5750d655c862e6b26b
+MISC ChangeLog 25571 SHA256 714a8e6b985f2bda42b702624f1890535c30afe7d7f429b9f2b16b8ec26a770e SHA512 702fb6d29c71fac8379b1aa0cdcffc78535df5778d169f0ef0de77092b5628e37039d17cdd42a48f2a6daa3ccbf5455a9a9324fa65008029a50d0b04fd323ac1 WHIRLPOOL fd3942e71145bbc067eb0b2bb98a25937682bb8469d8855922f36392d8a96c2463a10bcb9a20f858e335192538d1e7a14a54ca8a91e507c928b316917665c03e
 MISC metadata.xml 1025 SHA256 73ced63a34ac528635412bea6d8e671d6ba517c6bfa17d0f48a560a9de0f12f9 SHA512 40d2a20175ef2fd0bdc5228339f4236905cd91758d30bec4c8575ff2a90f59e3333167e8ffcb125f382530248931e1a0a98f7e67a40073bff0850c350bccc36f WHIRLPOOL 3c4f940a8a42426b530041e0958635cbd46d9a23817594f82dbe4dce2a0873189c727a53663bb98c198c146dd38dc2fcb6e06823c4c22cb9ae860c3d51ea6750
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQthLiAAoJEEdUh39IaPFNCJUIAIZ3Z7vDi8bkcHuVoK7LZj2v
-S3HeFg5xN17wbG5c3wB+iGaeVg7wRkeS5k4w9M35W7+xvVaBoKkm5qQlQFyFlnMc
-S5z+K1SlBiC8Q3KV+QFKBPinwoTN1JNclV1YvhTbEWnN65+igbqBll9DeKQjklMj
-k69q0pPk93pIIfiUip06hY3DBPJUxYGS8pRGpGtEz8BYcC4t81IsuFBRglF8zZoy
-1b8MYchtz3HLCBejXV9YxAcnYpqbqFL6Clc8x3RUZk7a4eH0n5GP/kYgYbTWBfPx
-xn8aCk4luSgSbpgi1riMaN2vd42SaIBONiuzTvFM/xEe6DvJslspwDUzS208Qis=
-=HZHz
+iQIcBAEBCAAGBQJQw4VrAAoJELEHsLL7fEFWJiUP/RpdfNnm4fLvJr/ceylg3zLZ
+VXbbL/IbuuK7DCOmv5HqzHJXd5AOS+Qe4EYWBL/bNA3M4lzK8Uqukek+Ek5eo6ra
+smKjkiA1wO8q7T9NWzIIT1LZ+TohLu7ZODqW0+1r3P2ZpL5fQl49Nw711W/6x6Y0
+QiEhs3jkgyB2NxTwKGcPbrh46fDJgCoaKxM9anX8H9M/qLIpQ4o53pIGQgacunR2
+MT8xojzlTyF3KmKS0WqruBgfxnDxAIkg26dzGfGMqPXHkGUwYQk8s2mcg2XuYEaj
+uAVJ99kYWiyoz5Z4T6SqmB3GbQuZYO6Z6pNhyWohpJ8vWdAa9F9hOSN2Yb0pH74+
++fHbyx2r1nCy3F91b6OWePCJM484ovalF9znQvZ2J0JWuN5i4opbGdACQsqlj0LQ
+wOKSoexgFx62Vlh7mllTvgHgtFcxB4+ckyBePgW2dMqAwBriAU3uY0jvBhT7JF80
+FLKXLHK/hH3KGVY+iWK51V9roTtFLFsL+spgC0dEB4g9/RoQ1FhuJSF8CZ/9hVqI
+OQcknrdYCEZwTGo4YpXRtgAIT5Pj41IFY9hOl9peFSllZSyJI1ctn8se/8ujZGsr
+kPfNRftkS8c5SFpD7fEJs0N9I53UWIJCbYVm16fY+Z1dHU2kYPiZ6ysCEJu0U+Lm
+Y6OyiebYAX6lpi4ZvDOg
+=Pa2e
 -----END PGP SIGNATURE-----
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