[vdr] 02/03: Updated patches
Tobias Grimm
tiber-guest at moszumanska.debian.org
Thu Feb 12 17:54:00 UTC 2015
This is an automated email from the git hooks/post-receive script.
tiber-guest pushed a commit to annotated tag debian/2.1.10-1_etobi1
in repository vdr.
commit cdbc4e834670d51ec2781e1c51f93f03ee33a794
Author: etobi <git at e-tobi.net>
Date: Thu Feb 12 18:49:40 2015 +0100
Updated patches
---
debian/.vdr-patches | 8 +++----
debian/patches/opt-37-x_menuorg.patch | 16 ++++++-------
debian/patches/opt-42-x_MainMenuHooks.patch | 16 ++++++-------
debian/patches/opt-45_yaepg.patch | 26 ++++++++++-----------
debian/patches/opt-50_graphtft.patch | 36 ++++++++++++++---------------
5 files changed, 51 insertions(+), 51 deletions(-)
diff --git a/debian/.vdr-patches b/debian/.vdr-patches
index e473b8b..6715f67 100644
--- a/debian/.vdr-patches
+++ b/debian/.vdr-patches
@@ -3,8 +3,8 @@
12_osdbase-maxitems.patch:0a9ce49053c44b51eae36db595870122
99_ncursesw-include.patch:17deb746df790f6b1f87744a218cd577
opt-27_ttxtsubs.patch:a72b11906b1a3bb9ede4effa5743a0fb
-opt-37-x_menuorg.patch:e6679bfd4fa23d239e981b05fa42fb62
+opt-37-x_menuorg.patch:5af45321309b1e723d89e5c6dc1c947f
opt-41-x_timer-info.patch:571ca43774dbd768cd9d90552fd1442d
-opt-42-x_MainMenuHooks.patch:d716f84c01ca2f5c057b893ea41f6f90
-opt-45_yaepg.patch:bf16931ea98ec607776192e636e4556c
-opt-50_graphtft.patch:afd5727a6b65ac5c15dfd9630327a29a
+opt-42-x_MainMenuHooks.patch:7ccacd9d4d79efbb2b9341c3d8e366a9
+opt-45_yaepg.patch:f867903d4be9339198bdb22e823b679e
+opt-50_graphtft.patch:7de63c9d4e2a8de754297ae40b367e01
diff --git a/debian/patches/opt-37-x_menuorg.patch b/debian/patches/opt-37-x_menuorg.patch
index 789ad52..d37b313 100644
--- a/debian/patches/opt-37-x_menuorg.patch
+++ b/debian/patches/opt-37-x_menuorg.patch
@@ -8,7 +8,7 @@ Author: Tobias Grimm <tg at e-tobi.net>
Index: vdr/mainmenuitemsprovider.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ vdr/mainmenuitemsprovider.h 2015-02-09 18:53:46.960460048 +0100
++++ vdr/mainmenuitemsprovider.h 2015-02-12 18:47:25.502258240 +0100
@@ -0,0 +1,60 @@
+/*
+ * vdr-menuorg - A plugin for the Linux Video Disk Recorder
@@ -72,8 +72,8 @@ Index: vdr/mainmenuitemsprovider.h
+#endif //__MAINMENUITEMSPROVIDER_H
Index: vdr/menu.c
===================================================================
---- vdr.orig/menu.c 2015-02-09 18:53:46.960460048 +0100
-+++ vdr/menu.c 2015-02-09 18:53:46.960460048 +0100
+--- vdr.orig/menu.c 2015-02-12 18:47:25.510258395 +0100
++++ vdr/menu.c 2015-02-12 18:47:25.506258317 +0100
@@ -31,6 +31,7 @@
#include "timers.h"
#include "transfer.h"
@@ -82,7 +82,7 @@ Index: vdr/menu.c
#define MAXWAIT4EPGINFO 3 // seconds
#define MODETIMEOUT 3 // seconds
-@@ -3941,6 +3942,9 @@
+@@ -3944,6 +3945,9 @@
cancelEditingItem = NULL;
stopRecordingItem = NULL;
recordControlsState = 0;
@@ -92,7 +92,7 @@ Index: vdr/menu.c
Set();
// Initial submenus:
-@@ -3969,6 +3973,29 @@
+@@ -3972,6 +3976,29 @@
SetTitle("VDR");
SetHasHotkeys();
@@ -122,7 +122,7 @@ Index: vdr/menu.c
// Basic menu items:
Add(new cOsdItem(hk(tr("Schedule")), osSchedule));
-@@ -3995,6 +4022,8 @@
+@@ -3998,6 +4025,8 @@
if (Commands.Count())
Add(new cOsdItem(hk(tr("Commands")), osCommands));
@@ -131,7 +131,7 @@ Index: vdr/menu.c
Update(true);
Display();
-@@ -4100,6 +4129,41 @@
+@@ -4103,6 +4132,41 @@
state = osEnd;
}
break;
@@ -176,7 +176,7 @@ Index: vdr/menu.c
Index: vdr/menuorgpatch.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ vdr/menuorgpatch.h 2015-02-09 18:53:46.960460048 +0100
++++ vdr/menuorgpatch.h 2015-02-12 18:47:25.506258317 +0100
@@ -0,0 +1,100 @@
+/*
+ * vdr-menuorg - A plugin for the Linux Video Disk Recorder
diff --git a/debian/patches/opt-42-x_MainMenuHooks.patch b/debian/patches/opt-42-x_MainMenuHooks.patch
index 665da30..0cb12d9 100644
--- a/debian/patches/opt-42-x_MainMenuHooks.patch
+++ b/debian/patches/opt-42-x_MainMenuHooks.patch
@@ -4,9 +4,9 @@ Author: Frank Schmirler <vdrdev at schmirler.de>
Index: vdr/menu.c
===================================================================
---- vdr.orig/menu.c 2015-02-09 18:53:54.328434375 +0100
-+++ vdr/menu.c 2015-02-09 18:53:54.324434390 +0100
-@@ -4075,15 +4075,30 @@
+--- vdr.orig/menu.c 2015-02-12 18:47:32.042384630 +0100
++++ vdr/menu.c 2015-02-12 18:47:32.042384630 +0100
+@@ -4078,15 +4078,30 @@
// Initial submenus:
@@ -43,7 +43,7 @@ Index: vdr/menu.c
}
cOsdObject *cMenuMain::PluginOsdObject(void)
-@@ -4216,13 +4231,34 @@
+@@ -4219,13 +4234,34 @@
eOSState state = cOsdMenu::ProcessKey(Key);
HadSubMenu |= HasSubMenu();
@@ -84,7 +84,7 @@ Index: vdr/menu.c
case osStopRecord: if (Interface->Confirm(tr("Stop recording?"))) {
cOsdItem *item = Get(Current());
if (item) {
-@@ -4309,6 +4345,8 @@
+@@ -4312,6 +4348,8 @@
default: break;
}
}
@@ -95,8 +95,8 @@ Index: vdr/menu.c
if (Key != kNone) {
Index: vdr/config.h
===================================================================
---- vdr.orig/config.h 2015-02-09 18:53:54.328434375 +0100
-+++ vdr/config.h 2015-02-09 18:53:54.328434375 +0100
+--- vdr.orig/config.h 2015-02-12 18:47:32.042384630 +0100
++++ vdr/config.h 2015-02-12 18:47:32.042384630 +0100
@@ -36,6 +36,8 @@
// plugins to work with newer versions of the core VDR as long as no
// VDR header files have changed.
@@ -109,7 +109,7 @@ Index: vdr/config.h
Index: vdr/README.MainMenuHooks
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ vdr/README.MainMenuHooks 2015-02-09 18:53:54.328434375 +0100
++++ vdr/README.MainMenuHooks 2015-02-12 18:47:32.042384630 +0100
@@ -0,0 +1,55 @@
+This is a "patch" for the Video Disk Recorder (VDR).
+
diff --git a/debian/patches/opt-45_yaepg.patch b/debian/patches/opt-45_yaepg.patch
index 7b14d5b..a02ec92 100644
--- a/debian/patches/opt-45_yaepg.patch
+++ b/debian/patches/opt-45_yaepg.patch
@@ -4,8 +4,8 @@ Origin: http://www.hoochvdr.info/yaepg/vdr-1.3.19-core-yaepg.diff
Index: vdr/PLUGINS/src/dvbsddevice/dvbsdffosd.c
===================================================================
---- vdr.orig/PLUGINS/src/dvbsddevice/dvbsdffosd.c 2015-02-07 11:23:37.260312760 +0100
-+++ vdr/PLUGINS/src/dvbsddevice/dvbsdffosd.c 2015-02-07 11:23:37.256312118 +0100
+--- vdr.orig/PLUGINS/src/dvbsddevice/dvbsdffosd.c 2015-02-12 18:47:44.802630668 +0100
++++ vdr/PLUGINS/src/dvbsddevice/dvbsdffosd.c 2015-02-12 18:47:44.798630591 +0100
@@ -77,6 +77,10 @@
Cmd(OSD_SetWindow, 0, i + 1);
Cmd(OSD_Close);
@@ -42,8 +42,8 @@ Index: vdr/PLUGINS/src/dvbsddevice/dvbsdffosd.c
}
Index: vdr/device.h
===================================================================
---- vdr.orig/device.h 2015-02-07 11:23:37.260312760 +0100
-+++ vdr/device.h 2015-02-07 11:23:37.260312760 +0100
+--- vdr.orig/device.h 2015-02-12 18:47:44.802630668 +0100
++++ vdr/device.h 2015-02-12 18:47:44.798630591 +0100
@@ -314,12 +314,12 @@
///< Direction (only the sign of Direction is evaluated, positive values
///< switch to higher channel numbers).
@@ -61,9 +61,9 @@ Index: vdr/device.h
static void SetCurrentChannel(const cChannel *Channel) { currentChannel = Channel ? Channel->Number() : 0; }
Index: vdr/osd.c
===================================================================
---- vdr.orig/osd.c 2015-02-07 11:23:37.260312760 +0100
-+++ vdr/osd.c 2015-02-07 11:23:37.260312760 +0100
-@@ -1654,6 +1654,7 @@
+--- vdr.orig/osd.c 2015-02-12 18:47:44.802630668 +0100
++++ vdr/osd.c 2015-02-12 18:47:44.798630591 +0100
+@@ -1663,6 +1663,7 @@
}
}
Osds.Append(this);
@@ -73,12 +73,12 @@ Index: vdr/osd.c
cOsd::~cOsd()
Index: vdr/osd.h
===================================================================
---- vdr.orig/osd.h 2015-02-07 11:23:37.260312760 +0100
-+++ vdr/osd.h 2015-02-07 11:23:37.260312760 +0100
-@@ -937,6 +937,7 @@
- ///< MyOsdDrawPixmap(Left() + pm->ViewPort().X(), Top() + pm->ViewPort().Y(), pm->Data(), w, h, h * d);
- ///< delete pm;
- ///< }
+--- vdr.orig/osd.h 2015-02-12 18:47:44.802630668 +0100
++++ vdr/osd.h 2015-02-12 18:48:43.191747160 +0100
+@@ -941,6 +941,7 @@
+ ///<
+ ///< If a plugin uses a derived cPixmap implementation, it needs to use that
+ ///< type instead of cPixmapMemory.
+ tArea vidWin;
};
diff --git a/debian/patches/opt-50_graphtft.patch b/debian/patches/opt-50_graphtft.patch
index 566378e..271b5e5 100644
--- a/debian/patches/opt-50_graphtft.patch
+++ b/debian/patches/opt-50_graphtft.patch
@@ -4,8 +4,8 @@ Origin: https://vdr-graphtft.svn.sourceforge.net/svnroot/vdr-graphtft
Index: vdr/menu.c
===================================================================
---- vdr.orig/menu.c 2015-02-09 18:54:00.152414080 +0100
-+++ vdr/menu.c 2015-02-09 18:54:00.148414095 +0100
+--- vdr.orig/menu.c 2015-02-12 18:49:10.880271296 +0100
++++ vdr/menu.c 2015-02-12 18:49:10.876271221 +0100
@@ -168,6 +168,7 @@
public:
cMenuEditChannel(cChannel *Channel, bool New = false);
@@ -158,7 +158,7 @@ Index: vdr/menu.c
};
cMenuSetupCAM::cMenuSetupCAM(void)
-@@ -3917,6 +3957,7 @@
+@@ -3920,6 +3960,7 @@
public:
cMenuSetupPlugins(void);
virtual eOSState ProcessKey(eKeys Key);
@@ -166,7 +166,7 @@ Index: vdr/menu.c
};
cMenuSetupPlugins::cMenuSetupPlugins(void)
-@@ -3972,6 +4013,7 @@
+@@ -3975,6 +4016,7 @@
public:
cMenuSetup(void);
virtual eOSState ProcessKey(eKeys Key);
@@ -176,8 +176,8 @@ Index: vdr/menu.c
cMenuSetup::cMenuSetup(void)
Index: vdr/menu.h
===================================================================
---- vdr.orig/menu.h 2015-02-09 18:54:00.152414080 +0100
-+++ vdr/menu.h 2015-02-09 18:54:00.148414095 +0100
+--- vdr.orig/menu.h 2015-02-12 18:49:10.880271296 +0100
++++ vdr/menu.h 2015-02-12 18:49:10.876271221 +0100
@@ -29,6 +29,7 @@
void SetText(const char *Text);
virtual void Display(void);
@@ -228,8 +228,8 @@ Index: vdr/menu.h
class cRecordControl {
Index: vdr/menuitems.h
===================================================================
---- vdr.orig/menuitems.h 2015-02-09 18:54:00.152414080 +0100
-+++ vdr/menuitems.h 2015-02-09 18:54:00.148414095 +0100
+--- vdr.orig/menuitems.h 2015-02-12 18:49:10.880271296 +0100
++++ vdr/menuitems.h 2015-02-12 18:49:10.876271221 +0100
@@ -220,6 +220,7 @@
cMenuSetupPage(void);
virtual eOSState ProcessKey(eKeys Key);
@@ -240,8 +240,8 @@ Index: vdr/menuitems.h
#endif //__MENUITEMS_H
Index: vdr/osdbase.c
===================================================================
---- vdr.orig/osdbase.c 2015-02-09 18:54:00.152414080 +0100
-+++ vdr/osdbase.c 2015-02-09 18:54:00.148414095 +0100
+--- vdr.orig/osdbase.c 2015-02-12 18:49:10.880271296 +0100
++++ vdr/osdbase.c 2015-02-12 18:49:10.876271221 +0100
@@ -106,6 +106,7 @@
free(status);
displayMenu->Clear();
@@ -260,8 +260,8 @@ Index: vdr/osdbase.c
displayMenu->SetMenuSortMode(menuSortMode);
Index: vdr/osdbase.h
===================================================================
---- vdr.orig/osdbase.h 2015-02-09 18:54:00.152414080 +0100
-+++ vdr/osdbase.h 2015-02-09 18:54:00.148414095 +0100
+--- vdr.orig/osdbase.h 2015-02-12 18:49:10.880271296 +0100
++++ vdr/osdbase.h 2015-02-12 18:49:10.876271221 +0100
@@ -138,6 +138,7 @@
void Ins(cOsdItem *Item, bool Current = false, cOsdItem *Before = NULL);
virtual void Display(void);
@@ -272,8 +272,8 @@ Index: vdr/osdbase.h
#endif //__OSDBASE_H
Index: vdr/recording.h
===================================================================
---- vdr.orig/recording.h 2015-02-09 18:54:00.152414080 +0100
-+++ vdr/recording.h 2015-02-09 18:54:00.148414095 +0100
+--- vdr.orig/recording.h 2015-02-12 18:49:10.880271296 +0100
++++ vdr/recording.h 2015-02-12 18:49:10.876271221 +0100
@@ -84,6 +84,7 @@
const cEvent *GetEvent(void) const { return event; }
const char *Title(void) const { return event->Title(); }
@@ -284,8 +284,8 @@ Index: vdr/recording.h
const char *Aux(void) const { return aux; }
Index: vdr/status.c
===================================================================
---- vdr.orig/status.c 2015-02-09 18:54:00.152414080 +0100
-+++ vdr/status.c 2015-02-09 18:54:00.148414095 +0100
+--- vdr.orig/status.c 2015-02-12 18:49:10.880271296 +0100
++++ vdr/status.c 2015-02-12 18:49:10.876271221 +0100
@@ -130,3 +130,32 @@
for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm))
sm->OsdProgramme(PresentTime, PresentTitle, PresentSubtitle, FollowingTime, FollowingTitle, FollowingSubtitle);
@@ -321,8 +321,8 @@ Index: vdr/status.c
+}
Index: vdr/status.h
===================================================================
---- vdr.orig/status.h 2015-02-09 18:54:00.152414080 +0100
-+++ vdr/status.h 2015-02-09 18:54:00.148414095 +0100
+--- vdr.orig/status.h 2015-02-12 18:49:10.880271296 +0100
++++ vdr/status.h 2015-02-12 18:49:10.876271221 +0100
@@ -84,6 +84,17 @@
// The OSD displays the single line Text with the current channel information.
virtual void OsdProgramme(time_t PresentTime, const char *PresentTitle, const char *PresentSubtitle, time_t FollowingTime, const char *FollowingTitle, const char *FollowingSubtitle) {}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr.git
More information about the pkg-vdr-dvb-changes
mailing list