r699 - in vdr/vdr-plugin-weather/trunk/debian: . patches
Tobias Grimm
pkg-vdr-dvb-changes@lists.alioth.debian.org
Sat, 25 Jun 2005 15:49:38 +0000
Author: tiber-guest
Date: 2005-06-25 15:49:37 +0000 (Sat, 25 Jun 2005)
New Revision: 699
Modified:
vdr/vdr-plugin-weather/trunk/debian/changelog
vdr/vdr-plugin-weather/trunk/debian/patches/02_vdr_1.3-fix.dpatch
Log:
made weather plugin work with 1.3.x
Modified: vdr/vdr-plugin-weather/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-weather/trunk/debian/changelog 2005-06-24 23:18:06 UTC (rev 698)
+++ vdr/vdr-plugin-weather/trunk/debian/changelog 2005-06-25 15:49:37 UTC (rev 699)
@@ -1,13 +1,13 @@
vdr-plugin-weather (0.2.1e-11) experimental; urgency=low
- * NOT RELEASED YET (does not work atm !!!)
-
* Thomas Schmidt <tschmidt@debian.org>
- Added 02_vdr_1.3-fix.dpatch to allow compiling the plugin
for vdr (>=1.3.23)
- - Depend/Build-Depend on vdr (>=1.3.23-1)
- - Conflict with vdr (>=1.3.24)
- Updated debian/watch
+ * Tobias Grimm <tg@e-tobi.net>
+ - Depend/Build-Depend on vdr (>=1.3.27-1)
+ - Conflict with vdr (>=1.3.28)
+ - Fixed osd area in 02_vdr_1.3-fix.dpatch to make it work with vdr 1.3.27
-- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org> Thu, 14 Apr 2005 20:02:36 +0200
Modified: vdr/vdr-plugin-weather/trunk/debian/patches/02_vdr_1.3-fix.dpatch
===================================================================
--- vdr/vdr-plugin-weather/trunk/debian/patches/02_vdr_1.3-fix.dpatch 2005-06-24 23:18:06 UTC (rev 698)
+++ vdr/vdr-plugin-weather/trunk/debian/patches/02_vdr_1.3-fix.dpatch 2005-06-25 15:49:37 UTC (rev 699)
@@ -5,9 +5,9 @@
## DP: Allows the plugin to be compiled for vdr 1.3.x
@DPATCH@
-diff -urNad vdr-plugin-weather-0.2.1e/display.c /tmp/dpep.VbJUoh/vdr-plugin-weather-0.2.1e/display.c
---- vdr-plugin-weather-0.2.1e/display.c 2005-04-16 20:21:10.490690344 +0200
-+++ /tmp/dpep.VbJUoh/vdr-plugin-weather-0.2.1e/display.c 2005-04-16 20:22:19.365219824 +0200
+diff -urNad weather/display.c /tmp/dpep.f9okrN/weather/display.c
+--- weather/display.c 2005-06-25 17:17:04.000000000 +0200
++++ /tmp/dpep.f9okrN/weather/display.c 2005-06-25 17:20:01.000000000 +0200
@@ -16,130 +16,132 @@
}
@@ -199,9 +199,9 @@
- osd->SetBitmap(x, y, windRose);
+ osd->DrawBitmap(x, y, windRose);
}
-diff -urNad vdr-plugin-weather-0.2.1e/display.h /tmp/dpep.VbJUoh/vdr-plugin-weather-0.2.1e/display.h
---- vdr-plugin-weather-0.2.1e/display.h 2005-04-16 20:21:10.490690344 +0200
-+++ /tmp/dpep.VbJUoh/vdr-plugin-weather-0.2.1e/display.h 2005-04-16 20:21:10.943621488 +0200
+diff -urNad weather/display.h /tmp/dpep.f9okrN/weather/display.h
+--- weather/display.h 2005-06-25 17:17:04.000000000 +0200
++++ /tmp/dpep.f9okrN/weather/display.h 2005-06-25 17:20:01.000000000 +0200
@@ -11,20 +11,20 @@
public:
cWeatherOsd(cUpdate *metarReader);
@@ -237,10 +237,10 @@
std::string cWeatherOsd::getIntensity(const std::string weather);
std::string cWeatherOsd::getPrecipitation(const std::string weather);
std::string cWeatherOsd::getCoverage(const std::string weather);
-diff -urNad vdr-plugin-weather-0.2.1e/simpleDisplay.c /tmp/dpep.VbJUoh/vdr-plugin-weather-0.2.1e/simpleDisplay.c
---- vdr-plugin-weather-0.2.1e/simpleDisplay.c 2005-04-16 20:21:10.490690344 +0200
-+++ /tmp/dpep.VbJUoh/vdr-plugin-weather-0.2.1e/simpleDisplay.c 2005-04-16 20:21:10.943621488 +0200
-@@ -18,21 +18,17 @@
+diff -urNad weather/simpleDisplay.c /tmp/dpep.f9okrN/weather/simpleDisplay.c
+--- weather/simpleDisplay.c 2005-06-25 17:17:04.000000000 +0200
++++ /tmp/dpep.f9okrN/weather/simpleDisplay.c 2005-06-25 17:21:14.000000000 +0200
+@@ -18,21 +18,18 @@
}
void cSimpleWeatherOsd::Show(void) {
@@ -255,8 +255,9 @@
- osd->AddColor(clrYellow);
- osd->AddColor(clrBlue);
- osd->Clear();
-+ tArea Area = {0, 240, 612, 250, 4};
++ tArea Area = {0, 240, 611, 489, 4};
+ osd->SetAreas(&Area, 1);
++ osd->DrawRectangle(0, 240, 611, 489, clrGray50);
if (metarReader->isDataAvailable()) {
Decoded_METAR *decodedMetar = metarReader->getDecodedMetar();
@@ -267,7 +268,7 @@
}
osd->Flush();
}
-@@ -54,14 +50,13 @@
+@@ -54,14 +51,13 @@
return state;
}
@@ -285,7 +286,7 @@
int maxSize = 0;
int strSize = 0;
-@@ -75,7 +70,7 @@
+@@ -75,7 +71,7 @@
return maxSize;
}
@@ -294,7 +295,7 @@
int maxSize = 0;
int strSize = 0;
-@@ -89,7 +84,7 @@
+@@ -89,7 +85,7 @@
return maxSize;
}
@@ -303,7 +304,7 @@
measurement measurements[10];
for(int i=0; i<10; i++) {
-@@ -174,18 +169,21 @@
+@@ -174,18 +170,21 @@
int maxSize = x + calculateMaxDescriptionFontWidth(measurements, cy, font) + gapX;
@@ -331,9 +332,9 @@
- osd->Fill(maxSize+gapX, lineY, maxSize+gapX+lineHeight, y, clrBlue);
+ osd->DrawRectangle(maxSize+gapX, lineY, maxSize+gapX+lineHeight, y, clrBlue);
}
-diff -urNad vdr-plugin-weather-0.2.1e/simpleDisplay.h /tmp/dpep.VbJUoh/vdr-plugin-weather-0.2.1e/simpleDisplay.h
---- vdr-plugin-weather-0.2.1e/simpleDisplay.h 2005-04-16 20:21:10.491690192 +0200
-+++ /tmp/dpep.VbJUoh/vdr-plugin-weather-0.2.1e/simpleDisplay.h 2005-04-16 20:21:10.943621488 +0200
+diff -urNad weather/simpleDisplay.h /tmp/dpep.f9okrN/weather/simpleDisplay.h
+--- weather/simpleDisplay.h 2005-06-25 17:17:04.000000000 +0200
++++ /tmp/dpep.f9okrN/weather/simpleDisplay.h 2005-06-25 17:20:01.000000000 +0200
@@ -17,14 +17,14 @@
virtual void Show(void);
virtual eOSState ProcessKey(eKeys Key);