compile fix >=vdr-2.1.2

(Portage version: 2.2.1/cvs/Linux i686, signed Manifest commit with key 34C2808A)

3 files changed, 33 insertions, 2 deletions

diff --git a/media-plugins/vdr-vdrmanager/ChangeLog b/media-plugins/vdr-vdrmanager/ChangeLog
index d41e4b035a8c..cacfcd6768a3 100644
--- a/media-plugins/vdr-vdrmanager/ChangeLog
+++ b/media-plugins/vdr-vdrmanager/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-vdrmanager
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vdrmanager/ChangeLog,v 1.8 2013/03/31 16:25:38 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vdrmanager/ChangeLog,v 1.9 2013/10/26 13:01:10 hd_brummy Exp $
+
+  26 Oct 2013; Joerg Bornkessel <hd_brummy@gentoo.org>
+  vdr-vdrmanager-0.9.ebuild, +files/vdr-vdrmanager-0.9_vdr-2.1.2.diff:
+  compile fix >=vdr-2.1.2
 
 *vdr-vdrmanager-0.9 (31 Mar 2013)
 
diff --git a/media-plugins/vdr-vdrmanager/files/vdr-vdrmanager-0.9_vdr-2.1.2.diff b/media-plugins/vdr-vdrmanager/files/vdr-vdrmanager-0.9_vdr-2.1.2.diff
new file mode 100644
index 000000000000..86af18e108b8
--- /dev/null
+++ b/media-plugins/vdr-vdrmanager/files/vdr-vdrmanager-0.9_vdr-2.1.2.diff
@@ -0,0 +1,25 @@
+diff -Naur vdr-vdrmanager-0.9.orig/helpers.cpp vdr-vdrmanager-0.9/helpers.cpp
+--- vdr-vdrmanager-0.9.orig/helpers.cpp	2013-10-26 11:11:37.000000000 +0200
++++ vdr-vdrmanager-0.9/helpers.cpp	2013-10-26 11:20:59.000000000 +0200
+@@ -272,12 +272,21 @@
+ 
+ 	cString FileName = recording->FileName();
+ 
++#if VDRVERSNUM > 20101
++    if (RecordingsHandler.GetUsage(FileName)) {
++       RecordingsHandler.Del(FileName);
++       recording = Recordings.GetByName(FileName); // RecordingsHandler.Del() might have deleted it if it was the edited version
++       // we continue with the code below even if recording is NULL,
++       // in order to have the menu updated etc.
++     }
++#else
+ 	if (cCutter::Active(recording->FileName())) {
+ 		cCutter::Stop();
+ 		recording = Recordings.GetByName(FileName); // cCutter::Stop() might have deleted it if it was the edited version
+ 		// we continue with the code below even if recording is NULL,
+ 		// in order to have the menu updated etc.
+ 	}
++#endif
+ 
+ 	if (cReplayControl::NowReplaying()
+ 			&& strcmp(cReplayControl::NowReplaying(), FileName) == 0) {
diff --git a/media-plugins/vdr-vdrmanager/vdr-vdrmanager-0.9.ebuild b/media-plugins/vdr-vdrmanager/vdr-vdrmanager-0.9.ebuild
index 8526ac3fab34..7e9205b66b9f 100644
--- a/media-plugins/vdr-vdrmanager/vdr-vdrmanager-0.9.ebuild
+++ b/media-plugins/vdr-vdrmanager/vdr-vdrmanager-0.9.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-vdrmanager/vdr-vdrmanager-0.9.ebuild,v 1.1 2013/03/31 16:25:38 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vdrmanager/vdr-vdrmanager-0.9.ebuild,v 1.2 2013/10/26 13:01:10 hd_brummy Exp $
 
 EAPI="5"
 
@@ -22,6 +22,8 @@ RDEPEND="stream? ( media-plugins/vdr-streamdev[server] )"
 
 S="${WORKDIR}/${P}"
 
+PATCHES=( "${FILESDIR}/${P}_vdr-2.1.2.diff" )
+
 pkg_postinst() {
 	vdr-plugin-2_pkg_postinst