compilefix vdr-2.1.2

Package-Manager: portage-2.2.1/cvs/Linux i686
Manifest-Sign-Key: 0x34C2808A

4 files changed, 84 insertions, 7 deletions

diff --git a/media-plugins/vdr-live/ChangeLog b/media-plugins/vdr-live/ChangeLog
index 26cd6a4f065f..8bc470baad34 100644
--- a/media-plugins/vdr-live/ChangeLog
+++ b/media-plugins/vdr-live/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-live
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/ChangeLog,v 1.41 2013/10/05 16:46:26 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/ChangeLog,v 1.42 2013/10/23 02:11:45 hd_brummy Exp $
+
+  23 Oct 2013; Joerg Bornkessel <hd_brummy@gentoo.org>
+  vdr-live-0.3.0_p20130504.ebuild,
+  +files/vdr-live-0.3.0_p20130504_vdr-2.1.2.diff:
+  compilefix vdr-2.1.2
 
 *vdr-live-0.3.0_p20130504 (05 Oct 2013)
 
diff --git a/media-plugins/vdr-live/Manifest b/media-plugins/vdr-live/Manifest
index 15970c224f65..895d3342e097 100644
--- a/media-plugins/vdr-live/Manifest
+++ b/media-plugins/vdr-live/Manifest
@@ -6,6 +6,7 @@ AUX confd-0.2 467 SHA256 84d9ccf84024d0c32ceefad53a115f458878b523d74844dfbbaa8e4
 AUX rc-addon-0.2.sh 611 SHA256 70181758e4477c7c364698c2e656c6a14c8cd421fbafc1195f649bedf5f95658 SHA512 d0bf68644f4702d5773a03b7d63b4d6542c0ac0c5593aebc7849d68a2051b8bd7da752efbff61ef4e9df830142822736e520012f79a8a40493b03135ba105ca1 WHIRLPOOL 1842fcb8775c3cda34b8a3b2ef383ccda3e3c2b91e236b1b2d9fe821ac801d7bbed8fdb2cd2a98fda5cd1c5f07962e2850b2760516a0b053a5a2a1cc7931b601
 AUX rc-addon.sh 180 SHA256 d9c9eca9f12362c1f8c162a9bb948feebdb8acc87413a611ecf5f52a3092878a SHA512 2bdf0e809148bbeb33ede687d40332b26dfaa2dc8be2e743f7c56cb19f572ff30e88ceac8c80602b8a39e0dc1657cd79f7afa1b8993b37714a400f7b1384f622 WHIRLPOOL 73d8af3cdb68c341473a18b5e5ff7c45f3165259f2716e454e3cc3a28a660ff4d17b2fffea82dee81eed0b49e36072be7a87138c91c19e601d1ca0997124f1d4
 AUX vdr-1.7.28-compatibility.patch 1146 SHA256 52bc7f9315db8102a5531a788e164bc347dae0deb3078c157a6722500b16041a SHA512 c7e48330e5e3dcd09e8bf830748308553a994e46bc89c6633e2a0daf03fd00c2fcaf7272a53b7977a33731b5c8e0e36f1e2f19e0806f0af932300e2dd4d16772 WHIRLPOOL a35b74aebfb763367f88bfbdef351642a193fb9c349d666f30ed26e185e1619456bc1207325bedd680dbbc57b481df42c036d3bd8a375e5d9bded8b96334d917
+AUX vdr-live-0.3.0_p20130504_vdr-2.1.2.diff 2722 SHA256 60ac1cbec3863fedf4620a9c30661139a3c5ee62c843fc809c5f3e53e79370eb SHA512 813e17202fb9dd921e38492127ad8518fc4aa2f6240ce9284990bf3e0a40c04b3b56efcaf667ce5f4aedf9b6e76422e2bb73c3218d124f3d8452b3b7979ba0b2 WHIRLPOOL 0571dbd5fc091aa3eead30179d162186b74a5adaa61a930734159111b61bc2316041b2e96484612742b94fbf6186235aae1f1f5249bfa9a8fed55e4fc48648e4
 AUX vdr-live_pcre.patch 586 SHA256 290fe19ec39c638a78ca4b7f21ab9d337aa85657491e77871fbf0ab175873c94 SHA512 fb48fea6b6e1e54fbdcb541da9a0e4563ecf0f7ecb2b74836282ad3afc22475f4434feaeee8a5dcda0cdad0086aa16ae2f756e9245a3e9a717e8fba5d555352a WHIRLPOOL 3c517b6e3e67d76a90362c176bfaf04cc056bbc168ea6ee2549750d8af71b6f91a7e3fa51381053c0609e53e31a592834494d8339df169aa6c92c861712475c0
 DIST vdr-live-0.2.0.tar.gz 560582 SHA256 30ac64040be4defb75beb9d3a5b0218694fc5b10486926acd989e6eb6c72ca55
 DIST vdr-live-0.2.0_p20120325.tar.bz2 1992249 SHA256 c73873d810d154ec7ebc167fad727e892ddabc523a601447b180ddd6f298a138 SHA512 d7e1355a22437f9b81928675f8b3d250793aa5803b1bfb3a8685798fa5bf2f42eb87600279abbc156312c5edcf7f4b15a323e884847f9244f3021647784bfb6b WHIRLPOOL 8b4f7ee2f43bd6971f46407fb85715bb1ccc8301e4ab6ba76a875a62682e39d2f7d9656d15fd58fe18c655f1b12d5c5ad814d4d38a6957d4f812048a16e76129
@@ -14,14 +15,14 @@ DIST vdr-live-0.3.0_p20130504.tar.bz2 6348021 SHA256 edd577580b9e99de88bcd3794fc
 EBUILD vdr-live-0.2.0.ebuild 1222 SHA256 25f86271282802d7a92f13cdf91b728b74d1d4a04f6344a103422fd968246d41 SHA512 cd5680a4a2aa74ac930ead073f54be0237337ae215ee9f81c9186b5f77cde0a356d795e0762178309f6dbcb528a283d0a3e421f75256f93f66f423e8c871c865 WHIRLPOOL 94350eca34ffeb35cf92c16142a8536c5cb61fd11bc67b35fd41e8df477346efd2b27907868545412edfa7c6312087a448e4af451622d52588fa40caa43bdd55
 EBUILD vdr-live-0.2.0_p20120325-r1.ebuild 2621 SHA256 d1a12df4430dbe1eac7566b1810454aac40ab08e82a27b9585fca762f6a7cd4b SHA512 9dde8b275e96dbd48a831f266d7419bb5625a4f8a75f5a91be22ee4a49a571ef30fc8952fc549ef83140b805ab0f9822bfdee876d21434699f7437f0c425f826 WHIRLPOOL fe4bc8d42217451fea682f69661a3f4cca80c747cbf6166d8ecd4e1f78af9ed1060eb5576d08820d95befe6e0d88071f5ea234a3f6360440057052a4864f7a85
 EBUILD vdr-live-0.3.0-r1.ebuild 2404 SHA256 939341a53669f1e0f2a06804fa6d38a7e13ea584f444fe0211c305ac7fda36ac SHA512 d9d37429ae8def6284ca963eb3d4e95c83f6fbeda02bd6dbc40e26945ae1f34e4e8fd16f01580bbed51ec8554a0bebc6e4cc83cdd7d67ae7586fe39ecd304ec9 WHIRLPOOL 444f6102f4bcbdf5e4164a15a89dec93ebf76a8bef8faf6da5298ab546d317f44d5d970a5b81d85f6122a73e56a7f1a1d1f6c649e5c49353936f26d10de1144a
-EBUILD vdr-live-0.3.0_p20130504.ebuild 2467 SHA256 dabc5138201ef2a5128fb7f47f47f44a8ceabe52dea14ccc3f179aba7c92d8eb SHA512 50e2d238d75679605c078fbc9c180e8f5f55fce0634c70894ea2dec1b1cf904fbe4677af2aae9b4cae3c8142ed2ac6884f87ea4798a63987cf6bd2fff27583fa WHIRLPOOL f0d41ecb5edcdefd62c7dc68aebb9a514bba403b12dafa0b9da764a38b729569447c59e274ac5edecd7cb6cfd56e77726edac8203c851a159f13f0c05284b6f7
-MISC ChangeLog 7861 SHA256 008459d0739fcd5efeeb74255339d43ea441102eb2fbb365c344e4ca39f595c7 SHA512 ae7025152c061b85b5056e20de2e8287162e5bc5047a39fbf82e8516414cdfc466fb08c0a9782696a2b0487be405e7606d528fc76123cc6aa0f4810472674bd7 WHIRLPOOL c0db84e95e761b68529459c4f9faadc60ee9844eb2782c65f7b9882f75b7dbaa861606e41a80f172cfe953721fb56efcb747bcfa839d6b86b8152a1aab48c382
+EBUILD vdr-live-0.3.0_p20130504.ebuild 2510 SHA256 3f6fa6d25ba8aecb1a047134cb66ce38f2644a1f8473d47506419b0e45bf961d SHA512 c671583d2d58ec45990dffe1c1da72e77d3e6d3005847827f096a63e7cd0e3bd718bb186d4c55919758132fa8da1eab1a14c58eb6a5ef474977d5f38798369a2 WHIRLPOOL 300b58d396c18abb4d26820477fe822d0a2b1071f6b355eb4429dabee2247713a5af5e360b512717b7c756ce24ca0f24c0e553f16ac996b07c14258389c91818
+MISC ChangeLog 8025 SHA256 852d10badf927634eea524556fc5d1455568a7d78dc071498c7f52966c8ff239 SHA512 6be11bce98187d1ea558b68d069965a9eb2539ef29ed3a160e2079110c62e0684439fc09c273b7bb4679669f001c2085fa112625f0106e3133f659da8d143d4e WHIRLPOOL 00000a65faaf24227ecdcd0bc024d5b7d582e96db0dce9b5d817ebb9c269e7143e0b2689d9b9e18dd3be5bd038dfbb738780dd9c9989edbe0c1d9122f684ecb0
 MISC metadata.xml 251 SHA256 b426b6e6d679a63de74d2c1a21e4da2381fb1b580b0180b041307471d67ab54f SHA512 8f48311caba6e3069390a1871a0cb9b8731ff57b812b3b8d5a5b5147d4e2b8ad28232d059abb00f049ba78a10570d9326957a57349d2f080624b41b043112056 WHIRLPOOL 2b082e9ef2c0a111b189ec0a020a10fcf8ddb4ea6f2eb5d9627f98ab6edb72cac03a9a04f97ee4624f27852b85bb06f2d662a54b0ee421c777eba10e85e37cbe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 Comment: signed/commited by hd_brummy@gentoo.org
 
-iD8DBQFSUEJpdn07HTTCgIoRCOSRAJ9leeaGDBNFaE2EeCV9fcn9Hu5VIQCfVTFB
-Kku1WWxWAtETTS5sXeza5JQ=
-=36Wp
+iD8DBQFSZzBpdn07HTTCgIoRCGpHAJ94Uw9/41W9oulGJ9QirBf/PATj5ACff8R3
+B+/ggkd/W8r+TU+jebIEadg=
+=gXrv
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-live/files/vdr-live-0.3.0_p20130504_vdr-2.1.2.diff b/media-plugins/vdr-live/files/vdr-live-0.3.0_p20130504_vdr-2.1.2.diff
new file mode 100644
index 000000000000..1346c9be611d
--- /dev/null
+++ b/media-plugins/vdr-live/files/vdr-live-0.3.0_p20130504_vdr-2.1.2.diff
@@ -0,0 +1,69 @@
+diff -Naur vdr-live-0.3.0_p20130504.orig/pages/recordings.ecpp vdr-live-0.3.0_p20130504/pages/recordings.ecpp
+--- vdr-live-0.3.0_p20130504.orig/pages/recordings.ecpp	2013-10-23 03:28:13.746493449 +0200
++++ vdr-live-0.3.0_p20130504/pages/recordings.ecpp	2013-10-23 03:29:48.779832793 +0200
+@@ -79,7 +79,11 @@
+ deletions.clear();
+ 
+ int FreeMB, UsedMB;
++#if APIVERSNUM > 20101
++int Percent = cVideoDirectory::VideoDiskSpace(&FreeMB, &UsedMB);
++#else
+ int Percent = VideoDiskSpace(&FreeMB, &UsedMB);
++#endif
+ int Minutes = int(double(FreeMB) / MB_PER_MINUTE);
+ int Hours = Minutes / 60;
+ Minutes %= 60;
+diff -Naur vdr-live-0.3.0_p20130504.orig/recman.cpp vdr-live-0.3.0_p20130504/recman.cpp
+--- vdr-live-0.3.0_p20130504.orig/recman.cpp	2013-10-23 03:28:13.756493450 +0200
++++ vdr-live-0.3.0_p20130504/recman.cpp	2013-10-23 03:31:25.813172263 +0200
+@@ -112,7 +112,11 @@
+ 		if (found == string::npos)
+ 			return false;
+ 
++#if APIVERSNUM > 20101
++		string newname = string(cVideoDirectory::Name()) + "/" + name + oldname.substr(found);
++#else
+ 		string newname = string(VideoDirectory) + "/" + name + oldname.substr(found);
++#endif
+ 
+ 		if (!MoveDirectory(oldname.c_str(), newname.c_str(), copy)) {
+ 			esyslog("[LIVE]: renaming failed from '%s' to '%s'", oldname.c_str(), newname.c_str());
+diff -Naur vdr-live-0.3.0_p20130504.orig/tools.cpp vdr-live-0.3.0_p20130504/tools.cpp
+--- vdr-live-0.3.0_p20130504.orig/tools.cpp	2013-10-23 03:28:13.799826786 +0200
++++ vdr-live-0.3.0_p20130504/tools.cpp	2013-10-23 03:34:29.146517191 +0200
+@@ -365,7 +365,11 @@
+ 			stat(source.c_str(), &st1);
+ 			stat(target.c_str(),&st2);
+ 			if (!copy && (st1.st_dev == st2.st_dev)) {
++#if APIVERSNUM > 20101
++				if (!cVideoDirectory::RenameVideoFile(source.c_str(), target.c_str())) {
++#else
+ 				if (!RenameVideoFile(source.c_str(), target.c_str())) {
++#endif
+ 					esyslog("[LIVE]: rename failed from %s to %s", source.c_str(), target.c_str());
+ 					return false;
+ 				}
+@@ -461,7 +465,11 @@
+ 						size_t found = source.find_last_of(delim);
+ 						if (found != std::string::npos) {
+ 							source = source.substr(0, found);
++#if APIVERSNUM > 20101
++							while (source != cVideoDirectory::Name()) {
++#else
+ 							while (source != VideoDirectory) {
++#endif
+ 								found = source.find_last_of(delim);
+ 								if (found == std::string::npos)
+ 									break;
+@@ -478,7 +486,11 @@
+ 					size_t found = target.find_last_of(delim);
+ 					if (found != std::string::npos) {
+ 						target = target.substr(0, found);
++#if APIVERSNUM > 20101
++						while (target != cVideoDirectory::Name()) {
++#else
+ 						while (target != VideoDirectory) {
++#endif
+ 							found = target.find_last_of(delim);
+ 							if (found == std::string::npos)
+ 								break;
diff --git a/media-plugins/vdr-live/vdr-live-0.3.0_p20130504.ebuild b/media-plugins/vdr-live/vdr-live-0.3.0_p20130504.ebuild
index 161c5c727b9e..a115bdf80d40 100644
--- a/media-plugins/vdr-live/vdr-live-0.3.0_p20130504.ebuild
+++ b/media-plugins/vdr-live/vdr-live-0.3.0_p20130504.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/vdr-live-0.3.0_p20130504.ebuild,v 1.1 2013/10/05 16:46:26 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/vdr-live-0.3.0_p20130504.ebuild,v 1.2 2013/10/23 02:11:45 hd_brummy Exp $
 
 EAPI="5"
 
@@ -58,6 +58,8 @@ src_prepare() {
 
 	vdr-plugin-2_src_prepare
 
+	epatch "${FILESDIR}/${P}_vdr-2.1.2.diff"
+
 	if ! use pcre; then
 		sed -i "s:^HAVE_LIBPCRECPP:#HAVE_LIBPCRECPP:" Makefile || die
 	fi