Gentoo Archives: gentoo-commits

From: "Matthias Schwarzott (zzam)" <zzam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-plugins/vdr-pilot/files: vdr-pilot-0.0.9-gcc-4.1.diff vdr-pilot-0.0.9-vdr-1.6.0.diff
Date: Wed, 02 Apr 2008 13:50:08
Message-Id: E1Jh3Ld-0007HW-3n@stork.gentoo.org
1 zzam 08/04/02 13:49:53
2
3 Added: vdr-pilot-0.0.9-gcc-4.1.diff
4 vdr-pilot-0.0.9-vdr-1.6.0.diff
5 Log:
6 Added vdr-1.6.0 and gcc-4.1 patches.
7 (Portage version: 2.1.4.4)
8
9 Revision Changes Path
10 1.1 media-plugins/vdr-pilot/files/vdr-pilot-0.0.9-gcc-4.1.diff
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-pilot/files/vdr-pilot-0.0.9-gcc-4.1.diff?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-pilot/files/vdr-pilot-0.0.9-gcc-4.1.diff?rev=1.1&content-type=text/plain
14
15 Index: vdr-pilot-0.0.9-gcc-4.1.diff
16 ===================================================================
17 diff -ru pilot-0.0.9-orig/pilotosd.c pilot-0.0.9/pilotosd.c
18 --- pilot-0.0.9-orig/pilotosd.c 2008-04-02 15:45:18.597448151 +0200
19 +++ pilot-0.0.9/pilotosd.c 2008-04-02 15:46:45.507442460 +0200
20 @@ -34,7 +34,7 @@
21 {
22 delete osd;
23 }
24 -void cPilotOsd::DrawSymbol(int x, int y, char *SymbolName[], tColor ColorFg)
25 +void cPilotOsd::DrawSymbol(int x, int y, const char *SymbolName[], tColor ColorFg)
26 {
27 cBitmap bm(SymbolName);
28 osd->DrawBitmap(x, y, bm, ColorFg, pal[0]);
29 diff -ru pilot-0.0.9-orig/pilotosd.h pilot-0.0.9/pilotosd.h
30 --- pilot-0.0.9-orig/pilotosd.h 2008-04-02 15:45:18.597448151 +0200
31 +++ pilot-0.0.9/pilotosd.h 2008-04-02 15:46:30.908163317 +0200
32 @@ -11,7 +11,7 @@
33
34 class cPilotOsd : public cOsdObject {
35 private:
36 - void DrawSymbol(int x, int y, char *SymbolName[], tColor color);
37 + void DrawSymbol(int x, int y, const char *SymbolName[], tColor color);
38 cOsd *osd;
39 int pal[16];
40 int lastTime;
41 diff -ru pilot-0.0.9-orig/symbols/down.xpm pilot-0.0.9/symbols/down.xpm
42 --- pilot-0.0.9-orig/symbols/down.xpm 2008-04-02 15:45:18.597448151 +0200
43 +++ pilot-0.0.9/symbols/down.xpm 2008-04-02 15:45:47.057442667 +0200
44 @@ -1,5 +1,5 @@
45 /* XPM */
46 -static char * down_xpm[] = {
47 +static const char * down_xpm[] = {
48 "22 26 2 1",
49 ". c #FFFFFF",
50 "* c #000000",
51 diff -ru pilot-0.0.9-orig/symbols/up.xpm pilot-0.0.9/symbols/up.xpm
52 --- pilot-0.0.9-orig/symbols/up.xpm 2008-04-02 15:45:18.597448151 +0200
53 +++ pilot-0.0.9/symbols/up.xpm 2008-04-02 15:45:53.807442292 +0200
54 @@ -1,5 +1,5 @@
55 /* XPM */
56 -static char * up_xpm[] = {
57 +static const char * up_xpm[] = {
58 "22 26 2 1",
59 ". c #FFFFFF",
60 "* c #000000",
61
62
63
64 1.1 media-plugins/vdr-pilot/files/vdr-pilot-0.0.9-vdr-1.6.0.diff
65
66 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-pilot/files/vdr-pilot-0.0.9-vdr-1.6.0.diff?rev=1.1&view=markup
67 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-pilot/files/vdr-pilot-0.0.9-vdr-1.6.0.diff?rev=1.1&content-type=text/plain
68
69 Index: vdr-pilot-0.0.9-vdr-1.6.0.diff
70 ===================================================================
71 diff -ru pilot-0.0.9-orig/Makefile pilot-0.0.9/Makefile
72 --- pilot-0.0.9-orig/Makefile 2008-04-02 15:37:55.657442868 +0200
73 +++ pilot-0.0.9/Makefile 2008-04-02 15:38:27.187445656 +0200
74 @@ -47,7 +47,7 @@
75
76 ### The object files (add further files here):
77
78 -OBJS = $(PLUGIN).o pilotosd.o pilotbmp.o pilotsetup.o
79 +OBJS = $(PLUGIN).o pilotosd.o pilotsetup.o
80
81 ### Implicit rules:
82
83 Dateien pilot-0.0.9-orig/pilot.o und pilot-0.0.9/pilot.o sind verschieden.
84 diff -ru pilot-0.0.9-orig/pilotosd.h pilot-0.0.9/pilotosd.h
85 --- pilot-0.0.9-orig/pilotosd.h 2008-04-02 15:37:55.657442868 +0200
86 +++ pilot-0.0.9/pilotosd.h 2008-04-02 15:38:32.497447004 +0200
87 @@ -4,7 +4,6 @@
88 #include <vdr/osd.h>
89 #include <vdr/menuitems.h>
90 #include <ctype.h>
91 -#include "pilotbmp.h"
92
93 static const cFont *font = cFont::GetFont(fontOsd);
94 static const int LINEHEIGHT = font->Height();
95
96
97
98
99 --
100 gentoo-commits@l.g.o mailing list