Added vdr-1.6.0 and gcc-4.1 patches.

Package-Manager: portage-2.1.4.4

5 files changed, 119 insertions, 3 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/Manifest b/media-plugins/vdr-pilot/Manifest
index f0fea6aff8f9..adfb1b174d6e 100644
--- a/media-plugins/vdr-pilot/Manifest
+++ b/media-plugins/vdr-pilot/Manifest
@@ -1,8 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX vdr-pilot-0.0.8-includes.diff 349 RMD160 4c49241ebf6fc1202ead7fbaf8642b781fb514c2 SHA1 f5a2559bdb920dc934a5adebf2f0a445a06e594a SHA256 073b2046bf4ecfda1d6a01592c8cf946ba4c4f4cdc7c73ef078a12bd5e42a792
+AUX vdr-pilot-0.0.9-gcc-4.1.diff 1614 RMD160 a3cefe9e8dd2eb8a462e36f4b4eaf40067fd80b5 SHA1 b7ac1f0864c33802cba6739356d7a738cc5629f4 SHA256 e0d9010c715f1df8a263469235516abf0a636d96070e322c110f1379c7942889
 AUX vdr-pilot-0.0.9-german.diff 3120 RMD160 10fbe58ddc6e76cb192851b6b98cf9d8bfec6802 SHA1 5cf11222385a313ad968680162b720c2c7ff2bd3 SHA256 8f7ce7a50c59a0c55b8b886d443e8717f04183ab1b1f30d45353b4de58c1adfd
+AUX vdr-pilot-0.0.9-vdr-1.6.0.diff 857 RMD160 217aa0681811973fe0b603edb8039511cfa913e4 SHA1 688854e36c9d57dc7712832e0577440e2402065d SHA256 84085f198c6d2ee8fb19f215bdf79b8efee133708b82c4de7f32e9131c417804
 DIST vdr-pilot-0.0.8.tgz 20401 RMD160 6a4d5735f300a2e204dab65f3d43757f9789b950 SHA1 edcf4a48f0dba6a768dec19795720e92e3990303 SHA256 986438f2678382e8647e15f164fc01e86c52ed8e027e7e5a733594b23287b421
 DIST vdr-pilot-0.0.9.tgz 20533 RMD160 4f5d7828705ad5cbf1e799fb4e95a405856d3510 SHA1 f847385ae608b0a2bc2db75d2b3b176b86eae44c SHA256 ea02062352b41f6b65793d4725372917a7118912f1387dccd515ab83f5486b11
 EBUILD vdr-pilot-0.0.8.ebuild 558 RMD160 ba4ab70e7584913db9eb28a4a138878129bddd4b SHA1 e02063f99764c20e456c43117c8095ce632746be SHA256 b3349a4604a579c137f5c0641612b6232c6d836fb6a9e6407358a6aa13b4dfec
+EBUILD vdr-pilot-0.0.9-r1.ebuild 781 RMD160 64f8cdd3e0b5f8efcd8ab216283662428e5bd054 SHA1 116c8afde5e0d15aff285759982b0f193a95886b SHA256 6e6ed9d18b99a01df5607e34850823b235cebebda9f79b1c82c645ea0dbca08d
 EBUILD vdr-pilot-0.0.9.ebuild 556 RMD160 0c2b747472011935b44b61bec2eca7ff0469d722 SHA1 a24b53ad10e2a345b657a8530cf9e55686ddee24 SHA256 fa7feadec5dfb20cb9cf3117da1ec92608a9e6c003a38a11706cfe0914d44c12
-MISC ChangeLog 918 RMD160 ddce7ef9dbbbe47cf79a5f1a75e802799173b520 SHA1 e88082e6592fc7167565bdaa3971b008a28691be SHA256 744d121de2e6ca0fe793dc5ad0e75fbb7bf24afeba2b93d6fe8a72736d950acc
+MISC ChangeLog 1154 RMD160 28b66cfa2d37e58ff4b3c343f62d7c76035c1da0 SHA1 879ba5a43abfa3f2cc90b5bece2e99a3eea9133e SHA256 a96492b8a9c184bd2dc598b4abb247b2f61425cd45e353c9a63ab05dafeea67e
 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkfzjwUACgkQt2vP6XvVdOeFkwCg3ioZzwZ45spJr+YP7YGII7kr
+HGsAoIGdDqczeFWnnGOUDZ0T1HcMM8Ns
+=1Q8L
+-----END PGP SIGNATURE-----
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
+}