Added vdr-1.5 patch from Thomas Günther.

(Portage version: 2.1.3_rc6)

4 files changed, 114 insertions, 2 deletions

diff --git a/media-plugins/vdr-prefermenu/ChangeLog b/media-plugins/vdr-prefermenu/ChangeLog
index ae93d3bde4bb..9df65d18a4b1 100644
--- a/media-plugins/vdr-prefermenu/ChangeLog
+++ b/media-plugins/vdr-prefermenu/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/vdr-prefermenu
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-prefermenu/ChangeLog,v 1.5 2006/10/30 15:17:52 zzam Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-prefermenu/ChangeLog,v 1.6 2007/07/05 07:02:10 zzam Exp $
+
+*vdr-prefermenu-0.6.6-r1 (05 Jul 2007)
+
+  05 Jul 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-prefermenu-0.6.6-no-static-getfont.diff,
+  +vdr-prefermenu-0.6.6-r1.ebuild:
+  Added vdr-1.5 patch from Thomas Günther.
 
   30 Oct 2006; Matthias Schwarzott <zzam@gentoo.org>
   vdr-prefermenu-0.6.6.ebuild:
diff --git a/media-plugins/vdr-prefermenu/files/digest-vdr-prefermenu-0.6.6-r1 b/media-plugins/vdr-prefermenu/files/digest-vdr-prefermenu-0.6.6-r1
new file mode 100644
index 000000000000..84a772aa114e
--- /dev/null
+++ b/media-plugins/vdr-prefermenu/files/digest-vdr-prefermenu-0.6.6-r1
@@ -0,0 +1,3 @@
+MD5 fee6d1b3c08488bb2f63da85aa264aae vdr-prefermenu-0.6.6.tgz 19617
+RMD160 48d3153e8898cdebf21d74f936e833cc233dcc94 vdr-prefermenu-0.6.6.tgz 19617
+SHA256 0b9338d1fff19e5ccf1f4e9f352e7bdf5b4f5e129007aa147d7ee4ab1034a6e8 vdr-prefermenu-0.6.6.tgz 19617
diff --git a/media-plugins/vdr-prefermenu/files/vdr-prefermenu-0.6.6-no-static-getfont.diff b/media-plugins/vdr-prefermenu/files/vdr-prefermenu-0.6.6-no-static-getfont.diff
new file mode 100644
index 000000000000..0c0239d2ac48
--- /dev/null
+++ b/media-plugins/vdr-prefermenu/files/vdr-prefermenu-0.6.6-no-static-getfont.diff
@@ -0,0 +1,73 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 90_prefermenu-0.6.6-1.5.3.dpatch by Thomas Günther <tom@toms-cafe.de>
+## http://toms-cafe.de/vdr/download/prefermenu-0.6.6-1.5.3.diff
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes for VDR >= 1.5.3.
+
+@DPATCH@
+--- prefermenu-0.6.6/prefermenu.c
++++ prefermenu-0.6.6/prefermenu.c
+@@ -75,6 +75,7 @@
+   }
+   // Clean up the file with current VDR channels.conf
+   PreferedChannelsList.Save();
++  const int LINEHEIGHT = cFont::GetFont(fontOsd)->Height();
+   config.height= (config.lines * (LINEHEIGHT+BORDERSIZE+2))+BORDERSIZE;
+   return new cPreferOsd;
+ }
+--- prefermenu-0.6.6/preferosd.c
++++ prefermenu-0.6.6/preferosd.c
+@@ -60,6 +60,7 @@
+   }
+   osd=cOsdProvider::NewOsd(config.originx, config.originy);
+   if (osd) {
++    const int LINEHEIGHT = cFont::GetFont(fontOsd)->Height();
+     tArea Area = { 0, 0, config.width+LINEHEIGHT, config.height-1, 4};
+     osd->SetAreas(&Area, 1);
+     DrawPreferMenu(0,0);
+@@ -168,6 +169,7 @@
+ {
+   if (current > 1) {
+     current -= 1;
++    const int LINEHEIGHT = cFont::GetFont(fontOsd)->Height();
+     DrawPreferMenu(-LINEHEIGHT,1);
+     DisplayPreferMenu();
+     //DrawPreferMneu(-10,1);
+@@ -181,6 +183,7 @@
+ {
+   if (current < number) {
+     current += 1;     
++    const int LINEHEIGHT = cFont::GetFont(fontOsd)->Height();
+     DrawPreferMenu(+LINEHEIGHT,-1);
+     DisplayPreferMenu();
+     //DrawPreferMenu(+10,-1);
+@@ -315,6 +318,8 @@
+ 
+ void cPreferOsd::DrawPreferMenu(int delta, int highlight)
+ {
++  const cFont *font = cFont::GetFont(fontOsd);
++  const int LINEHEIGHT = font->Height();
+   
+   int middle = int(config.height/2) + config.height%2;
+ 
+@@ -390,6 +395,8 @@
+ 
+ void cPreferOsd::DrawChannelsNames(int delta)
+ {
++  const cFont *font = cFont::GetFont(fontOsd);
++  const int LINEHEIGHT = font->Height();
+ 
+   // XXX The margin is hardcoded for now
+   // TODO: make it more flexible
+--- prefermenu-0.6.6/preferosd.h
++++ prefermenu-0.6.6/preferosd.h
+@@ -4,8 +4,6 @@
+ #include <vdr/plugin.h>
+ 
+ static const int BORDERSIZE = 2;
+-static const cFont *font = cFont::GetFont(fontOsd);
+-static const int LINEHEIGHT = font->Height();
+ 
+ 
+ class cPreferOsd : public cOsdObject {
diff --git a/media-plugins/vdr-prefermenu/vdr-prefermenu-0.6.6-r1.ebuild b/media-plugins/vdr-prefermenu/vdr-prefermenu-0.6.6-r1.ebuild
new file mode 100644
index 000000000000..97bc87729bd7
--- /dev/null
+++ b/media-plugins/vdr-prefermenu/vdr-prefermenu-0.6.6-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2003-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-prefermenu/vdr-prefermenu-0.6.6-r1.ebuild,v 1.1 2007/07/05 07:02:10 zzam Exp $
+
+
+inherit vdr-plugin
+
+DESCRIPTION="Video Disk Recorder Prefermenu Plugin"
+HOMEPAGE="http://www.olivierjacques.com/vdr/prefermenu/"
+SRC_URI="http://famillejacques.free.fr/vdr/prefermenu/vdr-${VDRPLUGIN}-${PV}.tgz
+		mirror://vdrfiles/${PN}/vdr-${VDRPLUGIN}-${PV}.tgz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ~amd64"
+IUSE=""
+
+DEPEND=">=media-video/vdr-1.3.45"
+
+PATCHES="${FILESDIR}/${P}-no-static-getfont.diff"
+
+src_install() {
+	vdr-plugin_src_install
+
+	touch prefermenu.conf
+	insinto /etc/vdr/plugins
+	doins prefermenu.conf
+	chown vdr:vdr -R ${D}/etc/vdr
+}