1 |
hd_brummy 12/04/07 01:36:55 |
2 |
|
3 |
Added: vdr-1.7.27.diff |
4 |
Log: |
5 |
compilefix >=vdr-1.7.27 |
6 |
|
7 |
(Portage version: 2.1.10.11/cvs/Linux i686) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 media-plugins/vdr-graphtft/files/vdr-1.7.27.diff |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-graphtft/files/vdr-1.7.27.diff?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-graphtft/files/vdr-1.7.27.diff?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: vdr-1.7.27.diff |
16 |
=================================================================== |
17 |
diff -Naur graphtft-30.orig/dspitems.c graphtft-30/dspitems.c |
18 |
--- graphtft-30.orig/dspitems.c 2012-04-07 03:09:26.000000000 +0200 |
19 |
+++ graphtft-30/dspitems.c 2012-04-07 03:11:03.000000000 +0200 |
20 |
@@ -397,7 +397,7 @@ |
21 |
else if (strcasecmp(var, "Path") == 0) |
22 |
return Str::notNull(recording->FileName()); |
23 |
else if (strcasecmp(var, "Time") == 0) |
24 |
- return formatDateTime(recording->start, fmt, buf, sizeof(buf)); |
25 |
+ return formatDateTime(recording->Start(), fmt, buf, sizeof(buf)); |
26 |
else if (strcasecmp(var, "EventID") == 0) |
27 |
return Str::toStr(!recording->Info() ? na : (int)recording->Info()->EventID()); |
28 |
else if (strcasecmp(var, "SubTitle") == 0) |
29 |
diff -Naur graphtft-30.orig/graphtft.c graphtft-30/graphtft.c |
30 |
--- graphtft-30.orig/graphtft.c 2012-04-07 03:16:05.000000000 +0200 |
31 |
+++ graphtft-30/graphtft.c 2012-04-07 03:19:52.000000000 +0200 |
32 |
@@ -311,7 +311,7 @@ |
33 |
GraphTFTSetup.PluginConfPath = strdup(DATA_DIR); |
34 |
|
35 |
#if APIVERSNUM < 10507 |
36 |
- RegisterI18n(Phrases); |
37 |
+// RegisterI18n(Phrases); |
38 |
#endif |
39 |
|
40 |
display = new cGraphTFTDisplay(THEMEVERSION); |
41 |
diff -Naur graphtft-30.orig/graphtft.h graphtft-30/graphtft.h |
42 |
--- graphtft-30.orig/graphtft.h 2012-04-07 03:16:05.000000000 +0200 |
43 |
+++ graphtft-30/graphtft.h 2012-04-07 03:21:04.000000000 +0200 |
44 |
@@ -16,7 +16,7 @@ |
45 |
#include <vdr/config.h> |
46 |
|
47 |
#if APIVERSNUM < 10507 |
48 |
-# include "i18n.h" |
49 |
+//# include "i18n.h" |
50 |
# define trNOOP(s) (s) |
51 |
#endif |
52 |
|
53 |
diff -Naur graphtft-30.orig/Makefile graphtft-30/Makefile |
54 |
--- graphtft-30.orig/Makefile 2012-04-07 03:16:05.000000000 +0200 |
55 |
+++ graphtft-30/Makefile 2012-04-07 03:18:44.000000000 +0200 |
56 |
@@ -240,7 +240,7 @@ |
57 |
### The object files (add further files here): |
58 |
|
59 |
COMMONOBJS = $(PLUGIN).o dspitems.o display.o \ |
60 |
- i18n.o setup.o osd.o scan.o theme.o common.o sysinfo.o \ |
61 |
+ setup.o osd.o scan.o theme.o common.o sysinfo.o \ |
62 |
touchthread.o |
63 |
|
64 |
# transfer.o |
65 |
@@ -311,10 +311,10 @@ |
66 |
|
67 |
### Targets: |
68 |
|
69 |
-all: libvdr-$(PLUGIN).so i18n |
70 |
+all: libvdr-$(PLUGIN).so |
71 |
@cp libvdr-$(PLUGIN).so $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) |
72 |
|
73 |
-alli: libvdr-$(PLUGIN).so i18n |
74 |
+alli: libvdr-$(PLUGIN).so |
75 |
|
76 |
libvdr-$(PLUGIN).so: $(COMMONOBJS) $(IMLIBOBJS) $(DFBOBJS) |
77 |
$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $^ $(LIBS) -o $@ |
78 |
diff -Naur graphtft-30.orig/setup.h graphtft-30/setup.h |
79 |
--- graphtft-30.orig/setup.h 2012-04-07 03:16:05.000000000 +0200 |
80 |
+++ graphtft-30/setup.h 2012-04-07 03:21:41.000000000 +0200 |
81 |
@@ -22,7 +22,7 @@ |
82 |
#include "theme.h" |
83 |
|
84 |
#if APIVERSNUM < 10507 |
85 |
-# include "i18n.h" |
86 |
+//# include "i18n.h" |
87 |
#endif |
88 |
|
89 |
//*************************************************************************** |