Added vdr-1.6.0 and gcc-4.1 patches.

(Portage version: 2.1.4.4)

4 files changed, 105 insertions, 2 deletions

diff --git a/media-plugins/vdr-pilot/ChangeLog b/media-plugins/vdr-pilot/ChangeLog
index 8411a312f003..b93c0eb6fed6 100644
--- a/media-plugins/vdr-pilot/ChangeLog
+++ b/media-plugins/vdr-pilot/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/vdr-pilot
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pilot/ChangeLog,v 1.5 2007/05/15 20:44:53 zzam Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pilot/ChangeLog,v 1.6 2008/04/02 13:49:51 zzam Exp $
+
+*vdr-pilot-0.0.9-r1 (02 Apr 2008)
+
+  02 Apr 2008; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-pilot-0.0.9-gcc-4.1.diff,
+  +files/vdr-pilot-0.0.9-vdr-1.6.0.diff, +vdr-pilot-0.0.9-r1.ebuild:
+  Added vdr-1.6.0 and gcc-4.1 patches.
 
   15 May 2007; Matthias Schwarzott <zzam@gentoo.org> vdr-pilot-0.0.9.ebuild:
   Marked stable on x86.
diff --git a/media-plugins/vdr-pilot/files/vdr-pilot-0.0.9-gcc-4.1.diff b/media-plugins/vdr-pilot/files/vdr-pilot-0.0.9-gcc-4.1.diff
new file mode 100644
index 000000000000..4079e0aa4490
--- /dev/null
+++ b/media-plugins/vdr-pilot/files/vdr-pilot-0.0.9-gcc-4.1.diff
@@ -0,0 +1,44 @@
+diff -ru pilot-0.0.9-orig/pilotosd.c pilot-0.0.9/pilotosd.c
+--- pilot-0.0.9-orig/pilotosd.c	2008-04-02 15:45:18.597448151 +0200
++++ pilot-0.0.9/pilotosd.c	2008-04-02 15:46:45.507442460 +0200
+@@ -34,7 +34,7 @@
+ {
+   delete osd;
+ }
+-void cPilotOsd::DrawSymbol(int x, int y, char *SymbolName[], tColor ColorFg)
++void cPilotOsd::DrawSymbol(int x, int y, const char *SymbolName[], tColor ColorFg)
+ {
+   cBitmap bm(SymbolName);
+   osd->DrawBitmap(x, y, bm, ColorFg, pal[0]);
+diff -ru pilot-0.0.9-orig/pilotosd.h pilot-0.0.9/pilotosd.h
+--- pilot-0.0.9-orig/pilotosd.h	2008-04-02 15:45:18.597448151 +0200
++++ pilot-0.0.9/pilotosd.h	2008-04-02 15:46:30.908163317 +0200
+@@ -11,7 +11,7 @@
+ 
+ class cPilotOsd : public cOsdObject {
+ private:
+-  void DrawSymbol(int x, int y, char *SymbolName[], tColor color);
++  void DrawSymbol(int x, int y, const char *SymbolName[], tColor color);
+   cOsd *osd;
+   int pal[16];
+   int lastTime;
+diff -ru pilot-0.0.9-orig/symbols/down.xpm pilot-0.0.9/symbols/down.xpm
+--- pilot-0.0.9-orig/symbols/down.xpm	2008-04-02 15:45:18.597448151 +0200
++++ pilot-0.0.9/symbols/down.xpm	2008-04-02 15:45:47.057442667 +0200
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * down_xpm[] = {
++static const char * down_xpm[] = {
+ "22 26 2 1",
+ ".	c #FFFFFF",
+ "*	c #000000",
+diff -ru pilot-0.0.9-orig/symbols/up.xpm pilot-0.0.9/symbols/up.xpm
+--- pilot-0.0.9-orig/symbols/up.xpm	2008-04-02 15:45:18.597448151 +0200
++++ pilot-0.0.9/symbols/up.xpm	2008-04-02 15:45:53.807442292 +0200
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * up_xpm[] = {
++static const char * up_xpm[] = {
+ "22 26 2 1",
+ ".	c #FFFFFF",
+ "*	c #000000",
diff --git a/media-plugins/vdr-pilot/files/vdr-pilot-0.0.9-vdr-1.6.0.diff b/media-plugins/vdr-pilot/files/vdr-pilot-0.0.9-vdr-1.6.0.diff
new file mode 100644
index 000000000000..e13a1392c540
--- /dev/null
+++ b/media-plugins/vdr-pilot/files/vdr-pilot-0.0.9-vdr-1.6.0.diff
@@ -0,0 +1,25 @@
+diff -ru pilot-0.0.9-orig/Makefile pilot-0.0.9/Makefile
+--- pilot-0.0.9-orig/Makefile	2008-04-02 15:37:55.657442868 +0200
++++ pilot-0.0.9/Makefile	2008-04-02 15:38:27.187445656 +0200
+@@ -47,7 +47,7 @@
+ 
+ ### The object files (add further files here):
+ 
+-OBJS = $(PLUGIN).o pilotosd.o pilotbmp.o pilotsetup.o 
++OBJS = $(PLUGIN).o pilotosd.o pilotsetup.o 
+ 
+ ### Implicit rules:
+ 
+Dateien pilot-0.0.9-orig/pilot.o und pilot-0.0.9/pilot.o sind verschieden.
+diff -ru pilot-0.0.9-orig/pilotosd.h pilot-0.0.9/pilotosd.h
+--- pilot-0.0.9-orig/pilotosd.h	2008-04-02 15:37:55.657442868 +0200
++++ pilot-0.0.9/pilotosd.h	2008-04-02 15:38:32.497447004 +0200
+@@ -4,7 +4,6 @@
+ #include <vdr/osd.h>
+ #include <vdr/menuitems.h>
+ #include <ctype.h>
+-#include "pilotbmp.h"
+ 
+ static const cFont *font = cFont::GetFont(fontOsd);
+ static const int LINEHEIGHT = font->Height();
+
diff --git a/media-plugins/vdr-pilot/vdr-pilot-0.0.9-r1.ebuild b/media-plugins/vdr-pilot/vdr-pilot-0.0.9-r1.ebuild
new file mode 100644
index 000000000000..47047bee2aa1
--- /dev/null
+++ b/media-plugins/vdr-pilot/vdr-pilot-0.0.9-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pilot/vdr-pilot-0.0.9-r1.ebuild,v 1.1 2008/04/02 13:49:51 zzam Exp $
+
+IUSE=""
+inherit vdr-plugin eutils
+
+DESCRIPTION="VDR plugin: Another way for viewing EPG and zap to channels"
+HOMEPAGE="http://famillejacques.free.fr/vdr/"
+SRC_URI="http://famillejacques.free.fr/vdr/pilot/${P}.tgz"
+
+KEYWORDS="~x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND=">=media-video/vdr-1.4.1"
+
+
+src_unpack() {
+	vdr-plugin_src_unpack unpack
+	epatch "${FILESDIR}/${P}-german.diff"
+	epatch "${FILESDIR}/${P}-gcc-4.1.diff"
+	if has_version ">=media-video/vdr-1.6.0"; then
+		epatch "${FILESDIR}/${P}-vdr-1.6.0.diff"
+	fi
+	vdr-plugin_src_unpack all_but_unpack
+}