r1500 - in vdr/vdr/trunk/debian: . patches

Thomas Schmidt tschmidt at costa.debian.org
Mon Nov 28 21:36:26 UTC 2005


Author: tschmidt
Date: 2005-11-28 21:36:25 +0000 (Mon, 28 Nov 2005)
New Revision: 1500

Removed:
   vdr/vdr/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
   vdr/vdr/trunk/debian/patches/16_recordings.c-fix.dpatch
   vdr/vdr/trunk/debian/patches/22_vdr-playerepg.dpatch
Modified:
   vdr/vdr/trunk/debian/changelog
   vdr/vdr/trunk/debian/patches/00list
   vdr/vdr/trunk/debian/patches/03_cmdsubmenu.dpatch
   vdr/vdr/trunk/debian/patches/04_newplugin.dpatch
Log:
vdr: New upstream release (1.3.37)

Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog	2005-11-28 21:16:46 UTC (rev 1499)
+++ vdr/vdr/trunk/debian/changelog	2005-11-28 21:36:25 UTC (rev 1500)
@@ -1,3 +1,17 @@
+vdr (1.3.37-1) unstable; urgency=low
+
+  * NOT RELEASED YET
+
+  * Thomas Schmidt <tschmidt at debian.org>
+    - New upstream release
+      + Removed 01_Makefile-fPIC-fix.dpatch
+      + Updated 03_cmdsubmenu.dpatch
+      + Updated 04_newplugin.dpatch
+      + Removed 16_recordings.c-fix.dpatch
+      + Removed 22_vdr-playerepg.dpatch
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Mon, 28 Nov 2005 22:23:52 +0100
+
 vdr (1.3.35-1) unstable; urgency=low
 
   * Thomas Schmidt <tschmidt at debian.org>

Modified: vdr/vdr/trunk/debian/patches/00list
===================================================================
--- vdr/vdr/trunk/debian/patches/00list	2005-11-28 21:16:46 UTC (rev 1499)
+++ vdr/vdr/trunk/debian/patches/00list	2005-11-28 21:36:25 UTC (rev 1500)
@@ -1,4 +1,3 @@
-01_Makefile-fPIC-fix
 02_Makefile-CFGDIR
 03_cmdsubmenu
 04_newplugin
@@ -12,9 +11,7 @@
 12_osdbase-maxitems
 13_epgfix
 15_dvbplayer
-16_recordings.c-fix
 17_replay
-22_vdr-playerepg
 
 # Patch needed for DVB subtitles or ttxtsubs (does not work with AC3-patch)
 # opt-21_subtitles_and_ttxtsubs

Deleted: vdr/vdr/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch	2005-11-28 21:16:46 UTC (rev 1499)
+++ vdr/vdr/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch	2005-11-28 21:36:25 UTC (rev 1500)
@@ -1,92 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
-## 01_Makefile-fPIC-fix.dpatch by Thomas Schmidt <tschmidt at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Adds -fPIC to Makefiles to fix potential FTBFS.
-
- at DPATCH@
-diff -urNad vdr-1.3.31/PLUGINS/src/hello/Makefile /tmp/dpep.SGxFe2/vdr-1.3.31/PLUGINS/src/hello/Makefile
---- vdr-1.3.31/PLUGINS/src/hello/Makefile	2003-12-21 16:47:22.000000000 +0100
-+++ /tmp/dpep.SGxFe2/vdr-1.3.31/PLUGINS/src/hello/Makefile	2005-09-04 17:12:42.453382128 +0200
-@@ -16,7 +16,7 @@
- ### The C++ compiler and options:
- 
- CXX      ?= g++
--CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
-+CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual
- 
- ### The directory environment:
- 
-diff -urNad vdr-1.3.31/PLUGINS/src/osddemo/Makefile /tmp/dpep.SGxFe2/vdr-1.3.31/PLUGINS/src/osddemo/Makefile
---- vdr-1.3.31/PLUGINS/src/osddemo/Makefile	2003-12-21 16:47:26.000000000 +0100
-+++ /tmp/dpep.SGxFe2/vdr-1.3.31/PLUGINS/src/osddemo/Makefile	2005-09-04 17:12:42.453382128 +0200
-@@ -16,7 +16,7 @@
- ### The C++ compiler and options:
- 
- CXX      ?= g++
--CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
-+CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual
- 
- ### The directory environment:
- 
-diff -urNad vdr-1.3.31/PLUGINS/src/servicedemo/Makefile /tmp/dpep.SGxFe2/vdr-1.3.31/PLUGINS/src/servicedemo/Makefile
---- vdr-1.3.31/PLUGINS/src/servicedemo/Makefile	2005-08-21 12:43:12.000000000 +0200
-+++ /tmp/dpep.SGxFe2/vdr-1.3.31/PLUGINS/src/servicedemo/Makefile	2005-09-04 17:12:42.453382128 +0200
-@@ -17,7 +17,7 @@
- ### The C++ compiler and options:
- 
- CXX      ?= g++
--CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
-+CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual
- 
- ### The directory environment:
- 
-diff -urNad vdr-1.3.31/PLUGINS/src/skincurses/Makefile /tmp/dpep.SGxFe2/vdr-1.3.31/PLUGINS/src/skincurses/Makefile
---- vdr-1.3.31/PLUGINS/src/skincurses/Makefile	2004-05-29 16:44:58.000000000 +0200
-+++ /tmp/dpep.SGxFe2/vdr-1.3.31/PLUGINS/src/skincurses/Makefile	2005-09-04 17:13:01.300516928 +0200
-@@ -16,7 +16,7 @@
- ### The C++ compiler and options:
- 
- CXX      ?= g++
--CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
-+CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual
- 
- ### The directory environment:
- 
-diff -urNad vdr-1.3.31/PLUGINS/src/sky/Makefile /tmp/dpep.SGxFe2/vdr-1.3.31/PLUGINS/src/sky/Makefile
---- vdr-1.3.31/PLUGINS/src/sky/Makefile	2003-12-21 16:47:31.000000000 +0100
-+++ /tmp/dpep.SGxFe2/vdr-1.3.31/PLUGINS/src/sky/Makefile	2005-09-04 17:12:42.453382128 +0200
-@@ -16,7 +16,7 @@
- ### The C++ compiler and options:
- 
- CXX      ?= g++
--CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
-+CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual
- 
- ### The directory environment:
- 
-diff -urNad vdr-1.3.31/PLUGINS/src/status/Makefile /tmp/dpep.SGxFe2/vdr-1.3.31/PLUGINS/src/status/Makefile
---- vdr-1.3.31/PLUGINS/src/status/Makefile	2003-12-21 16:47:41.000000000 +0100
-+++ /tmp/dpep.SGxFe2/vdr-1.3.31/PLUGINS/src/status/Makefile	2005-09-04 17:12:42.454381976 +0200
-@@ -16,7 +16,7 @@
- ### The C++ compiler and options:
- 
- CXX      ?= g++
--CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
-+CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual
- 
- ### The directory environment:
- 
-diff -urNad vdr-1.3.31/PLUGINS/src/svdrpdemo/Makefile /tmp/dpep.SGxFe2/vdr-1.3.31/PLUGINS/src/svdrpdemo/Makefile
---- vdr-1.3.31/PLUGINS/src/svdrpdemo/Makefile	2005-08-27 13:26:49.000000000 +0200
-+++ /tmp/dpep.SGxFe2/vdr-1.3.31/PLUGINS/src/svdrpdemo/Makefile	2005-09-04 17:12:42.454381976 +0200
-@@ -16,7 +16,7 @@
- ### The C++ compiler and options:
- 
- CXX      ?= g++
--CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
-+CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual
- 
- ### The directory environment:
- 

Modified: vdr/vdr/trunk/debian/patches/03_cmdsubmenu.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/03_cmdsubmenu.dpatch	2005-11-28 21:16:46 UTC (rev 1499)
+++ vdr/vdr/trunk/debian/patches/03_cmdsubmenu.dpatch	2005-11-28 21:36:25 UTC (rev 1500)
@@ -2,6 +2,11 @@
 
 ## 03_cmdsubmenu.dpatch by Albu at vdrportal.de
 ##
+## version 0.4 for vdr-1.3.36
+## http://toms-cafe.de/vdr/download/vdr-cmdsubmenu-0.4-1.3.36.diff
+##
+## History:
+##
 ## 2003-10-08: Version 0.1 - Albu at vdrportal.de
 ##   http://vdrportal.de/board/thread.php?threadid=6319
 ##
@@ -24,19 +29,19 @@
 ## DP: To create a submenu entry, prefix the name by one ore more "-".
 
 @DPATCH@
---- vdr-1.2.6/Makefile
-+++ vdr-1.2.6/Makefile
-@@ -48,6 +48,7 @@
+--- vdr-1.3.36/Makefile
++++ vdr-1.3.36/Makefile
+@@ -83,6 +83,7 @@
  
- DEFINES += -DREMOTE_$(REMOTE)
+ DEFINES += -DLIRC_DEVICE=\"$(LIRC_DEVICE)\" -DRCU_DEVICE=\"$(RCU_DEVICE)\"
  
 +DEFINES += -DCMD_SUBMENUS
  DEFINES += -D_GNU_SOURCE
  
  DEFINES += -DVIDEODIR=\"$(VIDEODIR)\"
---- vdr-1.2.6/config.c
-+++ vdr-1.2.6/config.c
-@@ -27,18 +27,29 @@
+--- vdr-1.3.36/config.c
++++ vdr-1.3.36/config.c
+@@ -28,18 +28,29 @@
  {
    title = command = NULL;
    confirm = false;
@@ -66,7 +71,7 @@
       int l = p - s;
       if (l > 0) {
          title = MALLOC(char, l + 1);
-@@ -85,6 +96,76 @@
+@@ -86,6 +97,76 @@
    return result;
  }
  
@@ -143,12 +148,12 @@
  // -- cSVDRPhost -------------------------------------------------------------
  
  cSVDRPhost::cSVDRPhost(void)
---- vdr-1.2.6/config.h
-+++ vdr-1.2.6/config.h
-@@ -32,11 +32,15 @@
+--- vdr-1.3.36/config.h
++++ vdr-1.3.36/config.h
+@@ -34,11 +34,15 @@
+ #define MaxSkinName 16
+ #define MaxThemeName 16
  
- #define MaxFileName 256
- 
 +class cCommands;
 +
  class cCommand : public cListObject {
@@ -161,7 +166,7 @@
    static char *result;
  public:
    cCommand(void);
-@@ -45,6 +49,12 @@
+@@ -47,6 +51,12 @@
    const char *Title(void) { return title; }
    bool Confirm(void) { return confirm; }
    const char *Execute(const char *Parameters = NULL);
@@ -174,7 +179,7 @@
    };
  
  typedef uint32_t in_addr_t; //XXX from /usr/include/netinet/in.h (apparently this is not defined on systems with glibc < 2.2)
-@@ -86,6 +96,10 @@
+@@ -88,6 +98,10 @@
  public:
    cConfig(void) { fileName = NULL; }
    virtual ~cConfig() { free(fileName); }
@@ -185,16 +190,16 @@
    const char *FileName(void) { return fileName; }
    bool Load(const char *FileName = NULL, bool AllowComments = false, bool MustExist = false)
    {
-@@ -114,7 +128,7 @@
-                 if (!isempty(buffer)) {
+@@ -117,7 +131,7 @@
+                 if (!isempty(s)) {
                     T *l = new T;
-                    if (l->Parse(buffer))
+                    if (l->Parse(s))
 -                      Add(l);
 +                      AddConfig(l);
                     else {
-                       esyslog("ERROR: error in %s, line %d\n", fileName, line);
+                       esyslog("ERROR: error in %s, line %d", fileName, line);
                        delete l;
-@@ -156,7 +170,10 @@
+@@ -159,7 +173,10 @@
    }
    };
  
@@ -206,9 +211,9 @@
  
  class cSVDRPhosts : public cConfig<cSVDRPhost> {
  public:
---- vdr-1.2.6/menu.c
-+++ vdr-1.2.6/menu.c
-@@ -1518,6 +1518,12 @@
+--- vdr-1.3.36/menu.c
++++ vdr-1.3.36/menu.c
+@@ -1247,6 +1247,12 @@
    if (command) {
       char *buffer = NULL;
       bool confirmed = true;

Modified: vdr/vdr/trunk/debian/patches/04_newplugin.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/04_newplugin.dpatch	2005-11-28 21:16:46 UTC (rev 1499)
+++ vdr/vdr/trunk/debian/patches/04_newplugin.dpatch	2005-11-28 21:36:25 UTC (rev 1500)
@@ -3,9 +3,7 @@
 ## 04_newplugin.dpatch by Thomas Schmidt <tschmidt at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch for the newplugin-script, to not require a normal
-## DP: vdr-source-dir and to add -fPIC to the CXXFLAGS of a
-## DP: new plugin
+## DP: Patch for the newplugin-script, to not require a normal vdr-source-dir
 
 @DPATCH@
 diff -urNad vdr/newplugin /tmp/dpep.ZZNkdG/vdr/newplugin
@@ -20,15 +18,6 @@
  
  $README = qq
  {This is a "plugin" for the Video Disk Recorder (VDR).
-@@ -71,7 +71,7 @@
- ### The C++ compiler and options:
- 
- CXX      ?= g++
--CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
-+CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual
- 
- ### The directory environment:
- 
 @@ -129,12 +129,12 @@
  	\@-rm -rf \$(TMPDIR)/\$(ARCHIVE)
  	\@mkdir \$(TMPDIR)/\$(ARCHIVE)

Deleted: vdr/vdr/trunk/debian/patches/16_recordings.c-fix.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/16_recordings.c-fix.dpatch	2005-11-28 21:16:46 UTC (rev 1499)
+++ vdr/vdr/trunk/debian/patches/16_recordings.c-fix.dpatch	2005-11-28 21:36:25 UTC (rev 1500)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
-## 16_recordings.c-fix.dpatch by Joachim Wilke <joachim.wilke at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes segfault which occured when reaching the end of a replay
-
- at DPATCH@
-diff -urNad vdr-1.3.35/recording.c /tmp/dpep.eegJOQ/vdr-1.3.35/recording.c
---- vdr-1.3.35/recording.c	2005-10-31 13:27:58.000000000 +0100
-+++ /tmp/dpep.eegJOQ/vdr-1.3.35/recording.c	2005-11-02 17:31:31.299956520 +0100
-@@ -1342,7 +1342,7 @@
-         // found a non existing file suffix
-         }
-      if (Open() >= 0) {
--        if (!record && Offset >= 0 && file->Seek(Offset, SEEK_SET) != Offset) {
-+        if (!record && Offset >= 0 && file && file->Seek(Offset, SEEK_SET) != Offset) {
-            LOG_ERROR_STR(fileName);
-            return NULL;
-            }

Deleted: vdr/vdr/trunk/debian/patches/22_vdr-playerepg.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/22_vdr-playerepg.dpatch	2005-11-28 21:16:46 UTC (rev 1499)
+++ vdr/vdr/trunk/debian/patches/22_vdr-playerepg.dpatch	2005-11-28 21:36:25 UTC (rev 1500)
@@ -1,51 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
-## 22_vdr-playerepg.dpatch by Stefan Hülswitt <s.huelswitt at gmx.de>
-## http://vdrportal.de/board/thread.php?postid=348701#post348701
-##
-## Thomas Günther <tom at toms-cafe.de>:
-##   - adapted to vdr-1.3.31
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes mp3 plugin problems with live background and EPG scan enabled.
-
- at DPATCH@
-diff -u vdr-1.3.29-orig/device.c vdr-current-1.3.29/device.c
---- vdr-1.3.29-orig/device.c	2005-08-14 12:52:08.000000000 +0200
-+++ vdr-current-1.3.29/device.c	2005-08-24 19:17:13.000000000 +0200
-@@ -847,9 +849,9 @@
- {
- }
- 
--bool cDevice::Replaying(void) const
-+bool cDevice::Replaying(bool ignoreLivePlayer) const
- {
--  return player != NULL;
-+  return player!=NULL && (!ignoreLivePlayer || player->playMode==pmAudioVideo || player->playMode==pmAudioOnlyBlack);
- }
- 
- bool cDevice::AttachPlayer(cPlayer *Player)
-diff -u vdr-1.3.29-orig/device.h vdr-current-1.3.29/device.h
---- vdr-1.3.29-orig/device.h	2005-08-13 13:44:13.000000000 +0200
-+++ vdr-current-1.3.29/device.h	2005-08-24 18:58:32.000000000 +0200
-@@ -460,7 +462,7 @@
-        ///< to a complete packet with data from the next call to PlayPes().
-        ///< That way any functions called from within PlayPes() will be
-        ///< guaranteed to always receive complete PES packets.
--  bool Replaying(void) const;
-+  bool Replaying(bool ignoreLivePlayer=false) const;
-        ///< Returns true if we are currently replaying.
-   void StopReplay(void);
-        ///< Stops the current replay session (if any).
-diff -u vdr-1.3.31-orig/eitscan.c vdr-current-1.3.31/eitscan.c
---- vdr-1.3.31-orig/eitscan.c	2005-08-28 18:46:14.000000000 +0200
-+++ vdr-current-1.3.31/eitscan.c	2005-09-01 01:17:13.000000000 +0200
-@@ -150,7 +150,7 @@
-                          if (!Channel->Ca() || Channel->Ca() == Device->DeviceNumber() + 1 || Channel->Ca() >= 0x0100) {
-                             if (Device->ProvidesTransponder(Channel)) {
-                                if (!Device->Receiving()) {
--                                  bool IsPrimaryDeviceReplaying = Device == cDevice::PrimaryDevice() && Device->Replaying() && cTransferControl::ReceiverDevice() != cDevice::PrimaryDevice();
-+                                  bool IsPrimaryDeviceReplaying = Device == cDevice::PrimaryDevice() && Device->Replaying(true) && cTransferControl::ReceiverDevice() != cDevice::PrimaryDevice();
-                                   if (Device != cDevice::ActualDevice() || (Device->ProvidesTransponderExclusively(Channel) && (IsPrimaryDeviceReplaying || now - lastActivity > Setup.EPGScanTimeout * 3600))) {
-                                      if (!IsPrimaryDeviceReplaying && Device == cDevice::ActualDevice() && !currentChannel) {
-                                         if (cTransferControl::ReceiverDevice())




More information about the pkg-vdr-dvb-changes mailing list