[SCM] vdr packaging repository branch, e-tobi, updated. debian/1.7.27-1_etobi1

[etobi]

The following commit has been merged in the e-tobi branch:
commit 21f8012c224d7b550939017072fca6b6cb4579cc
Author: etobi <git at e-tobi.net>
Date:   Sun Mar 11 19:18:09 2012 +0100

    New upstream release
    
    * Dropped Added 01-upstream-fix1.patch
    * Dropped Added 02-upstream-fix2.patch

diff --git a/debian/.vdr-patches b/debian/.vdr-patches
index 15f8005..be7a42d 100644
--- a/debian/.vdr-patches
+++ b/debian/.vdr-patches
@@ -1,11 +1,9 @@
 debian/patches/12_osdbase-maxitems.patch:f6fc7c5a100f8e891280195b3e1d69ba
-debian/patches/02-upstream-fix2.patch:9b7bb807c19b7488162b6a711ef35b64
+debian/patches/16_channels.conf.terr-fix.patch:933f8daa6bb6d26c711d0ae987a2b03e
 debian/patches/17_epg_channel_name_width.patch:12180ba935fa7834f818fcae9e0ed182
 debian/patches/04_newplugin.patch:5877f4f62dab4f3d437d4eef7cae3ac0
 debian/patches/99_ncursesw-include.patch:9bafeb768f7921015a5bab5e47786950
 debian/patches/82_valgrind.patch:60ad50e72eabb0861d096d1002fddca7
 debian/patches/06_default_svdrp_port_0.patch:4835f681f185991262a3160146f43f2f
-debian/patches/16_channels.conf.terr-fix.patch:933f8daa6bb6d26c711d0ae987a2b03e
-debian/patches/01-upstream-fix1.patch:7f69cdde1298149977bf70310d31a9f0
 debian/patches/11_sortrecordings.patch:3e3a2f988cb7db03f8f56a44012a65f4
 debian/patches/81_Make_config.patch:76dc4a78d1da16e3e524e41587d0c90d
diff --git a/debian/changelog b/debian/changelog
index 89d949f..0d5c4ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+vdr (1.7.26-1) unstable; urgency=low
+
+  * New upstream release
+  * Dropped Added 01-upstream-fix1.patch
+  * Dropped Added 02-upstream-fix2.patch
+
+ -- Tobias Grimm <etobi at debian.org>  Sun, 11 Mar 2012 10:37:07 +0100
+
 vdr (1.7.24-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/patches/01-upstream-fix1.patch b/debian/patches/01-upstream-fix1.patch
deleted file mode 100644
index a4d5665..0000000
--- a/debian/patches/01-upstream-fix1.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Minor fix released shortly after the upstream release
-Author: Klaus Schmidinger <Klaus.Schmidinger at tvdr.de>
-
---- vdr.orig/dvbplayer.c 2012/02/19 10:48:02     2.23
-+++ vdr/dvbplayer.c 2012/02/19 14:21:22
-@@ -291,6 +291,8 @@
-      delete index;
-      index = NULL;
-      }
-+  else if (PauseLive)
-+     framesPerSecond = cRecording(FileName).FramesPerSecond(); // the fps rate might have changed from the default
- }
-
- cDvbPlayer::~cDvbPlayer()
-
diff --git a/debian/patches/02-upstream-fix2.patch b/debian/patches/02-upstream-fix2.patch
deleted file mode 100644
index 45dfacf..0000000
--- a/debian/patches/02-upstream-fix2.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-Description: Reverts some problematic changes from the upstream release
-Author: Udo Richter <udo_richter at gmx.de>
-
---- vdr.orig/dvbplayer.c	2012-02-20 22:51:24.000000000 +0100
-+++ vdr/dvbplayer.c	2012-02-20 22:55:26.000000000 +0100
-@@ -87,7 +87,6 @@
- private:
-   cUnbufferedFile *f;
-   uchar *buffer;
--  uchar *result;
-   int wanted;
-   int length;
-   cCondWait newSet;
-@@ -101,7 +100,7 @@
-   void Clear(void);
-   void Request(cUnbufferedFile *File, int Length);
-   int Result(uchar **Buffer);
--  bool Reading(void) { return result; }
-+  bool Reading(void) { return buffer; }
-   bool WaitForDataMs(int msToWait);
-   };
- 
-@@ -110,7 +109,6 @@
- {
-   f = NULL;
-   buffer = NULL;
--  result = NULL;
-   wanted = length = 0;
-   Start();
- }
-@@ -120,7 +118,6 @@
-   newSet.Signal();
-   Cancel(3);
-   free(buffer);
--  free(result);
- }
- 
- void cNonBlockingFileReader::Clear(void)
-@@ -129,8 +126,6 @@
-   f = NULL;
-   free(buffer);
-   buffer = NULL;
--  free(result);
--  result = NULL;
-   wanted = length = 0;
-   Unlock();
- }
-@@ -142,18 +137,18 @@
-   wanted = Length;
-   buffer = MALLOC(uchar, wanted);
-   f = File;
--  newSet.Signal();
-   Unlock();
-+  newSet.Signal();
- }
- 
- int cNonBlockingFileReader::Result(uchar **Buffer)
- {
-   LOCK_THREAD;
--  if (result && length == wanted) {
--     *Buffer = result;
--     result = NULL;
-+  if (buffer && length == wanted) {
-+     *Buffer = buffer;
-+     buffer = NULL;
-      return wanted;
--  }
-+     }
-   errno = EAGAIN;
-   return -1;
- }
-@@ -177,8 +172,6 @@
-               length = wanted = r; // this will forward the error status to the caller
-               }
-            if (length == wanted) {
--              result = buffer;
--              buffer = NULL;
-               cMutexLock NewDataLock(&newDataMutex);
-               newDataCond.Broadcast();
-               }
-@@ -190,9 +183,9 @@
- 
- bool cNonBlockingFileReader::WaitForDataMs(int msToWait)
- {
--  if (result && length == wanted)
--     return true;
-   cMutexLock NewDataLock(&newDataMutex);
-+  if (buffer && length == wanted)
-+     return true;
-   return newDataCond.TimedWait(newDataMutex, msToWait);
- }
- 
-@@ -415,13 +408,13 @@
-      Goto(0, true);
-   while (Running()) {
-         if (WaitingForData)
--           nonBlockingFileReader->WaitForDataMs(10); // this keeps the CPU load low, but reacts immediately on new data
-+           nonBlockingFileReader->WaitForDataMs(3); // this keeps the CPU load low, but reacts immediately on new data
-         else if (Sleep) {
-            cPoller Poller;
-            DevicePoll(Poller, 10);
-            Sleep = false;
-            if (playMode == pmStill || playMode == pmPause)
--              cCondWait::SleepMs(10);
-+              cCondWait::SleepMs(3);
-            }
-         {
-           LOCK_THREAD;
-@@ -483,15 +476,7 @@
-                    }
-                 if (!eof) {
-                    uchar *b = NULL;
--                   int Retries = 5;
--                   int r;
--                   while (true) {
--                         r = nonBlockingFileReader->Result(&b);
--                         if (r == -1 && errno == EAGAIN && --Retries)
--                            nonBlockingFileReader->WaitForDataMs(10); 
--                         else 
--                            break;
--                         }
-+                   int r = nonBlockingFileReader->Result(&b);
-                    if (r > 0) {
-                       WaitingForData = false;
-                       uint32_t Pts = 0;
diff --git a/debian/patches/series b/debian/patches/series
index 782e192..caca8ca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-01-upstream-fix1.patch
-02-upstream-fix2.patch
 04_newplugin.patch
 06_default_svdrp_port_0.patch
 11_sortrecordings.patch

-- 
vdr packaging repository