[SCM] vdr packaging repository branch, master, updated. debian/1.7.23-1-12-g25f8b18
etobi
git at e-tobi.net
Sun Mar 11 09:42:36 UTC 2012
The following commit has been merged in the master branch:
commit 5b634fc3f6bf2fdc043be43673b13a37602c487d
Author: etobi <git at e-tobi.net>
Date: Wed Feb 22 02:24:55 2012 +0100
Added 02-upstream-fix2.patch - reverts some problematic changes in the upstream release
diff --git a/debian/.vdr-patches b/debian/.vdr-patches
index a0c1bd2..15f8005 100644
--- a/debian/.vdr-patches
+++ b/debian/.vdr-patches
@@ -1,10 +1,11 @@
debian/patches/12_osdbase-maxitems.patch:f6fc7c5a100f8e891280195b3e1d69ba
-debian/patches/16_channels.conf.terr-fix.patch:933f8daa6bb6d26c711d0ae987a2b03e
+debian/patches/02-upstream-fix2.patch:9b7bb807c19b7488162b6a711ef35b64
debian/patches/17_epg_channel_name_width.patch:12180ba935fa7834f818fcae9e0ed182
debian/patches/04_newplugin.patch:5877f4f62dab4f3d437d4eef7cae3ac0
debian/patches/99_ncursesw-include.patch:9bafeb768f7921015a5bab5e47786950
-debian/patches/01-upstream-fix.patch:9cefd2996f9778b03e67c36c225612f1
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 4d51e5a..c8b1401 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
vdr (1.7.24-1) unstable; urgency=low
* New upstream release
- * Added 01-upstream-fix.patch - a minor patch from Klaus Schmidinger
+ * Added 01-upstream-fix1.patch - a minor patch from Klaus Schmidinger
+ * Added 02-upstream-fix2.patch - reverts some problematic changes in the
+ upstream release
-- Tobias Grimm <etobi at debian.org> Sun, 19 Feb 2012 17:21:08 +0100
diff --git a/debian/patches/01-upstream-fix.patch b/debian/patches/01-upstream-fix1.patch
similarity index 52%
rename from debian/patches/01-upstream-fix.patch
rename to debian/patches/01-upstream-fix1.patch
index 822cdd3..a4d5665 100644
--- a/debian/patches/01-upstream-fix.patch
+++ b/debian/patches/01-upstream-fix1.patch
@@ -1,5 +1,8 @@
---- dvbplayer.c 2012/02/19 10:48:02 2.23
-+++ dvbplayer.c 2012/02/19 14:21:22
+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;
diff --git a/debian/patches/02-upstream-fix2.patch b/debian/patches/02-upstream-fix2.patch
new file mode 100644
index 0000000..45dfacf
--- /dev/null
+++ b/debian/patches/02-upstream-fix2.patch
@@ -0,0 +1,125 @@
+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 79d8a6a..782e192 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
-01-upstream-fix.patch
+01-upstream-fix1.patch
+02-upstream-fix2.patch
04_newplugin.patch
06_default_svdrp_port_0.patch
11_sortrecordings.patch
--
vdr packaging repository
More information about the pkg-vdr-dvb-changes
mailing list