r5402 - in /vdr/vdr-plugin-playlist/trunk/debian: changelog patches/00list patches/91_playlist-0.0.2-compile-fix.dpatch patches/91_playlist-0.0.2rc3-fix-1.3.25.dpatch patches/92_playlist-0.0.2-buffer.dpatch patches/93_playlist-0.0.2-1.5.7.dpatch
tom-guest at users.alioth.debian.org
tom-guest at users.alioth.debian.org
Mon Sep 3 20:24:15 UTC 2007
Author: tom-guest
Date: Mon Sep 3 20:24:15 2007
New Revision: 5402
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=5402
Log:
Added 93_playlist-0.0.2-1.5.7.dpatch, Fixed summary
Added:
vdr/vdr-plugin-playlist/trunk/debian/patches/91_playlist-0.0.2rc3-fix-1.3.25.dpatch
vdr/vdr-plugin-playlist/trunk/debian/patches/93_playlist-0.0.2-1.5.7.dpatch
Removed:
vdr/vdr-plugin-playlist/trunk/debian/patches/91_playlist-0.0.2-compile-fix.dpatch
vdr/vdr-plugin-playlist/trunk/debian/patches/92_playlist-0.0.2-buffer.dpatch
Modified:
vdr/vdr-plugin-playlist/trunk/debian/changelog
vdr/vdr-plugin-playlist/trunk/debian/patches/00list
Modified: vdr/vdr-plugin-playlist/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-playlist/trunk/debian/changelog?rev=5402&op=diff
==============================================================================
--- vdr/vdr-plugin-playlist/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-playlist/trunk/debian/changelog Mon Sep 3 20:24:15 2007
@@ -1,3 +1,12 @@
+vdr-plugin-playlist (0.0.1+0.0.2rc3-20) experimental; urgency=low
+
+ * Added 93_playlist-0.0.2-1.5.7.dpatch
+ * Fixed summary: replaced 91_playlist-0.0.2-compile-fix.dpatch and
+ 92_playlist-0.0.2-buffer.dpatch with 91_playlist-0.0.2rc3-fix-1.3.25.dpatch
+ (Thx to viking at vdrportal.de)
+
+ -- Thomas Günther <tom at toms-cafe.de> Mon, 3 Sep 2007 22:17:00 +0200
+
vdr-plugin-playlist (0.0.1+0.0.2rc3-19) experimental; urgency=low
* Release for vdrdevel 1.5.6
Modified: vdr/vdr-plugin-playlist/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-playlist/trunk/debian/patches/00list?rev=5402&op=diff
==============================================================================
--- vdr/vdr-plugin-playlist/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-playlist/trunk/debian/patches/00list Mon Sep 3 20:24:15 2007
@@ -1,5 +1,5 @@
01_Makefile-fPIC-fix
-90_APIVERSION.dpatch
-91_playlist-0.0.2-compile-fix
-92_playlist-0.0.2-buffer
+90_APIVERSION
+91_playlist-0.0.2rc3-fix-1.3.25
+93_playlist-0.0.2-1.5.7
Added: vdr/vdr-plugin-playlist/trunk/debian/patches/91_playlist-0.0.2rc3-fix-1.3.25.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-playlist/trunk/debian/patches/91_playlist-0.0.2rc3-fix-1.3.25.dpatch?rev=5402&op=file
==============================================================================
--- vdr/vdr-plugin-playlist/trunk/debian/patches/91_playlist-0.0.2rc3-fix-1.3.25.dpatch (added)
+++ vdr/vdr-plugin-playlist/trunk/debian/patches/91_playlist-0.0.2rc3-fix-1.3.25.dpatch Mon Sep 3 20:24:15 2007
@@ -1,0 +1,85 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 91_playlist-0.0.2rc3-fix-1.3.25.dpatch by viking at vdrportal.de
+## http://vdrportal.de/board/thread.php?postid=566945#post566945
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes for VDR >= 1.3.25 and VDR >= 1.3.36.
+
+ at DPATCH@
+diff -Nur playlist-0.0.2.ORG/dataplaylist.c playlist-0.0.2/dataplaylist.c
+--- playlist-0.0.2.ORG/dataplaylist.c 2004-10-08 02:34:00.000000000 +0200
++++ playlist-0.0.2/dataplaylist.c 2007-01-18 10:17:08.000000000 +0100
+@@ -145,7 +145,11 @@
+ char *temp = strrchr(title, '\t');
+ if (temp)
+ *temp = 0;
++#if VDRVERSNUM >= 10325
++ summary = recording->Info()->Description() ? strdup(recording->Info()->Description()) : NULL;
++#else
+ summary = recording->Summary() ? strdup(recording->Summary()) : NULL;
++#endif
+ return true;
+ }
+ isdel = true;
+diff -Nur playlist-0.0.2.ORG/menuplaylist.c playlist-0.0.2/menuplaylist.c
+--- playlist-0.0.2.ORG/menuplaylist.c 2004-10-08 02:34:00.000000000 +0200
++++ playlist-0.0.2/menuplaylist.c 2007-01-18 10:20:32.000000000 +0100
+@@ -154,7 +154,11 @@
+ else
+ {
+ cRecording *recording = GetRecording(ri);
++#if VDRVERSNUM >= 10325
++ SetHelp(singleselect ? tr("Select") : tr("Add"), singleselect ? NULL : ri->IsMark() ? tr("UnMark") : tr("Mark"), deleterecords.u ? tr("Delete") : NULL, (recording && recording->Info()->Description() && *recording->Info()->Description()) ? tr("Summary") : NULL);
++#else
+ SetHelp(singleselect ? tr("Select") : tr("Add"), singleselect ? NULL : ri->IsMark() ? tr("UnMark") : tr("Mark"), deleterecords.u ? tr("Delete") : NULL, (recording && recording->Summary() && *recording->Summary()) ? tr("Summary") : NULL);
++#endif
+ }
+ } else
+ {
+@@ -256,9 +260,18 @@
+ if (ri && !ri->IsDirectory())
+ {
+ cRecording *recording = GetRecording(ri);
++#if VDRVERSNUM >= 10325
++ if (recording && recording->Info()->Description() && *recording->Info()->Description())
++#else
+ if (recording && recording->Summary() && *recording->Summary())
++#endif
++
+ #if VDRVERSNUM >= 10307
++#if VDRVERSNUM >= 10325
++ return AddSubMenu(new cMenuText(tr("Summary"), recording->Info()->Description()));
++#else
+ return AddSubMenu(new cMenuText(tr("Summary"), recording->Summary()));
++#endif
+ #else
+ return AddSubMenu(new cMenuItemText(tr("Summary"), recording->Summary()));
+ #endif
+diff -Nur playlist-0.0.2.ORG/playlist.c playlist-0.0.2/playlist.c
+--- playlist-0.0.2.ORG/playlist.c 2004-10-08 02:34:00.000000000 +0200
++++ playlist-0.0.2/playlist.c 2007-01-18 10:15:43.000000000 +0100
+@@ -378,10 +378,11 @@
+ asprintf(&p, "%s%s%s", q, *(q + strlen(q) - 1) == '/' ? "" : "/", playlistconfigfile.u);
+ if (!access(playlistconfigfile.u, F_OK) && !access(playlistconfigfile.u, R_OK) || !access(p, F_OK) && !access(p, R_OK))
+ {
++ char *s;
+ #define MAXARGS 100
+ int fargc = 1;
+ char *fargv[MAXARGS];
+- char buffer[MAXPARSEBUFFER];
++ cReadLine ReadLine;
+ bool done;
+ FILE *f;
+
+@@ -405,9 +406,9 @@
+ esyslog("%s: ERROR: cannot open config file: [%s]%s", plugin_name, ConfigDirectory(""), playlistconfigfile.u);
+ return false;
+ }
+- while (fgets(buffer, sizeof(buffer), f) > 0)
++ while ((s = ReadLine.Read(f)) != NULL)
+ {
+- p = skipspace(stripspace(buffer));
++ p = skipspace(stripspace(s));
+ q = NULL;
+ done = false;
+ while (!done)
Added: vdr/vdr-plugin-playlist/trunk/debian/patches/93_playlist-0.0.2-1.5.7.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-playlist/trunk/debian/patches/93_playlist-0.0.2-1.5.7.dpatch?rev=5402&op=file
==============================================================================
--- vdr/vdr-plugin-playlist/trunk/debian/patches/93_playlist-0.0.2-1.5.7.dpatch (added)
+++ vdr/vdr-plugin-playlist/trunk/debian/patches/93_playlist-0.0.2-1.5.7.dpatch Mon Sep 3 20:24:15 2007
@@ -1,0 +1,36 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 93_playlist-0.0.2-1.5.7.dpatch by Thomas Günther <tom at toms-cafe.de>
+## http://toms-cafe.de/vdr/download/playlist-0.0.2-1.5.7.diff
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes for VDR >= 1.5.7.
+
+ at DPATCH@
+--- playlist-0.0.2/playlist.c
++++ playlist-0.0.2/playlist.c
+@@ -159,7 +159,11 @@ cPluginPlaylist::cPluginPlaylist(void)
+ // Initialize any member variables here.
+ // DON'T DO ANYTHING ELSE THAT MAY HAVE SIDE EFFECTS, REQUIRE GLOBAL
+ // VDR OBJECTS TO EXIST OR PRODUCE ANY OUTPUT!
++#if VDRVERSNUM >= 10507
++ OSDLanguage = NULL;
++#else
+ OSDLanguage = -1;
++#endif
+ PluginPlaylist = this;
+ }
+
+--- playlist-0.0.2/playlist.h
++++ playlist-0.0.2/playlist.h
+@@ -139,7 +139,11 @@ void ExpandEnvironment(tParamFile *FileS
+ class cPluginPlaylist : public cPlugin {
+ private:
+ // Add any member variables or functions you may need here.
++#if VDRVERSNUM >= 10507
++ const char *OSDLanguage;
++#else
+ int OSDLanguage;
++#endif
+ void TestAndSetOSDLanguage(void);
+ bool ProcessArg(int argc, char *argv[]);
+
More information about the pkg-vdr-dvb-changes
mailing list