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-pvr350/files: vdr-pvr350-0.0.4.20070807-vdr-1.6.0.diff
Date: Tue, 01 Apr 2008 17:09:16
Message-Id: E1Jgjz0-00036e-7s@stork.gentoo.org
1 zzam 08/04/01 17:09:14
2
3 Added: vdr-pvr350-0.0.4.20070807-vdr-1.6.0.diff
4 Log:
5 Make plugin compatible to vdr-1.6.0
6 (Portage version: 2.1.4.4)
7
8 Revision Changes Path
9 1.1 media-plugins/vdr-pvr350/files/vdr-pvr350-0.0.4.20070807-vdr-1.6.0.diff
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-pvr350/files/vdr-pvr350-0.0.4.20070807-vdr-1.6.0.diff?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-pvr350/files/vdr-pvr350-0.0.4.20070807-vdr-1.6.0.diff?rev=1.1&content-type=text/plain
13
14 Index: vdr-pvr350-0.0.4.20070807-vdr-1.6.0.diff
15 ===================================================================
16 Nur in pvr350-2007-08-07: libvdr-pvr350.so.
17 Nur in pvr350-2007-08-07: libvdr-pvr350.so.1.6.0.
18 Nur in pvr350-2007-08-07: patches.
19 Nur in pvr350-2007-08-07: pvr350audio.o.
20 Nur in pvr350-2007-08-07: pvr350device.o.
21 Dateien pvr350-2007-08-07-orig/pvr350.o und pvr350-2007-08-07/pvr350.o sind verschieden.
22 diff -ru pvr350-2007-08-07-orig/pvr350osd.c pvr350-2007-08-07/pvr350osd.c
23 --- pvr350-2007-08-07-orig/pvr350osd.c 2007-07-28 22:43:32.000000000 +0200
24 +++ pvr350-2007-08-07/pvr350osd.c 2008-04-01 13:54:20.315786872 +0200
25 @@ -24,8 +24,8 @@
26 #include "pvr350device.h"
27
28 #if VDRVERSNUM >= 10307
29 -cPvr350Osd::cPvr350Osd(int Left, int Top,int fbfd, unsigned char *osdbuf)
30 - :cOsd(Left, Top)
31 +cPvr350Osd::cPvr350Osd(int Left, int Top, uint level, int fbfd, unsigned char *osdbuf)
32 + :cOsd(Left, Top, level)
33 {
34 fd = fbfd;
35 osd = osdbuf;
36 @@ -130,9 +130,9 @@
37 osdfd = fd;
38 }
39
40 -cOsd *cPvr350OsdProvider::CreateOsd(int Left, int Top)
41 +cOsd *cPvr350OsdProvider::CreateOsd(int Left, int Top, uint level)
42 {
43 - return new cPvr350Osd(Left, Top, osdfd, osdBuf);
44 + return new cPvr350Osd(Left, Top, level, osdfd, osdBuf);
45 }
46
47 #else
48 diff -ru pvr350-2007-08-07-orig/pvr350osd.h pvr350-2007-08-07/pvr350osd.h
49 --- pvr350-2007-08-07-orig/pvr350osd.h 2007-07-26 23:11:20.000000000 +0200
50 +++ pvr350-2007-08-07/pvr350osd.h 2008-04-01 13:40:03.000000000 +0200
51 @@ -20,7 +20,7 @@
52 unsigned char *osd;
53
54 public:
55 - cPvr350Osd(int Left, int Top,int fbfd, unsigned char *osdbuf);
56 + cPvr350Osd(int Left, int Top, uint level, int fbfd, unsigned char *osdbuf);
57 ~cPvr350Osd();
58 eOsdError CanHandleAreas(const tArea *Areas, int NumAreas);
59 void Flush(void);
60 @@ -36,7 +36,7 @@
61 int osdfd;
62 public:
63 cPvr350OsdProvider(int fd, unsigned char *buf);
64 - virtual cOsd *CreateOsd(int Left, int Top);
65 + virtual cOsd *CreateOsd(int Left, int Top, uint level);
66 };
67
68 #else
69 Nur in pvr350-2007-08-07: pvr350osd.o.
70 Nur in pvr350-2007-08-07: pvr350tools.o.
71
72
73
74 --
75 gentoo-commits@l.g.o mailing list