eapi=4; compilefix >=vdr-1.7.27

Package-Manager: portage-2.1.10.11/cvs/Linux i686

4 files changed, 115 insertions, 8 deletions

diff --git a/media-plugins/vdr-extrecmenu/ChangeLog b/media-plugins/vdr-extrecmenu/ChangeLog
index 142bef39886d..70fc1878e619 100644
--- a/media-plugins/vdr-extrecmenu/ChangeLog
+++ b/media-plugins/vdr-extrecmenu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-extrecmenu
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-extrecmenu/ChangeLog,v 1.33 2012/02/11 18:49:56 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-extrecmenu/ChangeLog,v 1.34 2012/04/07 08:24:58 hd_brummy Exp $
+
+  07 Apr 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
+  vdr-extrecmenu-1.2.1.ebuild, +files/vdr-1.7.27.diff:
+  eapi=4; compilefix >=vdr-1.7.27
 
   11 Feb 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
   +files/dvdarchive-2.3-beta-configfile.patch:
diff --git a/media-plugins/vdr-extrecmenu/Manifest b/media-plugins/vdr-extrecmenu/Manifest
index 736d741e065a..31822df73282 100644
--- a/media-plugins/vdr-extrecmenu/Manifest
+++ b/media-plugins/vdr-extrecmenu/Manifest
@@ -3,16 +3,17 @@ Hash: SHA1
 
 AUX dvdarchive-2.3-beta-configfile.patch 302 RMD160 dde33ff87c3847d74a085b9eba7705f623b3d098 SHA1 d8372fa9bb8bc570cb2f9c0ca0360b633f9cdf00 SHA256 bf57eb01dedef979c2eec550ba99e9bcdbb787e84313d0a8ebc502a7b99c96da
 AUX dvdarchive.conf 633 RMD160 e232242a2ae07d24728561fa7bbbeeaec58ecbef SHA1 ce7e18be59142b85f27d7d0439366dc6d319a20b SHA256 761ed894c225fca7be33bd6f3a844c1e952fc5c20c38d76bd480d7b15243578e
+AUX vdr-1.7.27.diff 3810 RMD160 c011549b99aa47a230cc2c5196db527d6489c407 SHA1 b45ffb26506184d381f10808e353b2a951a9fbcd SHA256 5f714e3aef0bddbeb22fae8e5a202cfa8f5d05e28c3a9496db445dc44e8722a4
 DIST dvdarchive-2.3-beta.sh.gz 3412 RMD160 bb30c90b6e2cd033bdfe35d98149d4ac15ddb3fc SHA1 1fed47a8a7a9cf998ab31ac04ccd114debdc5001 SHA256 e8df7ea215e8a856cef1c03373d419c24ddace5c63f780282cbc6b18679000bd
 DIST vdr-extrecmenu-1.2.1.tgz 728625 RMD160 49c89db643747bafb196417af8da607cb6e437a7 SHA1 2090d2ead94784a89f7221d61c0a37cb46555ad4 SHA256 1f1317bb421e4ab56e3513021ad676d5b55173221730b96602698e96cd3689cf
-EBUILD vdr-extrecmenu-1.2.1.ebuild 1244 RMD160 ed5f6b5128eea089fe3bfb2bfe887dbfc35e05d0 SHA1 6f647b17360f15041fa208a47411a2ab46147a70 SHA256 8f7b17d1d1f84d1085ebf6bcb51dc4746b278d60b9a540fa6c42699a7314485e
-MISC ChangeLog 5644 RMD160 4476193258a1c3b363150706fec4a2798cf60fab SHA1 96870a7d39b03724a292753de3e341ec2361abef SHA256 b1636ed368d7ba8552d6632ee863dcee2b068405e5eeeb508a6a5deefab3f127
+EBUILD vdr-extrecmenu-1.2.1.ebuild 1337 RMD160 646157f64b769005ac1b3a548b6d9add1168d024 SHA1 61ceca27bcd7e2db6d6fddf3483ed7859584605e SHA256 80984f5005582fc63ad7e45e06f51c58cb767865bf42c680d2dc1b60f5e70246
+MISC ChangeLog 5789 RMD160 29a3703052f70c2f14c4256d34605764716984bb SHA1 8123b0ca6eda262e9087b07ea9723cb56644caec SHA256 f2842379acd82d263760595fefaf986b2bcaf8dc9921231722dd9feb1b2147aa
 MISC metadata.xml 337 RMD160 f0276e381deb2e62761aa580195b1c05be29f5d5 SHA1 401d1f6dd5361fa11c936bfa18aa86047a82c614 SHA256 ca40fe91ad4ff2629c376890772b86f0e306359568fd5dad9a5c9804d0791b7f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFPNrhkdn07HTTCgIoRApAmAJ4miM4uta6ttp+PQGJeToXknnaSZQCgl1l1
-jUnmCqrGUb6aEmjOLkkC83w=
-=U6aT
+iD8DBQFPf/rCdn07HTTCgIoRAjpZAJ9sWR9Z9JDfjpLTPfkpSCvzYEP1XQCffTHO
+sQFwyM4Y0RmZTJSwUyLX8LY=
+=ruv2
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-extrecmenu/files/vdr-1.7.27.diff b/media-plugins/vdr-extrecmenu/files/vdr-1.7.27.diff
new file mode 100644
index 000000000000..7da091713d57
--- /dev/null
+++ b/media-plugins/vdr-extrecmenu/files/vdr-1.7.27.diff
@@ -0,0 +1,98 @@
+diff -Naur extrecmenu-1.2.1.orig/mymenueditrecording.c extrecmenu-1.2.1/mymenueditrecording.c
+--- extrecmenu-1.2.1.orig/mymenueditrecording.c	2012-04-07 09:48:21.000000000 +0200
++++ extrecmenu-1.2.1/mymenueditrecording.c	2012-04-07 09:52:03.000000000 +0200
+@@ -500,8 +500,8 @@
+ myMenuRecordingDetails::myMenuRecordingDetails(cRecording *Recording):cOsdMenu(tr("Details"),12)
+ {
+   recording=Recording;
+-  priority=recording->priority;
+-  lifetime=recording->lifetime;
++  priority=recording->Priority();
++  lifetime=recording->Lifetime();
+ 
+   Add(new cMenuEditIntItem(trVDR("Priority"),&priority,0,MAXPRIORITY));
+   Add(new cMenuEditIntItem(trVDR("Lifetime"),&lifetime,0,MAXLIFETIME));
+@@ -514,7 +514,10 @@
+   {
+     if(Key==kOk)
+     {
+-      if((priority!=recording->priority)||(lifetime!=recording->lifetime))
++        int old_priority = recording->Priority();
++        int old_lifetime = recording->Lifetime();
++        if((priority!=old_priority)||(lifetime!=old_lifetime))
++//      if((priority!=recording->priority)||(lifetime!=recording->lifetime))
+       {
+ #if VDRVERSNUM > 10713
+         if(recording->IsPesRecording())
+diff -Naur extrecmenu-1.2.1.orig/tools.c extrecmenu-1.2.1/tools.c
+--- extrecmenu-1.2.1.orig/tools.c	2012-04-07 09:48:21.000000000 +0200
++++ extrecmenu-1.2.1/tools.c	2012-04-07 09:56:33.000000000 +0200
+@@ -456,7 +456,7 @@
+     if(!(fromfile=fromfilename->Open()) || !(tofile=tofilename->Open()))
+       return;
+     fromfile->SetReadAhead(MEGABYTE(20));
+-    index=mark->position;
++    index=mark->Position();
+     mark=frommarks.Next(mark);
+     tomarks.Add(0);
+     tomarks.Save();
+@@ -542,8 +542,8 @@
+     filesize+=length;
+     if(!lastiframe)
+       lastiframe=toindex->Last();
+-      
+-    if(mark && index >= mark->position)
++
++    if(mark && index >= mark->Position())
+     {
+       mark=frommarks.Next(mark);
+       tomarks.Add(lastiframe);
+@@ -552,7 +552,7 @@
+       tomarks.Save();
+       if(mark)
+       {
+-        index=mark->position;
++        index=mark->Position();
+         mark=frommarks.Next(mark);
+         currentfilenumber=0;
+         cutin=true;
+diff -Naur extrecmenu-1.2.1.orig/mymenurecordings.c extrecmenu-1.2.1/mymenurecordings.c
+--- extrecmenu-1.2.1.orig/mymenurecordings.c	2012-04-07 10:08:35.000000000 +0200
++++ extrecmenu-1.2.1/mymenurecordings.c	2012-04-07 10:17:19.000000000 +0200
+@@ -66,7 +66,9 @@
+   else
+   {
+     stringstream text;
+-    text << *DateString(recording->start) << ", " << *TimeString(recording->start) << "\n\n";
++//    text << *DateString(recording->start) << ", " << *TimeString(recording->start) << "\n\n";
++    time_t start = recording->Start();
++    text << *DateString(start) << ", " << *TimeString(start) << "\n\n";
+ 
+     if(recording->Info()->Title())
+     {
+@@ -95,8 +97,12 @@
+     else
+       text << tr("Size") << ": " << recmb << " MB\n";
+ 
+-    text << trVDR("Priority") << ": " << recording->priority << "\n";
+-    text << trVDR("Lifetime") << ": " << recording->lifetime << "\n";
++//    text << trVDR("Priority") << ": " << recording->priority << "\n";
++//    text << trVDR("Lifetime") << ": " << recording->lifetime << "\n";
++    int prio = recording->Priority();
++    int lft = recording->Lifetime();
++    text << trVDR("Priority") << ": " << prio << "\n";
++    text << trVDR("Lifetime") << ": " << lft << "\n";
+ 
+     DisplayMenu()->SetText(text.str().c_str(),false);
+     cStatus::MsgOsdTextItem(text.str().c_str());
+@@ -192,7 +198,9 @@
+ 
+       // date and time of recording
+       struct tm tm_r;
+-      struct tm *t=localtime_r(&Recording->start,&tm_r);
++//      struct tm *t=localtime_r(&Recording->start,&tm_r);
++      time_t start = Recording->Start();
++      struct tm *t=localtime_r(&start,&tm_r);
+ 
+       idbuffer << t->tm_mday << t->tm_mon << t->tm_year
+                << t->tm_hour << t->tm_min;
diff --git a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.1.ebuild b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.1.ebuild
index ce878764d033..961616473b83 100644
--- a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.1.ebuild
+++ b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.1.ebuild,v 1.5 2012/02/07 14:22:00 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.1.ebuild,v 1.6 2012/04/07 08:24:58 hd_brummy Exp $
 
-EAPI="3"
+EAPI="4"
 
 inherit vdr-plugin eutils
 
@@ -39,6 +39,10 @@ src_prepare() {
 	if has_version ">=media-video/vdr-1.7.18"; then
 		sed -e "s:Read(f):Read():" -i mymenueditrecording.c
 	fi
+
+	if has_version ">=media-video/vdr-1.7.27"; then
+		epatch "${FILESDIR}/vdr-1.7.27.diff"
+	fi
 }
 
 src_install() {