Add vdr >=1.7.27 compatibility patch

Package-Manager: portage-2.2.0_alpha98/cvs/Linux x86_64

4 files changed, 79 insertions, 19 deletions

diff --git a/media-plugins/vdr-live/ChangeLog b/media-plugins/vdr-live/ChangeLog
index 692302f12bd7..9aac727ddc2e 100644
--- a/media-plugins/vdr-live/ChangeLog
+++ b/media-plugins/vdr-live/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/vdr-live
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/ChangeLog,v 1.30 2012/03/09 23:25:19 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/ChangeLog,v 1.31 2012/04/02 20:30:50 idl0r Exp $
+
+*vdr-live-0.2.0.20120114-r1 (02 Apr 2012)
+
+  02 Apr 2012; Christian Ruppert <idl0r@gentoo.org>
+  +files/vdr-1.7.27-compatibility.patch, +vdr-live-0.2.0.20120114-r1.ebuild,
+  -vdr-live-0.2.0.20120114.ebuild:
+  Add vdr >=1.7.27 compatibility patch
 
   09 Mar 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
   vdr-live-0.2.0.20120114.ebuild:
diff --git a/media-plugins/vdr-live/Manifest b/media-plugins/vdr-live/Manifest
index c4731d6a724f..a4fdac1a2730 100644
--- a/media-plugins/vdr-live/Manifest
+++ b/media-plugins/vdr-live/Manifest
@@ -1,23 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX confd 125 RMD160 f9b80ed1c08301c7cdab9c4fe20c0e933a977db1 SHA1 3b8ef982bbfa64811176379c629ca3b7f1a08778 SHA256 949c97e715af8405b47877afe4fa9c93dc3ed04b1ac6b6d7982e41f61ba0d122
 AUX confd-0.2 468 RMD160 3ee305c163c134820c7285647ba7c6332468106f SHA1 88b65b954be6ae749c14752166f00830fc69af65 SHA256 bf4f4a961212ba6847fb0456bdc9cafd9f82d930324fb9c45adcbffdff267488
 AUX rc-addon-0.2.sh 607 RMD160 9ed2ade55523ec30951f32f2616cbc34471ef127 SHA1 fffdc2702378b53528c25817ba8bdddfecc645cb SHA256 af62d925e3fc2de3990868de6acb830896aa04052dc95ca0ec8627eac3055fbe
 AUX rc-addon.sh 180 RMD160 cd41dc99aed6f463dce1d22ca028317fc23a99e1 SHA1 153dc6a11f59195659628ed86f677755b71090f9 SHA256 d9c9eca9f12362c1f8c162a9bb948feebdb8acc87413a611ecf5f52a3092878a
+AUX vdr-1.7.27-compatibility.patch 1193 RMD160 234924f4894259709bda1fcf0049ddf7f2473c99 SHA1 5af920fa985a7978a0ff34c618d5918006481c08 SHA256 c3752db0093e245776449e575ed1bebf7465fb16d02e5c30d4df3d9a59c3786a
 DIST vdr-live-0.2.0.20110419.tar.gz 1987984 RMD160 7740af3b6fb91e5b9fdde305094563e9fec3a7e3 SHA1 fffe8c2a86c628df8d56129580aee4dd7905e4aa SHA256 b3c2263e10f97b35f071a707b651922173b21b2b88f651cf4c788b330ca5fa2a
 DIST vdr-live-0.2.0.20120114.tar.gz 1993095 RMD160 3b982ba64171a458e530cfd388185ce20959f129 SHA1 28d1a3669d24a9ed3cbb41e4c21900dd96936fbd SHA256 fb1a931f282aa8282d6fa1a5ebac6a97cdfd59574b29b9413e7f498ea2723449
 DIST vdr-live-0.2.0.tar.gz 560582 RMD160 10f7196ecaaa99280a6032f5d8d80a6c73a1f8d6 SHA1 b9687db0c913026ae4d29d99cbc6f031f4f32d34 SHA256 30ac64040be4defb75beb9d3a5b0218694fc5b10486926acd989e6eb6c72ca55
 EBUILD vdr-live-0.2.0.20110419-r1.ebuild 2752 RMD160 0a042ddca4740d94dea35003ada80e167407a84a SHA1 cbfd214a6fd15733e6cc5d78c2c2197732beb193 SHA256 c3e5b37ffd3f4b7c92dac9cad9b633c779e4688cec9fa1284143085da5c30cbb
-EBUILD vdr-live-0.2.0.20120114.ebuild 2710 RMD160 cdfd8eeef2b594d6cc11f99fb2d63aa7598a93e8 SHA1 e65953f4d16574bc01a50163ef17dbd71b965d6a SHA256 14769d64f272c756666eafe875e344daed317013ce0a0fa9d94617f5bc88f9ba
+EBUILD vdr-live-0.2.0.20120114-r1.ebuild 2748 RMD160 3d1996f07ffb4d45f8f699b254a27aadc2a48264 SHA1 cc20d7b30dc95c3e2c50e554f0c8293016cd2fe9 SHA256 e9e320daf5efd4385409421d72f67103087887e06dfa214ac512cede91ea9574
 EBUILD vdr-live-0.2.0.ebuild 1222 RMD160 cd71347d9e29a14b82aad793f52d71529ed3030a SHA1 3696794eafbf52282a7a9a4f80ea4e872268d0c2 SHA256 25f86271282802d7a92f13cdf91b728b74d1d4a04f6344a103422fd968246d41
-MISC ChangeLog 5748 RMD160 d9474518110e85743131e5a654ace1365553db44 SHA1 421678c0f5249cd8c1034cc6cb13bc0083df7f84 SHA256 328bf25f68966bae59dd5ca666abac5954d8d2e1246b18bbe2ec1e5d38940653
+MISC ChangeLog 5991 RMD160 7e5a06a5c2f45b8d88d05b61d6b16cee3478a43a SHA1 dccc46946795c7ad6f13a07af9069f950796531c SHA256 0995f8f32f0d45e3b3913497559981c848abb3e30d32779142fb499c7d583595
 MISC metadata.xml 251 RMD160 b4bdfc1a9e947ad1d1f76c1942f02057d5cbc993 SHA1 6e174f6e4395999a9dafd53f523e079766c0b094 SHA256 b426b6e6d679a63de74d2c1a21e4da2381fb1b580b0180b041307471d67ab54f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-Comment: added by hd_brummy@gentoo.org
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iD8DBQFPWpKZdn07HTTCgIoRAhr3AJ9j5nL+cuOVcV7KWRb8Wq6PXojXTgCgp4Mp
-RMdRbCDHdS7hjLcTJ9HXwP4=
-=ZXBB
+iQEcBAEBCAAGBQJPegx/AAoJEMOx0zmdw4Z16pIH/3sXty3+HMrgobOwqcCb5Wko
+bKn6oIzrKsU6RcxJq5TCzjh5nxFlcEBBWSt2BHJX1jodPa51fUW+jgL4IjutOHyW
+ft0PwqyhPi0AqERkZrWlhOOYAeWm80X+N5I7DkSKR6O38FX7ccbsh4YfrDn8dtwd
+48W6DCoL/QXkVeZDCeeExIUeIyCbG8XvrWwG58rLJwykJswndQPAa4Oohs3UqFIO
+QXDTTOVNUK8o/IvZdX/AD00q8FGDuQwyUqqqPMn7SQJpZ+repbH4FhapzooQO97P
+yw1WWdj8i0Cs7C6b6lR+xRJ3A4THQpKdPYQZyDw2YNJqkd+WzocEnlzYnaYqT20=
+=5LZZ
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-live/files/vdr-1.7.27-compatibility.patch b/media-plugins/vdr-live/files/vdr-1.7.27-compatibility.patch
new file mode 100644
index 000000000000..4eb296676621
--- /dev/null
+++ b/media-plugins/vdr-live/files/vdr-1.7.27-compatibility.patch
@@ -0,0 +1,48 @@
+commit 94a0a210a485ce1fc95c47a6bc67c4c16c89a0f9
+Author: Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>
+Date:   Sun Mar 25 16:42:12 2012 +0200
+
+    Updated LIVE to latest changes in vdr 1.7.27
+    - Do not use the direct access to cRecoding members any more.
+
+diff --git a/epg_events.cpp b/epg_events.cpp
+index a514769..cd4996e 100644
+--- a/epg_events.cpp
++++ b/epg_events.cpp
+@@ -182,12 +182,20 @@ namespace vdrlive
+ 
+ 	time_t EpgRecording::GetStartTime() const
+ 	{
++#if VDRVERSNUM < 10726
+ 		return m_recording ? m_recording->start : 0;
++#else
++		return m_recording ? m_recording->Start() : 0;
++#endif
+ 	}
+ 
+ 	time_t EpgRecording::GetEndTime() const
+ 	{
++#if VDRVERSNUM < 10726
+ 		return m_recording ? m_recording->start : 0;
++#else
++		return m_recording ? m_recording->Start() : 0;
++#endif
+ 	}
+ 
+ 	const string EpgRecording::Name() const
+diff --git a/recman.cpp b/recman.cpp
+index fb315d2..6a2fc00 100644
+--- a/recman.cpp
++++ b/recman.cpp
+@@ -383,7 +383,11 @@ namespace vdrlive {
+ 
+ 	time_t RecordingsItemRec::StartTime() const
+ 	{
++#if VDRVERSNUM < 10726
+ 		return m_recording->start;
++#else
++		return m_recording->Start();
++#endif
+ 	}
+ 
+ 	long RecordingsItemRec::Duration() const
diff --git a/media-plugins/vdr-live/vdr-live-0.2.0.20120114.ebuild b/media-plugins/vdr-live/vdr-live-0.2.0.20120114-r1.ebuild
index 10c07ebbd400..7fd065149b03 100644
--- a/media-plugins/vdr-live/vdr-live-0.2.0.20120114.ebuild
+++ b/media-plugins/vdr-live/vdr-live-0.2.0.20120114-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-plugins/vdr-live/vdr-live-0.2.0.20120114.ebuild,v 1.2 2012/03/09 23:25:19 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/vdr-live-0.2.0.20120114-r1.ebuild,v 1.1 2012/04/02 20:30:50 idl0r Exp $
 
 EAPI="4"
 
@@ -55,6 +55,8 @@ src_prepare() {
 	if ! has_version ">=media-video/vdr-1.7.13"; then
 	sed -i "s:-include \$(VDRDIR)/Make.global:#-include \$(VDRDIR)/Make.global:" Makefile
 	fi
+
+	epatch "${FILESDIR}/vdr-1.7.27-compatibility.patch"
 }
 
 src_install() {
@@ -78,7 +80,7 @@ pkg_postinst() {
 	elog "On first install use login:pass"
 	elog "\tadmin:live"
 
-	ewarn "\t\tWARNiNG!!!"
+	ewarn "\t\tWARNING!!!"
 	ewarn "This is a developer snapshot"
 	einfo "On problems, use the stable amd64, x86 versions of"
 	einfo "dev-libs/tntnet dev-libs/cxxtools media-plugins/vdr-live"
@@ -100,12 +102,11 @@ pkg_postinst() {
 }
 
 pkg_config() {
-
-			make_live_cert
-			local base=$(get_base 1)
-			local keydir="/etc/vdr/plugins/live"
-			install -d "${ROOT}${keydir}"
-			install -m0400 "${base}.key" "${ROOT}${keydir}/live.key"
-			install -m0444 "${base}.crt" "${ROOT}${keydir}/live.crt"
-			chown vdr:vdr "${ROOT}"/etc/vdr/plugins/live/live.*
+	make_live_cert
+	local base=$(get_base 1)
+	local keydir="/etc/vdr/plugins/live"
+	install -d "${ROOT}${keydir}"
+	install -m0400 "${base}.key" "${ROOT}${keydir}/live.key"
+	install -m0444 "${base}.crt" "${ROOT}${keydir}/live.crt"
+	chown vdr:vdr "${ROOT}"/etc/vdr/plugins/live/live.*
 }