Hello community,
here is the log from the commit of package vdr for openSUSE:Factory checked in at 2019-06-12 13:15:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/vdr (Old)
and /work/SRC/openSUSE:Factory/.vdr.new.4811 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vdr"
Wed Jun 12 13:15:26 2019 rev:55 rq:708951 version:2.4.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/vdr/vdr.changes 2019-06-01 09:52:12.463268817 +0200
+++ /work/SRC/openSUSE:Factory/.vdr.new.4811/vdr.changes 2019-06-12 13:15:28.852742331 +0200
@@ -1,0 +2,7 @@
+Sat Jun 1 08:36:32 UTC 2019 - Stefan Seyfried
+
+- add upstream patches:
+ * vdr-2.4.0-40-fix-wrong-variable-name.diff
+ * vdr-2.4.0-41-chg-skins-message-to-queue.diff
+ * vdr-2.4.0-42-fix-nit-dvbs2-backwards-compatibility-mode.diff
+-------------------------------------------------------------------
New:
----
vdr-2.4.0-40-fix-wrong-variable-name.diff
vdr-2.4.0-41-chg-skins-message-to-queue.diff
vdr-2.4.0-42-fix-nit-dvbs2-backwards-compatibility-mode.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vdr.spec ++++++
--- /var/tmp/diff_new_pack.H7jnuC/_old 2019-06-12 13:15:29.744741396 +0200
+++ /var/tmp/diff_new_pack.H7jnuC/_new 2019-06-12 13:15:29.752741387 +0200
@@ -89,6 +89,9 @@
Patch137: ftp://ftp.tvdr.de/vdr/Developer/Patches/vdr-2.4/vdr-2.4.0-37-chg-max-pixmap-size.diff
Patch138: ftp://ftp.tvdr.de/vdr/Developer/Patches/vdr-2.4/vdr-2.4.0-38-chg-playerbufsize.diff
Patch139: ftp://ftp.tvdr.de/vdr/Developer/Patches/vdr-2.4/vdr-2.4.0-39-fix-card-index-vs-device-number.diff
+Patch140: ftp://ftp.tvdr.de/vdr/Developer/Patches/vdr-2.4/vdr-2.4.0-40-fix-wrong-variable-name.diff
+Patch141: ftp://ftp.tvdr.de/vdr/Developer/Patches/vdr-2.4/vdr-2.4.0-41-chg-skins-message-to-queue.diff
+Patch142: ftp://ftp.tvdr.de/vdr/Developer/Patches/vdr-2.4/vdr-2.4.0-42-fix-nit-dvbs2-backwards-compatibility-mode.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: doxygen
@@ -180,6 +183,9 @@
%patch137 -p0
%patch138 -p0
%patch139 -p0
+%patch140 -p0
+%patch141 -p0
+%patch142 -p0
#
%patch1 -p1
%patch2 -p1
++++++ vdr-2.4.0-40-fix-wrong-variable-name.diff ++++++
# Fixed a wrong variable name in cFileName::cFileName().
#
--- recording.c 2019/05/07 09:22:34 5.4
+++ recording.c 2019/05/28 21:47:32
@@ -2896,7 +2896,7 @@
// Prepare the file name:
fileName = MALLOC(char, strlen(FileName) + RECORDFILESUFFIXLEN);
if (!fileName) {
- esyslog("ERROR: can't copy file name '%s'", fileName);
+ esyslog("ERROR: can't copy file name '%s'", FileName);
return;
}
strcpy(fileName, FileName);
++++++ vdr-2.4.0-41-chg-skins-message-to-queue.diff ++++++
# If cSkins::Message() is called from a background thread and Type is not mtStatus,
# the call is now automatically forwarded to QueueMessage().
#
diff -u -r5.1 ./skins.c
--- ./skins.c 2018/04/28 12:13:01 5.1
+++ ./skins.c 2019/05/29 16:43:09
@@ -250,7 +250,10 @@
eKeys cSkins::Message(eMessageType Type, const char *s, int Seconds)
{
if (!cThread::IsMainThread()) {
- dsyslog("cSkins::Message() called from background thread - ignored! (Use cSkins::QueueMessage() instead)");
+ if (Type != mtStatus)
+ QueueMessage(Type, s, Seconds);
+ else
+ dsyslog("cSkins::Message(%d, \"%s\", %d) called from background thread - ignored! (Use cSkins::QueueMessage() instead)", Type, s, Seconds);
return kNone;
}
switch (Type) {
diff -u -r5.0 ./skins.h
--- ./skins.h 2017/11/02 15:04:56 5.0
+++ ./skins.h 2019/05/29 16:36:41
@@ -477,6 +477,8 @@
///< has been received within Seconds (the default value of 0 results
///< in the value defined for "Message time" in the setup), kNone
///< will be returned.
+ ///< If Message() is called from a background thread and Type is not
+ ///< mtStatus, the call will be automatically forwarded to QueueMessage().
int QueueMessage(eMessageType Type, const char *s, int Seconds = 0, int Timeout = 0);
///< Like Message(), but this function may be called from a background
///< thread. The given message is put into a queue and the main program
++++++ vdr-2.4.0-42-fix-nit-dvbs2-backwards-compatibility-mode.diff ++++++
# Fixed handling the S2SatelliteDeliverySystemDescriptor for transponders broadcasting
# in "backwards compatibility mode" according to ETSI EN 300 468.
#
--- nit.c 2019/03/18 10:29:09 5.3
+++ nit.c 2019/05/31 13:07:15
@@ -97,6 +97,15 @@
}
delete fld;
+ // Necessary for "backwards compatibility mode" according to ETSI EN 300 468:
+ bool ForceDVBS2 = false;
+ for (SI::Loop::Iterator it2; (d = ts.transportStreamDescriptors.getNext(it2)); ) {
+ if (d->getDescriptorTag() == SI::S2SatelliteDeliverySystemDescriptorTag) {
+ ForceDVBS2 = true;
+ break;
+ }
+ }
+
for (SI::Loop::Iterator it2; (d = ts.transportStreamDescriptors.getNext(it2)); ) {
switch (d->getDescriptorTag()) {
case SI::SatelliteDeliverySystemDescriptorTag: {
@@ -110,11 +119,12 @@
dtp.SetCoderateH(CodeRates[sd->getFecInner()]);
static int Modulations[] = { QAM_AUTO, QPSK, PSK_8, QAM_16 };
dtp.SetModulation(Modulations[sd->getModulationType()]);
- dtp.SetSystem(sd->getModulationSystem() ? DVB_SYSTEM_2 : DVB_SYSTEM_1);
+ bool System = sd->getModulationSystem() || ForceDVBS2;
+ dtp.SetSystem(System ? DVB_SYSTEM_2 : DVB_SYSTEM_1);
static int RollOffs[] = { ROLLOFF_35, ROLLOFF_25, ROLLOFF_20, ROLLOFF_AUTO };
- dtp.SetRollOff(sd->getModulationSystem() ? RollOffs[sd->getRollOff()] : ROLLOFF_AUTO);
+ dtp.SetRollOff(System ? RollOffs[sd->getRollOff()] : ROLLOFF_AUTO);
int SymbolRate = BCD2INT(sd->getSymbolRate()) / 10;
- dbgnit(" %s %d %c %d %d\n", *cSource::ToString(Source), Frequency, dtp.Polarization(), SymbolRate, cChannel::Transponder(Frequency, dtp.Polarization()));
+ dbgnit(" %s %d %c %d %d DVB-S%d\n", *cSource::ToString(Source), Frequency, dtp.Polarization(), SymbolRate, cChannel::Transponder(Frequency, dtp.Polarization()), System ? 2 : 1);
if (Setup.UpdateChannels >= 5) {
bool found = false;
bool forceTransponderUpdate = false;