commit vdr13

18 May 2006

Hello community,

here is the log from the commit of package vdr13
checked in at Thu May 18 10:17:47 CEST 2006.

--------

--- vdr13/vdr13.changes	2006-02-19 23:24:06.000000000 +0100
+++ vdr13/vdr13.changes	2006-05-02 14:03:08.000000000 +0200
@@ -1,0 +2,22 @@
+Tue May  2 14:02:28 CEST 2006 - lnussel@suse.de
+
+- new version 1.4.0
+- fix runvdr script not working with plugins that have a dash in the
+  name (#171518)
+
+-------------------------------------------------------------------
+Wed Apr 26 10:14:20 CEST 2006 - lnussel@suse.de
+
+- apply vdr-1.3.48-apiversion.diff and vdr-1.3.48-inteditzero.diff
+
+-------------------------------------------------------------------
+Tue Apr 25 10:36:46 CEST 2006 - lnussel@suse.de
+
+- new version 1.3.48 (RC for 1.4.0)
+
+-------------------------------------------------------------------
+Wed Mar 29 15:29:06 CEST 2006 - lnussel@suse.de
+
+- new version 1.3.45
+
+-------------------------------------------------------------------

Old:
----
  vdr-1.3.27-stupid.diff
  vdr-1.3.38-dvbplayer-nosleep.diff
  vdr-1.3.39.tar.bz2

New:
----
  runvdr.diff
  vdr-1.3.45-dvbplayer-nosleep.diff
  vdr-1.4.0.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ vdr13.spec ++++++
--- /var/tmp/diff_new_pack.GQtPn9/_old	2006-05-18 10:17:00.000000000 +0200
+++ /var/tmp/diff_new_pack.GQtPn9/_new	2006-05-18 10:17:00.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package vdr13 (Version 1.3.39)
+# spec file for package vdr13 (Version 1.4.0)
 #
 # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -18,8 +18,8 @@
 Group:          Hardware/TV
 Requires:       dvb
 Prereq:         /usr/sbin/useradd
-Version:        1.3.39
-Release:        6
+Version:        1.4.0
+Release:        2
 Summary:        Video Disk Recorder
 Source:         ftp://ftp.cadsoft.de/vdr/Developer/vdr-%{version}.tar.bz2
 Source1:        rcvdr
@@ -33,11 +33,10 @@
 Source9:        remote.conf
 Patch0:         vdr13-scripts.diff
 #Patch10:      vdr-1.3.30-su.diff
-Patch11:        vdr-1.3.27-stupid.diff
-Patch12:        vdr-1.3.38-dvbplayer-nosleep.diff
+Patch12:        vdr-1.3.45-dvbplayer-nosleep.diff
 Patch13:        vdr-1.3.25-utf8-0.0.3.patch
 Patch14:        vdr-1.3.23-utf8-fonts.diff
-#Patch15:      vdr-1.3.37-aliasing.diff
+Patch20:        runvdr.diff
 # unused patches
 Patch98:        vdr-1.3.5-find-v4l-device-kernel-2.6.patch
 Patch99:        vdr-1.3.14-sc.diff
@@ -111,13 +110,13 @@
 #
 qpatch %PATCH0
 #qpatch %PATCH10
-qpatch %PATCH11
 qpatch %PATCH12
+#qpatch %PATCH11
 %if %with_freetype
 qpatch %PATCH13
 qpatch %PATCH14
 %endif
-#qpatch %PATCH15
+qpatch %PATCH20 -p0
 qpush
 #
 cat > Make.config <<EOF
@@ -222,6 +221,16 @@
 /var/adm/fillup-templates/*
 
 %changelog -n vdr13
+* Tue May 02 2006 - lnussel@suse.de
+- new version 1.4.0
+- fix runvdr script not working with plugins that have a dash in the
+  name (#171518)
+* Wed Apr 26 2006 - lnussel@suse.de
+- apply vdr-1.3.48-apiversion.diff and vdr-1.3.48-inteditzero.diff
+* Tue Apr 25 2006 - lnussel@suse.de
+- new version 1.3.48 (RC for 1.4.0)
+* Wed Mar 29 2006 - lnussel@suse.de
+- new version 1.3.45
 * Sun Feb 19 2006 - lnussel@suse.de
 - GIGA moved to different transponder
 * Sun Feb 05 2006 - lnussel@suse.de





++++++ runvdr.diff ++++++
--- runvdr.orig	2005-05-05 12:41:36.000000000 +0200
+++ runvdr	2006-05-02 13:32:35.000000000 +0200
@@ -57,7 +57,7 @@
 	
     for p in $installed_plugins; do
 	option="-P$p"
-	eval args=\$VDR_PLUGIN_ARGS_$p
+	eval args=\$VDR_PLUGIN_ARGS_${p//[^[:alnum:]]/_}
 	[ -n "$args" ] && option="$option $args"
 	echo "\"$option\""
     done

++++++ vdr-1.3.38-dvbplayer-nosleep.diff -> vdr-1.3.45-dvbplayer-nosleep.diff ++++++
--- vdr13/vdr-1.3.38-dvbplayer-nosleep.diff	2006-01-08 19:28:26.000000000 +0100
+++ vdr13/vdr-1.3.45-dvbplayer-nosleep.diff	2006-03-29 14:33:47.000000000 +0200
@@ -1,8 +1,8 @@
-Index: vdr-1.3.38/dvbplayer.c
+Index: vdr-1.3.45/dvbplayer.c
 ===================================================================
---- vdr-1.3.38.orig/dvbplayer.c
-+++ vdr-1.3.38/dvbplayer.c
-@@ -185,6 +185,7 @@ private:
+--- vdr-1.3.45.orig/dvbplayer.c
++++ vdr-1.3.45/dvbplayer.c
+@@ -199,6 +199,7 @@ private:
    bool eof;
    bool firstPacket;
    ePlayModes playMode;
@@ -10,7 +10,7 @@
    ePlayDirs playDir;
    int trickSpeed;
    int readIndex, writeIndex;
-@@ -345,8 +346,10 @@ void cDvbPlayer::Activate(bool On)
+@@ -359,8 +360,10 @@ void cDvbPlayer::Activate(bool On)
       if (replayFile)
          Start();
       }
@@ -22,15 +22,19 @@
  }
  
  void cDvbPlayer::Action(void)
-@@ -361,15 +364,10 @@ void cDvbPlayer::Action(void)
+@@ -375,19 +378,11 @@ void cDvbPlayer::Action(void)
  
    nonBlockingFileReader = new cNonBlockingFileReader;
    int Length = 0;
 -  bool Sleep = false;
+   bool WaitingForData = false;
  
    while (Running() && (NextFile() || readIndex >= 0 || ringBuffer->Available() || !DeviceFlush(100))) {
 -        if (Sleep) {
--           cCondWait::SleepMs(3); // this keeps the CPU load low
+-           if (WaitingForData)
+-              nonBlockingFileReader->WaitForDataMs(3); // this keeps the CPU load low, but reacts immediately on new data
+-           else
+-              cCondWait::SleepMs(3); // this keeps the CPU load low
 -           Sleep = false;
 -           }
          cPoller Poller;
@@ -39,7 +43,7 @@
  
             LOCK_THREAD;
  
-@@ -442,7 +440,7 @@ void cDvbPlayer::Action(void)
+@@ -463,7 +458,7 @@ void cDvbPlayer::Action(void)
                   }
                }
             else
@@ -48,7 +52,7 @@
  
             // Get the next frame from the buffer:
  
-@@ -485,8 +483,6 @@ void cDvbPlayer::Action(void)
+@@ -506,8 +501,6 @@ void cDvbPlayer::Action(void)
                   p = NULL;
                   }
                }
@@ -57,7 +61,7 @@
             }
          }
  
-@@ -517,6 +513,7 @@ void cDvbPlayer::Play(void)
+@@ -538,6 +531,7 @@ void cDvbPlayer::Play(void)
       DevicePlay();
       playMode = pmPlay;
       playDir = pdForward;
@@ -65,10 +69,10 @@
      }
  }
  
-Index: vdr-1.3.38/thread.h
+Index: vdr-1.3.45/thread.h
 ===================================================================
---- vdr-1.3.38.orig/thread.h
-+++ vdr-1.3.38/thread.h
+--- vdr-1.3.45.orig/thread.h
++++ vdr-1.3.45/thread.h
 @@ -81,12 +81,12 @@ private:
    bool running;
    pthread_t childTid;

++++++ vdr-1.3.39.tar.bz2 -> vdr-1.4.0.tar.bz2 ++++++
++++   18565 lines of diff (skipped)



++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

    

root＠suse.de

tags

participants (1)