[vdr-osdteletext] Apply Udo Richter's patch taking advantage of new VDR 1.7.25 features.

Ville Skyttä scop at fedoraproject.org
Tue Mar 6 21:14:27 UTC 2012


commit b0af092753ca7bf86ca51ad7efcee4fd641f29be
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Tue Mar 6 23:14:19 2012 +0200

    Apply Udo Richter's patch taking advantage of new VDR 1.7.25 features.

 vdr-osdteletext-0.9.1-vdr1725.patch |   18 ++++++++++++++++++
 vdr-osdteletext.spec                |    8 +++++++-
 2 files changed, 25 insertions(+), 1 deletions(-)
---
diff --git a/vdr-osdteletext-0.9.1-vdr1725.patch b/vdr-osdteletext-0.9.1-vdr1725.patch
new file mode 100644
index 0000000..d6b2937
--- /dev/null
+++ b/vdr-osdteletext-0.9.1-vdr1725.patch
@@ -0,0 +1,18 @@
+diff --git a/txtrecv.c b/txtrecv.c
+index 15bd88f..2321697 100644
+--- a/txtrecv.c
++++ b/txtrecv.c
+@@ -485,6 +485,13 @@ cTxtStatus::~cTxtStatus()
+ 
+ void cTxtStatus::ChannelSwitch(const cDevice *Device, int ChannelNumber)
+ {
++#if VDRVERSNUM >= 10725
++   // Disconnect receiver if channel is 0, will reconnect to new
++   // receiver after channel change.
++   if (ChannelNumber == 0 && Device->IsPrimaryDevice())
++      DELETENULL(receiver);
++#endif
++
+    // ignore if channel is 0
+    if (ChannelNumber == 0) return;
+ 
diff --git a/vdr-osdteletext.spec b/vdr-osdteletext.spec
index c5b530d..490aadb 100644
--- a/vdr-osdteletext.spec
+++ b/vdr-osdteletext.spec
@@ -3,13 +3,15 @@
 
 Name:           vdr-%{pname}
 Version:        0.9.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        OSD teletext plugin for VDR
 
 License:        GPLv2+
 URL:            http://projects.vdr-developer.org/projects/show/plg-osdteletext
 Source0:        http://projects.vdr-developer.org/attachments/download/658/%{name}-%{version}.tgz
 Source1:        %{name}.conf
+# http://www.linuxtv.org/pipermail/vdr/2012-March/025895.html
+Patch0:         %{name}-0.9.1-vdr1725.patch
 
 BuildRequires:  vdr-devel >= 1.6.0-41
 Requires:       vdr(abi)%{?_isa} = %{vdr_apiversion}
@@ -24,6 +26,7 @@ background.
 %setup -q -n %{pname}-%{version}
 sed -i -e 's|/var/cache/vdr/vtx|%{vdr_cachedir}/osdteletext|g' \
     osdteletext.c README README.DE txtrecv.c
+%patch0 -p1
 
 
 %build
@@ -62,6 +65,9 @@ fi
 
 
 %changelog
+* Tue Mar  6 2012 Ville Skyttä <ville.skytta at iki.fi> - 0.9.1-7
+- Apply Udo Richter's patch taking advantage of new VDR 1.7.25 features.
+
 * Mon Feb 20 2012 Ville Skyttä <ville.skytta at iki.fi> - 0.9.1-6
 - Rebuild.
 


More information about the scm-commits mailing list